csu 2.2.0__tar.gz → 2.2.1__tar.gz

{csu-2.2.0 → csu-2.2.1}/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.2.0
+current_version = 2.2.1
 commit = True
 tag = True
 

{csu-2.2.0 → csu-2.2.1}/.cookiecutterrc

@@ -40,7 +40,7 @@ default_context:
     sphinx_theme: furo
     test_matrix_separate_coverage: 'no'
     tests_inside_package: 'yes'
-    version: 2.2.0
+    version: 2.2.1
     version_manager: bump2version
     website: https://blog.ionelmc.ro
     year_from: '2024'

{csu-2.2.0 → csu-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.2.0
+Version: 2.2.1
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -77,9 +77,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.2.0.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.2.1.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.2.0...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.2.1...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.2.0 → csu-2.2.1}/README.rst

@@ -34,9 +34,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.2.0.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.2.1.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.2.0...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.2.1...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.2.0 → csu-2.2.1}/pyproject.toml

@@ -12,7 +12,7 @@ dynamic = [
     "readme",
 ]
 name = "csu"
-version = "2.2.0"
+version = "2.2.1"
 license = "BSD-2-Clause"
 license-files = ["LICENSE"]
 description = "Clean Slate Utils - bunch of utility code, mostly Django/DRF specific."

{csu-2.2.0 → csu-2.2.1}/src/csu/__init__.py

