update stubs (#107)

Author: flying-sheep

Cargo.toml

@@ -18,7 +18,7 @@ openssl = { version = "0.10", features = ["vendored"] }
 numpy = "0.25.0"
 unsafe_cell_slice = "0.2.0"
 serde_json = "1.0.128"
-pyo3-stub-gen = "0.9.1"
+pyo3-stub-gen = "0.12.2"
 opendal = { version = "0.53.0", features = ["services-http"] }
 tokio = { version = "1.41.1", features = ["rt-multi-thread"] }
 zarrs_opendal = "0.7.2"

hatch.toml

@@ -3,9 +3,9 @@
 
 import builtins
 import typing
-from enum import Enum
 
 import numpy.typing
+import zarr.abc.store
 
 class Basic:
     def __new__(cls, byte_interface: typing.Any, chunk_spec: typing.Any) -> Basic: ...
@@ -14,7 +14,7 @@ class CodecPipelineImpl:
     def __new__(
         cls,
         array_metadata: builtins.str,
-        store_config: StoreConfig,
+        store_config: zarr.abc.store.Store,
         *,
         validate_checksums: builtins.bool | None = None,
         chunk_concurrent_minimum: builtins.int | None = None,
@@ -33,12 +33,6 @@ class CodecPipelineImpl:
         write_empty_chunks: builtins.bool,
     ) -> None: ...
 
-class FilesystemStoreConfig:
-    root: builtins.str
-
-class HttpStoreConfig:
-    endpoint: builtins.str
-
 class WithSubset:
     def __new__(
         cls,
@@ -48,6 +42,6 @@ class WithSubset:
         shape: typing.Sequence[builtins.int],
     ) -> WithSubset: ...
 
-class StoreConfig(Enum):
-    Filesystem = ...
-    Http = ...
+def codec_metadata_v2_to_v3(
+    filters: typing.Sequence[builtins.str] | None, compressor: builtins.str | None
+) -> builtins.list[builtins.str]: ...

python/zarrs/_internal.pyi

@@ -158,7 +158,7 @@ def make_chunk_info_for_rust_with_indices(
     ],
     drop_axes: tuple[int, ...],
     shape: tuple[int, ...],
-) -> list[WithSubset]:
+) -> RustChunkInfo:
     shape = shape if shape else (1,)  # constant array
     chunk_info_with_indices: list[WithSubset] = []
     write_empty_chunks: bool = True

python/zarrs/utils.py

@@ -5,6 +5,7 @@ use zarrs::metadata::{
 };
 
 #[pyfunction]
+#[pyo3_stub_gen::derive::gen_stub_pyfunction]
 #[pyo3(signature = (filters=None, compressor=None))]
 pub fn codec_metadata_v2_to_v3(
     filters: Option<Vec<String>>,

src/metadata_v2.rs

@@ -6,7 +6,6 @@ use pyo3::{
     types::{PyAnyMethods, PyStringMethods, PyTypeMethods},
     Bound, FromPyObject, PyAny, PyErr, PyResult,
 };
-use pyo3_stub_gen::derive::gen_stub_pyclass_enum;
 use zarrs::storage::{
     storage_adapter::async_to_sync::AsyncToSyncStorageAdapter, ReadableWritableListableStorage,
 };
@@ -20,7 +19,6 @@ pub use self::filesystem::FilesystemStoreConfig;
 pub use self::http::HttpStoreConfig;
 
 #[derive(Debug, Clone)]
-#[gen_stub_pyclass_enum]
 pub enum StoreConfig {
     Filesystem(FilesystemStoreConfig),
     Http(HttpStoreConfig),
@@ -60,6 +58,12 @@ impl<'py> FromPyObject<'py> for StoreConfig {
     }
 }
 
+impl pyo3_stub_gen::PyStubType for StoreConfig {
+    fn type_output() -> pyo3_stub_gen::TypeInfo {
+        pyo3_stub_gen::TypeInfo::with_module("zarr.abc.store.Store", "zarr.abc.store".into())
+    }
+}
+
 impl TryFrom<&StoreConfig> for ReadableWritableListableStorage {
     type Error = PyErr;
 

src/store.rs

@@ -1,16 +1,12 @@
 use std::sync::Arc;
 
-use pyo3::{exceptions::PyRuntimeError, pyclass, PyErr};
-use pyo3_stub_gen::derive::gen_stub_pyclass;
+use pyo3::{exceptions::PyRuntimeError, PyErr};
 use zarrs::{filesystem::FilesystemStore, storage::ReadableWritableListableStorage};
 
 use crate::utils::PyErrExt;
 
 #[derive(Debug, Clone)]
-#[gen_stub_pyclass]
-#[pyclass]
 pub struct FilesystemStoreConfig {
-    #[pyo3(get, set)]
     pub root: String,
 }
 

src/store/filesystem.rs

@@ -1,16 +1,12 @@
 use std::collections::HashMap;
 
-use pyo3::{exceptions::PyValueError, pyclass, Bound, PyAny, PyErr, PyResult};
-use pyo3_stub_gen::derive::gen_stub_pyclass;
+use pyo3::{exceptions::PyValueError, Bound, PyAny, PyErr, PyResult};
 use zarrs::storage::ReadableWritableListableStorage;
 
 use super::opendal_builder_to_sync_store;
 
 #[derive(Debug, Clone)]
-#[gen_stub_pyclass]
-#[pyclass]
 pub struct HttpStoreConfig {
-    #[pyo3(get, set)]
     pub endpoint: String,
 }