hammad-python 0.0.13__py3-none-any.whl → 0.0.14__py3-none-any.whl

hammad/data/collections/__init__.py

@@ -1,7 +1,7 @@
 """hammad.data.collections"""
 
 from typing import TYPE_CHECKING
-from ..._core._utils._import_utils import _auto_create_getattr_loader
+from ...performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .base_collection import BaseCollection
@@ -26,7 +26,7 @@ __all__ = (
 )
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:

hammad/data/collections/vector_collection.py

@@ -27,13 +27,6 @@ except ImportError as e:
 from .base_collection import BaseCollection, Object, Filters, Schema
 from ...ai.embeddings.create import (
     create_embeddings,
-    async_create_embeddings,
-)
-from ...ai.embeddings.client.fastembed_text_embeddings_client import (
-    FastEmbedTextEmbeddingModel,
-)
-from ...ai.embeddings.client.litellm_embeddings_client import (
-    LiteLlmEmbeddingModel,
 )
 
 __all__ = ("VectorCollection",)

hammad/{configuration → data/configurations}/__init__.py

@@ -5,7 +5,7 @@ from various sources.
 """
 
 from typing import TYPE_CHECKING
-from .._core._utils._import_utils import _auto_create_getattr_loader
+from ...performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .configuration import (
@@ -28,7 +28,7 @@ __all__ = (
 )
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:

hammad/{configuration → data/configurations}/configuration.py

@@ -10,7 +10,7 @@ import msgspec
 import yaml
 
 from ..types.file import File, FileSource
-from ..base.fields import field
+from ..models.base.fields import field
 
 __all__ = (
     "Configuration",

hammad/data/databases/__init__.py

@@ -1,7 +1,7 @@
 """hammad.data.databases"""
 
 from typing import TYPE_CHECKING
-from ..._core._utils._import_utils import _auto_create_getattr_loader
+from ...performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .database import Database, create_database
@@ -13,7 +13,7 @@ __all__ = (
 )
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:

hammad/data/models/__init__.py

@@ -0,0 +1,44 @@
+"""hammad.data.models
+
+Contains **BOTH** resources contains predefined models or base class like
+models, as well as modules & utilities specifically for various interfaces
+of models such as `pydantic`."""
+
+from typing import TYPE_CHECKING
+from ...performance.imports import create_getattr_importer
+
+if TYPE_CHECKING:
+    from .base import (
+        Model,
+        field,
+        validator,
+        is_field,
+        is_model,
+        model_settings
+    )
+    from .pydantic import (
+        convert_to_pydantic_model,
+        convert_to_pydantic_field
+    )
+
+
+__all__ = (
+    # hammad.models.base
+    "Model",
+    "field",
+    "validator",
+    "is_field",
+    "is_model",
+    "model_settings",
+
+    # hammad.models.pydantic
+    "convert_to_pydantic_model",
+    "convert_to_pydantic_field",
+)
+
+
+__getattr__ = create_getattr_importer(__all__)
+
+
+def __dir__() -> list[str]:
+    return list(__all__)

hammad/{base → data/models/base}/__init__.py

@@ -1,11 +1,11 @@
-"""hammad.base
+"""hammad.models.base
 
 Contains the `Model` and `field` system along with an assortment
 of various utilities for interacting and managing these objects.
 """
 
 from typing import TYPE_CHECKING
-from .._core._utils._import_utils import _auto_create_getattr_loader
+from ....performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .model import Model, model_settings
@@ -28,7 +28,7 @@ __all__ = (
     "get_field_info",
 )
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:

hammad/{pydantic → data/models/pydantic}/__init__.py

