arize 8.0.0b0__py3-none-any.whl → 8.0.0b2__py3-none-any.whl

arize/__init__.py

@@ -37,7 +37,7 @@ def make_to_df(field_name: str) -> object:
         json_normalize: bool = False,
         convert_dtypes: bool = True,
     ) -> object:
-        """Convert a list of objects to a pandas DataFrame.
+        """Convert a list of objects to a :class:`pandas.DataFrame`.
 
         Behavior:
           - If an item is a Pydantic v2 model, use `.model_dump(by_alias=...)`.

arize/_client_factory.py

@@ -0,0 +1,50 @@
+"""Factory for creating and caching the generated OpenAPI client."""
+
+from __future__ import annotations
+
+import threading
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from arize._generated.api_client.api_client import ApiClient
+    from arize.config import SDKConfiguration
+
+
+class GeneratedClientFactory:
+    """Factory for creating and caching generated OpenAPI clients.
+
+    This factory is owned by ArizeClient and provides thread-safe lazy
+    initialization of the OpenAPI client used by various subclients.
+    """
+
+    def __init__(self, sdk_config: SDKConfiguration) -> None:
+        """Initialize the factory.
+
+        Args:
+            sdk_config: SDK configuration containing API settings.
+        """
+        self._sdk_config = sdk_config
+        self._client: ApiClient | None = None
+        self._lock = threading.Lock()
+
+    def get_client(self) -> ApiClient:
+        """Get or create the generated OpenAPI client instance.
+
+        Returns:
+            The shared generated API client instance.
+        """
+        if self._client is not None:
+            return self._client
+
+        with self._lock:
+            if self._client is not None:
+                return self._client
+
+            # Import lazily to avoid extra dependencies at config time
+            from arize._generated import api_client as gen
+
+            cfg = gen.Configuration(host=self._sdk_config.api_url)
+            if self._sdk_config.api_key:
+                cfg.access_token = self._sdk_config.api_key
+            self._client = gen.ApiClient(cfg)
+            return self._client

arize/_flight/client.py

@@ -333,8 +333,8 @@ class ArizeFlightClient:
                 latest version.
 
         Returns:
-            A pandas DataFrame containing the dataset examples with JSON string columns
-            converted to dict objects.
+            :class:`pandas.DataFrame`: A pandas DataFrame containing the dataset examples
+                with JSON string columns converted to dict objects.
 
         Raises:
             RuntimeError: If the Flight request fails.
@@ -374,8 +374,8 @@ class ArizeFlightClient:
             experiment_id: Experiment ID to retrieve runs from.
 
         Returns:
-            A pandas DataFrame containing the experiment runs with JSON string columns
-            converted to dict objects.
+            :class:`pandas.DataFrame`: A pandas DataFrame containing the experiment runs
+                with JSON string columns converted to dict objects.
 
         Raises:
             RuntimeError: If the Flight request fails.

arize/_generated/api_client/__init__.py

