fix: be less dumb

Author: gadomski

src/search.rs

@@ -46,12 +46,12 @@ pub fn search<'py>(
     {
         pyo3_async_runtimes::tokio::future_into_py(py, async move {
             let value = search_duckdb(href, search, max_items)?;
-            Ok(value)
+            Ok(Json(value.items))
         })
     } else {
         pyo3_async_runtimes::tokio::future_into_py(py, async move {
             let value = search_api(href, search, max_items).await?;
-            Ok(value)
+            Ok(Json(value.items))
         })
     }
 }
@@ -105,16 +105,25 @@ pub fn search_to<'py>(
     {
         pyo3_async_runtimes::tokio::future_into_py(py, async move {
             let value = search_duckdb(href, search, max_items)?;
-            Ok(value)
+            let count = value.items.len();
+            let _ = format
+                .put_opts(
+                    outfile,
+                    serde_json::to_value(value).map_err(Error::from)?,
+                    options.unwrap_or_default(),
+                )
+                .await
+                .map_err(Error::from)?;
+            Ok(count)
         })
     } else {
         pyo3_async_runtimes::tokio::future_into_py(py, async move {
             let value = search_api(href, search, max_items).await?;
-            let count = value.0.items.len();
+            let count = value.items.len();
             let _ = format
                 .put_opts(
                     outfile,
-                    serde_json::to_value(value.0).map_err(Error::from)?,
+                    serde_json::to_value(value).map_err(Error::from)?,
                     options.unwrap_or_default(),
                 )
                 .await
@@ -128,16 +137,16 @@ fn search_duckdb(
     href: String,
     search: Search,
     max_items: Option<usize>,
-) -> Result<Json<stac_api::ItemCollection>> {
+) -> Result<stac_api::ItemCollection> {
     let value = stac_duckdb::search(&href, search, max_items)?;
-    Ok(Json(value))
+    Ok(value)
 }
 
 async fn search_api(
     href: String,
     search: Search,
     max_items: Option<usize>,
-) -> Result<Json<stac_api::ItemCollection>> {
+) -> Result<stac_api::ItemCollection> {
     let value = stac_api::client::search(&href, search, max_items).await?;
-    Ok(Json(value))
+    Ok(value)
 }

stacrs.pyi

@@ -272,10 +272,10 @@ async def search_to(
             to None.
 
     Returns:
-        list[dict[str, Any]]: A list of the returned STAC items.
+        int: The number of items written
 
     Examples:
-        >>> items = await stacrs.search_to("out.parquet",
+        >>> count = await stacrs.search_to("out.parquet",
         ...     "https://landsatlook.usgs.gov/stac-server",
         ...     collections=["landsat-c2l2-sr"],
         ...     intersects={"type": "Point", "coordinates": [-105.119, 40.173]},

tests/test_search.py

@@ -7,14 +7,14 @@
 
 
 async def test_search() -> None:
-    item_collection = await stacrs.search(
+    items = await stacrs.search(
         "https://landsatlook.usgs.gov/stac-server",
         collections="landsat-c2l2-sr",
         intersects={"type": "Point", "coordinates": [-105.119, 40.173]},
         sortby="-properties.datetime",
         max_items=1,
     )
-    assert len(item_collection["features"]) == 1
+    assert len(items) == 1
 
 
 async def test_search_to(tmp_path: Path) -> None:
@@ -47,5 +47,5 @@ async def test_search_to_geoparquet(tmp_path: Path) -> None:
 
 
 async def test_search_geoparquet(data: Path) -> None:
-    item_collection = await stacrs.search(str(data / "extended-item.parquet"))
-    assert len(item_collection["features"]) == 1
+    items = await stacrs.search(str(data / "extended-item.parquet"))
+    assert len(items) == 1