@@ -1,43 +1,55 @@
-"""hammad.pydantic
+"""hammad.models.pydantic
 
 Contains both models and pydantic **specific** utiltiies / resources
 meant for general case usage."""
 
 from typing import TYPE_CHECKING
-from .._core._utils._import_utils import _auto_create_getattr_loader
+from ....performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
+    from .models import (
+        ArbitraryModel,
+        CacheableModel,
+        FastModel,
+        FunctionModel,
+        SubscriptableModel,
+    )
     from .converters import (
         convert_to_pydantic_model,
         convert_to_pydantic_field,
+        convert_dataclass_to_pydantic_model,
+        convert_dict_to_pydantic_model,
+        convert_function_to_pydantic_model,
+        convert_sequence_to_pydantic_model,
+        convert_type_to_pydantic_model,
         create_confirmation_pydantic_model,
         create_selection_pydantic_model,
     )
-    from .models import (
-        FastModel,
-        FunctionModel,
-        ArbitraryModel,
-        CacheableModel,
-        SubscriptableModel,
-    )
 
 
 __all__ = (
+    # hammad.models.pydantic.models
+    "ArbitraryModel",
+    "CacheableModel",
+    "FastModel",
+    "FunctionModel",
+    "SubscriptableModel",
+    # hammad.models.pydantic.converters
     "convert_to_pydantic_model",
     "convert_to_pydantic_field",
+    "convert_dataclass_to_pydantic_model",
+    "convert_dict_to_pydantic_model",
+    "convert_function_to_pydantic_model",
+    "convert_sequence_to_pydantic_model",
+    "convert_type_to_pydantic_model",
     "create_confirmation_pydantic_model",
     "create_selection_pydantic_model",
-    "FastModel",
-    "FunctionModel",
-    "ArbitraryModel",
-    "CacheableModel",
-    "SubscriptableModel",
 )
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:
-    """Get the attributes of the pydantic module."""
+    """Get the attributes of the models module."""
     return list(__all__)

hammad/{pydantic → data/models/pydantic}/converters.py

@@ -1,4 +1,4 @@
-"""hammad.utils.pydantic.converters
+"""hammad.data.models.pydantic.converters
 
 Contains various converters for converting various objects into
 a Pydantic model. These converters are used to convert
@@ -28,7 +28,10 @@ from typing import (
 )
 from pydantic import BaseModel, Field, create_model
 
-from ..cache.decorators import cached
+from ....cache.decorators import cached
+
+from typing import get_origin, get_args
+from typing_inspect import is_generic_type
 
 logger = logging.getLogger(__name__)
 
@@ -518,6 +521,12 @@ def convert_to_pydantic_model(
                 description=description,
             )
 
+    # Handle generic types (like list[str], dict[str, int], etc.)
+    if is_generic_type(target) or get_origin(target) is not None:
+        return convert_type_to_pydantic_model(
+            target, name, description, field_name, default
+        )
+
     # Handle standard Python types (int, str, etc.)
     if isinstance(target, type):
         return convert_type_to_pydantic_model(

hammad/{pydantic → data/models/pydantic}/models/__init__.py

@@ -1,7 +1,7 @@
-"""hammad.pydantic.models"""
+"""hammad.data.models.pydantic.models"""
 
 from typing import TYPE_CHECKING
-from ..._core._utils._import_utils import _auto_create_getattr_loader
+from .....performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .arbitrary_model import ArbitraryModel
@@ -20,7 +20,7 @@ __all__ = (
 )
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:

hammad/{pydantic → data/models/pydantic}/models/arbitrary_model.py

@@ -1,4 +1,4 @@
-"""hammad.pydantic.models.arbitrary_model"""
+"""hammad.data.models.pydantic.models.arbitrary_model"""
 
 from typing import Any, Dict
 from pydantic import ConfigDict

hammad/{pydantic → data/models/pydantic}/models/cacheable_model.py

@@ -1,4 +1,4 @@
-"""hammad.pydantic.models.cacheable_model"""
+"""hammad.data.models.pydantic.models.cacheable_model"""
 
 from typing import Any, Callable, Dict, Optional
 from functools import wraps

hammad/{pydantic → data/models/pydantic}/models/fast_model.py

@@ -1,4 +1,4 @@
-"""hammad.pydantic.models.fast_model"""
+"""hammad.data.models.pydantic.models.fast_model"""
 
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple, TypeVar, Generic
 from pydantic import BaseModel, ConfigDict

hammad/{pydantic → data/models/pydantic}/models/function_model.py

@@ -1,4 +1,4 @@
-"""hammad.pydantic.models.function_model"""
+"""hammad.data.models.pydantic.models.function_model"""
 
 from typing import Any, Callable, Dict, List, Optional, TypeVar, Generic, cast
 from pydantic import BaseModel

hammad/{pydantic → data/models/pydantic}/models/subscriptable_model.py

@@ -1,4 +1,4 @@
-"""hammad.pydantic.models.subscriptable_model"""
+"""hammad.data.models.pydantic.models.subscriptable_model"""
 
 from pydantic import BaseModel
 from typing import Any

hammad/data/types/__init__.py

@@ -0,0 +1,41 @@
+"""hammad.data.types
+
+Contains functional alias, or model-like objects that are meant to be used
+by users as bases as well as for type hints. These objects define simple
+interfaces for various types of common objects."""
+
+from typing import TYPE_CHECKING
+from ...performance.imports import create_getattr_importer
+
+
+if TYPE_CHECKING:
+    from .text import (
+        BaseText,
+        Text,
+    )
+    from .file import File
+    from .multimodal import (
+        Audio,
+        Image,
+    )
+
+
+__all__ = (
+    # hammad.data.types.text
+    "BaseText",
+    "Text",
+
+    # hammad.data.types.file
+    "File",
+
+    # hammad.data.types.multimodal
+    "Audio",
+    "Image",
+)
+
+
+__getattr__ = create_getattr_importer(__all__)
+
+
+def __dir__() -> list[str]:
+    return list(__all__)

hammad/{types → data/types}/file.py

@@ -6,8 +6,8 @@ from typing import Any, Self
 import mimetypes
 from urllib.parse import urlparse
 
-from ..base.model import Model
-from ..base.fields import field
+from ..models.base.model import Model
+from ..models.base.fields import field
 
 __all__ = ("File", "FileSource")
 

hammad/{multimodal → data/types/multimodal}/__init__.py

@@ -4,7 +4,7 @@ Contains types and model like objects for working with various
 types of multimodal data."""
 
 from typing import TYPE_CHECKING
