nuclia 4.8.6__py3-none-any.whl → 4.8.8__py3-none-any.whl

nuclia/cli/run.py

@@ -1,6 +1,6 @@
 import logging
 import sys
-from pathlib import Path
+from importlib.metadata import version
 
 import fire  # type: ignore
 from nucliadb_sdk import exceptions
@@ -9,12 +9,13 @@ from nuclia.data import get_auth
 from nuclia.exceptions import NeedUserToken, UserTokenExpired
 from nuclia.lib.utils import serialize
 from nuclia.sdk.accounts import NucliaAccounts
+from nuclia.sdk.backup import NucliaBackup
 from nuclia.sdk.kb import NucliaKB
 from nuclia.sdk.kbs import NucliaKBS
-from nuclia.sdk.backup import NucliaBackup
 from nuclia.sdk.logger import logger
 from nuclia.sdk.nua import NucliaNUA
 from nuclia.sdk.zones import NucliaZones
+
 from .utils import CustomFormatter
 
 
@@ -30,9 +31,7 @@ class NucliaCLI(object):
 
     def version(self):
         """Print the version of the CLI"""
-        _dir = Path(__file__).resolve().parent.parent.parent
-        VERSION = _dir.joinpath("VERSION").open().read().strip()
-        return VERSION
+        return version("nuclia")
 
 
 def run():

nuclia/lib/nua.py

@@ -26,6 +26,7 @@ from nuclia_models.predict.generative_responses import (
     CitationsGenerativeResponse,
     MetaGenerativeResponse,
     StatusGenerativeResponse,
+    ToolsGenerativeResponse,
 )
 from nuclia.lib.nua_responses import (
     ChatModel,
@@ -55,6 +56,8 @@ import os
 from tqdm import tqdm
 import asyncio
 from nuclia.lib.utils import build_httpx_client, build_httpx_async_client
+from pydantic import ValidationError
+
 
 if TYPE_CHECKING:
     from nucliadb_protos.writer_pb2 import BrokerMessage
@@ -146,8 +149,19 @@ class NuaClient:
             json=payload,
             timeout=timeout,
         ) as response:
-            for json_body in response.iter_lines():
-                yield GenerativeChunk.model_validate_json(json_body)  # type: ignore
+            if response.headers.get("content-type") == "application/x-ndjson":
+                for json_body in response.iter_lines():
+                    try:
+                        yield GenerativeChunk.model_validate_json(json_body)  # type: ignore
+                    except ValidationError as e:
+                        raise RuntimeError(f"Invalid stream chunk: {json_body}") from e
+
+            else:
+                # Read the full error body and raise an appropriate exception
+                error_content = response.content
+                raise RuntimeError(
+                    f"Stream request failed with status {response.status_code}: {error_content.decode('utf-8')}"
+                )
 
     def add_config_predict(self, kbid: str, config: LearningConfigurationCreation):
         endpoint = f"{self.url}{CONFIG}/{kbid}"
@@ -233,6 +247,8 @@ class NuaClient:
                 result.citations = chunk.chunk.citations
             elif isinstance(chunk.chunk, StatusGenerativeResponse):
                 result.code = chunk.chunk.code
+            elif isinstance(chunk.chunk, ToolsGenerativeResponse):
+                result.tools = chunk.chunk.tools
         return result
 
     def generate_stream(
@@ -453,8 +469,19 @@ class AsyncNuaClient:
             json=payload,
             timeout=timeout,
         ) as response:
