nucliadb-utils 2.46.1.post388__py3-none-any.whl → 2.46.1.post390__py3-none-any.whl

nucliadb_utils/settings.py

@@ -166,6 +166,9 @@ class TransactionSettings(BaseSettings):
     transaction_jetstream_auth: Optional[str] = None
     transaction_jetstream_servers: List[str] = ["nats://localhost:4222"]
     transaction_local: bool = False
+    transaction_commit_timeout: int = Field(
+        default=60, description="Transaction commit timeout in seconds"
+    )
 
 
 transaction_settings = TransactionSettings()

nucliadb_utils/tests/unit/test_transaction.py

@@ -17,12 +17,17 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program. If not, see <http://www.gnu.org/licenses/>.
 
+import asyncio
 from unittest import mock
 
 import pytest
-from nucliadb_protos.writer_pb2 import Notification
+from nucliadb_protos.writer_pb2 import BrokerMessage, Notification
 
-from nucliadb_utils.transaction import TransactionUtility, WaitFor
+from nucliadb_utils.transaction import (
+    TransactionCommitTimeoutError,
+    TransactionUtility,
+    WaitFor,
+)
 
 
 @pytest.fixture()
@@ -100,3 +105,15 @@ async def test_wait_for_commit_stop_waiting(txn: TransactionUtility, pubsub):
     # Unsubscribing twice with the same request_id should raise KeyError
     with pytest.raises(KeyError):
         await txn.stop_waiting(kbid, request_id=request_id)
+
+
+@pytest.mark.asyncio
+async def test_commit_timeout(txn: TransactionUtility, pubsub):
+    txn.js = mock.AsyncMock()
+    bm = BrokerMessage()
+
+    waiting_event = mock.Mock(wait=mock.Mock(side_effect=asyncio.TimeoutError))
+    txn.wait_for_commited = mock.AsyncMock(return_value=waiting_event)  # type: ignore
+
+    with pytest.raises(TransactionCommitTimeoutError):
+        await txn.commit(bm, 1, wait=True, target_subject="foo")

nucliadb_utils/transaction.py

@@ -49,6 +49,10 @@ class WaitFor:
         self.seq = seq
 
 
+class TransactionCommitTimeoutError(Exception):
+    pass
+
+
 class LocalTransactionUtility:
     async def commit(
         self,
@@ -85,9 +89,11 @@ class TransactionUtility:
         self,
         nats_servers: list[str],
         nats_creds: Optional[str] = None,
+        commit_timeout: int = 60,
     ):
         self.nats_creds = nats_creds
         self.nats_servers = nats_servers
+        self.commit_timeout = commit_timeout
 
     async def disconnected_cb(self):
         logger.info("Got disconnected from NATS!")
@@ -201,9 +207,12 @@ class TransactionUtility:
 
         if wait and waiting_event is not None:
             try:
-                await asyncio.wait_for(waiting_event.wait(), timeout=30.0)
+                await asyncio.wait_for(
+                    waiting_event.wait(), timeout=self.commit_timeout
+                )
             except asyncio.TimeoutError:
                 logger.warning("Took too much to commit")
+                raise TransactionCommitTimeoutError()
             finally:
                 await self.stop_waiting(writer.kbid, request_id=request_id)
 

nucliadb_utils/utilities.py

