nucliadb 6.4.0.post4176__py3-none-any.whl → 6.4.0.post4184__py3-none-any.whl

nucliadb/common/context/__init__.py

@@ -100,7 +100,7 @@ class ApplicationContext:
         if self.enabled_transaction:
             self._transaction = await start_transaction_utility(self.service_name)
         if self.enabled_nidx:
-            self._nidx = await start_nidx_utility()
+            self._nidx = await start_nidx_utility(self.service_name)
 
     @property
     def kv_driver(self) -> Driver:

nucliadb/common/nidx.py

@@ -19,7 +19,7 @@
 #
 
 import os
-from typing import Optional
+from typing import Optional, Union
 
 from nidx_protos.nidx_pb2_grpc import NidxApiStub, NidxIndexerStub, NidxSearcherStub
 from nidx_protos.nodewriter_pb2 import (
@@ -89,10 +89,11 @@ def _storage_config(prefix: str, bucket: Optional[str]) -> dict[str, str]:
 class NidxBindingUtility(NidxUtility):
     """Implements Nidx utility using the binding"""
 
-    def __init__(self):
+    def __init__(self, service_name: str):
         if ingest_settings.driver != DriverConfig.PG:
             raise ValueError("nidx_binding requires DRIVER=pg")
 
+        self.service_name = service_name
         self.config = {
             "METADATA__DATABASE_URL": ingest_settings.driver_pg_url,
             "SEARCHER__METADATA_REFRESH_INTERVAL": str(
@@ -107,10 +108,10 @@ class NidxBindingUtility(NidxUtility):
 
         self.binding = nidx_binding.NidxBinding(self.config)
         self.api_client = NidxApiStub(
-            get_traced_grpc_channel(f"localhost:{self.binding.api_port}", "nidx_api")
+            get_traced_grpc_channel(f"localhost:{self.binding.api_port}", self.service_name)
         )
         self.searcher_client = NidxSearcherStub(
-            get_traced_grpc_channel(f"localhost:{self.binding.searcher_port}", "nidx_searcher")
+            get_traced_grpc_channel(f"localhost:{self.binding.searcher_port}", self.service_name)
         )
 
     async def finalize(self):
@@ -124,12 +125,13 @@ class NidxBindingUtility(NidxUtility):
 
 
 class NidxNatsIndexer:
-    def __init__(self):
+    def __init__(self, service_name: str):
         self.nats_connection_manager = NatsConnectionManager(
-            service_name="NidxIndexer",
+            service_name=service_name,
             nats_servers=indexing_settings.index_jetstream_servers,
             nats_creds=indexing_settings.index_jetstream_auth,
         )
+        assert indexing_settings.index_nidx_subject is not None
         self.subject = indexing_settings.index_nidx_subject
 
     async def initialize(self):
@@ -147,11 +149,12 @@ class NidxNatsIndexer:
 
 
 class NidxGrpcIndexer:
-    def __init__(self, address):
+    def __init__(self, address: str, service_name: str):
         self.address = address
+        self.service_name = service_name
 
     async def initialize(self):
-        self.client = NidxIndexerStub(get_traced_grpc_channel(self.address, "nidx_indexer"))
+        self.client = NidxIndexerStub(get_traced_grpc_channel(self.address, self.service_name))
 
     async def finalize(self):
         pass
@@ -164,14 +167,16 @@ class NidxGrpcIndexer:
 class NidxServiceUtility(NidxUtility):
     """Implements Nidx utility connecting to the network service"""
 
-    def __init__(self):
+    indexer: Union[NidxNatsIndexer, NidxGrpcIndexer]
+
+    def __init__(self, service_name: str):
         if not settings.nidx_api_address or not settings.nidx_searcher_address:
             raise ValueError("NIDX_API_ADDRESS and NIDX_SEARCHER_ADDRESS are required")
 
         if indexing_settings.index_nidx_subject:
-            self.indexer = NidxNatsIndexer()
+            self.indexer = NidxNatsIndexer(service_name)
         elif settings.nidx_indexer_address is not None:
-            self.indexer = NidxGrpcIndexer(settings.nidx_indexer_address)
+            self.indexer = NidxGrpcIndexer(settings.nidx_indexer_address, service_name)
         else:
             raise ValueError("NIDX_INDEXER_ADDRESS or INDEX_NIDX_SUBJECT are required")
 
@@ -189,7 +194,7 @@ class NidxServiceUtility(NidxUtility):
         return await self.indexer.index(writer)
 
 
-async def start_nidx_utility() -> Optional[NidxUtility]:
+async def start_nidx_utility(service_name: str = "nucliadb.nidx") -> Optional[NidxUtility]:
     nidx = get_utility(Utility.NIDX)
     if nidx:
         return nidx
@@ -202,13 +207,13 @@ async def start_nidx_utility() -> Optional[NidxUtility]:
             and settings.nidx_indexer_address is not None
         ):
             # Standalone with nidx service (via grpc). This is used in clustered standalone mode
-            nidx_utility = NidxServiceUtility()
+            nidx_utility = NidxServiceUtility(service_name)
         else:
             # Normal standalone mode with binding
-            nidx_utility = NidxBindingUtility()
+            nidx_utility = NidxBindingUtility(service_name)
     else:
         # Component deploy with nidx service via grpc & nats (cloud)
-        nidx_utility = NidxServiceUtility()
+        nidx_utility = NidxServiceUtility(service_name)
 
     await nidx_utility.initialize()
     set_utility(Utility.NIDX, nidx_utility)

nucliadb/ingest/app.py

@@ -61,7 +61,7 @@ async def initialize() -> list[Callable[[], Awaitable[None]]]:
 
     start_partitioning_utility()
 
-    await start_nidx_utility()
+    await start_nidx_utility(SERVICE_NAME)
 
     await start_audit_utility(SERVICE_NAME)
 

nucliadb/search/lifecycle.py

@@ -48,7 +48,7 @@ async def lifespan(app: FastAPI):
 
     await setup_driver()
     await setup_cluster()
-    await start_nidx_utility()
+    await start_nidx_utility(SERVICE_NAME)
 
     await start_audit_utility(SERVICE_NAME)
 

{nucliadb-6.4.0.post4176.dist-info → nucliadb-6.4.0.post4184.dist-info}/METADATA

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

{nucliadb-6.4.0.post4176.dist-info → nucliadb-6.4.0.post4184.dist-info}/RECORD

@@ -58,7 +58,7 @@ 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=1DSrgbhI8DxvZtNvNaqiRR75svylbSdWbE-XpaH4aMY,8720
+nucliadb/common/nidx.py,sha256=3EeQGjM_gxK0l_Rb54fspFWVNnzUiKF-_GMxTiiDC8Q,9116
 nucliadb/common/vector_index_config.py,sha256=LqGwhrDCp1q1vBow3scd1Chhr4GLYjYnGL72FKvOYYc,1552
 nucliadb/common/cluster/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/common/cluster/exceptions.py,sha256=t7v_l93t44l2tQpdQXgO_w-c4YZRcaayOz1A2i0w4RQ,1258
@@ -70,7 +70,7 @@ nucliadb/common/cluster/settings.py,sha256=JPwV_0U_i618Tn66GWUq6qCKNjy4TWkGEGld9
 nucliadb/common/cluster/utils.py,sha256=IfW5PA7Ab26xWUYNOc3yBoksWV1GK4BGhTRo1vnHNKg,4662
 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=C3SsVpwyqHj2PPAUgtf0GVmq9KVQi3q5dJCsMIs9fpY,5999
+nucliadb/common/context/__init__.py,sha256=IKAHuiCjbOEsqfLozWwJ6mRFzFncsZMyxNC5E_XZ5EM,6016
 nucliadb/common/context/fastapi.py,sha256=mH_8n5t7quNSPivNM2JS5EQf2sTVJsdzXW6LaY7EHAA,1629
 nucliadb/common/datamanagers/__init__.py,sha256=jksw4pXyXb05SG3EN-BPBrhc1u1Ge_m21PYqD7NYQEs,2118
 nucliadb/common/datamanagers/atomic.py,sha256=WihdtBWQIAuElZQjh1xQ--q5dJowwlkovqsW-OB_t2k,3230
@@ -117,7 +117,7 @@ nucliadb/export_import/models.py,sha256=dbjScNkiMRv4X3Ktudy1JRliD25bfoDTy3JmEZgQ
 nucliadb/export_import/tasks.py,sha256=DWbdqY97ffoyfipelGXz3Jqz1iam6JCjQSh367Fc3NA,2947
 nucliadb/export_import/utils.py,sha256=8XOVMYXXw8b4ikojG7RjQ4tKN3Xu7nfu2yCUOqD50sk,23216
 nucliadb/ingest/__init__.py,sha256=fsw3C38VP50km3R-nHL775LNGPpJ4JxqXJ2Ib1f5SqE,1011
-nucliadb/ingest/app.py,sha256=TaVgh5B2riFVmcsrbPb7a5YCzmnybjx-NK0BXgTwGAY,7535
+nucliadb/ingest/app.py,sha256=KCptzFq1Msq4eHFxvEol4TFwSLdmkG2v1EfQ3C8PhyY,7547
 nucliadb/ingest/partitions.py,sha256=2NIhMYbNT0TNBL6bX1UMSi7vxFGICstCKEqsB0TXHOE,2410
 nucliadb/ingest/processing.py,sha256=QmkHq-BU4vub7JRWe9VHvQ2DcAmT6-CzgFXuZxXhcBU,20953
 nucliadb/ingest/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -198,7 +198,7 @@ nucliadb/reader/reader/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXM
 nucliadb/reader/reader/notifications.py,sha256=6yUsPvvSRqayJ2peOtE0JY0v4657P_S5SAm32th0Y88,7809
 nucliadb/search/__init__.py,sha256=tnypbqcH4nBHbGpkINudhKgdLKpwXQCvDtPchUlsyY4,1511
 nucliadb/search/app.py,sha256=-WEX1AZRA8R_9aeOo9ovOTwjXW_7VfwWN7N2ccSoqXg,3387
-nucliadb/search/lifecycle.py,sha256=V_Pj5PRP0yyDY8d5LytO4X8p9HhN7UomqRG6Ri0UaFA,2206
+nucliadb/search/lifecycle.py,sha256=hiylV-lxsAWkqTCulXBg0EIfMQdejSr8Zar0L_GLFT8,2218
 nucliadb/search/openapi.py,sha256=t3Wo_4baTrfPftg2BHsyLWNZ1MYn7ZRdW7ht-wFOgRs,1016
 nucliadb/search/predict.py,sha256=VJr5Itx8FE7CZIGYcP-fRgd2YGxAnP9Qj9NxiwWiwcc,22819
 nucliadb/search/predict_models.py,sha256=ZAe0dneUsPmV9uBar57cCFADCGOrYDsJHuqKlA5zWag,5937
@@ -365,8 +365,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.4.0.post4176.dist-info/METADATA,sha256=rJlDXepoujPd3njKMwXFHiHxnZ7RdqlHOitll6NnRl4,4226
-nucliadb-6.4.0.post4176.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
-nucliadb-6.4.0.post4176.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.4.0.post4176.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.4.0.post4176.dist-info/RECORD,,
+nucliadb-6.4.0.post4184.dist-info/METADATA,sha256=h5VkazlE0pMRugxfoA8Kllo-Rv62A4biOd4IoWQSV-Y,4226
+nucliadb-6.4.0.post4184.dist-info/WHEEL,sha256=ooBFpIzZCPdw3uqIQsOo4qqbA4ZRPxHnOH7peeONza0,91
+nucliadb-6.4.0.post4184.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.4.0.post4184.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.4.0.post4184.dist-info/RECORD,,