nucliadb 6.3.5.post4026__py3-none-any.whl → 6.3.5.post4032__py3-none-any.whl

nucliadb/common/cache.py

@@ -91,6 +91,7 @@ class Cache(Generic[T], ABC):
     def __del__(self):
         # we want to clear the cache before deleting the object and set the
         # metric appropriately
+        # XXX: apparently, this doesn't work properly. Don't rely on it
         self.clear()
 
     @abstractmethod
@@ -164,7 +165,7 @@ def delete_resource_cache() -> None:
     cache = rcache.get()
     if cache is not None:
         rcache.set(None)
-        del cache
+        cache.clear()
 
 
 def get_extracted_text_cache() -> Optional[ExtractedTextCache]:
@@ -180,4 +181,4 @@ def delete_extracted_text_cache() -> None:
     cache = etcache.get()
     if cache is not None:
         etcache.set(None)
-        del cache
+        cache.clear()

nucliadb/search/search/cache.py

@@ -21,6 +21,8 @@ import contextlib
 import logging
 from typing import Optional
 
+import backoff
+
 from nucliadb.common.cache import (
     delete_extracted_text_cache,
     delete_resource_cache,
@@ -94,13 +96,30 @@ async def get_field_extracted_text(field: Field) -> Optional[ExtractedText]:
             return extracted_text
 
         cache.metrics.ops.inc({"type": "miss"})
-        extracted_text = await field.get_extracted_text()
+        extracted_text = await field_get_extracted_text(field)
         if extracted_text is not None:
             # Only cache if we actually have extracted text
             cache.set(key, extracted_text)
         return extracted_text
 
 
+@backoff.on_exception(backoff.expo, (Exception,), jitter=backoff.random_jitter, max_tries=3)
+async def field_get_extracted_text(field: Field) -> Optional[ExtractedText]:
+    try:
+        return await field.get_extracted_text()
+    except Exception:
+        logger.warning(
+            "Error getting extracted text for field. Retrying",
+            exc_info=True,
+            extra={
+                "kbid": field.kbid,
+                "resource_id": field.resource.uuid,
+                "field": f"{field.type}/{field.id}",
+            },
+        )
+        raise
+
+
 async def get_extracted_text_from_field_id(kbid: str, field: FieldId) -> Optional[ExtractedText]:
     rid = field.rid
     orm_resource = await get_resource(kbid, rid)

{nucliadb-6.3.5.post4026.dist-info → nucliadb-6.3.5.post4032.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb
-Version: 6.3.5.post4026
+Version: 6.3.5.post4032
 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.5.post4026
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.5.post4026
-Requires-Dist: nucliadb-protos>=6.3.5.post4026
-Requires-Dist: nucliadb-models>=6.3.5.post4026
-Requires-Dist: nidx-protos>=6.3.5.post4026
+Requires-Dist: nucliadb-telemetry[all]>=6.3.5.post4032
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.5.post4032
+Requires-Dist: nucliadb-protos>=6.3.5.post4032
+Requires-Dist: nucliadb-models>=6.3.5.post4032
+Requires-Dist: nidx-protos>=6.3.5.post4032
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.24.2
 Requires-Dist: uvicorn[standard]

{nucliadb-6.3.5.post4026.dist-info → nucliadb-6.3.5.post4032.dist-info}/RECORD

@@ -53,7 +53,7 @@ nucliadb/backups/settings.py,sha256=SyzsInj1BRbBI0atg5IXWbMbOZ_eVg4eSQ3IcnUhCxQ,
 nucliadb/backups/tasks.py,sha256=WkL1LgdYBHbV_A5ilyYv5p3zmXwxH68TDudytN5f7zk,4225
 nucliadb/backups/utils.py,sha256=_Vogjqcru5oqNZM-bZ0q7Ju79Bv1PD-LVFEa7Z-Q13I,1261
 nucliadb/common/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
-nucliadb/common/cache.py,sha256=4iZEfoXgpwTj5Yh25wnllJQWJ8TqefpVOH2y3Z6wjjE,5589
+nucliadb/common/cache.py,sha256=bwkKJ3tgsDE794SIklkOrAwY8vPSvyambC0y8ziMthg,5669
 nucliadb/common/constants.py,sha256=QpigxJh_CtD85Evy0PtV5cVq6x0U_f9xfIcXz1ymkUg,869
 nucliadb/common/counters.py,sha256=8lOi3A2HeLDDlcNaS2QT1SfD3350VPBjiY3FkmHH1V8,977
 nucliadb/common/ids.py,sha256=4QjoIofes_vtKj2HsFWZf8VVIVWXxdkYtLpx1n618Us,8239
@@ -228,7 +228,7 @@ nucliadb/search/api/v1/resource/utils.py,sha256=-NjZqAQtFEXKpIh8ui5S26ItnJ5rzmmG
 nucliadb/search/requesters/__init__.py,sha256=itSI7dtTwFP55YMX4iK7JzdMHS5CQVUiB1XzQu4UBh8,833
 nucliadb/search/requesters/utils.py,sha256=cQZ4-NftiMljoWQ7-Zl7nWfr6u_FY8u_wc9kTvKQcAg,6999
 nucliadb/search/search/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
-nucliadb/search/search/cache.py,sha256=s5wfWq40I4HOLtsKxe3Q5vanL9-3J5T8e0G3yvQ7OKg,4817
+nucliadb/search/search/cache.py,sha256=F7rT0X-bp02Qh-heNo1tRhXG3iqTkL41F1wA_HIZdoM,5404
 nucliadb/search/search/cut.py,sha256=ytY0_GY7ocNjfxTb4aosxEp4ZfhQNDP--JkhEMGD298,1153
 nucliadb/search/search/exceptions.py,sha256=klGLgAGGrXcSGix_W6418ZBMqDchAIGjN77ofkOScEI,1039
 nucliadb/search/search/fetch.py,sha256=XJHIFnZmXM_8Kb37lb4lg1GYG7cZ1plT-qAIb_QziX4,6184
@@ -361,8 +361,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.5.post4026.dist-info/METADATA,sha256=pxJ_dFn3jLaLxEXtBXk93R87X5pt9NFdaWNvgBsfvag,4301
-nucliadb-6.3.5.post4026.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nucliadb-6.3.5.post4026.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.5.post4026.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.5.post4026.dist-info/RECORD,,
+nucliadb-6.3.5.post4032.dist-info/METADATA,sha256=hbwiwOO_3khU7Rm8IyIFwpmCR3KwiILVV-agkTKmNgA,4301
+nucliadb-6.3.5.post4032.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nucliadb-6.3.5.post4032.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.5.post4032.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.5.post4032.dist-info/RECORD,,