nucliadb 6.2.1.post2992__py3-none-any.whl → 6.2.1.post3003__py3-none-any.whl

nucliadb/ingest/orm/knowledgebox.py

@@ -27,7 +27,6 @@ from grpc.aio import AioRpcError
 
 from nucliadb.common import datamanagers
 from nucliadb.common.cluster.exceptions import ShardNotFound
-from nucliadb.common.cluster.manager import get_index_node
 from nucliadb.common.cluster.utils import get_shard_manager
 
 # XXX: this keys shouldn't be exposed outside datamanagers
@@ -372,6 +371,8 @@ class KnowledgeBox:
         if exists is False:
             logger.error(f"{kbid} KB does not exists on Storage")
 
+        nidx_api = get_nidx_api_client()
+
         async with driver.transaction() as txn:
             storage_to_delete = KB_TO_DELETE_STORAGE.format(kbid=kbid)
             await txn.set(storage_to_delete, b"")
@@ -384,25 +385,17 @@ class KnowledgeBox:
                 logger.warning(f"Shards not found for KB while purging it", extra={"kbid": kbid})
             else:
                 for shard in shards_obj.shards:
-                    # Delete the shard on nodes
-                    for replica in shard.replicas:
-                        node = get_index_node(replica.node)
-                        if node is None:
-                            logger.error(
-                                f"No node {replica.node} found, let's continue. Some shards may stay orphaned",
-                                extra={"kbid": kbid},
-                            )
-                            continue
+                    if shard.nidx_shard_id:
                         try:
-                            await node.delete_shard(replica.shard.id)
+                            await nidx_api.DeleteShard(noderesources_pb2.ShardId(id=shard.nidx_shard_id))
                             logger.debug(
-                                f"Succeded deleting shard from nodeid={replica.node} at {node.address}",
-                                extra={"kbid": kbid, "node_id": replica.node},
+                                f"Succeded deleting shard",
+                                extra={"kbid": kbid, "shard_id": shard.nidx_shard_id},
                             )
                         except AioRpcError as exc:
                             if exc.code() == StatusCode.NOT_FOUND:
                                 continue
-                            raise ShardNotFound(f"{exc.details()} @ {node.address}")
+                            raise ShardNotFound(f"{exc.details()} @ shard {shard.nidx_shard_id}")
 
             await txn.commit()
         await cls.delete_all_kb_keys(driver, kbid)

nucliadb/purge/__init__.py

@@ -25,6 +25,7 @@ from nucliadb.common.cluster.exceptions import NodeError, ShardNotFound
 from nucliadb.common.cluster.utils import setup_cluster, teardown_cluster
 from nucliadb.common.maindb.driver import Driver
 from nucliadb.common.maindb.utils import setup_driver, teardown_driver