@@ -2,4 +2,4 @@
 a.k.a Clean Slate Utils
 """
 
-__version__ = "2.2.0"
+__version__ = "2.2.1"

{csu-2.2.0 → csu-2.2.1}/src/csu/worker/engine.py

@@ -173,7 +173,7 @@ class AbstractProducer(AbstractWorker):
             if self.shutdown_requested:
                 break
             self.state = WorkerState.WAITING
-            await self.engine.wait_worker_ready()
+            await self.engine.before_produce()
             if self.shutdown_requested:
                 break
             try:
@@ -187,11 +187,13 @@ class AbstractProducer(AbstractWorker):
                 task = None
             if task:
                 # noinspection PyArgumentList
-                await self.engine.push(job := self.job_class(**task.job_kwargs))
+                job = self.job_class(**task.job_kwargs)
+                await self.engine.push(job)
                 logger.info("%s.run() awaiting %s.done of %s.", self, job, task)
                 await task.done_watchdog(job)
             if self.shutdown_requested:
                 break
+            self.engine.after_produce(idle=not task)
             self.state = WorkerState.AFTER
             await self.after(idle=not task)
 
@@ -295,10 +297,14 @@ class AbstractEngine(ABC):
         # if raised then there's no task to mark as done (this won't be reached on exception)
         self.queue.task_done()
 
-    async def wait_worker_ready(self):
+    async def before_produce(self):
         # event set after consuming, cleared right before there's a task
         await self.queue_sem.acquire()
 
+    def after_produce(self, *, idle):
+        if idle:
+            self.queue_sem.release()
+
     def add_worker(self, worker: AbstractWorker):
         assert self.queue is None, f"{self} is already started, {self.queue=}"
         self.workers.append(worker)
@@ -352,7 +358,6 @@ class AbstractEngine(ABC):
             for worker in self.workers:
                 worker.runner.cancel()
         await asyncio.gather(*[worker.runner for worker in self.workers], return_exceptions=True)
-        self.workers.clear()
         logger.info("%s shutdown complete.", self)
 
     def report(self, inspect: defaultdict[str, object]):

{csu-2.2.0 → csu-2.2.1}/src/csu.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: csu
-Version: 2.2.0
+Version: 2.2.1
 Summary: Clean Slate Utils - bunch of utility code, mostly Django/DRF specific.
 Author-email: Ionel Cristian Mărieș <contact@ionelmc.ro>
 License-Expression: BSD-2-Clause
@@ -77,9 +77,9 @@ Overview
 .. |supported-implementations| image:: https://img.shields.io/pypi/implementation/csu.svg
     :alt: Supported implementations
     :target: https://pypi.org/project/csu
-.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.2.0.svg
+.. |commits-since| image:: https://img.shields.io/github/commits-since/ionelmc/python-csu/v2.2.1.svg
     :alt: Commits since latest release
-    :target: https://github.com/ionelmc/python-csu/compare/v2.2.0...main
+    :target: https://github.com/ionelmc/python-csu/compare/v2.2.1...main
 .. |scrutinizer| image:: https://img.shields.io/scrutinizer/quality/g/ionelmc/python-csu/main.svg
     :alt: Scrutinizer Status
     :target: https://scrutinizer-ci.com/g/ionelmc/python-csu/

{csu-2.2.0 → csu-2.2.1}/tests/test_exampleworker.py

@@ -108,13 +108,13 @@ def test_graceful_shutdown():
             "INFO:worker:ExampleEngine(4w/0q) requesting workers to stop and awaiting 1 producers...",
             "CONSUMER 0 perform_work JOB 1 DONE",
             "CONSUMER 0 save_result JOB 1",
-            "INFO:worker:ExampleProducer(1/WAITING).on_exit(<Task finished name='Task-5' coro=<AbstractProducer.run() done, defined at /home/ionel/open-source/python-csu/src/csu/worker/engine.py:167> result=None>) exit with result: None",
+            "INFO:worker:ExampleProducer(1/WAITING).on_exit(",
             "INFO:worker:ExampleEngine(4w/0q) flushing queue (0 items) and awaiting consumers...",
-            "INFO:worker:ExampleConsumer(1/SHUTDOWN).on_exit(<Task finished name='Task-2' coro=<AbstractConsumer.run() done, defined at /home/ionel/open-source/python-csu/src/csu/worker/engine.py:214> result=None>) exit with result: None",
-            "INFO:worker:ExampleConsumer(2/SHUTDOWN).on_exit(<Task finished name='Task-3' coro=<AbstractConsumer.run() done, defined at /home/ionel/open-source/python-csu/src/csu/worker/engine.py:214> result=None>) exit with result: None",
-            "INFO:worker:ExampleConsumer(3/SHUTDOWN).on_exit(<Task finished name='Task-4' coro=<AbstractConsumer.run() done, defined at /home/ionel/open-source/python-csu/src/csu/worker/engine.py:214> result=None>) exit with result: None",
-            "INFO:worker:ExampleEngine(0w/0q) shutdown complete.",
-            "DONE: {'ExampleEngine':",
+            "INFO:worker:ExampleConsumer(1/SHUTDOWN).on_exit(",
+            "INFO:worker:ExampleConsumer(2/SHUTDOWN).on_exit(",
+            "INFO:worker:ExampleConsumer(3/SHUTDOWN).on_exit(",
+            "INFO:worker:ExampleEngine(4w/0q) shutdown complete.",
+            "DONE: {'ExampleConsumer': {'EXITED': 3}, 'ExampleProducer': {'EXITED': 1}, 'ExampleEngine': {'JOBS': 3, 'QSIZE': 0, 'SEMVAL': 2}}",
         )
 
 
@@ -139,5 +139,26 @@ def test_forced_shutdown():
             "CONSUMER 1 perform_work JOB 2 DONE",
             "CONSUMER 2 perform_work JOB 3 DONE",
             "DONE: {'ExampleConsumer': {'CANCELED': 3}, 'ExampleProducer': {'CANCELED': 1}, 'ExampleEngine': {'JOBS': 3, 'QSIZE': 0, 'SEMVAL': 0}}",
-            "INFO:worker:ExampleEngine(0w/0q) shutdown complete.",
+        )
+
+
+def test_sem_rollback():
+    with TestProcess(sys.executable, "-mexampleworker", "1", "2", "10", "10") as target, dump_on_error(target.read):
+        wait_for_strings(
+            target.read,
+            15,
+            "PRODUCER fetch_task @ 1 RETURN",
+            "CONSUMER 0 perform_work JOB 1 START",
+            "CONSUMER 0 perform_work JOB 1 DONE",
+            "CONSUMER 0 save_result JOB 1",
+            "PRODUCER fetch_task @ 2 SKIP",
+            "PRODUCER fetch_task @ 3 RETURN",
+            "CONSUMER 0 perform_work JOB 3 START",
+            "CONSUMER 0 perform_work JOB 3 DONE",
+            "CONSUMER 0 save_result JOB 3",
+            "PRODUCER fetch_task @ 4 SKIP",
+            "PRODUCER fetch_task @ 5 RETURN",
+            "CONSUMER 0 perform_work JOB 5 START",
+            "CONSUMER 0 perform_work JOB 5 DONE",
+            "CONSUMER 0 save_result JOB 5",
         )