-            async for json_body in response.aiter_lines():
-                yield GenerativeChunk.model_validate_json(json_body)  # type: ignore
+            if response.headers.get("content-type") == "application/x-ndjson":
+                async for json_body in response.aiter_lines():
+                    try:
+                        yield GenerativeChunk.model_validate_json(json_body)  # type: ignore
+                    except ValidationError as e:
+                        raise RuntimeError(f"Invalid stream chunk: {json_body}") from e
+
+            else:
+                # Read the full error body and raise an appropriate exception
+                error_content = await response.aread()
+                raise RuntimeError(
+                    f"Stream request failed with status {response.status_code}: {error_content.decode('utf-8')}"
+                )
 
     async def add_config_predict(
         self, kbid: str, config: LearningConfigurationCreation
@@ -564,6 +591,9 @@ class AsyncNuaClient:
                 result.citations = chunk.chunk.citations
             elif isinstance(chunk.chunk, StatusGenerativeResponse):
                 result.code = chunk.chunk.code
+            elif isinstance(chunk.chunk, ToolsGenerativeResponse):
+                result.tools = chunk.chunk.tools
+
         return result
 
     async def generate_stream(

nuclia/lib/nua_responses.py

@@ -120,10 +120,10 @@ class ChatModel(BaseModel):
             raise ValueError("Can not setup markdown and JSON Schema at the same time")
         if self.citations is True and self.json_schema is not None:
             raise ValueError("Can not setup citations and JSON Schema at the same time")
-        if self.citations is True and self.tools is not None:
+        if self.citations is True and len(self.tools) > 0:
             raise ValueError("Can not setup citations and Tools at the same time")
-        if self.tools is True and self.json_schema is not None:
-            raise ValueError("Can not setup tools and JSON Schema at the same time")
+        if len(self.tools) > 0 and self.json_schema is not None:
+            raise ValueError("Can not setup Tools and JSON Schema at the same time")
         return self
 
 

nuclia/tests/test_kb/test_search.py

@@ -69,7 +69,7 @@ def test_search(testing_config):
 def test_catalog(testing_config):
     search = NucliaSearch()
     results = search.catalog()
-    assert len(results.resources.keys()) == 2
+    assert len(results.resources.keys()) >= 2
 
 
 def test_search_object(testing_config):

{nuclia-4.8.6.dist-info → nuclia-4.8.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nuclia
-Version: 4.8.6
+Version: 4.8.8
 Summary: Nuclia Python SDK
 Author-email: Nuclia <info@nuclia.com>
 License-Expression: MIT
@@ -26,7 +26,7 @@ Requires-Dist: httpcore>=1.0.0
 Requires-Dist: prompt_toolkit
 Requires-Dist: nucliadb_sdk<7,>=6.4
 Requires-Dist: nucliadb_models<7,>=6.4
-Requires-Dist: nuclia-models>=0.32.0
+Requires-Dist: nuclia-models>=0.38.1
 Requires-Dist: tqdm
 Requires-Dist: aiofiles
 Requires-Dist: backoff

{nuclia-4.8.6.dist-info → nuclia-4.8.8.dist-info}/RECORD

@@ -5,15 +5,15 @@ nuclia/decorators.py,sha256=GUhGDSrNtQ3DHpgsFArVJXpjykbDpi-Y8XRV5Vm4r6I,9879
 nuclia/exceptions.py,sha256=5nuWelyxjV7-oDJUnYRgIw_gnDnRUzJxvtXrAknV7So,748
 nuclia/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nuclia/cli/run.py,sha256=po6XRcWhtf-OcV2BkD4YJ0PmNTm6Hll4bs_rpotBEWo,1661
+nuclia/cli/run.py,sha256=B1hP0upSbSCqqT89WAwsd93ZxkAoF6ajVyLOdYmo8fU,1560
 nuclia/cli/utils.py,sha256=iZ3P8juBdAGvaRUd2BGz7bpUXNDHdPrC5p876yyZ2Cs,1223
 nuclia/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/lib/conversations.py,sha256=M6qhL9NPEKroYF767S-Q2XWokRrjX02kpYTzRvZKwUE,149
 nuclia/lib/kb.py,sha256=98zpJ8Dp4rQYMNKm4nhpOms3PY-PFOd8acNgDmBud-o,31819
 nuclia/lib/models.py,sha256=lO3TZa4jTQ6C8ptGO1oX-5pxDgv8ocO13z7j5jXOC0Y,1554
-nuclia/lib/nua.py,sha256=TmjQuYKRjP6R2gjelU2Z354G_7Cm2L58kf8kql7MA3M,25626
+nuclia/lib/nua.py,sha256=sUVFdCjvLigTqUUhILywdHpiC0qKCtKPABn5kUXfuxQ,27064
 nuclia/lib/nua_chat.py,sha256=ApL1Y1FWvAVUt-Y9a_8TUSJIhg8-UmBSy8TlDPn6tD8,3874
-nuclia/lib/nua_responses.py,sha256=zji-T-ipYRPo-e1U163Nn_saIiYJYNW3PfjTSL2fQXg,12726
+nuclia/lib/nua_responses.py,sha256=9WRGpvvhA2ZOyOv9kzX1zI7C3ypM8ySqciVYCSibUjo,12724
 nuclia/lib/utils.py,sha256=XAVRRICPem-qOIEcssqDuv-vqD-9PICk6Iuj6DK5GKk,4808
 nuclia/sdk/__init__.py,sha256=-nAw8i53XBdmbfTa1FJZ0FNRMNakimDVpD6W4OdES-c,1374
 nuclia/sdk/accounts.py,sha256=7XQ3K9_jlSuk2Cez868FtazZ05xSGab6h3Mt1qMMwIE,647
@@ -47,7 +47,7 @@ nuclia/tests/test_kb/test_labels.py,sha256=IUdTq4mzv0OrOkwBWWy4UwKGKyJybtoHrgvXr
 nuclia/tests/test_kb/test_logs.py,sha256=Iw0v-R5QLlfHKxL8roPeOQKjTylgpYgot0wG4vsXQTE,2609
 nuclia/tests/test_kb/test_remi.py,sha256=OX5N-MHbgcwpLg6fBjrAK_KhqkMspJo_VKQHCBCayZ8,2080
 nuclia/tests/test_kb/test_resource.py,sha256=05Xgmg5fwcPW2PZKnUSSjr6MPXp5w8XDgx8plfNcR68,1102
-nuclia/tests/test_kb/test_search.py,sha256=GWI1_TqCma9PSdn2yvHaFm-IHBldmEnVGQflQ556EJE,4660
+nuclia/tests/test_kb/test_search.py,sha256=bsQhfB6-NYFwY3gqkrVJJnru153UgZqEhV22ho4VeWM,4660
 nuclia/tests/test_kb/test_tasks.py,sha256=tfJl1js2o0_dKyXdOxiwdj929kbzMkfl5XjO8HVMInQ,3456
 nuclia/tests/test_manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/tests/test_manage/test_account.py,sha256=u9NhRK8gJLS7BEY618aGoYoV2rgDLHZUeSsWWYkDhF8,289
@@ -61,9 +61,9 @@ nuclia/tests/test_nucliadb/test_crud.py,sha256=GuY76HRvt2DFaNgioKm5n0Aco1HnG7zzV
 nuclia/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/tests/unit/test_export_import.py,sha256=xo_wVbjUnNlVV65ZGH7LtZ38qy39EkJp2hjOuTHC1nU,980
 nuclia/tests/unit/test_nua_responses.py,sha256=t_hIdVztTi27RWvpfTJUYcCL0lpKdZFegZIwLdaPNh8,319
-nuclia-4.8.6.dist-info/licenses/LICENSE,sha256=Ops2LTti_HJtpmWcanuUTdTY3vKDR1myJ0gmGBKC0FA,1063
-nuclia-4.8.6.dist-info/METADATA,sha256=4MApTsfo0mSQQ23CtcAq93ZW0_g4_dyA1WNQY25P4Xs,2337
-nuclia-4.8.6.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-nuclia-4.8.6.dist-info/entry_points.txt,sha256=iZHOyXPNS54r3eQmdi5So20xO1gudI9K2oP4sQsCJRw,46
-nuclia-4.8.6.dist-info/top_level.txt,sha256=cqn_EitXOoXOSUvZnd4q6QGrhm04pg8tLAZtem-Zfdo,7
-nuclia-4.8.6.dist-info/RECORD,,
+nuclia-4.8.8.dist-info/licenses/LICENSE,sha256=Ops2LTti_HJtpmWcanuUTdTY3vKDR1myJ0gmGBKC0FA,1063
+nuclia-4.8.8.dist-info/METADATA,sha256=EI0YpmuSdlgl0IM4hDq9C0DJSW7mgmFoIzYz2KQh-Qo,2337
+nuclia-4.8.8.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+nuclia-4.8.8.dist-info/entry_points.txt,sha256=iZHOyXPNS54r3eQmdi5So20xO1gudI9K2oP4sQsCJRw,46
+nuclia-4.8.8.dist-info/top_level.txt,sha256=cqn_EitXOoXOSUvZnd4q6QGrhm04pg8tLAZtem-Zfdo,7
+nuclia-4.8.8.dist-info/RECORD,,