fix Client.get_items

Author: mishaschwartz

pystac_client/client.py

@@ -443,27 +443,34 @@ def get_collections(self) -> Iterator[Collection]:
                 call_modifier(self.modifier, collection)
                 yield collection
 
-    def get_items(
-        self, *ids: str, recursive: bool | None = None
-    ) -> Iterator["Item_Type"]:
+    def get_items(self, *ids: str, recursive: bool = True) -> Iterator["Item_Type"]:
         """Return all items of this catalog.
 
         Args:
             ids: Zero or more item ids to find.
-            recursive: unused in pystac-client, but needed for falling back to pystac
+            recursive : If True, search this catalog and all children for the
+                item; otherwise, only search the items of this catalog. Defaults
+                to True.
 
         Return:
             Iterator[Item]: Iterator of items whose parent is this
                 catalog.
         """
         if self.conforms_to(ConformanceClasses.ITEM_SEARCH):
-            search = self.search(ids=ids)
+            if recursive:
+                search = self.search(ids=ids)
+                try:
+                    yield from search.items()
+                    return
+                except APIError:
+                    child_catalogs = [catalog for catalog, _, _ in self.walk()]
+                    search = self.search(ids=ids, collections=[self, *child_catalogs])
+            else:
+                search = self.search(ids=ids, collections=[self.id])
             yield from search.items()
         else:
             self._warn_about_fallback("ITEM_SEARCH")
-            for item in super().get_items(
-                *ids, recursive=recursive is None or recursive
-            ):
+            for item in super().get_items(*ids, recursive=recursive):
                 call_modifier(self.modifier, item)
                 yield item