@@ -265,6 +265,7 @@ async def start_transaction_utility(
         transaction_utility = TransactionUtility(
             nats_creds=transaction_settings.transaction_jetstream_auth,
             nats_servers=transaction_settings.transaction_jetstream_servers,
+            commit_timeout=transaction_settings.transaction_commit_timeout,
         )
         await transaction_utility.initialize(service_name)
     set_utility(Utility.TRANSACTION, transaction_utility)

{nucliadb_utils-2.46.1.post388.dist-info → nucliadb_utils-2.46.1.post390.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nucliadb-utils
-Version: 2.46.1.post388
+Version: 2.46.1.post390
 Home-page: https://nuclia.com
 License: BSD
 Classifier: Development Status :: 4 - Beta
@@ -21,8 +21,8 @@ Requires-Dist: nats-py[nkeys] >=2.6.0
 Requires-Dist: pyjwt >=2.4.0
 Requires-Dist: memorylru >=1.1.2
 Requires-Dist: mrflagly
-Requires-Dist: nucliadb-protos >=2.46.1.post388
-Requires-Dist: nucliadb-telemetry >=2.46.1.post388
+Requires-Dist: nucliadb-protos >=2.46.1.post390
+Requires-Dist: nucliadb-telemetry >=2.46.1.post390
 Provides-Extra: cache
 Requires-Dist: redis >=4.3.4 ; extra == 'cache'
 Requires-Dist: orjson >=3.6.7 ; extra == 'cache'

{nucliadb_utils-2.46.1.post388.dist-info → nucliadb_utils-2.46.1.post390.dist-info}/RECORD

@@ -12,11 +12,11 @@ nucliadb_utils/nats.py,sha256=7hRKMflwxK-p_L0KFO5jibOGhzSw2F24mKvPG-A_iN8,8224
 nucliadb_utils/partition.py,sha256=0tmXuwRM_v-OmKoRkB--OMDzomVEkmgxqMmNNomI_24,1173
 nucliadb_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb_utils/run.py,sha256=bKMfsPEK6WdWfiPyWPUxCqcLo4tq6eOwyaf910TOwBk,1713
-nucliadb_utils/settings.py,sha256=9655MTOgB8Xj9oDB2wKUI2V7-CgpgWtr8o7RotGE-2g,7090
+nucliadb_utils/settings.py,sha256=rRG1w5QsvsToVSZxOY6Rh1R0kxJUx_b-REsCK715T0I,7213
 nucliadb_utils/signals.py,sha256=KxV4UUNWf4wrEbt1iJzy6PxYuTEhi6IRisKlYlq5OtM,2702
 nucliadb_utils/store.py,sha256=kQ35HemE0v4_Qg6xVqNIJi8vSFAYQtwI3rDtMsNy62Y,890
-nucliadb_utils/transaction.py,sha256=4j95ZjQ334nD0mr8NiMIzU2wQ9rJhk9YoGppkZ8Vdjc,6967
-nucliadb_utils/utilities.py,sha256=TfyLlsvVbIZWK84dpPygjjPp7yLJy8C6MWTZE6DdCg8,13903
+nucliadb_utils/transaction.py,sha256=CQpsuF-E2omh4gGMxXCn0dv7vL9ctxooWpSgWGbGfBA,7212
+nucliadb_utils/utilities.py,sha256=-j-um6vUQvN0s-G5nJ7lGlj7TNjoVVBr4lwdujBQBHQ,13979
 nucliadb_utils/audit/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb_utils/audit/audit.py,sha256=v-e9R4hc6iVjtN2JeZk1MAhV5x_OC5s59uSv-kF3qFk,2698
 nucliadb_utils/audit/basic.py,sha256=grlJpq5Z2LSkwgxY3PaaLb9e8asuevMPOgrzG1UcUDI,3267
@@ -56,15 +56,15 @@ nucliadb_utils/tests/unit/test_nats.py,sha256=4lLQOucQGwL9lubTfNFqXhXtua9u4lTlWj
 nucliadb_utils/tests/unit/test_run.py,sha256=VHeojVBj_AfV_uNch9eEi4zCT-O94VKjwb_O-UZgqpA,1910
 nucliadb_utils/tests/unit/test_signals.py,sha256=Br3BjBZpAtKPqeSmfHSGf1Seu4mB2OBWFCgLcNEH0PQ,2647
 nucliadb_utils/tests/unit/test_tests.py,sha256=-YHgVMKJr_3WYwrBj9TnwpVLIkP80PLZpWnvAIYvnz8,1189
-nucliadb_utils/tests/unit/test_transaction.py,sha256=la8d5ZyCOyWflPJ11Uz3OEFCJ7ARWF9YWrxToLKdjkI,3408
+nucliadb_utils/tests/unit/test_transaction.py,sha256=ULVALWbMWEkH2Gq5Q8olEL8k8Kqyh5RAe0Lp9qdF1V4,3917
 nucliadb_utils/tests/unit/test_utilities.py,sha256=uzSFm7HzHGU-PS4-dqjFQxyxgypNAvwKEm0PtBg6Wmg,5099
 nucliadb_utils/tests/unit/storages/__init__.py,sha256=itSI7dtTwFP55YMX4iK7JzdMHS5CQVUiB1XzQu4UBh8,833
 nucliadb_utils/tests/unit/storages/test_aws.py,sha256=GCsB_jwCUNV3Ogt8TZZEmNKAHvOlR0HGU7blrFbtJqs,1924
 nucliadb_utils/tests/unit/storages/test_gcs.py,sha256=2XzJwgNpfjVGjtE-QdZhu3ayuT1EMEXINdM-_SatPCY,3554
 nucliadb_utils/tests/unit/storages/test_pg.py,sha256=sJfUttMSzq8W1XYolAUcMxl_R5HcEzb5fpCklPeMJiY,17000
 nucliadb_utils/tests/unit/storages/test_storage.py,sha256=VFpRq6Q6BjnIrBQCumYzR8DQUacwhxt5CzTKSlqqD24,6892
-nucliadb_utils-2.46.1.post388.dist-info/METADATA,sha256=Qhus0IVe2x8vIFNk8RCAjjDg6th4sYsTQ3QqYGOkBF4,1978
-nucliadb_utils-2.46.1.post388.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-nucliadb_utils-2.46.1.post388.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-2.46.1.post388.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nucliadb_utils-2.46.1.post388.dist-info/RECORD,,
+nucliadb_utils-2.46.1.post390.dist-info/METADATA,sha256=Ho91jRfMOwhC3OCEDzgb9XwEKLJgKrItfLnx8y0_d3o,1978
+nucliadb_utils-2.46.1.post390.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+nucliadb_utils-2.46.1.post390.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-2.46.1.post390.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+nucliadb_utils-2.46.1.post390.dist-info/RECORD,,