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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperforge_nucliadb
-Version: 1.0.0.post58
+Version: 1.0.0.post62
 Summary: NucliaDB Hyperforge agent
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: Apache-2.0
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: hyperforge
 Requires-Dist: lingua-language-detector

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyperforge_nucliadb"
-version = "1.0.0.post58"
+version = "1.0.0.post62"
 license = "Apache-2.0"
 description = "NucliaDB Hyperforge agent"
 authors = [{ name = "Nuclia", email = "nucliadb@nuclia.com" }]
@@ -17,7 +17,7 @@ classifiers = [
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-requires-python = ">=3.10, <4"
+requires-python = ">=3.12, <4"
 dependencies = ["hyperforge", "lingua-language-detector", "nucliadb_sdk"]
 
 [dependency-groups]
@@ -43,3 +43,6 @@ asyncio_mode = "auto"
 
 # Exclude specific files from being packaged
 source-exclude = ["tests/**", "*.pyc"]
+
+[tool.ruff]
+extend = "../../ruff.toml"

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/advanced_ask_agent.py

@@ -2,6 +2,7 @@ import asyncio
 from time import time
 from typing import Any, Dict, List, Optional, cast
 
+from hyperforge import logger
 from hyperforge.agent import Agent
 from hyperforge.configure import agent
 from hyperforge.context.agent import ContextAgent
@@ -10,7 +11,6 @@ from hyperforge.memory import Chunk, Context, QuestionMemory, Source
 from nucliadb_models import filters as ndb_filters
 from nucliadb_models.search import AskRequest
 
-from hyperforge import logger
 from hyperforge_nucliadb.advanced_ask_config import (
     AdvancedAskAgentConfig,
 )
@@ -85,7 +85,7 @@ class AdvancedAskAgent(ContextAgent, Agent[AdvancedAskAgentConfig]):
         nucliadb_driver = get_ndb_driver(manager, source)
 
         context = Context(
-            agent_id=self.config.id,
+            agent_id=self.config.id,  # ty: ignore[invalid-argument-type]
             original_question_uuid=memory.original_question_uuid,
             actual_question_uuid=question_uuid,
             question=question,

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/ask/ask.py

@@ -2,6 +2,7 @@ import asyncio
 from time import time
 from typing import Any, ClassVar, Dict, List, Optional, cast
 
+from hyperforge import logger
 from hyperforge.agent import Agent
 from hyperforge.configure import agent
 from hyperforge.context.agent import ContextAgent, trace_agent
@@ -9,7 +10,6 @@ from hyperforge.definition import FunctionDefinition
 from hyperforge.manager import Manager
 from hyperforge.memory.memory import Context, QuestionMemory, Source
 
-from hyperforge import logger
 from hyperforge_nucliadb.ask.analysis import question_analysis
 from hyperforge_nucliadb.ask.config import AskAgentConfig
 from hyperforge_nucliadb.ask.hydrate import hydrate
@@ -96,7 +96,7 @@ class AskAgent(ContextAgent, Agent[AskAgentConfig]):
                 config=self.config,
                 question=question,
                 step_title=self.step_title("Choose parameters"),
-            )  # type: ignore
+            )
             result.append(analysis)
         return result
 
