nucliadb 6.3.5.post3996__py3-none-any.whl → 6.3.5.post4010__py3-none-any.whl

nucliadb/common/cluster/base.py

@@ -18,7 +18,7 @@
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 from abc import ABCMeta, abstractmethod
-from typing import AsyncIterator, Optional
+from typing import AsyncIterator
 
 from nucliadb_protos import nodereader_pb2, noderesources_pb2, utils_pb2
 from nucliadb_protos.nodereader_pb2_grpc import NodeReaderStub
@@ -38,31 +38,15 @@ class AbstractIndexNode(metaclass=ABCMeta):
         self,
         *,
         id: str,
-        address: str,
-        shard_count: int,
-        available_disk: int,
-        dummy: bool = False,
-        primary_id: Optional[str] = None,
     ):
         self.id = id
-        self.address = address
-        self.shard_count = shard_count
-        self.available_disk = available_disk
-        self.dummy = dummy
-        self.primary_id = primary_id
 
     def __str__(self):
-        if self.primary_id is None:
-            return f"{self.__class__.__name__}({self.id}, {self.address})"
-        else:
-            return f"{self.__class__.__name__}({self.id}, {self.address}, primary_id={self.primary_id})"
+        return f"{self.__class__.__name__}({self.id}"
 
     def __repr__(self):
         return self.__str__()
 
-    def is_read_replica(self) -> bool:
-        return self.primary_id is not None
-
     @property
     @abstractmethod
     def reader(self) -> NodeReaderStub:  # pragma: no cover

nucliadb/common/cluster/rollover.py

@@ -54,7 +54,6 @@ class UnexpectedRolloverError(Exception):
 async def create_rollover_index(
     app_context: ApplicationContext,
     kbid: str,
-    drain_nodes: Optional[list[str]] = None,
     external: Optional[ExternalIndexManager] = None,
 ) -> None:
     """
@@ -63,7 +62,7 @@ async def create_rollover_index(
     it is used to store the rollover state during the rollover. However, the actual indexing will be done
     by the external index provider.
     """
-    await create_rollover_shards(app_context, kbid, drain_nodes=drain_nodes)
+    await create_rollover_shards(app_context, kbid)
     if external is not None:
         if external.supports_rollover:
             await create_rollover_external_index(kbid, external)
