hyperforge-nucliadb 1.0.0.post62__tar.gz → 1.0.0.post85__tar.gz

{hyperforge_nucliadb-1.0.0.post62 → hyperforge_nucliadb-1.0.0.post85}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperforge_nucliadb
-Version: 1.0.0.post62
+Version: 1.0.0.post85
 Summary: NucliaDB Hyperforge agent
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: Apache-2.0

{hyperforge_nucliadb-1.0.0.post62 → hyperforge_nucliadb-1.0.0.post85}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyperforge_nucliadb"
-version = "1.0.0.post62"
+version = "1.0.0.post85"
 license = "Apache-2.0"
 description = "NucliaDB Hyperforge agent"
 authors = [{ name = "Nuclia", email = "nucliadb@nuclia.com" }]

{hyperforge_nucliadb-1.0.0.post62 → hyperforge_nucliadb-1.0.0.post85}/src/hyperforge_nucliadb/driver.py

@@ -111,14 +111,10 @@ class NucliaDBDriver(Driver):
 
     async def labels(self) -> Dict[str, List[str]]:
         labelsets = await self.driver.get_labelsets(kbid=self.config.kbid)
-        result = {}
-        for labelset in labelsets.labelsets:
-            labels = await self.driver.get_labelset(
-                kbid=self.config.kbid, labelset=labelset
-            )
-            result[labelset] = [x.title for x in labels.labels]
-
-        return result
+        return {
+            labelset_id: [label.title for label in labelset.labels]
+            for labelset_id, labelset in labelsets.labelsets.items()
+        }
 
     async def field_facets(self) -> Dict[str, int]:
         field_labels = {}

{hyperforge_nucliadb-1.0.0.post62 → hyperforge_nucliadb-1.0.0.post85}/src/hyperforge_nucliadb.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperforge_nucliadb
-Version: 1.0.0.post62
+Version: 1.0.0.post85
 Summary: NucliaDB Hyperforge agent
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: Apache-2.0

{hyperforge_nucliadb-1.0.0.post62 → hyperforge_nucliadb-1.0.0.post85}/src/hyperforge_nucliadb.egg-info/SOURCES.txt

@@ -34,5 +34,6 @@ src/hyperforge_nucliadb/sync/config.py
 src/hyperforge_nucliadb/sync/config_driver.py
 src/hyperforge_nucliadb/sync/driver.py
 tests/test_ask_utils.py
+tests/test_driver.py
 tests/test_nucliadb.py
 tests/test_sync.py

hyperforge_nucliadb-1.0.0.post85/tests/test_driver.py

@@ -0,0 +1,34 @@
+from types import SimpleNamespace
+from unittest.mock import AsyncMock
+
+import pytest
+
+from hyperforge_nucliadb.driver import NucliaDBDriver
+
+
+def make_driver(client):
+    return NucliaDBDriver.model_construct(
+        provider="nucliadb",
+        name="test",
+        config=SimpleNamespace(kbid="test-kb"),
+        driver=client,
+        manager=SimpleNamespace(),
+        _synonyms=None,
+    )
+
+
+@pytest.mark.asyncio
+async def test_labels_uses_complete_labelsets_response():
+    client = AsyncMock()
+    client.get_labelsets.return_value = SimpleNamespace(
+        labelsets={
+            "type": SimpleNamespace(labels=[SimpleNamespace(title="report")]),
+            "topic": SimpleNamespace(labels=[SimpleNamespace(title="science")]),
+        }
+    )
+    driver = make_driver(client)
+
+    assert await driver.labels() == {"type": ["report"], "topic": ["science"]}
+
+    client.get_labelsets.assert_awaited_once_with(kbid="test-kb")
+    client.get_labelset.assert_not_awaited()

{hyperforge_nucliadb-1.0.0.post62 → hyperforge_nucliadb-1.0.0.post85}/tests/test_nucliadb.py

