fix superlinked package (#19673)

Author: logan-markewich

llama-index-integrations/retrievers/llama-index-retrievers-superlinked/examples/steam_games_example.ipynb

@@ -25,7 +25,7 @@
     "import pandas as pd\n",
     "\n",
     "import superlinked.framework as sl\n",
-    "from llama_index_retrievers_superlinked import SuperlinkedRetriever\n",
+    "from llama_index.retrievers.superlinked import SuperlinkedRetriever\n",
     "\n",
     "try:\n",
     "    from llama_index.core.query_engine import RetrieverQueryEngine\n",

llama-index-integrations/retrievers/llama-index-retrievers-superlinked/examples/steam_games_example.py

@@ -18,7 +18,7 @@
 import pandas as pd
 
 import superlinked.framework as sl
-from llama_index_retrievers_superlinked import SuperlinkedRetriever
+from llama_index.retrievers.superlinked import SuperlinkedRetriever
 
 try:
     from llama_index.core.query_engine import RetrieverQueryEngine

llama-index-integrations/retrievers/llama-index-retrievers-superlinked/llama_index/retrievers/superlinked/__init__.py

@@ -0,0 +1,7 @@
+"""
+Superlinked retriever integration for LlamaIndex.
+"""
+
+from llama_index.retrievers.superlinked.retriever import SuperlinkedRetriever
+
+__all__ = ["SuperlinkedRetriever"]

llama-index-integrations/retrievers/llama-index-retrievers-superlinked/src/llama_index_retrievers_superlinked/retriever.py renamed to llama-index-integrations/retrievers/llama-index-retrievers-superlinked/llama_index/retrievers/superlinked/retriever.py

@@ -1,12 +1,10 @@
-from __future__ import annotations
-
 from typing import Any, List, Optional
 
 from llama_index.core.retrievers import BaseRetriever
 from llama_index.core.schema import QueryBundle, NodeWithScore, TextNode
 from llama_index.core.callbacks.base import CallbackManager
-from superlinked.framework.dsl.app.app import App  # type: ignore  # noqa: F401
-from superlinked.framework.dsl.query.query_descriptor import (  # type: ignore  # noqa: F401
+from superlinked.framework.dsl.app.app import App
+from superlinked.framework.dsl.query.query_descriptor import (
     QueryDescriptor,
 )
 
@@ -22,8 +20,8 @@ class SuperlinkedRetriever(BaseRetriever):
     def __init__(
         self,
         *,
-        sl_client: Any,
-        sl_query: Any,
+        sl_client: App,
+        sl_query: QueryDescriptor,
         page_content_field: str,
         query_text_param: str = "query_text",
         metadata_fields: Optional[List[str]] = None,
@@ -59,8 +57,7 @@ def __init__(
         # Initialize BaseRetriever
         super().__init__(callback_manager=callback_manager)
 
-    # LlamaIndex retrievers implement _retrieve(QueryBundle)
-    def _retrieve(self, query_bundle: QueryBundle) -> List[NodeWithScore]:  # type: ignore[override]
+    def _retrieve(self, query_bundle: QueryBundle) -> List[NodeWithScore]:
         """
         Execute the Superlinked query and map results to nodes.
 

llama-index-integrations/retrievers/llama-index-retrievers-superlinked/pyproject.toml

@@ -1,6 +1,6 @@
 [build-system]
-requires = ["setuptools>=68", "wheel"]
-build-backend = "setuptools.build_meta"
+requires = ["hatchling"]
+build-backend = "hatchling.build"
 
 [dependency-groups]
 dev = [
@@ -10,10 +10,10 @@ dev = [
 
 [project]
 name = "llama-index-retrievers-superlinked"
-version = "0.1.0"
+version = "0.1.1"
 description = "LlamaIndex retriever integration for Superlinked"
 readme = "README.md"
-requires-python = ">=3.9,<4.0"
+requires-python = ">=3.10,<4.0"
 license = {text = "MIT"}
 authors = [
     {name = "Superlinked", email = "[email protected]"},
@@ -32,6 +32,14 @@ dependencies = [
 [project.urls]
 Homepage = "https://github.com/run-llama/llama_index"
 
+[tool.hatch.build.targets.sdist]
+include = ["llama_index/"]
+exclude = ["**/BUILD"]
+
+[tool.hatch.build.targets.wheel]
+include = ["llama_index/"]
+exclude = ["**/BUILD"]
+
 [tool.llamahub]
 contains_example = true
 import_path = "llama_index.retrievers.superlinked"
@@ -42,16 +50,3 @@ SuperlinkedRetriever = "Superlinked"
 [tool.pytest.ini_options]
 addopts = "-q"
 pythonpath = ["src"]
-
-[tool.setuptools]
-package-dir = {"" = "src"}
-
-[tool.setuptools.packages.find]
-where = ["src"]
-include = [
-    "llama_index*",
-    "llama_index_retrievers_superlinked*",
-]
-exclude = [
-    "tests*",
-]

llama-index-integrations/retrievers/llama-index-retrievers-superlinked/src/llama_index/retrievers/superlinked/__init__.py

@@ -1,11 +1,10 @@
 """Integration-like tests using only mocks to simulate Superlinked behavior."""
 
-from __future__ import annotations
-
+import pytest
 from typing import Any, List
 from unittest.mock import Mock
 
-import pytest
+from llama_index.retrievers.superlinked import SuperlinkedRetriever
 
 
 # Patch superlinked modules once for all tests
@@ -42,8 +41,6 @@ def _make_entries(docs: List[dict]) -> list:
 
 
 def test_basic_flow() -> None:
-    from llama_index_retrievers_superlinked import SuperlinkedRetriever
-
     retriever = SuperlinkedRetriever(
         sl_client=MockApp(),
         sl_query=MockQuery(),
@@ -69,8 +66,6 @@ def test_basic_flow() -> None:
 
 
 def test_k_limit_and_metadata_subset() -> None:
-    from llama_index_retrievers_superlinked import SuperlinkedRetriever
-
     retriever = SuperlinkedRetriever(
         sl_client=MockApp(),
         sl_query=MockQuery(),
@@ -98,8 +93,6 @@ def test_k_limit_and_metadata_subset() -> None:
 
 
 def test_error_returns_empty_list() -> None:
-    from llama_index_retrievers_superlinked import SuperlinkedRetriever
-
     retriever = SuperlinkedRetriever(
         sl_client=MockApp(),
         sl_query=MockQuery(),

llama-index-integrations/retrievers/llama-index-retrievers-superlinked/src/llama_index_retrievers_superlinked/__init__.py

@@ -1,11 +1,10 @@
 """Unit tests for SuperlinkedRetriever (LlamaIndex)."""
 
-from __future__ import annotations
-
+import pytest
 from typing import Any
 from unittest.mock import Mock
 
-import pytest
+from llama_index.retrievers.superlinked import SuperlinkedRetriever
 
 
 # Patch superlinked types before importing the retriever to satisfy validators
@@ -32,8 +31,6 @@ def _patch_superlinked_modules(monkeypatch: Any) -> None:
 
 
 def test_retriever_validate_and_retrieve_success() -> None:
-    from llama_index_retrievers_superlinked import SuperlinkedRetriever
-
     retriever = SuperlinkedRetriever(
         sl_client=MockApp(),
         sl_query=MockQuery(),
@@ -69,8 +66,6 @@ def test_retriever_validate_and_retrieve_success() -> None:
 
 
 def test_retriever_respects_k() -> None:
-    from llama_index_retrievers_superlinked import SuperlinkedRetriever
-
     retriever = SuperlinkedRetriever(
         sl_client=MockApp(),
         sl_query=MockQuery(),
@@ -95,8 +90,6 @@ def test_retriever_respects_k() -> None:
 
 
 def test_retriever_metadata_fields_subset() -> None:
-    from llama_index_retrievers_superlinked import SuperlinkedRetriever
-
     retriever = SuperlinkedRetriever(
         sl_client=MockApp(),
         sl_query=MockQuery(),
@@ -116,8 +109,6 @@ def test_retriever_metadata_fields_subset() -> None:
 
 
 def test_retriever_missing_page_content_skips() -> None:
-    from llama_index_retrievers_superlinked import SuperlinkedRetriever
-
     retriever = SuperlinkedRetriever(
         sl_client=MockApp(),
         sl_query=MockQuery(),
@@ -136,8 +127,6 @@ def test_retriever_missing_page_content_skips() -> None:
 
 
 def test_retriever_query_exception_returns_empty() -> None:
-    from llama_index_retrievers_superlinked import SuperlinkedRetriever
-
     retriever = SuperlinkedRetriever(
         sl_client=MockApp(),
         sl_query=MockQuery(),
@@ -150,8 +139,6 @@ def test_retriever_query_exception_returns_empty() -> None:
 
 
 def test_query_text_param_is_used() -> None:
-    from llama_index_retrievers_superlinked import SuperlinkedRetriever
-
     retriever = SuperlinkedRetriever(
         sl_client=MockApp(),
         sl_query=MockQuery(),