nucliadb 6.3.4.post3799__py3-none-any.whl → 6.3.4.post3817__py3-none-any.whl

nucliadb/common/datamanagers/resources.py

@@ -103,7 +103,8 @@ async def modify_slug(txn: Transaction, *, kbid: str, rid: str, new_slug: str) -
 async def get_resource_shard_id(
     txn: Transaction, *, kbid: str, rid: str, for_update: bool = False
 ) -> Optional[str]:
-    shard = await txn.get(KB_RESOURCE_SHARD.format(kbid=kbid, uuid=rid, for_update=for_update))
+    key = KB_RESOURCE_SHARD.format(kbid=kbid, uuid=rid)
+    shard = await txn.get(key, for_update=for_update)
     if shard is not None:
         return shard.decode()
     else:

nucliadb/search/predict.py

@@ -19,6 +19,7 @@
 #
 import base64
 import json
+import logging
 import os
 import random
 from enum import Enum
@@ -216,13 +217,16 @@ class PredictEngine:
         else:
             return {"X-STF-KBID": kbid}
 
-    async def check_response(self, resp: aiohttp.ClientResponse, expected_status: int = 200) -> None:
+    async def check_response(
+        self, kbid: str, resp: aiohttp.ClientResponse, expected_status: int = 200
+    ) -> None:
         if resp.status == expected_status:
             return
 
         if resp.status == 402:
             data = await resp.json()
             raise LimitsExceededError(402, data["detail"])
+
         try:
             data = await resp.json()
             try:
@@ -234,10 +238,22 @@ class PredictEngine:
             aiohttp.client_exceptions.ContentTypeError,
         ):
             detail = await resp.text()
-        if str(resp.status).startswith("5"):
-            logger.error(f"Predict API error at {resp.url}: {detail}")
-        else:
-            logger.info(f"Predict API error at {resp.url}: {detail}")
+
+        is_5xx_error = resp.status > 499
+        # NOTE: 512 is a special status code sent by learning predict api indicating that the error
+        # is related to an external generative model, so we don't want to log it as an error
+        is_external_generative_error = resp.status == 512
+        log_level = logging.ERROR if is_5xx_error and not is_external_generative_error else logging.INFO
+        logger.log(
+            log_level,
+            "Predict API error",
+            extra=dict(
+                kbid=kbid,
+                url=resp.url,
+                status_code=resp.status,
+                detail=detail,
+            ),
+        )
         raise ProxiedPredictAPIError(status=resp.status, detail=detail)
 
     @backoff.on_exception(
@@ -265,7 +281,7 @@ class PredictEngine:
             json=item.model_dump(),
             headers=self.get_predict_headers(kbid),
         )
-        await self.check_response(resp, expected_status=200)
+        await self.check_response(kbid, resp, expected_status=200)
         return await _parse_rephrase_response(resp)
 
     @predict_observer.wrap({"type": "chat_ndjson"})
@@ -294,7 +310,7 @@ class PredictEngine:
             headers=headers,
             timeout=None,
         )
-        await self.check_response(resp, expected_status=200)
+        await self.check_response(kbid, resp, expected_status=200)
         ident = resp.headers.get(NUCLIA_LEARNING_ID_HEADER)
         model = resp.headers.get(NUCLIA_LEARNING_MODEL_HEADER)
         return ident, model, get_chat_ndjson_generator(resp)
@@ -348,7 +364,7 @@ class PredictEngine:
             params=params,
             headers=self.get_predict_headers(kbid),
         )
-        await self.check_response(resp, expected_status=200)
+        await self.check_response(kbid, resp, expected_status=200)
         data = await resp.json()
         return QueryInfo(**data)
 
@@ -368,7 +384,7 @@ class PredictEngine:
             params={"text": sentence},
             headers=self.get_predict_headers(kbid),
         )
-        await self.check_response(resp, expected_status=200)
+        await self.check_response(kbid, resp, expected_status=200)
         data = await resp.json()
         return convert_relations(data)
 
@@ -387,7 +403,7 @@ class PredictEngine:
             headers=self.get_predict_headers(kbid),
             timeout=None,
         )
