hammad-python 0.0.26__tar.gz → 0.0.28__tar.gz

{hammad_python-0.0.26 → hammad_python-0.0.28}/PKG-INFO

@@ -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 → hammad_python-0.0.28}/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_python-0.0.26 → hammad_python-0.0.28}/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_python-0.0.26 → hammad_python-0.0.28}/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_python-0.0.26 → hammad_python-0.0.28}/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 → hammad_python-0.0.28}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "hammad-python"
-version = "0.0.26"
+version = "0.0.28"
 license = {file = "LICENSE"}
 readme = "README.md"
 authors = [{name = "Hammad Saeed", email = "hammadaidev@gmail.com"}]
@@ -49,15 +49,6 @@ genai = [
     "uvicorn>=0.34.0",
     "pydantic-graph>=0.4.2",
 ]
-all = [
-    "litellm>=1.73.6",
-    "instructor>=1.9.0",
-    "qdrant-client>=1.14.3",
-    "mcp>=1.10.1",
-    "fastapi>=0.115.6",
-    "uvicorn>=0.34.0",
-    "pydantic-graph>=0.4.2",
-]
 
 [dependency-groups]
 dev = [