sie-haystack 0.1.10__tar.gz → 0.2.0__tar.gz

{sie_haystack-0.1.10 → sie_haystack-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sie-haystack
-Version: 0.1.10
+Version: 0.2.0
 Summary: SIE integration for Haystack
 Author-email: Superlinked <dev@superlinked.com>
 License: Apache-2.0
@@ -30,11 +30,31 @@ SIE integration for Haystack.
 pip install sie-haystack
 ```
 
+## Imports
+
+Preferred import paths follow Haystack's namespace convention:
+
+```python
+from haystack_integrations.components.embedders.sie import (
+    SIEDocumentEmbedder,
+    SIETextEmbedder,
+)
+from haystack_integrations.components.rankers.sie import SIERanker
+from haystack_integrations.components.extractors.sie import SIEExtractor
+```
+
+The legacy flat imports remain supported for compatibility:
+
+```python
+from sie_haystack import SIEDocumentEmbedder, SIEExtractor, SIERanker, SIETextEmbedder
+```
+
 ## Usage
 
 ```python
 from haystack import Document
-from sie_haystack import SIETextEmbedder, SIEDocumentEmbedder, SIERanker
+from haystack_integrations.components.embedders.sie import SIEDocumentEmbedder, SIETextEmbedder
+from haystack_integrations.components.rankers.sie import SIERanker
 
 # Embed a query
 text_embedder = SIETextEmbedder(base_url="http://localhost:8080", model="BAAI/bge-m3")

{sie_haystack-0.1.10 → sie_haystack-0.2.0}/README.md

@@ -8,11 +8,31 @@ SIE integration for Haystack.
 pip install sie-haystack
 ```
 
+## Imports
+
+Preferred import paths follow Haystack's namespace convention:
+
+```python
+from haystack_integrations.components.embedders.sie import (
+    SIEDocumentEmbedder,
+    SIETextEmbedder,
+)
+from haystack_integrations.components.rankers.sie import SIERanker
+from haystack_integrations.components.extractors.sie import SIEExtractor
+```
+
+The legacy flat imports remain supported for compatibility:
+
+```python
+from sie_haystack import SIEDocumentEmbedder, SIEExtractor, SIERanker, SIETextEmbedder
+```
+
 ## Usage
 
 ```python
 from haystack import Document
-from sie_haystack import SIETextEmbedder, SIEDocumentEmbedder, SIERanker
+from haystack_integrations.components.embedders.sie import SIEDocumentEmbedder, SIETextEmbedder
+from haystack_integrations.components.rankers.sie import SIERanker
 
 # Embed a query
 text_embedder = SIETextEmbedder(base_url="http://localhost:8080", model="BAAI/bge-m3")

{sie_haystack-0.1.10 → sie_haystack-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sie-haystack"
-version = "0.1.10"
+version = "0.2.0"
 description = "SIE integration for Haystack"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -33,7 +33,7 @@ requires = ["hatchling"]
 build-backend = "hatchling.build"
 
 [tool.hatch.build.targets.wheel]
-packages = ["src/sie_haystack"]
+packages = ["src/sie_haystack", "src/haystack_integrations"]
 
 [tool.pytest.ini_options]
 asyncio_mode = "auto"

sie_haystack-0.2.0/src/haystack_integrations/components/embedders/sie/__init__.py

@@ -0,0 +1,25 @@
+"""Haystack namespace exports for SIE embedders.
+
+This mirrors Haystack's `haystack_integrations.components.*` convention
+while keeping the existing `sie_haystack` imports available.
+"""
+
+from sie_haystack.embedders import (
+    SIEDocumentEmbedder,
+    SIEImageEmbedder,
+    SIEMultivectorDocumentEmbedder,
+    SIEMultivectorTextEmbedder,
+    SIESparseDocumentEmbedder,
+    SIESparseTextEmbedder,
+    SIETextEmbedder,
+)
+
+__all__ = [
+    "SIEDocumentEmbedder",
+    "SIEImageEmbedder",
+    "SIEMultivectorDocumentEmbedder",
+    "SIEMultivectorTextEmbedder",
+    "SIESparseDocumentEmbedder",
+    "SIESparseTextEmbedder",
+    "SIETextEmbedder",
+]

sie_haystack-0.2.0/src/haystack_integrations/components/extractors/sie/__init__.py

@@ -0,0 +1,11 @@
+"""Haystack namespace exports for SIE extractors."""
+
+from sie_haystack.extractors import Classification, DetectedObject, Entity, Relation, SIEExtractor
+
+__all__ = [
+    "Classification",
+    "DetectedObject",
+    "Entity",
+    "Relation",
+    "SIEExtractor",
+]

sie_haystack-0.2.0/src/haystack_integrations/components/rankers/sie/__init__.py

@@ -0,0 +1,5 @@
+"""Haystack namespace exports for SIE rankers."""
+
+from sie_haystack.rankers import SIERanker
+
+__all__ = ["SIERanker"]

sie_haystack-0.2.0/tests/test_namespace_aliases.py

@@ -0,0 +1,73 @@
+"""Tests for Haystack namespace alias exports."""
+
+from haystack_integrations.components.embedders.sie import (
+    SIEDocumentEmbedder as NamespacedDocumentEmbedder,
+)
+from haystack_integrations.components.embedders.sie import (
+    SIEImageEmbedder as NamespacedImageEmbedder,
+)
+from haystack_integrations.components.embedders.sie import (
+    SIEMultivectorDocumentEmbedder as NamespacedMultivectorDocumentEmbedder,
+)
+from haystack_integrations.components.embedders.sie import (
+    SIEMultivectorTextEmbedder as NamespacedMultivectorTextEmbedder,
+)
+from haystack_integrations.components.embedders.sie import (
+    SIESparseDocumentEmbedder as NamespacedSparseDocumentEmbedder,
+)
+from haystack_integrations.components.embedders.sie import (
+    SIESparseTextEmbedder as NamespacedSparseTextEmbedder,
+)
+from haystack_integrations.components.embedders.sie import (
+    SIETextEmbedder as NamespacedTextEmbedder,
+)
+from haystack_integrations.components.extractors.sie import (
+    Classification as NamespacedClassification,
+)
+from haystack_integrations.components.extractors.sie import (
+    DetectedObject as NamespacedDetectedObject,
+)
+from haystack_integrations.components.extractors.sie import (
+    Entity as NamespacedEntity,
+)
+from haystack_integrations.components.extractors.sie import (
+    Relation as NamespacedRelation,
+)
+from haystack_integrations.components.extractors.sie import (
+    SIEExtractor as NamespacedExtractor,
+)
+from haystack_integrations.components.rankers.sie import SIERanker as NamespacedRanker
+from sie_haystack import (
+    SIEDocumentEmbedder,
+    SIEExtractor,
+    SIEImageEmbedder,
+    SIEMultivectorDocumentEmbedder,
+    SIEMultivectorTextEmbedder,
+    SIERanker,
+    SIESparseDocumentEmbedder,
+    SIESparseTextEmbedder,
+    SIETextEmbedder,
+)
+from sie_haystack.extractors import Classification, DetectedObject, Entity, Relation
+
+
+def test_namespaced_embedder_exports_match_flat_exports() -> None:
+    assert NamespacedTextEmbedder is SIETextEmbedder
+    assert NamespacedDocumentEmbedder is SIEDocumentEmbedder
+    assert NamespacedSparseTextEmbedder is SIESparseTextEmbedder
+    assert NamespacedSparseDocumentEmbedder is SIESparseDocumentEmbedder
+    assert NamespacedMultivectorTextEmbedder is SIEMultivectorTextEmbedder
+    assert NamespacedMultivectorDocumentEmbedder is SIEMultivectorDocumentEmbedder
+    assert NamespacedImageEmbedder is SIEImageEmbedder
+
+
+def test_namespaced_ranker_export_matches_flat_export() -> None:
+    assert NamespacedRanker is SIERanker
+
+
+def test_namespaced_extractor_exports_match_flat_exports() -> None:
+    assert NamespacedExtractor is SIEExtractor
+    assert NamespacedEntity is Entity
+    assert NamespacedRelation is Relation
+    assert NamespacedClassification is Classification
+    assert NamespacedDetectedObject is DetectedObject