-        await self.check_response(resp, expected_status=200)
+        await self.check_response(kbid, resp, expected_status=200)
         data = await resp.json()
         return SummarizedResponse.model_validate(data)
 
@@ -405,7 +421,7 @@ class PredictEngine:
             json=item.model_dump(),
             headers=self.get_predict_headers(kbid),
         )
-        await self.check_response(resp, expected_status=200)
+        await self.check_response(kbid, resp, expected_status=200)
         data = await resp.json()
         return RerankResponse.model_validate(data)
 
@@ -423,7 +439,7 @@ class PredictEngine:
             json=item.model_dump(),
             headers=self.get_predict_headers(kbid),
         )
-        await self.check_response(resp, expected_status=200)
+        await self.check_response(kbid, resp, expected_status=200)
         data = await resp.json()
         return RunAgentsResponse.model_validate(data)
 

nucliadb/writer/api/v1/knowledgebox.py

@@ -66,7 +66,7 @@ async def create_kb_endpoint(request: Request, item: KnowledgeBoxConfig) -> Know
     except KnowledgeBoxConflict:
         raise HTTPException(status_code=419, detail="Knowledge box already exists")
     except ExternalIndexCreationError as exc:
-        raise HTTPException(status_code=502, detail=str(exc))
+        raise HTTPException(status_code=512, detail=str(exc))
     except Exception:
         logger.exception("Could not create KB")
         raise HTTPException(status_code=500, detail="Error creating knowledge box")