@@ -46,7 +46,6 @@ __all__ = [
     "ExperimentsList200Response",
     "ExperimentsRunsList200Response",
     "PaginationMetadata",
-    "PrimitiveValue",
     "Problem",
     "Project",
     "ProjectsCreateRequest",
@@ -86,7 +85,6 @@ from arize._generated.api_client.models.experiments_create_request import Experi
 from arize._generated.api_client.models.experiments_list200_response import ExperimentsList200Response as ExperimentsList200Response
 from arize._generated.api_client.models.experiments_runs_list200_response import ExperimentsRunsList200Response as ExperimentsRunsList200Response
 from arize._generated.api_client.models.pagination_metadata import PaginationMetadata as PaginationMetadata
-from arize._generated.api_client.models.primitive_value import PrimitiveValue as PrimitiveValue
 from arize._generated.api_client.models.problem import Problem as Problem
 from arize._generated.api_client.models.project import Project as Project
 from arize._generated.api_client.models.projects_create_request import ProjectsCreateRequest as ProjectsCreateRequest

arize/_generated/api_client/api/datasets_api.py

@@ -940,7 +940,7 @@ class DatasetsApi:
         self,
         dataset_id: Annotated[StrictStr, Field(description="The unique identifier of the dataset")],
         dataset_version_id: Annotated[Optional[StrictStr], Field(description="The unique identifier of the dataset version")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=10000, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -1021,7 +1021,7 @@ class DatasetsApi:
         self,
         dataset_id: Annotated[StrictStr, Field(description="The unique identifier of the dataset")],
         dataset_version_id: Annotated[Optional[StrictStr], Field(description="The unique identifier of the dataset version")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=10000, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -1102,7 +1102,7 @@ class DatasetsApi:
         self,
         dataset_id: Annotated[StrictStr, Field(description="The unique identifier of the dataset")],
         dataset_version_id: Annotated[Optional[StrictStr], Field(description="The unique identifier of the dataset version")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=10000, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -1861,7 +1861,7 @@ class DatasetsApi:
     def datasets_list(
         self,
         space_id: Annotated[Optional[StrictStr], Field(description="Filter search results to a particular space ID")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=100, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         cursor: Annotated[Optional[StrictStr], Field(description="Opaque pagination cursor returned from a previous response (`pagination.next_cursor`). Treat it as an unreadable token; do not attempt to parse or construct it. ")] = None,
         _request_timeout: Union[
             None,
@@ -1941,7 +1941,7 @@ class DatasetsApi:
     def datasets_list_with_http_info(
         self,
         space_id: Annotated[Optional[StrictStr], Field(description="Filter search results to a particular space ID")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=100, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         cursor: Annotated[Optional[StrictStr], Field(description="Opaque pagination cursor returned from a previous response (`pagination.next_cursor`). Treat it as an unreadable token; do not attempt to parse or construct it. ")] = None,
         _request_timeout: Union[
             None,
@@ -2021,7 +2021,7 @@ class DatasetsApi:
     def datasets_list_without_preload_content(
         self,
         space_id: Annotated[Optional[StrictStr], Field(description="Filter search results to a particular space ID")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=100, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         cursor: Annotated[Optional[StrictStr], Field(description="Opaque pagination cursor returned from a previous response (`pagination.next_cursor`). Treat it as an unreadable token; do not attempt to parse or construct it. ")] = None,
         _request_timeout: Union[
             None,

arize/_generated/api_client/api/experiments_api.py

@@ -898,7 +898,7 @@ class ExperimentsApi:
     def experiments_list(
         self,
         dataset_id: Annotated[Optional[StrictStr], Field(description="Filter experiments to a particular dataset ID")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=100, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         cursor: Annotated[Optional[StrictStr], Field(description="Opaque pagination cursor returned from a previous response (`pagination.next_cursor`). Treat it as an unreadable token; do not attempt to parse or construct it. ")] = None,
         _request_timeout: Union[
             None,
@@ -978,7 +978,7 @@ class ExperimentsApi:
     def experiments_list_with_http_info(
         self,
         dataset_id: Annotated[Optional[StrictStr], Field(description="Filter experiments to a particular dataset ID")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=100, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         cursor: Annotated[Optional[StrictStr], Field(description="Opaque pagination cursor returned from a previous response (`pagination.next_cursor`). Treat it as an unreadable token; do not attempt to parse or construct it. ")] = None,
         _request_timeout: Union[
             None,
@@ -1058,7 +1058,7 @@ class ExperimentsApi:
     def experiments_list_without_preload_content(
         self,
         dataset_id: Annotated[Optional[StrictStr], Field(description="Filter experiments to a particular dataset ID")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=100, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         cursor: Annotated[Optional[StrictStr], Field(description="Opaque pagination cursor returned from a previous response (`pagination.next_cursor`). Treat it as an unreadable token; do not attempt to parse or construct it. ")] = None,
         _request_timeout: Union[
             None,
@@ -1211,7 +1211,7 @@ class ExperimentsApi:
     def experiments_runs_list(
         self,
         experiment_id: Annotated[StrictStr, Field(description="The unique identifier of the experiment")],
-        limit: Annotated[Optional[Annotated[int, Field(le=10000, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -1288,7 +1288,7 @@ class ExperimentsApi:
     def experiments_runs_list_with_http_info(
         self,
         experiment_id: Annotated[StrictStr, Field(description="The unique identifier of the experiment")],
-        limit: Annotated[Optional[Annotated[int, Field(le=10000, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -1365,7 +1365,7 @@ class ExperimentsApi:
     def experiments_runs_list_without_preload_content(
         self,
         experiment_id: Annotated[StrictStr, Field(description="The unique identifier of the experiment")],
-        limit: Annotated[Optional[Annotated[int, Field(le=10000, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],

arize/_generated/api_client/api/projects_api.py

@@ -891,7 +891,7 @@ class ProjectsApi:
     def projects_list(
         self,
         space_id: Annotated[Optional[StrictStr], Field(description="Filter search results to a particular space ID")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=100, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         cursor: Annotated[Optional[StrictStr], Field(description="Opaque pagination cursor returned from a previous response (`pagination.next_cursor`). Treat it as an unreadable token; do not attempt to parse or construct it. ")] = None,
         _request_timeout: Union[
             None,
@@ -970,7 +970,7 @@ class ProjectsApi:
     def projects_list_with_http_info(
         self,
         space_id: Annotated[Optional[StrictStr], Field(description="Filter search results to a particular space ID")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=100, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         cursor: Annotated[Optional[StrictStr], Field(description="Opaque pagination cursor returned from a previous response (`pagination.next_cursor`). Treat it as an unreadable token; do not attempt to parse or construct it. ")] = None,
         _request_timeout: Union[
             None,
@@ -1049,7 +1049,7 @@ class ProjectsApi:
     def projects_list_without_preload_content(
         self,
         space_id: Annotated[Optional[StrictStr], Field(description="Filter search results to a particular space ID")] = None,
-        limit: Annotated[Optional[Annotated[int, Field(le=500, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
+        limit: Annotated[Optional[Annotated[int, Field(le=100, strict=True, ge=1)]], Field(description="Maximum items to return")] = None,
         cursor: Annotated[Optional[StrictStr], Field(description="Opaque pagination cursor returned from a previous response (`pagination.next_cursor`). Treat it as an unreadable token; do not attempt to parse or construct it. ")] = None,
         _request_timeout: Union[
             None,

arize/_generated/api_client/models/__init__.py

@@ -29,7 +29,6 @@ from arize._generated.api_client.models.experiments_create_request import Experi
 from arize._generated.api_client.models.experiments_list200_response import ExperimentsList200Response
 from arize._generated.api_client.models.experiments_runs_list200_response import ExperimentsRunsList200Response
 from arize._generated.api_client.models.pagination_metadata import PaginationMetadata
-from arize._generated.api_client.models.primitive_value import PrimitiveValue
 from arize._generated.api_client.models.problem import Problem
 from arize._generated.api_client.models.project import Project
 from arize._generated.api_client.models.projects_create_request import ProjectsCreateRequest

arize/_generated/api_client/models/datasets_create_request.py

@@ -19,7 +19,6 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing import Any, ClassVar, Dict, List
-from arize._generated.api_client.models.primitive_value import PrimitiveValue
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -29,7 +28,7 @@ class DatasetsCreateRequest(BaseModel):
     """ # noqa: E501
     name: StrictStr = Field(description="Name of the new dataset")
     space_id: StrictStr = Field(description="ID of the space the dataset will belong to")
-    examples: List[Dict[str, PrimitiveValue]] = Field(description="Array of examples for the new dataset")
+    examples: List[Dict[str, Any]] = Field(description="Array of examples for the new dataset")
     __properties: ClassVar[List[str]] = ["name", "space_id", "examples"]
 
     model_config = ConfigDict(
@@ -71,13 +70,6 @@ class DatasetsCreateRequest(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of each item in examples (list)
-        _items = []
-        if self.examples:
-            for _item_examples in self.examples:
-                if _item_examples:
-                    _items.append(_item_examples.to_dict())
-            _dict['examples'] = _items
         return _dict
 
     @classmethod
@@ -97,7 +89,7 @@ class DatasetsCreateRequest(BaseModel):
         _obj = cls.model_validate({
             "name": obj.get("name"),
             "space_id": obj.get("space_id"),
-            "examples": [Dict[str, PrimitiveValue].from_dict(_item) for _item in obj["examples"]] if obj.get("examples") is not None else None
+            "examples": obj.get("examples")
         })
         return _obj
 

arize/_generated/api_client/models/datasets_examples_insert_request.py

@@ -19,7 +19,6 @@ import json
 
 from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List
-from arize._generated.api_client.models.primitive_value import PrimitiveValue
 from typing import Optional, Set
 from typing_extensions import Self
 
@@ -27,7 +26,7 @@ class DatasetsExamplesInsertRequest(BaseModel):
     """
     DatasetsExamplesInsertRequest
     """ # noqa: E501
-    examples: List[Dict[str, PrimitiveValue]] = Field(description="Array of examples to append to the dataset version")
+    examples: List[Dict[str, Any]] = Field(description="Array of examples to append to the dataset version")
     __properties: ClassVar[List[str]] = ["examples"]
 
     model_config = ConfigDict(
@@ -69,13 +68,6 @@ class DatasetsExamplesInsertRequest(BaseModel):
             exclude=excluded_fields,
             exclude_none=True,
         )
-        # override the default output from pydantic by calling `to_dict()` of each item in examples (list)
-        _items = []
-        if self.examples:
-            for _item_examples in self.examples:
-                if _item_examples:
-                    _items.append(_item_examples.to_dict())
-            _dict['examples'] = _items
         return _dict
 
     @classmethod
@@ -93,7 +85,7 @@ class DatasetsExamplesInsertRequest(BaseModel):
                 raise ValueError("Error due to additional fields (not defined in DatasetsExamplesInsertRequest) in the input: " + _key)
 
         _obj = cls.model_validate({
-            "examples": [Dict[str, PrimitiveValue].from_dict(_item) for _item in obj["examples"]] if obj.get("examples") is not None else None
+            "examples": obj.get("examples")
         })
         return _obj
 

arize/_generated/api_client/test/test_datasets_create_request.py

@@ -38,9 +38,7 @@ class TestDatasetsCreateRequest(unittest.TestCase):
                 name = '',
                 space_id = '',
                 examples = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ]
             )
         else:
@@ -48,9 +46,7 @@ class TestDatasetsCreateRequest(unittest.TestCase):
                 name = '',
                 space_id = '',
                 examples = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ],
         )
         """

arize/_generated/api_client/test/test_datasets_examples_insert_request.py

@@ -36,17 +36,13 @@ class TestDatasetsExamplesInsertRequest(unittest.TestCase):
         if include_optional:
             return DatasetsExamplesInsertRequest(
                 examples = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ]
             )
         else:
             return DatasetsExamplesInsertRequest(
                 examples = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ],
         )
         """

arize/_generated/api_client/test/test_datasets_examples_list200_response.py

@@ -36,9 +36,7 @@ class TestDatasetsExamplesList200Response(unittest.TestCase):
         if include_optional:
             return DatasetsExamplesList200Response(
                 examples = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ],
                 pagination = arize._generated.api_client.models.pagination_metadata.PaginationMetadata(
                     next_cursor = '', 
@@ -47,9 +45,7 @@ class TestDatasetsExamplesList200Response(unittest.TestCase):
         else:
             return DatasetsExamplesList200Response(
                 examples = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ],
                 pagination = arize._generated.api_client.models.pagination_metadata.PaginationMetadata(
                     next_cursor = '', 

arize/_generated/api_client/test/test_datasets_examples_update_request.py

@@ -36,18 +36,14 @@ class TestDatasetsExamplesUpdateRequest(unittest.TestCase):
         if include_optional:
             return DatasetsExamplesUpdateRequest(
                 examples = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ],
                 new_version = ''
             )
         else:
             return DatasetsExamplesUpdateRequest(
                 examples = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ],
         )
         """

arize/_generated/api_client/test/test_experiments_create_request.py

@@ -38,9 +38,7 @@ class TestExperimentsCreateRequest(unittest.TestCase):
                 name = '',
                 dataset_id = '',
                 experiment_runs = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ]
             )
         else:
@@ -48,9 +46,7 @@ class TestExperimentsCreateRequest(unittest.TestCase):
                 name = '',
                 dataset_id = '',
                 experiment_runs = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ],
         )
         """

arize/_generated/api_client/test/test_experiments_runs_list200_response.py

@@ -36,9 +36,7 @@ class TestExperimentsRunsList200Response(unittest.TestCase):
         if include_optional:
             return ExperimentsRunsList200Response(
                 experiment_runs = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ],
                 pagination = arize._generated.api_client.models.pagination_metadata.PaginationMetadata(
                     next_cursor = '', 
@@ -47,9 +45,7 @@ class TestExperimentsRunsList200Response(unittest.TestCase):
         else:
             return ExperimentsRunsList200Response(
                 experiment_runs = [
-                    {
-                        'key' : null
-                        }
+                    { }
                     ],
                 pagination = arize._generated.api_client.models.pagination_metadata.PaginationMetadata(
                     next_cursor = '', 

arize/_generated/api_client_README.md

@@ -109,7 +109,6 @@ Class | Method | HTTP request | Description
  - [ExperimentsList200Response](arize/_generated/api_client/docs/ExperimentsList200Response.md)
  - [ExperimentsRunsList200Response](arize/_generated/api_client/docs/ExperimentsRunsList200Response.md)
  - [PaginationMetadata](arize/_generated/api_client/docs/PaginationMetadata.md)
- - [PrimitiveValue](arize/_generated/api_client/docs/PrimitiveValue.md)
  - [Problem](arize/_generated/api_client/docs/Problem.md)
  - [Project](arize/_generated/api_client/docs/Project.md)
  - [ProjectsCreateRequest](arize/_generated/api_client/docs/ProjectsCreateRequest.md)

arize/_lazy.py

@@ -1,6 +1,7 @@
 # src/arize/_lazy.py
 from __future__ import annotations
 
+import inspect
 import logging
 import sys
 import threading
@@ -8,6 +9,8 @@ from importlib import import_module
 from typing import TYPE_CHECKING, ClassVar
 
 if TYPE_CHECKING:
+    import types
+
     from arize.config import SDKConfiguration
 
 logger = logging.getLogger(__name__)
@@ -22,6 +25,11 @@ class LazySubclientsMixin:
         self._lazy_cache: dict[str, object] = {}
         self._lazy_lock = threading.Lock()
 
+        # Add generated client factory
+        from arize._client_factory import GeneratedClientFactory
+
+        self._gen_client_factory = GeneratedClientFactory(sdk_config)
+
     def __getattr__(self, name: str) -> object:
         subs = self._SUBCLIENTS
         if name not in subs:
@@ -41,12 +49,18 @@ class LazySubclientsMixin:
             module = _dynamic_import(module_path)
             klass = getattr(module, class_name)
 
-            # Pass sdk_config if the child accepts it; otherwise construct bare.
-            try:
-                instance = klass(sdk_config=self.sdk_config)
-            except TypeError:
-                instance = klass()
-
+            # Determine which parameters this subclient needs
+            # and build kwargs accordingly
+            sig = inspect.signature(klass.__init__)
+            kwargs = {}
+            if "sdk_config" in sig.parameters:
+                kwargs["sdk_config"] = self.sdk_config
+            if "generated_client" in sig.parameters:
+                kwargs["generated_client"] = (
+                    self._gen_client_factory.get_client()
+                )
+
+            instance = klass(**kwargs)
             self._lazy_cache[name] = instance
             return instance
 
@@ -82,8 +96,8 @@ def require(
         )
 
 
-def _dynamic_import(modname: str, retries: int = 2) -> object:
-    def _attempt_import(remaining_attempts: int) -> object:
+def _dynamic_import(modname: str, retries: int = 2) -> types.ModuleType:
+    def _attempt_import(remaining_attempts: int) -> types.ModuleType:
         try:
             return import_module(modname)
         except (ModuleNotFoundError, ImportError, KeyError):
@@ -92,4 +106,6 @@ def _dynamic_import(modname: str, retries: int = 2) -> object:
                 raise
             return _attempt_import(remaining_attempts - 1)
 
-    return _attempt_import(retries) if retries > 0 else None
+    if retries <= 0:
+        raise ValueError(f"retries must be > 0, got {retries}")
+    return _attempt_import(retries)