--wip-- [skip ci]

Author: gadomski

Cargo.lock

@@ -9,37 +9,22 @@ use pyo3::{
     IntoPyObjectExt,
 };
 use pyo3_arrow::PyTable;
-use stac_duckdb::{Client, Config};
-use std::sync::Mutex;
+use stac_duckdb::Client;
+use std::{path::PathBuf, sync::Mutex};
 
 #[pyclass(frozen)]
 pub struct DuckdbClient(Mutex<Client>);
 
 #[pymethods]
 impl DuckdbClient {
     #[new]
-    #[pyo3(signature = (*, use_s3_credential_chain=false, use_azure_credential_chain=false, use_httpfs=false, use_hive_partitioning=false, install_extensions=true, custom_extension_repository=None, extension_directory=None))]
+    #[pyo3(signature = (*, use_hive_partitioning=false, extension_directory=None, install_extensions=true))]
     fn new(
-        use_s3_credential_chain: bool,
-        use_azure_credential_chain: bool,
-        use_httpfs: bool,
         use_hive_partitioning: bool,
+        extension_directory: Option<PathBuf>,
         install_extensions: bool,
-        custom_extension_repository: Option<String>,
-        extension_directory: Option<String>,
     ) -> Result<DuckdbClient> {
-        let config = Config {
-            use_s3_credential_chain,
-            use_azure_credential_chain,
-            use_httpfs,
-            use_hive_partitioning,
-            install_extensions,
-            custom_extension_repository,
-            extension_directory,
-            convert_wkb: true,
-        };
-        let client = Client::with_config(config)?;
-        Ok(DuckdbClient(Mutex::new(client)))
+        todo!()
     }
 
     #[pyo3(signature = (href, *, intersects=None, ids=None, collections=None, limit=None, bbox=None, datetime=None, include=None, exclude=None, sortby=None, filter=None, query=None, **kwargs))]
@@ -123,10 +108,11 @@ impl DuckdbClient {
                 .0
                 .lock()
                 .map_err(|err| PyException::new_err(err.to_string()))?;
-            let convert_wkb = client.config.convert_wkb;
-            client.config.convert_wkb = false;
+            // FIXME this is awkward
+            let convert_wkb = client.convert_wkb;
+            client.convert_wkb = false;
             let result = client.search_to_arrow(&href, search);
-            client.config.convert_wkb = convert_wkb;
+            client.convert_wkb = convert_wkb;
             result?
         };
         if record_batches.is_empty() {

src/duckdb.rs

@@ -1,7 +1,10 @@
+from pathlib import Path
+
 import pytest
-import rustac
 from geopandas import GeoDataFrame
-from rustac import DuckdbClient
+
+import rustac
+from rustac import DuckdbClient, RustacError
 
 
 @pytest.fixture
@@ -27,11 +30,6 @@ def test_get_collections(client: DuckdbClient) -> None:
     assert len(collections) == 1
 
 
-@pytest.mark.skip("slow")
-def test_init_with_config() -> None:
-    DuckdbClient(use_s3_credential_chain=True, use_hive_partitioning=True)
-
-
 def test_search_to_arrow(client: DuckdbClient) -> None:
     pytest.importorskip("arro3.core")
     table = client.search_to_arrow("data/100-sentinel-2-items.parquet")
@@ -40,3 +38,15 @@ def test_search_to_arrow(client: DuckdbClient) -> None:
     data_frame_table = data_frame.to_arrow()
     item_collection = rustac.from_arrow(data_frame_table)
     assert len(item_collection["features"]) == 100
+
+
+def test_custom_extension_directory() -> None:
+    extension_directory = Path(__file__).parent / "duckdb-extensions"
+    client = DuckdbClient(extension_directory=extension_directory)
+    # Search to ensure we trigger everything
+    client.search("data/100-sentinel-2-items.parquet")
+
+
+def test_no_install(tmp_path: Path) -> None:
+    with pytest.raises(RustacError):
+        DuckdbClient(extension_directory=tmp_path, install_extensions=False)