{nucliadb-6.3.4.post3799.dist-info → nucliadb-6.3.4.post3817.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb
-Version: 6.3.4.post3799
+Version: 6.3.4.post3817
 Summary: NucliaDB
 Author-email: Nuclia <nucliadb@nuclia.com>
 License: AGPL
@@ -20,11 +20,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nucliadb-telemetry[all]>=6.3.4.post3799
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.4.post3799
-Requires-Dist: nucliadb-protos>=6.3.4.post3799
-Requires-Dist: nucliadb-models>=6.3.4.post3799
-Requires-Dist: nidx-protos>=6.3.4.post3799
+Requires-Dist: nucliadb-telemetry[all]>=6.3.4.post3817
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.4.post3817
+Requires-Dist: nucliadb-protos>=6.3.4.post3817
+Requires-Dist: nucliadb-models>=6.3.4.post3817
+Requires-Dist: nidx-protos>=6.3.4.post3817
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.24.2
 Requires-Dist: uvicorn

{nucliadb-6.3.4.post3799.dist-info → nucliadb-6.3.4.post3817.dist-info}/RECORD

@@ -78,7 +78,7 @@ nucliadb/common/datamanagers/fields.py,sha256=9KqBzTssAT68FR5hd17Xu_CSwAYdKFuYic
 nucliadb/common/datamanagers/kb.py,sha256=P7EhF4tApIUG2jw_HH1oMufTKG9__kuOLKnrCNGbDM4,6156
 nucliadb/common/datamanagers/labels.py,sha256=Zm0GQpSPoGXEEysUY7VsDIcyKSIIQsMVphj23IyM9_c,4502
 nucliadb/common/datamanagers/processing.py,sha256=ByxdZzdbAfJGqC6__mY-zryjk040TyQfcUq3rxujeoY,1587
-nucliadb/common/datamanagers/resources.py,sha256=cuwcVL-GEjS1VHigJtz5SG_dRhl09UADQ9MSYOOqs70,10779
+nucliadb/common/datamanagers/resources.py,sha256=VwFdCyHSnzMU3ASYRhC-wuCjCQEjOKEF7tIob4lTcPg,10793
 nucliadb/common/datamanagers/rollover.py,sha256=BM1hJ2cEU91xekM5PtmnA0SN3i3w0WmodiyTpO8YZZs,7865
 nucliadb/common/datamanagers/search_configurations.py,sha256=O-8eW43CE46GcxO6TB5hpi27NBguv4BL4SI1vLlN8os,2463
 nucliadb/common/datamanagers/synonyms.py,sha256=zk3GEH38KF5vV_VcuL6DCg-2JwgXJfQl7Io6VPqv2cw,1566
@@ -193,7 +193,7 @@ nucliadb/search/__init__.py,sha256=tnypbqcH4nBHbGpkINudhKgdLKpwXQCvDtPchUlsyY4,1
 nucliadb/search/app.py,sha256=-WEX1AZRA8R_9aeOo9ovOTwjXW_7VfwWN7N2ccSoqXg,3387
 nucliadb/search/lifecycle.py,sha256=V_Pj5PRP0yyDY8d5LytO4X8p9HhN7UomqRG6Ri0UaFA,2206
 nucliadb/search/openapi.py,sha256=t3Wo_4baTrfPftg2BHsyLWNZ1MYn7ZRdW7ht-wFOgRs,1016
-nucliadb/search/predict.py,sha256=z2-RkhMkH-5T6PtFkfESxNof07XiS5FxicLHPRyCUXc,22284
+nucliadb/search/predict.py,sha256=VJr5Itx8FE7CZIGYcP-fRgd2YGxAnP9Qj9NxiwWiwcc,22819
 nucliadb/search/predict_models.py,sha256=ZAe0dneUsPmV9uBar57cCFADCGOrYDsJHuqKlA5zWag,5937
 nucliadb/search/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb/search/run.py,sha256=aFb-CXRi_C8YMpP_ivNj8KW1BYhADj88y8K9Lr_nUPI,1402
@@ -331,7 +331,7 @@ nucliadb/writer/api/utils.py,sha256=wIQHlU8RQiIGVLI72suvyVIKlCU44Unh0Ae0IiN6Qwo,
 nucliadb/writer/api/v1/__init__.py,sha256=akI9A_jloNLb0dU4T5zjfdyvmSAiDeIdjAlzNx74FlU,1128
 nucliadb/writer/api/v1/export_import.py,sha256=elf-EQY5DD3mhw8kWb9tQpDcbrF9sY6VFYqxQOjuVP0,8201
 nucliadb/writer/api/v1/field.py,sha256=FySCMpcruSAKGeepeAlOihjwxyUPcDO73Uilq5VDWRk,18514
-nucliadb/writer/api/v1/knowledgebox.py,sha256=MLeIuym4jPrJgfy1NTcN9CpUGwuBiqDHMcx0hY9DR7g,9530
+nucliadb/writer/api/v1/knowledgebox.py,sha256=PHEYDFa-sN5JrI8-EiVVg5FDOsRuCLT43kyAB4xt-xA,9530
 nucliadb/writer/api/v1/learning_config.py,sha256=CKBjqcbewkfPwGUPLDWzZSpro6XkmCaVppe5Qtpu5Go,3117
 nucliadb/writer/api/v1/resource.py,sha256=jV9HM-ID1PPYypfy4Sl4_9aSPF87v7gSJZUSzHjHcQ4,19740
 nucliadb/writer/api/v1/router.py,sha256=RjuoWLpZer6Kl2BW_wznpNo6XL3BOpdTGqXZCn3QrrQ,1034
@@ -354,8 +354,8 @@ nucliadb/writer/tus/local.py,sha256=7jYa_w9b-N90jWgN2sQKkNcomqn6JMVBOVeDOVYJHto,
 nucliadb/writer/tus/s3.py,sha256=vF0NkFTXiXhXq3bCVXXVV-ED38ECVoUeeYViP8uMqcU,8357
 nucliadb/writer/tus/storage.py,sha256=ToqwjoYnjI4oIcwzkhha_MPxi-k4Jk3Lt55zRwaC1SM,2903
 nucliadb/writer/tus/utils.py,sha256=MSdVbRsRSZVdkaum69_0wku7X3p5wlZf4nr6E0GMKbw,2556
-nucliadb-6.3.4.post3799.dist-info/METADATA,sha256=uH02kQKeWrB090Tk5FIcFC7uOW1veqoU6D9BO4lY0os,4291
-nucliadb-6.3.4.post3799.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nucliadb-6.3.4.post3799.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.4.post3799.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.4.post3799.dist-info/RECORD,,
+nucliadb-6.3.4.post3817.dist-info/METADATA,sha256=YJJR7no2TypIzteRiSkHcCRCO0O63H7eqF_ezQhgXSQ,4291
+nucliadb-6.3.4.post3817.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nucliadb-6.3.4.post3817.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.4.post3817.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.4.post3817.dist-info/RECORD,,