@@ -28,7 +28,7 @@ from hyperforge_nucliadb.driver_config import (
 
 NUA_KEY = os.environ.get(
     "NUA_KEY",
-) or cassette_nua_key("https://europe-1.nuclia.cloud/")
+) or cassette_nua_key("https://europe-1.dp.progress.cloud/")
 KB_DE48CFAA_3209_4041_BB64_8604AFF061FB = os.environ.get(
     "KB_DE48CFAA_3209_4041_BB64_8604AFF061FB"
 ) or cassette_nua_key("https://europe-1.nuclia.cloud/")
@@ -250,7 +250,7 @@ async def test_nucliadb_agent():
 
 
 @pytest.mark.asyncio
-@pytest.mark.vcr(ignore_localhost=True, ignore_hosts=["europe-1.dp.progress.cloud"])
+@pytest.mark.vcr(ignore_localhost=True)
 async def test_nucliadb_agent_simple():
     answers = []
 
@@ -276,7 +276,7 @@ async def test_nucliadb_agent_simple():
 
 
 @pytest.mark.asyncio
-@pytest.mark.vcr(ignore_localhost=True, ignore_hosts=["europe-1.dp.progress.cloud"])
+@pytest.mark.vcr(ignore_localhost=True)
 async def test_nucliadb_agent_simple_disable_ai_parameter_search():
     question_memory = await arag_main(
         agent_id="default",
@@ -294,7 +294,7 @@ async def test_nucliadb_agent_simple_disable_ai_parameter_search():
 
 
 @pytest.mark.asyncio
-@pytest.mark.vcr(ignore_localhost=True, ignore_hosts=["europe-1.dp.progress.cloud"])
+@pytest.mark.vcr(ignore_localhost=True)
 async def test_nucliadb_agent_basic_ask():
     config = deepcopy(CONFIG_SIMPLE)
 
@@ -475,13 +475,17 @@ def test_build_ask_request():
 
 @pytest.mark.asyncio
 async def test_nucliadb_not_localhost():
+    config = deepcopy(CONFIG_LOCAL)
+    config["preprocess"] = []
+    config["generation"] = []
+
     with pytest.raises(PrivateUrlError):
         await arag_main(
             agent_id="default",
             internal_nua=False,
-            external_nua_api_key=NUA_KEY,
+            external_nua_api_key=None,
             question="Como usar max_tokens.answer. En español y dame link a la doucmentación",
-            config=CONFIG_LOCAL,
+            config=config,
             loaded_modules=[
                 "hyperforge_nucliadb",
                 "hyperforge_summarize",

{hyperforge_nucliadb-1.0.0.post62 → hyperforge_nucliadb-1.0.0.post85}/tests/test_sync.py

@@ -15,7 +15,7 @@ from hyperforge.pubsub import UserToAgentInteraction
 
 NUA_KEY = os.environ.get(
     "NUA_KEY",
-) or cassette_nua_key("https://europe-1.nuclia.cloud/")
+) or cassette_nua_key("https://europe-1.dp.progress.cloud/")
 
 
 KB_E103CAF3_F8CB_4161_A57C_AAD1192D0666 = os.environ.get(
@@ -23,7 +23,7 @@ KB_E103CAF3_F8CB_4161_A57C_AAD1192D0666 = os.environ.get(
 ) or cassette_nua_key("https://europe-1.nuclia.cloud/")
 
 pytestmark = [
-    pytest.mark.vcr(ignore_localhost=True, ignore_hosts=["europe-1.dp.progress.cloud"]),
+    pytest.mark.vcr(ignore_localhost=True),
     pytest.mark.asyncio,
 ]
 
@@ -87,7 +87,7 @@ def _mock_sync_response(
     )
 
 
-async def test_sync_agent(arag_api: AsyncClient):
+async def test_sync_agent():
     sync_driver_config = cast(dict[str, Any], CONFIG["drivers"][0]["config"])  # type: ignore
     sync_base_url = f"{sync_driver_config['url']}/v1/kb/{sync_driver_config['kbid']}"