+from nucliadb.common.nidx import start_nidx_utility, stop_nidx_utility
 from nucliadb.ingest import SERVICE_NAME, logger
 from nucliadb.ingest.fields.base import Field
 from nucliadb.ingest.orm.knowledgebox import (
@@ -262,6 +263,7 @@ async def main():
     This script will purge all knowledge boxes marked to be deleted in maindb.
     """
     await setup_cluster()
+    await start_nidx_utility()
     driver = await setup_driver()
     storage = await get_storage(
         gcs_scopes=["https://www.googleapis.com/auth/devstorage.full_control"],
@@ -283,6 +285,7 @@ async def main():
             purge_resources_storage_task.cancel()
             await storage.finalize()
             await teardown_driver()
+            await stop_nidx_utility()
             await teardown_cluster()
         except Exception:  # pragma: no cover
             logger.exception("Error tearing down utilities on purge command")

{nucliadb-6.2.1.post2992.dist-info → nucliadb-6.2.1.post3003.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nucliadb
-Version: 6.2.1.post2992
+Version: 6.2.1.post3003
 Home-page: https://docs.nuclia.dev/docs/management/nucliadb/intro
 Author: NucliaDB Community
 Author-email: nucliadb@nuclia.com
@@ -22,10 +22,10 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: >=3.9, <4
 Description-Content-Type: text/markdown
-Requires-Dist: nucliadb-telemetry[all]>=6.2.1.post2992
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.2.1.post2992
-Requires-Dist: nucliadb-protos>=6.2.1.post2992
-Requires-Dist: nucliadb-models>=6.2.1.post2992
+Requires-Dist: nucliadb-telemetry[all]>=6.2.1.post3003
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.2.1.post3003
+Requires-Dist: nucliadb-protos>=6.2.1.post3003
+Requires-Dist: nucliadb-models>=6.2.1.post3003
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.24.2
 Requires-Dist: uvicorn

{nucliadb-6.2.1.post2992.dist-info → nucliadb-6.2.1.post3003.dist-info}/RECORD

@@ -130,7 +130,7 @@ nucliadb/ingest/orm/brain.py,sha256=UND5EsNUdd7XdjScYqRqg4r_xCx3l-My8alGw5M9CWg,
 nucliadb/ingest/orm/broker_message.py,sha256=ZEMueoGuuRKO4tHgzc0P0AM1Ls1TTYey_4UvRQf0BpY,6915
 nucliadb/ingest/orm/entities.py,sha256=5d6Gfo-Yz-rns_mNJeRqiGaPeWpUMgSKZnmWIGMLCKo,15537
 nucliadb/ingest/orm/exceptions.py,sha256=k4Esv4NtL4TrGTcsQpwrSfDhPQpiYcRbB1SpYmBX5MY,1432
-nucliadb/ingest/orm/knowledgebox.py,sha256=9n2QRuRj5BZiQU93O68UafxCN415kchizeU7A2j-WIo,25580
+nucliadb/ingest/orm/knowledgebox.py,sha256=CGNfvft-IzSUQNENsnqYebp5dGfk2o3N561pcKes-28,25144
 nucliadb/ingest/orm/metrics.py,sha256=OkwMSPKLZcKba0ZTwtTiIxwBgaLMX5ydhGieKvi2y7E,1096
 nucliadb/ingest/orm/resource.py,sha256=KDTEwZ6_5eLvLu1s30Pln4BFDOy9D7_ChT7kRmQ1J2g,44670
 nucliadb/ingest/orm/utils.py,sha256=vCe_9UxHu26JDFGLwQ0wH-XyzJIpQCTK-Ow9dtZR5Vg,2716
@@ -155,7 +155,7 @@ nucliadb/migrator/settings.py,sha256=jOUX0ZMunCXN8HpF9xXN0aunJYRhu4Vdr_ffjRIqwtw
 nucliadb/migrator/utils.py,sha256=NgUreUvON8_nWEzTxELBMWlfV7E6-6qi-g0DMEbVEz4,2885
 nucliadb/models/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/models/responses.py,sha256=qnuOoc7TrVSUnpikfTwHLKez47_DE4mSFzpxrwtqijA,1599
-nucliadb/purge/__init__.py,sha256=ijcigiWz38ohXmVVwDU87aCki1BkmAIQRjDoNQ3LPRM,11647
+nucliadb/purge/__init__.py,sha256=BphuNvsJ1aSwuVXUcSOaK4nj9pDcpuKRBf_QAcoRj-A,11787
 nucliadb/purge/orphan_shards.py,sha256=7Qm5PFscGr5ihcn5YZ9BaDh6shagkYouv8Z_tTzLuM8,9222
 nucliadb/reader/__init__.py,sha256=C5Efic7WlGm2U2C5WOyquMFbIj2Pojwe_8mwzVYnOzE,1304
 nucliadb/reader/app.py,sha256=Se-BFTE6d1v1msLzQn4q5XIhjnSxa2ckDSHdvm7NRf8,3096
@@ -330,9 +330,9 @@ 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.2.1.post2992.dist-info/METADATA,sha256=XCzGcCOzEQ1nXetscEuNcrPVX2UPSfneLcKx5urGmT0,4603
-nucliadb-6.2.1.post2992.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-nucliadb-6.2.1.post2992.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.2.1.post2992.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.2.1.post2992.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nucliadb-6.2.1.post2992.dist-info/RECORD,,
+nucliadb-6.2.1.post3003.dist-info/METADATA,sha256=-FuHmxJcszMT19D0ONJHbJUeQdVt_x6rk0yWUTQuf3w,4603
+nucliadb-6.2.1.post3003.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+nucliadb-6.2.1.post3003.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.2.1.post3003.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.2.1.post3003.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+nucliadb-6.2.1.post3003.dist-info/RECORD,,