dsw-command-queue 4.9.4__tar.gz → 4.9.5__tar.gz

{dsw_command_queue-4.9.4 → dsw_command_queue-4.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-command-queue
-Version: 4.9.4
+Version: 4.9.5
 Summary: Library for working with command queue and persistent commands
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -19,7 +19,8 @@ Classifier: Topic :: Utilities
 Requires-Python: <4,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dsw-database==4.9.4
+Requires-Dist: func-timeout
+Requires-Dist: dsw-database==4.9.5
 
 # Data Stewardship Wizard: Command Queue
 

{dsw_command_queue-4.9.4 → dsw_command_queue-4.9.5}/dsw/command_queue/build_info.py

@@ -9,9 +9,9 @@ BuildInfo = namedtuple(
 )
 
 BUILD_INFO = BuildInfo(
-    version='v4.9.4~b3defbc',
-    built_at='2024-09-09 12:10:23Z',
-    sha='b3defbc09e94a677dc1d3a60834bfb04950d215f',
+    version='v4.9.5~d9d46ef',
+    built_at='2024-09-13 10:11:04Z',
+    sha='d9d46eff9e341643f8e594f5e6d1347a3a91f840',
     branch='HEAD',
-    tag='v4.9.4',
+    tag='v4.9.5',
 )

{dsw_command_queue-4.9.4 → dsw_command_queue-4.9.5}/dsw/command_queue/command_queue.py

@@ -1,5 +1,6 @@
 import abc
 import datetime
+import func_timeout
 import logging
 import os
 import platform
@@ -45,21 +46,26 @@ class CommandWorker:
     def work(self, payload: PersistentCommand):
         pass
 
-    def process_exception(self, e: Exception):
+    def process_timeout(self, e: BaseException):
+        pass
+
+    def process_exception(self, e: BaseException):
         pass
 
 
 class CommandQueue:
 
     def __init__(self, worker: CommandWorker, db: Database,
-                 channel: str, component: str, timeout: float):
+                 channel: str, component: str, wait_timeout: float,
+                 work_timeout: int | None = None):
         self.worker = worker
         self.db = db
         self.queries = CommandQueries(
             channel=channel,
             component=component
         )
-        self.timeout = timeout
+        self.wait_timeout = wait_timeout
+        self.work_timeout = work_timeout
 
     @tenacity.retry(
         reraise=True,
@@ -84,7 +90,7 @@ class CommandQueue:
             self._fetch_and_process_queued()
 
             LOG.debug('Waiting for notifications')
-            w = select.select(fds, [], [], self.timeout)
+            w = select.select(fds, [], [], self.wait_timeout)
 
             if INTERRUPTED:
                 LOG.debug('Interrupt signal received, ending...')
@@ -92,7 +98,7 @@ class CommandQueue:
 
             if w == ([], [], []):
                 LOG.debug(f'Nothing received in this cycle '
-                          f'(timeouted after {self.timeout} seconds)')
+                          f'(timeouted after {self.wait_timeout} seconds)')
             else:
                 notifications = 0
                 for n in psycopg.generators.notifies(queue_conn.connection.pgconn):
@@ -141,13 +147,46 @@ class CommandQueue:
         LOG.debug(f'Previous state: {command.state}')
         LOG.debug(f'Attempts: {command.attempts} / {command.max_attempts}')
         LOG.debug(f'Last error: {command.last_error_message}')
+        attempt_number = command.attempts + 1
 
         try:
-            self.worker.work(command)
+            self.db.execute_query(
+                query=self.queries.query_command_start(),
+                attempts=attempt_number,
+                updated_at=datetime.datetime.now(tz=datetime.UTC),
+                uuid=command.uuid,
+            )
+            self.db.conn_query.connection.commit()
+
+            def work():
+                self.worker.work(command)
+
+            if self.work_timeout is None:
+                LOG.info('Processing (without any timeout set)')
+                work()
+            else:
+                LOG.info(f'Processing (with timeout set to {self.work_timeout} seconds)')
+                func_timeout.func_timeout(
+                    timeout=self.work_timeout,
+                    func=work,
+                    args=(),
+                    kwargs=None,
+                )
 
             self.db.execute_query(
                 query=self.queries.query_command_done(),
-                attempts=command.attempts + 1,
+                attempts=attempt_number,
+                updated_at=datetime.datetime.now(tz=datetime.UTC),
+                uuid=command.uuid,
+            )
+        except func_timeout.exceptions.FunctionTimedOut as e:
+            msg = f'Processing exceeded time limit ({self.work_timeout} seconds)'
+            LOG.warning(msg)
+            self.worker.process_timeout(e)
+            self.db.execute_query(
+                query=self.queries.query_command_error(),
+                attempts=attempt_number,
+                error_message=msg,
                 updated_at=datetime.datetime.now(tz=datetime.UTC),
                 uuid=command.uuid,
             )
@@ -157,7 +196,7 @@ class CommandQueue:
             self.worker.process_exception(e)
             self.db.execute_query(
                 query=self.queries.query_command_error(),
-                attempts=command.attempts + 1,
+                attempts=attempt_number,
                 error_message=msg,
                 updated_at=datetime.datetime.now(tz=datetime.UTC),
                 uuid=command.uuid,

{dsw_command_queue-4.9.4 → dsw_command_queue-4.9.5}/dsw/command_queue/query.py

@@ -47,3 +47,12 @@ class CommandQueries:
                 updated_at = %(updated_at)s
             WHERE uuid = %(uuid)s;
         """
+
+    @staticmethod
+    def query_command_start() -> str:
+        return """
+            UPDATE persistent_command
+            SET attempts = %(attempts)s,
+                updated_at = %(updated_at)s
+            WHERE uuid = %(uuid)s;
+        """

{dsw_command_queue-4.9.4 → dsw_command_queue-4.9.5}/dsw_command_queue.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dsw-command-queue
-Version: 4.9.4
+Version: 4.9.5
 Summary: Library for working with command queue and persistent commands
 Author-email: Marek Suchánek <marek.suchanek@ds-wizard.org>
 License: Apache License 2.0
@@ -19,7 +19,8 @@ Classifier: Topic :: Utilities
 Requires-Python: <4,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: dsw-database==4.9.4
+Requires-Dist: func-timeout
+Requires-Dist: dsw-database==4.9.5
 
 # Data Stewardship Wizard: Command Queue
 

dsw_command_queue-4.9.5/dsw_command_queue.egg-info/requires.txt

@@ -0,0 +1,2 @@
+func-timeout
+dsw-database==4.9.5

{dsw_command_queue-4.9.4 → dsw_command_queue-4.9.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'dsw-command-queue'
-version = "4.9.4"
+version = "4.9.5"
 description = 'Library for working with command queue and persistent commands'
 readme = 'README.md'
 keywords = ['dsw', 'subscriber', 'publisher', 'database', 'queue', 'processing']
@@ -24,8 +24,9 @@ classifiers = [
 ]
 requires-python = '>=3.10, <4'
 dependencies = [
+    'func-timeout',
     # DSW
-    "dsw-database==4.9.4",
+    "dsw-database==4.9.5",
 ]
 
 [project.urls]

dsw_command_queue-4.9.4/dsw_command_queue.egg-info/requires.txt

@@ -1 +0,0 @@
-dsw-database==4.9.4