@@ -100,11 +99,11 @@ async def create_rollover_external_index(kbid: str, external: ExternalIndexManag
 
 
 async def create_rollover_shards(
-    app_context: ApplicationContext, kbid: str, drain_nodes: Optional[list[str]] = None
+    app_context: ApplicationContext,
+    kbid: str,
 ) -> writer_pb2.Shards:
     """
     Creates new index node shards for a rollover operation.
-    If drain_nodes is provided, no replicas will be created on those nodes.
     """
 
     logger.info("Creating rollover shards", extra={"kbid": kbid})
@@ -583,7 +582,8 @@ async def clean_rollover_status(app_context: ApplicationContext, kbid: str) -> N
 
 
 async def rollover_kb_index(
-    app_context: ApplicationContext, kbid: str, drain_nodes: Optional[list[str]] = None
+    app_context: ApplicationContext,
+    kbid: str,
 ) -> None:
     """
     Rollover a KB index is the process of creating new shard replicas for every
@@ -592,9 +592,6 @@ async def rollover_kb_index(
 
     Once all the data is in the new indexes, cut over to the replicated index delete the old one.
 
-    If drain_nodes is provided, no index node replicas will be created on those nodes. This is useful
-    for when we want to remove a set of nodes from the index node cluster.
-
     This is a very expensive operation and should be done with care.
 
     Process:
@@ -612,7 +609,7 @@ async def rollover_kb_index(
     logger.info("Rolling over KB index", extra=extra)
 
     async with locking.distributed_lock(locking.KB_SHARDS_LOCK.format(kbid=kbid)):
-        await create_rollover_index(app_context, kbid, drain_nodes=drain_nodes, external=external)
+        await create_rollover_index(app_context, kbid, external=external)
         await schedule_resource_indexing(app_context, kbid)
         await index_to_rollover_index(app_context, kbid, external=external)
         await cutover_index(app_context, kbid, external=external)

nucliadb/common/cluster/utils.py

@@ -43,8 +43,6 @@ logger = logging.getLogger(__name__)
 
 _lock = asyncio.Lock()
 
-_STANDALONE_SERVER = "_standalone_service"
-
 
 async def setup_cluster() -> Union[KBShardManager, StandaloneKBShardManager]:
     async with _lock:
@@ -65,11 +63,6 @@ async def teardown_cluster():
     if get_utility(Utility.SHARD_MANAGER):
         clean_utility(Utility.SHARD_MANAGER)
 
-    std_server = get_utility(_STANDALONE_SERVER)
-    if std_server is not None:
-        await std_server.stop(None)
-        clean_utility(_STANDALONE_SERVER)
-
 
 def get_shard_manager() -> KBShardManager:
     return get_utility(Utility.SHARD_MANAGER)  # type: ignore

nucliadb/common/nidx.py

@@ -279,21 +279,10 @@ class FakeNode(AbstractIndexNode):
     def writer(self):
         return self.client
 
-    def is_read_replica(_):
-        return False
-
     @property
     def id(self):
         return "nidx"
 
-    @property
-    def address(self):
-        return "nidx"
-
-    @property
-    def primary_id(self):
-        return "nidx"
-
 
 def get_nidx_fake_node() -> FakeNode:
     nidx = get_nidx()

nucliadb/ingest/service/writer.py

@@ -24,7 +24,6 @@ from nucliadb.backups import tasks as backup_tasks
 from nucliadb.backups import utils as backup_utils
 from nucliadb.common import datamanagers
 from nucliadb.common.cluster.exceptions import AlreadyExists, EntitiesGroupNotFound
-from nucliadb.common.cluster.manager import get_nidx_fake_node
 from nucliadb.common.cluster.utils import get_shard_manager
 from nucliadb.common.datamanagers.exceptions import KnowledgeBoxNotFound
 from nucliadb.common.external_index_providers.exceptions import ExternalIndexCreationError
@@ -59,8 +58,6 @@ from nucliadb_protos.writer_pb2 import (
     IndexStatus,
     ListEntitiesGroupsRequest,
     ListEntitiesGroupsResponse,
-    ListMembersRequest,
-    ListMembersResponse,
     NewEntitiesGroupRequest,
     NewEntitiesGroupResponse,
     OpStatusWriter,
@@ -407,25 +404,6 @@ class WriterServicer(writer_pb2_grpc.WriterServicer):
 
             return response
 
-    async def ListMembers(  # type: ignore
-        self, request: ListMembersRequest, context=None
-    ) -> ListMembersResponse:
-        response = ListMembersResponse()
-        response.members.extend(
-            [
-                writer_pb2.Member(
-                    id=n.id,
-                    listen_address=n.address,
-                    is_self=False,
-                    dummy=n.dummy,
-                    shard_count=n.shard_count,
-                    primary_id=n.primary_id or "",
-                )
-                for n in [get_nidx_fake_node()]
-            ]
-        )
-        return response
-
     async def Index(self, request: IndexResource, context=None) -> IndexStatus:  # type: ignore
         async with self.driver.transaction() as txn:
             kbobj = KnowledgeBoxORM(txn, self.storage, request.kbid)

nucliadb/search/requesters/utils.py

@@ -209,9 +209,7 @@ def debug_nodes_info(nodes: list[tuple[AbstractIndexNode, str]]) -> list[dict[st
         info = {
             "id": node.id,
             "shard_id": shard_id,
-            "address": node.address,
+            "address": "nidx",
         }
-        if node.primary_id:
-            info["primary_id"] = node.primary_id
         details.append(info)
     return details

{nucliadb-6.3.5.post3996.dist-info → nucliadb-6.3.5.post4010.dist-info}/METADATA

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

{nucliadb-6.3.5.post3996.dist-info → nucliadb-6.3.5.post4010.dist-info}/RECORD

@@ -57,16 +57,16 @@ nucliadb/common/constants.py,sha256=QpigxJh_CtD85Evy0PtV5cVq6x0U_f9xfIcXz1ymkUg,
 nucliadb/common/counters.py,sha256=8lOi3A2HeLDDlcNaS2QT1SfD3350VPBjiY3FkmHH1V8,977
 nucliadb/common/ids.py,sha256=4QjoIofes_vtKj2HsFWZf8VVIVWXxdkYtLpx1n618Us,8239
 nucliadb/common/locking.py,sha256=RL0CabZVPzxHZyUjYeUyLvsJTm7W3J9o4fEgsY_ufNc,5896
-nucliadb/common/nidx.py,sha256=Xuh7qT3fTDiyBlXe40gXtk3URE0EoJHoi0BsSA5fNZU,10240
+nucliadb/common/nidx.py,sha256=y2P5DwElqOqdYI7FIpslkTp6wxscohrJmSqRYfMJA_w,10067
 nucliadb/common/cluster/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
-nucliadb/common/cluster/base.py,sha256=kklDqyvsubNX0W494ttl9f3E58lGaX6AXqAd8XX8ZHE,5522
+nucliadb/common/cluster/base.py,sha256=p_KcAMX0ij2D3vllWCFx2hK5IiYjSHHvfZ1Jwks7JYg,4926
 nucliadb/common/cluster/exceptions.py,sha256=t7v_l93t44l2tQpdQXgO_w-c4YZRcaayOz1A2i0w4RQ,1258
 nucliadb/common/cluster/grpc_node_dummy.py,sha256=LxONv0mhDFhx7mI91qqGfQlQ-R0qOGDYaxhXoBHLXaE,3548
 nucliadb/common/cluster/manager.py,sha256=KIzqAYGgdVK3GicJ9LdLoei8arWZ7H60imbc32USPj4,12754
 nucliadb/common/cluster/rebalance.py,sha256=cLUlR08SsqmnoA_9GDflV6k2tXmkAPpyFxZErzp45vo,8754
-nucliadb/common/cluster/rollover.py,sha256=vrWdAL7Ad-Qvai1GXSZGOx_p0CNW-j095EMxvscQQ24,26069
+nucliadb/common/cluster/rollover.py,sha256=WhiLzNI520RJZ_Si6wEQgWyZu92D7ijO8_3wh2OawLE,25648
 nucliadb/common/cluster/settings.py,sha256=JPwV_0U_i618Tn66GWUq6qCKNjy4TWkGEGld9GwH5uk,2048
-nucliadb/common/cluster/utils.py,sha256=ap4gw691rtVJRQtVJICA1CNh22Njf9im-DyVTNy4u2Y,4842
+nucliadb/common/cluster/utils.py,sha256=K0BZ75m12Tbi7KS1Tr3LqXJSPhJzUHkBMo4j8W8nQpA,4639
 nucliadb/common/cluster/standalone/__init__.py,sha256=itSI7dtTwFP55YMX4iK7JzdMHS5CQVUiB1XzQu4UBh8,833
 nucliadb/common/cluster/standalone/utils.py,sha256=af3r-x_GF7A6dwIAhZLR-r-SZQEVxsFrDKeMfUTA6G0,1908
 nucliadb/common/context/__init__.py,sha256=ZLUvKuIPaolKeA3aeZa2JcHwCIaEauNu8WpdKsiINXo,3354
@@ -159,7 +159,7 @@ nucliadb/ingest/orm/processor/processor.py,sha256=q2iBJJ_5SV_bxA3t5MrbV70iQhir94
 nucliadb/ingest/orm/processor/sequence_manager.py,sha256=uqEphtI1Ir_yk9jRl2gPf7BlzzXWovbARY5MNZSBI_8,1704
 nucliadb/ingest/service/__init__.py,sha256=MME_G_ERxzJR6JW_hfE2qcfXpmpH1kdG-S0a-M0qRm8,2043
 nucliadb/ingest/service/exceptions.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
-nucliadb/ingest/service/writer.py,sha256=6ZjIEkksy6sHo8W46Omlxf6i8i-B72jUNtQK7VnBunc,22359
+nucliadb/ingest/service/writer.py,sha256=EN-qEDJnL5in7cs1lC-z6b4ui_byFJMJ5huyCtwR_sU,21637
 nucliadb/middleware/__init__.py,sha256=A8NBlBuEkunCFMKpR9gnfNELsVn0Plc55BIQMbWDM8Q,2202
 nucliadb/migrator/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/migrator/command.py,sha256=dKbJ1tAmP6X4lMVRSSlz351euaqs2wBPpOczLjATUes,2089
@@ -225,7 +225,7 @@ nucliadb/search/api/v1/resource/ingestion_agents.py,sha256=fqqRCd8Wc9GciS5P98lcn
 nucliadb/search/api/v1/resource/search.py,sha256=yULbW3SQ9PjISw8ge-Ivgx6gxR3CJdVH8n-pXWJFgig,5189
 nucliadb/search/api/v1/resource/utils.py,sha256=-NjZqAQtFEXKpIh8ui5S26ItnJ5rzmmG0BHxGSS9QPw,1141
 nucliadb/search/requesters/__init__.py,sha256=itSI7dtTwFP55YMX4iK7JzdMHS5CQVUiB1XzQu4UBh8,833
-nucliadb/search/requesters/utils.py,sha256=BIJjfjJt3qClA6XRtqA7E5am5Re29CaY_R6QOuTG-24,7082
+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=n9vkN6Y6Xnr2RBJyoH0WzjzGTJOMfKekU9tfPTWWCPc,6810
 nucliadb/search/search/cut.py,sha256=ytY0_GY7ocNjfxTb4aosxEp4ZfhQNDP--JkhEMGD298,1153
@@ -360,8 +360,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.post3996.dist-info/METADATA,sha256=4JGtXA-f0Q61lp2HVgY0ujHmW4VAQ0CP6MhdLtDlcNc,4301
-nucliadb-6.3.5.post3996.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-nucliadb-6.3.5.post3996.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.5.post3996.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.5.post3996.dist-info/RECORD,,
+nucliadb-6.3.5.post4010.dist-info/METADATA,sha256=TTdOvczaWksu8xom0t1nX1pM5i5EnXT3Jxvf5HmV6IY,4301
+nucliadb-6.3.5.post4010.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+nucliadb-6.3.5.post4010.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.5.post4010.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.5.post4010.dist-info/RECORD,,