@@ -242,7 +242,7 @@ class AskAgent(ContextAgent, Agent[AskAgentConfig]):
             raise Exception("No NDB available")
 
         context = Context(
-            agent_id=self.config.id,
+            agent_id=self.config.id,  # ty: ignore[invalid-argument-type]
             original_question_uuid=memory.original_question_uuid,
             actual_question_uuid=question_uuid,
             question=question,
@@ -284,7 +284,7 @@ class AskAgent(ContextAgent, Agent[AskAgentConfig]):
             # for now I'm only adding it if we have no fallback agent configured
             if self.config.fallback is None:
                 context = Context(
-                    agent_id=self.config.id,
+                    agent_id=self.config.id,  # ty: ignore[invalid-argument-type]
                     original_question_uuid=memory.original_question_uuid,
                     actual_question_uuid=missing_uuid,
                     question=missing,

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/ask/rerank.py

@@ -1,9 +1,8 @@
+from hyperforge import logger
 from hyperforge.manager import Manager
 from hyperforge.models import Context
 from nuclia.lib.nua_responses import RerankModel
 
-from hyperforge import logger
-
 
 async def rerank(context: Context, manager: Manager, top_k: int) -> None:
     """

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/ask_utils.py

@@ -1,11 +1,10 @@
 from typing import Literal, Optional
 
+from hyperforge import logger
 from nucliadb_models import filters as ndb_filters
 from nucliadb_models.labels import LABEL_QUERY_ALIASES as LABEL_ALIASES
 from nucliadb_models.search import SyncAskResponse
 
-from hyperforge import logger
-
 
 def get_chunk_text(ask_response: SyncAskResponse, chunk_id: str) -> str:
     ids = chunk_id.split("/")

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/basic_ask_agent.py

@@ -4,6 +4,7 @@ import json
 from time import time
 from typing import Any, ClassVar, Dict, List, Literal, Optional, cast
 
+from hyperforge import PROMPT_ENVIRONMENT, logger
 from hyperforge.agent import Agent
 from hyperforge.configure import agent
 from hyperforge.context.agent import ContextAgent
@@ -36,7 +37,6 @@ from nucliadb_models.search import (
     SyncAskResponse,
 )
 
-from hyperforge import PROMPT_ENVIRONMENT, logger
 from hyperforge_nucliadb.ask.multi import choose_source
 from hyperforge_nucliadb.ask_utils import (
     combine_catalog_filter_expressions,
@@ -584,7 +584,7 @@ class BasicAskAgent(ContextAgent, Agent[BasicAskAgentConfig]):
 
                 if len(images_urls) > 0:
                     context = Context(
-                        agent_id=self.config.id,
+                        agent_id=self.config.id,  # ty: ignore[invalid-argument-type]
                         original_question_uuid=memory.original_question_uuid,
                         actual_question_uuid=None,
                         question="Search images by title. Title: "
@@ -626,8 +626,8 @@ class BasicAskAgent(ContextAgent, Agent[BasicAskAgentConfig]):
             for resource_id in resource_ids:
                 resource = await nucliadb_driver.get_resource_by_id(
                     query_params={
-                        "show": ["basic", "extracted"],  # type: ignore
-                        "extracted": ["metadata", "file"],  # type: ignore
+                        "show": ["basic", "extracted"],
+                        "extracted": ["metadata", "file"],
                     },
                     rid=resource_id,
                 )
@@ -637,7 +637,7 @@ class BasicAskAgent(ContextAgent, Agent[BasicAskAgentConfig]):
                 images_urls = await self.get_all_images(resource=resource)
                 if len(images_urls) > 0:
                     context = Context(
-                        agent_id=self.config.id,
+                        agent_id=self.config.id,  # ty: ignore[invalid-argument-type]
                         original_question_uuid=memory.original_question_uuid,
                         actual_question_uuid=None,
                         question="All images by title. Title: " + title,

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/sync/agent.py

@@ -41,7 +41,7 @@ from hyperforge_nucliadb.sync.driver import SyncDriver
     description="Provide answer questions from synched resources. This agent is responsible for handling the authentication flow and resource validation for synched resources, and then providing the valid resources to the Basic Ask Agent to answer questions.",
     config_schema=SyncAskAgentConfig,
 )
-class SyncAskAgent(BasicAskAgent):  # type: ignore
+class SyncAskAgent(BasicAskAgent):
     sources: Dict[str, SyncDriver]
     settings: OAuthSettings = OAuthSettings()
 

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/sync/config_driver.py

@@ -8,12 +8,11 @@ from hyperforge_nucliadb.driver_config import (
     NucliaDBConnection,
 )
 
-
 SYNC_HTTP_TIMEOUT = Timeout(connect=5.0, read=30.0, write=10.0, pool=5.0)
 
 
 class SyncConnection(NucliaDBConnection):
-    connection_ids: list[str]  # type: ignore
+    connection_ids: list[str]
 
     @property
     def kb_url(self) -> str:

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

@@ -1,5 +1,5 @@
-import datetime
 import asyncio
+import datetime
 import random
 import time
 from typing import Any, Dict, List, cast
@@ -35,7 +35,6 @@ from hyperforge_nucliadb.sync.config_driver import (
     SyncDriverConfig,
 )
 
-
 SYNC_VALIDATE_ATTEMPTS = 2
 SYNC_VALIDATE_RETRY_BASE_SECONDS = 0.5
 SYNC_VALIDATE_RETRY_JITTER_SECONDS = 0.25
@@ -83,7 +82,7 @@ class ExternalConnectionOutput(BaseModel):
 )
 class SyncDriver(NucliaDBDriver):
     async_driver: AsyncClient
-    config: SyncConnection  # type: ignore
+    config: SyncConnection
     information: Dict[str, ExternalConnectionOutput]
     sync_configs: Dict[str, list[str]]
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperforge_nucliadb
-Version: 1.0.0.post58
+Version: 1.0.0.post62
 Summary: NucliaDB Hyperforge agent
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: Apache-2.0
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: hyperforge
 Requires-Dist: lingua-language-detector

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

@@ -8,12 +8,6 @@ from hyperforge.interaction import AragAnswer
 from hyperforge.minimal_fixtures import cassette_nua_key
 from hyperforge.models import Context
 from hyperforge.utils.http import PrivateUrlError
-from hyperforge_nucliadb.advanced_ask_agent import build_ask_request
-from hyperforge_nucliadb.advanced_ask_config import AdvancedAskAgentConfig
-from hyperforge_nucliadb.ask.hydrate import hydrate_images
-from hyperforge_nucliadb.driver_config import (
-    NucliaDBConnection,
-)
 from nucliadb_models import filters as ndb_filters
 from nucliadb_models.hydration import (
     Hydrated,
@@ -25,6 +19,13 @@ from nucliadb_models.hydration import (
 )
 from nucliadb_models.search import AskRequest, Image
 
+from hyperforge_nucliadb.advanced_ask_agent import build_ask_request
+from hyperforge_nucliadb.advanced_ask_config import AdvancedAskAgentConfig
+from hyperforge_nucliadb.ask.hydrate import hydrate_images
+from hyperforge_nucliadb.driver_config import (
+    NucliaDBConnection,
+)
+
 NUA_KEY = os.environ.get(
     "NUA_KEY",
 ) or cassette_nua_key("https://europe-1.nuclia.cloud/")
@@ -249,7 +250,7 @@ async def test_nucliadb_agent():
 
 
 @pytest.mark.asyncio
-@pytest.mark.vcr(ignore_localhost=True)
+@pytest.mark.vcr(ignore_localhost=True, ignore_hosts=["europe-1.dp.progress.cloud"])
 async def test_nucliadb_agent_simple():
     answers = []
 
@@ -275,7 +276,7 @@ async def test_nucliadb_agent_simple():
 
 
 @pytest.mark.asyncio
-@pytest.mark.vcr(ignore_localhost=True)
+@pytest.mark.vcr(ignore_localhost=True, ignore_hosts=["europe-1.dp.progress.cloud"])
 async def test_nucliadb_agent_simple_disable_ai_parameter_search():
     question_memory = await arag_main(
         agent_id="default",
@@ -293,7 +294,7 @@ async def test_nucliadb_agent_simple_disable_ai_parameter_search():
 
 
 @pytest.mark.asyncio
-@pytest.mark.vcr(ignore_localhost=True)
+@pytest.mark.vcr(ignore_localhost=True, ignore_hosts=["europe-1.dp.progress.cloud"])
 async def test_nucliadb_agent_basic_ask():
     config = deepcopy(CONFIG_SIMPLE)
 

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

@@ -22,7 +22,10 @@ KB_E103CAF3_F8CB_4161_A57C_AAD1192D0666 = os.environ.get(
     "KB_E103CAF3_F8CB_4161_A57C_AAD1192D0666"
 ) or cassette_nua_key("https://europe-1.nuclia.cloud/")
 
-pytestmark = [pytest.mark.vcr(ignore_localhost=True), pytest.mark.asyncio]
+pytestmark = [
+    pytest.mark.vcr(ignore_localhost=True, ignore_hosts=["europe-1.dp.progress.cloud"]),
+    pytest.mark.asyncio,
+]
 
 CONFIG = {
     "drivers": [

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/ask/analysis.py

@@ -3,6 +3,7 @@ from copy import deepcopy
 from time import time
 from typing import Any, Dict, List
 
+from hyperforge import PROMPT_ENVIRONMENT
 from hyperforge.manager import Manager
 from hyperforge.memory.memory import QuestionMemory, Source
 from nuclia_models.predict.run_agents import RunTextAgentsRequest
@@ -10,7 +11,6 @@ from nuclia_models.worker.triggers import Relation
 from nucliadb_models import RelationNodeType
 from nucliadb_models.search import Filter, KnowledgeGraphEntity
 
-from hyperforge import PROMPT_ENVIRONMENT
 from hyperforge_nucliadb.ask.config import AskAgentConfig
 from hyperforge_nucliadb.ask.kb_analysis import get_knowledge_base_analysis
 from hyperforge_nucliadb.ask.models import Analysis

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/ask/hydrate.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass, field
 from enum import Enum
 from typing import Dict, List, Tuple
 
+from hyperforge import logger
 from hyperforge.models import Chunk, Context, FieldTypes
 from nuclia.lib.nua_responses import Image
 from nucliadb_models import PagePositions
@@ -24,7 +25,6 @@ from nucliadb_models.hydration import (
 from nucliadb_models.resource import FileFieldExtractedData, LinkFieldExtractedData
 from nucliadb_models.search import KnowledgeboxFindResults
 
-from hyperforge import logger
 from hyperforge_nucliadb.ask.models import NDBChunk, SearchResults
 from hyperforge_nucliadb.driver import NucliaDBDriver
 

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/ask/multi.py

@@ -2,11 +2,11 @@ import asyncio
 from time import time
 from typing import List, cast
 
+from hyperforge import PROMPT_ENVIRONMENT
 from hyperforge.manager import Manager
 from hyperforge.memory.memory import QuestionMemory
 from hyperforge.models import Source
 
-from hyperforge import PROMPT_ENVIRONMENT
 from hyperforge_nucliadb.driver import NucliaDBDriver
 from hyperforge_nucliadb.sync.driver import SyncDriver
 

{hyperforge_nucliadb-1.0.0.post58 → hyperforge_nucliadb-1.0.0.post62}/src/hyperforge_nucliadb/ask/query_analysis.py

@@ -2,9 +2,9 @@ import re
 from dataclasses import dataclass
 from typing import Optional
 
+from hyperforge import logger
 from lingua import LanguageDetectorBuilder
 
-from hyperforge import logger
 from hyperforge_nucliadb.ask.config import AskAgentConfig
 from hyperforge_nucliadb.ask.kb_analysis import KnowledgeBoxInfo
 

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

@@ -4,6 +4,7 @@ from functools import reduce
 from typing import Dict, List, Optional, Union
 
 import httpx
+from hyperforge import logger
 from hyperforge.configure import driver
 from hyperforge.driver import Driver
 from hyperforge.models import Facets
@@ -37,7 +38,6 @@ from nucliadb_models.search import (
 )
 from nucliadb_sdk.v2 import NucliaDBAsync
 
-from hyperforge import logger
 from hyperforge_nucliadb.driver_config import (
     ManagerConnection,
     NucliaDBConfig,