hammad-python 0.0.26__py3-none-any.whl → 0.0.28__py3-none-any.whl

hammad/data/__init__.py

@@ -23,6 +23,7 @@ if TYPE_CHECKING:
     from .collections import (
         Collection,
         create_collection,
+        CollectionType,
         TantivyCollectionIndex,
         QdrantCollectionIndex,
         TantivyCollectionIndexSettings,
@@ -59,6 +60,7 @@ __all__ = (
     # hammad.data.collections
     "Collection",
     "create_collection",
+    "CollectionType",
     "TantivyCollectionIndex",
     "QdrantCollectionIndex",
     "TantivyCollectionIndexSettings",

hammad/data/collections/__init__.py

@@ -7,6 +7,7 @@ if TYPE_CHECKING:
     from .collection import (
         Collection,
         create_collection,
+        CollectionType,
     )
 
     from .indexes import (
@@ -29,6 +30,7 @@ __all__ = (
     # hammad.data.collections.collection
     "Collection",
     "create_collection",
+    "CollectionType",
     # hammad.data.collections.indexes
     "TantivyCollectionIndex",
     "QdrantCollectionIndex",

hammad/data/collections/collection.py

@@ -1,14 +1,10 @@
 """hammad.data.collections.collection"""
 
 from typing import (
-    Any,
-    Callable,
-    Dict,
-    List,
     Literal,
     Optional,
     Type,
-    TypeVar,
+    TypeAlias,
     Union,
     overload,
     TYPE_CHECKING,
@@ -37,9 +33,17 @@ else:
 __all__ = (
     "Collection",
     "VectorSearchResult",
+    "CollectionType",
 )
 
 
+CollectionType: TypeAlias = Union["TantivyCollectionIndex", "QdrantCollectionIndex"]
+"""Alias for a type of collection index.
+
+This is a union of TantivyCollectionIndex and QdrantCollectionIndex.
+"""
+
+
 class Collection:
     """
     A unified collection factory that creates the appropriate collection index type
@@ -222,7 +226,16 @@ def create_collection(
     distance_metric: "DistanceMetric" = "dot",
     settings: Optional["QdrantCollectionIndexSettings"] = None,
     query_settings: Optional["QdrantCollectionIndexQuerySettings"] = None,
-    embedding_function: Optional[Callable[[Any], List[float]]] = None,
+    embedding_model: Optional[
+        "EmbeddingModelName"
+    ] = "openai/text-embedding-3-small",
+    embedding_dimensions: Optional[int] = None,
+    embedding_api_key: Optional[str] = None,
+    embedding_base_url: Optional[str] = None,
+    # Rerank-specific parameters
+    rerank_model: Optional[str] = None,
+    rerank_api_key: Optional[str] = None,
+    rerank_base_url: Optional[str] = None,
 ) -> "QdrantCollectionIndex": ...
 
 
@@ -247,7 +260,16 @@ def create_collection(
     ] = None,
     # Vector/Qdrant-specific parameters
     distance_metric: "DistanceMetric" = "dot",
-    embedding_function: Optional[Callable[[Any], List[float]]] = None,
+    embedding_model: Optional[
+        "EmbeddingModelName"
+    ] = "openai/text-embedding-3-small",
+    embedding_dimensions: Optional[int] = None,
+    embedding_api_key: Optional[str] = None,
+    embedding_base_url: Optional[str] = None,
+    # Rerank-specific parameters
+    rerank_model: Optional[str] = None,
+    rerank_api_key: Optional[str] = None,
+    rerank_base_url: Optional[str] = None,
 ) -> Union["TantivyCollectionIndex", "QdrantCollectionIndex"]:
     """
     Create a data collection of the specified type. Collections are a unified
@@ -275,6 +297,11 @@ def create_collection(
         embedding_api_key: API key for the embedding service
         embedding_base_url: Base URL for the embedding service
 
+        # Rerank parameters (for vector collections):
+        rerank_model: The rerank model to use (e.g., 'cohere/rerank-english-v3.0')
+        rerank_api_key: API key for the rerank service
+        rerank_base_url: Base URL for the rerank service
+
     Returns:
         A TantivyCollectionIndex or QdrantCollectionIndex instance
     """
@@ -289,5 +316,11 @@ def create_collection(
         settings=settings,
         query_settings=query_settings,
         distance_metric=distance_metric,
-        embedding_function=embedding_function,
+        embedding_model=embedding_model,
+        embedding_dimensions=embedding_dimensions,
+        embedding_api_key=embedding_api_key,
+        embedding_base_url=embedding_base_url,
+        rerank_model=rerank_model,
+        rerank_api_key=rerank_api_key,
+        rerank_base_url=rerank_base_url,
     )

hammad/formatting/__init__.py

@@ -5,12 +5,24 @@ from .._internal import create_getattr_importer
 
 if TYPE_CHECKING:
     from . import json
+    from .json import (
+        convert_to_json_schema
+    )
     from . import text
+    from .text import (
+        convert_to_text,
+        convert_type_to_text,
+        convert_docstring_to_text
+    )
     from . import yaml
 
 __all__ = (
     "json",
+    "convert_to_json_schema",
     "text",
+    "convert_to_text",
+    "convert_type_to_text",
+    "convert_docstring_to_text",
     "yaml",
 )
 

{hammad_python-0.0.26.dist-info → hammad_python-0.0.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hammad-python
-Version: 0.0.26
+Version: 0.0.28
 Author-email: Hammad Saeed <hammadaidev@gmail.com>
 License: MIT License
         
@@ -41,14 +41,6 @@ Provides-Extra: ai
 Requires-Dist: instructor>=1.9.0; extra == 'ai'
 Requires-Dist: litellm>=1.73.6; extra == 'ai'
 Requires-Dist: qdrant-client>=1.14.3; extra == 'ai'
-Provides-Extra: all
-Requires-Dist: fastapi>=0.115.6; extra == 'all'
-Requires-Dist: instructor>=1.9.0; extra == 'all'
-Requires-Dist: litellm>=1.73.6; extra == 'all'
-Requires-Dist: mcp>=1.10.1; extra == 'all'
-Requires-Dist: pydantic-graph>=0.4.2; extra == 'all'
-Requires-Dist: qdrant-client>=1.14.3; extra == 'all'
-Requires-Dist: uvicorn>=0.34.0; extra == 'all'
 Provides-Extra: genai
 Requires-Dist: fastapi>=0.115.6; extra == 'genai'
 Requires-Dist: instructor>=1.9.0; extra == 'genai'

{hammad_python-0.0.26.dist-info → hammad_python-0.0.28.dist-info}/RECORD

@@ -16,9 +16,9 @@ hammad/cli/styles/__init__.py,sha256=Ok7J_uhJgyswNkBWnDw50oTX9Xk1HPksUl3UbmT1qTI
 hammad/cli/styles/settings.py,sha256=irChf9RsMij3djx_n9D9duoVIzxLCpd9-BlKl6U_OLk,5532
 hammad/cli/styles/types.py,sha256=vNIeQY_23m10K8qVT7Iy-PMwosGL-La-UAZKszHJjEE,7911
 hammad/cli/styles/utils.py,sha256=zzi0JdH1X7O8XWRlMVfJP2jB-OWt7zkpm_LeCHoSKVY,28287
-hammad/data/__init__.py,sha256=rga828Od--N3QeGlnOSweADD1WsRLjSTqkaZVk1VhW0,2232
-hammad/data/collections/__init__.py,sha256=xEORHnjoV75Fa6LFDMyFw90oDaJ0e9VmISLFV3mOsIQ,1110
-hammad/data/collections/collection.py,sha256=fi7jyT2GmXiGLNajjegBJMbefzggL0PIMHf-81ov7Bo,10833
+hammad/data/__init__.py,sha256=VfrHgmyf4RU1y8U0oA23TcohuF-XUh8742rH3lUnw0g,2278
+hammad/data/collections/__init__.py,sha256=_7qoquGARHfx6G_ui9D4czyQAx5RkVHyrdFBhB7UI9U,1156
+hammad/data/collections/collection.py,sha256=zDx27gMv-5F-ClTSaI0_1_GZN8K9bzXmvWIvIBqpkH0,12172
 hammad/data/collections/indexes/__init__.py,sha256=RmXKWKq2sbtA1swz5vamKKWut-eKfc-Q2tUnij-E-IU,960
 hammad/data/collections/indexes/qdrant/__init__.py,sha256=KU89TIJkYmJPnVxWKHfXntkIYwhn86ejXtWG30hCyHg,49
 hammad/data/collections/indexes/qdrant/index.py,sha256=UzhW64i5Yq5AXyGZjkW4dljgQxwKUbjF6vhzendbjko,25634
@@ -46,7 +46,7 @@ hammad/data/types/text.py,sha256=x22KAEX18eU0m5DUvY5P9f1kcYYtoUv9tPRlvmTJubA,408
 hammad/data/types/multimodal/__init__.py,sha256=jPqoHTmgBJnc_8jg-QMjAYiOiRys29IcDnJ3FMrCH_0,689
 hammad/data/types/multimodal/audio.py,sha256=6T3XJXrAazkAluwohfGff0ENmhRtIMAX0XV22KVGgDU,5380
 hammad/data/types/multimodal/image.py,sha256=IDjuCfTpsNqWEaAZ2c6M28gwTpswHy6tGu16F3GE6Rg,4733
-hammad/formatting/__init__.py,sha256=5WZP0WBgTPF7hRtcz_cSMrQG2fKuOGwhFiBTn2J4A_g,348
+hammad/formatting/__init__.py,sha256=HspdG2uFBPcqtUa5lMdqV_9gTon1Emvn61WBUAz4xCI,642
 hammad/formatting/json/__init__.py,sha256=V4uODCUQdptfyw_D96R3XDopw1bgNIR2ogiEG-Z-FtQ,525
 hammad/formatting/json/converters.py,sha256=CfEKtoTkeQbaGnpHHY3SAFVFjRjeG115X94L8Jq-14I,5597
 hammad/formatting/text/__init__.py,sha256=ZAA7D4pwKFjeUxHsnm21QKSTtQ7Fj8ncO__m5Ry_eHY,1506
@@ -129,7 +129,7 @@ hammad/web/openapi/__init__.py,sha256=JhJQ6_laBmB2djIYFc0vgGha2GsdUe4FP1LDdZCQ5J
 hammad/web/openapi/client.py,sha256=1pXz7KAO_0pN4kQZoWKWskXDYGiJ535TsPO1GGCiC0E,26816
 hammad/web/search/__init__.py,sha256=e9A6znPIiZCz-4secyHbUs0uUGf5yAqW6wGacgx961U,24
 hammad/web/search/client.py,sha256=LIx2MsHhn6cRTuq5i1mWowRTdIhPobY4GQV3S3bk9lk,36694
-hammad_python-0.0.26.dist-info/METADATA,sha256=u04KMVnt5FBw6dPi0fP19OdhLXU2UlT7CU8kaXtP-RY,6785
-hammad_python-0.0.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hammad_python-0.0.26.dist-info/licenses/LICENSE,sha256=h74yFUWjbBaodcWG5wNmm30npjl8obVcxD-1nQfUp2I,1069
-hammad_python-0.0.26.dist-info/RECORD,,
+hammad_python-0.0.28.dist-info/METADATA,sha256=04h910Ph7yU2eqX-ptzlQ536MLO3r1b-UyrHsQM2Sv0,6425
+hammad_python-0.0.28.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hammad_python-0.0.28.dist-info/licenses/LICENSE,sha256=h74yFUWjbBaodcWG5wNmm30npjl8obVcxD-1nQfUp2I,1069
+hammad_python-0.0.28.dist-info/RECORD,,