-from .._core._utils._import_utils import _auto_create_getattr_loader
+from ....performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .image import Image
@@ -17,7 +17,7 @@ __all__ = (
 )
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:

hammad/{multimodal → data/types/multimodal}/audio.py

@@ -3,8 +3,8 @@
 import httpx
 from typing import Self
 
-from ..types.file import File, FileSource
-from ..base.fields import field
+from ...types.file import File, FileSource
+from ...models.base.fields import field
 
 __all__ = ("Audio",)
 

hammad/{multimodal → data/types/multimodal}/image.py

@@ -3,8 +3,8 @@
 import httpx
 from typing import Self
 
-from ..types.file import File, FileSource
-from ..base.fields import field
+from ...types.file import File, FileSource
+from ...models.base.fields import field
 
 __all__ = ("Image",)
 

hammad/{text → data/types}/text.py

@@ -1,4 +1,4 @@
-"""hammad.text
+"""hammad.types.text
 
 Contains the `BaseText` type, which is a functional type & object
 for created intelligently rendered strings and markdown strings
@@ -25,11 +25,11 @@ from typing import (
     Generic,
 )
 
-from .markdown import (
+from ...formatting.text.markdown import (
     markdown_heading,
     markdown_code_block,
 )
-from .converters import convert_to_text
+from ...formatting.text.converters import convert_to_text
 
 
 # -----------------------------------------------------------------------------
@@ -269,7 +269,7 @@ class BaseText(ABC):
                     toc_headings.append((section.heading_level, section.title))
 
             if toc_headings:
-                from .markdown import markdown_table
+                from ...formatting.text.markdown import markdown_table
 
                 parts.append(markdown_table(toc_headings))
 

hammad/formatting/__init__.py

@@ -0,0 +1,38 @@
+"""hammad.formatting
+
+Contains resources for working with various data structures and formats
+such as JSON, YAML, and text / markdown formatting."""
+
+from typing import TYPE_CHECKING
+from ..performance.imports import create_getattr_importer
+
+
+if TYPE_CHECKING:
+    from .json import (
+        convert_to_json_schema,
+        encode_json,
+        decode_json,
+    )
+    from .yaml import (
+        encode_yaml,
+        decode_yaml,
+    )
+
+
+__all__ = (
+    # hammad.formatting.json
+    "convert_to_json_schema",
+    "encode_json",
+    "decode_json",
+    # hammad.formatting.yaml
+    "encode_yaml",
+    "decode_yaml",
+)
+
+
+__getattr__ = create_getattr_importer(__all__)
+
+
+def __dir__() -> list[str]:
+    """Get the attributes of the formatting module."""
+    return list(__all__)

hammad/{json → formatting/json}/__init__.py

@@ -1,7 +1,7 @@
-"""hammad.utils.json"""
+"""hammad.formatting.json"""
 
 from typing import TYPE_CHECKING
-from .._core._utils._import_utils import _auto_create_getattr_loader
+from ...performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .converters import (
@@ -13,7 +13,7 @@ if TYPE_CHECKING:
 __all__ = ("convert_to_json_schema", "encode_json", "decode_json")
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:

hammad/{json → formatting/json}/converters.py

@@ -1,4 +1,4 @@
-"""hammad.utils.json.utils
+"""hammad.formatting.json.utils
 
 Contains various utility functions used when working with JSON data."""
 
@@ -7,7 +7,7 @@ from typing import Any
 import msgspec
 from msgspec.json import encode as encode_json, decode as decode_json
 
-from ..typing import get_type_description, inspection
+from ...typing import get_type_description, inspection  # type: ignore
 
 __all__ = (
     "SchemaError",

hammad/{text → formatting/text}/__init__.py

@@ -1,7 +1,9 @@
-"""hammad.text"""
+"""hammad.formatting.text
+
+Contains resources for working with text / markdown formatting."""
 
 from typing import TYPE_CHECKING
-from .._core._utils._import_utils import _auto_create_getattr_loader
+from ...performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .converters import (
@@ -27,17 +29,6 @@ if TYPE_CHECKING:
         markdown_table,
         markdown_table_row,
     )
-    from .text import (
-        BaseText,
-        Text,
-        OutputText,
-        OutputFormat,
-        HeadingStyle,
-        CodeSection,
-        SimpleText,
-        SchemaSection,
-        UserResponse,
-    )
 
 
 __all__ = (
@@ -62,20 +53,10 @@ __all__ = (
     "markdown_list_item",
     "markdown_table",
     "markdown_table_row",
-    # hammad.text.text
-    "BaseText",
-    "Text",
-    "OutputText",
-    "OutputFormat",
-    "HeadingStyle",
-    "CodeSection",
-    "SimpleText",
-    "SchemaSection",
-    "UserResponse",
 )
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:

hammad/{text → formatting/text}/converters.py

@@ -1,4 +1,4 @@
-"""hammad.text.utils.converters"""
+"""hammad.formatting.text.converters"""
 
 import json
 import logging
@@ -15,7 +15,7 @@ from typing import (
     Union,
 )
 
-from ..typing import (
+from ...typing import (
     inspection,
     is_pydantic_basemodel,
     is_msgspec_struct,

hammad/{text → formatting/text}/markdown.py

@@ -1,4 +1,4 @@
-"""hammad.text.utils.markdown"""
+"""hammad.formatting.text.markdown"""
 
 from typing import (
     List,

hammad/{yaml → formatting/yaml}/__init__.py

@@ -1,28 +1,24 @@
-"""hammad.yaml
+"""hammad.formatting.yaml
 
 Simply extends the `msgspec.yaml` submodule."""
 
 from typing import TYPE_CHECKING
-from .._core._utils._import_utils import _auto_create_getattr_loader
+from ...performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .converters import (
-        Yaml,
         encode_yaml,
         decode_yaml,
-        read_yaml_file,
     )
 
 
 __all__ = (
-    "Yaml",
     "encode_yaml",
     "decode_yaml",
-    "read_yaml_file",
 )
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]:

hammad/formatting/yaml/converters.py

@@ -0,0 +1,5 @@
+"""hammad.formatting.yaml.converters"""
+
+from msgspec.yaml import encode as encode_yaml, decode as decode_yaml
+
+__all__ = ("encode_yaml", "decode_yaml")

hammad/logging/__init__.py

@@ -1,7 +1,7 @@
 """hammad.logging"""
 
 from typing import TYPE_CHECKING
-from .._core._utils._import_utils import _auto_create_getattr_loader
+from ..performance.imports import create_getattr_importer
 
 if TYPE_CHECKING:
     from .logger import Logger, create_logger, create_logger_level, LoggerLevelName
@@ -27,7 +27,7 @@ __all__ = (
 )
 
 
-__getattr__ = _auto_create_getattr_loader(__all__)
+__getattr__ = create_getattr_importer(__all__)
 
 
 def __dir__() -> list[str]: