nucliadb 6.1.0.post2507__py3-none-any.whl → 6.1.0.post2518__py3-none-any.whl

nucliadb/ingest/consumer/consumer.py

@@ -291,56 +291,7 @@ class IngestProcessedConsumer(IngestConsumer):
     other writes are going to be coming from user actions and we don't want to slow them down.
     """
 
-    async def get_stream_last_seqid(self) -> Optional[int]:
-        """
-        XXX NOTE: Getting the last sequence id of the stream for the processed pull consumer is only needed when the new pull consumer is created.
-
-        For environments where we had the previous push consumer, we need to get the last sequence id from the old consumer info so that
-        we can start from there.
-
-        This code must be deleted once the new pull consumers are deployed on all environments and all the old push consumers have been deleted.
-        From then on, we will rely on the nats server to keep track of the last sequence id.
-        """
-        if has_feature(const.Features.PULL_PROCESSED_CONSUMERS_DEPLOYED):
-            logger.warning(
-                f"Feature flag {const.Features.PULL_PROCESSED_CONSUMERS_DEPLOYED} is enabled. Relying on nats to keep track of the last sequence id."
-            )
-            return None
-
-        try:
-            push_consumer_info: nats.js.api.ConsumerInfo = (
-                await self.nats_connection_manager.js.consumer_info(
-                    stream=const.Streams.INGEST_PROCESSED.name,
-                    # This is the old consumer name
-                    consumer="nucliadb-processed",
-                    timeout=2,
-                )
-            )
-            # Start from the last non-acked message
-            if push_consumer_info.ack_floor is None:
-                logger.warning(
-                    f"Nats consumer {push_consumer_info.name} has no ack floor. Starting from scratch."
-                )
-                return 1
-            last_seqid = push_consumer_info.ack_floor.stream_seq + 1
-            logger.info(
-                f"Starting from last sequence id {last_seqid} for {const.Streams.INGEST_PROCESSED.name}"
-            )
-            return last_seqid
-        except (nats.js.errors.NotFoundError, nats.errors.TimeoutError):
-            logger.warning(
-                f"Could not get last sequence id for {const.Streams.INGEST_PROCESSED.name}. Starting from scratch."
-            )
-            # Start from scratch
-            return 1
-
     async def setup_nats_subscription(self):
-        last_sequence_id = await self.get_stream_last_seqid()
-        if last_sequence_id is None:
-            delivery_policy = nats.js.api.DeliverPolicy.ALL
-        else:
-            delivery_policy = nats.js.api.DeliverPolicy.BY_START_SEQUENCE
-
         subject = const.Streams.INGEST_PROCESSED.subject
         durable_name = const.Streams.INGEST_PROCESSED.group
         self.subscription = await self.nats_connection_manager.pull_subscribe(
@@ -352,8 +303,7 @@ class IngestProcessedConsumer(IngestConsumer):
             config=nats.js.api.ConsumerConfig(
                 durable_name=durable_name,
                 ack_policy=nats.js.api.AckPolicy.EXPLICIT,
-                deliver_policy=delivery_policy,
-                opt_start_seq=last_sequence_id,
+                deliver_policy=nats.js.api.DeliverPolicy.ALL,
                 max_ack_pending=1,
                 max_deliver=nats_consumer_settings.nats_max_deliver,
                 ack_wait=nats_consumer_settings.nats_ack_wait,

nucliadb/writer/tus/gcs.py

@@ -49,7 +49,7 @@ from nucliadb.writer.tus.exceptions import (
 from nucliadb.writer.tus.storage import BlobStore, FileStorageManager
 from nucliadb.writer.tus.utils import to_str
 from nucliadb_protos.resources_pb2 import CloudFile
-from nucliadb_utils.storages.gcs import CHUNK_SIZE, MIN_UPLOAD_SIZE
+from nucliadb_utils.storages.gcs import CHUNK_SIZE, MIN_UPLOAD_SIZE, TIMEOUT
 
 
 class GoogleCloudException(Exception):
@@ -142,7 +142,7 @@ class GCloudBlobStore(BlobStore):
                 self._credentials = None
 
         loop = asyncio.get_event_loop()
-        self.session = aiohttp.ClientSession(loop=loop)
+        self.session = aiohttp.ClientSession(loop=loop, timeout=TIMEOUT)
 
     async def check_exists(self, bucket_name: str):
         if self.session is None:

{nucliadb-6.1.0.post2507.dist-info → nucliadb-6.1.0.post2518.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nucliadb
-Version: 6.1.0.post2507
+Version: 6.1.0.post2518
 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.1.0.post2507
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.1.0.post2507
-Requires-Dist: nucliadb-protos>=6.1.0.post2507
-Requires-Dist: nucliadb-models>=6.1.0.post2507
+Requires-Dist: nucliadb-telemetry[all]>=6.1.0.post2518
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.1.0.post2518
+Requires-Dist: nucliadb-protos>=6.1.0.post2518
+Requires-Dist: nucliadb-models>=6.1.0.post2518
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nucliadb-node-binding>=2.26.0
 Requires-Dist: uvicorn

{nucliadb-6.1.0.post2507.dist-info → nucliadb-6.1.0.post2518.dist-info}/RECORD

@@ -115,7 +115,7 @@ nucliadb/ingest/settings.py,sha256=SDQpMRsTsNyi6IDxCJy6BZVUSKUzwAMuxf6ktp31VMM,3
 nucliadb/ingest/utils.py,sha256=l1myURu3r8oA11dx3GpHw-gNTUc1AFX8xdPm9Lgl2rA,2275
 nucliadb/ingest/consumer/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/ingest/consumer/auditing.py,sha256=EJoqRRr4dk2eUMK0GOY6b9xHO0YLQ0LjoP_xZBLACZo,7280
-nucliadb/ingest/consumer/consumer.py,sha256=G4YIDSTqbZALMf9COAeitPrFmDbxNUvmBMIC0h_bUvo,16341
+nucliadb/ingest/consumer/consumer.py,sha256=y9XF4U3cZN5JFzC-ZnBCn7z5viJDMmjoeEprxm7VghE,13941
 nucliadb/ingest/consumer/materializer.py,sha256=7ofLbwjldJA8TWXDRZRM4U5EviZt3qNSQ8oadmkzS0Y,3840
 nucliadb/ingest/consumer/metrics.py,sha256=ji1l_4cKiHJthQd8YNem1ft4iMbw9KThmVvJmLcv3Xg,1075
 nucliadb/ingest/consumer/pull.py,sha256=EYT0ImngMQgatStG68p2GSrPQBbJxeuq8nFm8DdAbwk,9280
@@ -326,14 +326,14 @@ nucliadb/writer/tus/__init__.py,sha256=huWpKnDnjsrKlBBJk30ta5vamlA-4x0TbPs_2Up8h
 nucliadb/writer/tus/azure.py,sha256=XhWAlWTM0vmXcXtuEPYjjeEhuZjiZXZu8q9WsJ7omFE,4107
 nucliadb/writer/tus/dm.py,sha256=UTY1pW6mk9xrCWKMS4ncibGHKlywNrceUYPbLIKP3co,5487
 nucliadb/writer/tus/exceptions.py,sha256=WfZSSjsHfoy63wUFlH3QoHx7FMoCNA1oKJmWpZZDnCo,2156
-nucliadb/writer/tus/gcs.py,sha256=q23QxvOUl0itGhIyWiqsjnimeBYrtlEayThnqxRq-rg,14034
+nucliadb/writer/tus/gcs.py,sha256=nApFHim3zPqoP8L1oFz7R7uB4MTJ8azA7SUyIDFBcvs,14060
 nucliadb/writer/tus/local.py,sha256=7jYa_w9b-N90jWgN2sQKkNcomqn6JMVBOVeDOVYJHto,5193
 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.1.0.post2507.dist-info/METADATA,sha256=gKMwO_dELa98uXILkFVpuVeT4F-lVyO0FZ_yg47Qja8,4390
-nucliadb-6.1.0.post2507.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-nucliadb-6.1.0.post2507.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.1.0.post2507.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.1.0.post2507.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nucliadb-6.1.0.post2507.dist-info/RECORD,,
+nucliadb-6.1.0.post2518.dist-info/METADATA,sha256=vlXI0isiN0iNukrmEoWn-GRTtBdRk4re7b-NXIv-wTA,4390
+nucliadb-6.1.0.post2518.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+nucliadb-6.1.0.post2518.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.1.0.post2518.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.1.0.post2518.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+nucliadb-6.1.0.post2518.dist-info/RECORD,,