saq 0.24.0__py3-none-any.whl → 0.24.4__py3-none-any.whl

saq/__init__.py

@@ -14,4 +14,4 @@ __all__ = [
     "Worker",
 ]
 
-__version__ = "0.24.0"
+__version__ = "0.24.4"

saq/queue/postgres.py

@@ -75,6 +75,8 @@ class PostgresQueue(Queue):
         job_lock_sweep: Whether or not the jobs are swept if there's no lock. (default True)
         priorities: The priority range to dequeue. (default (0, 32767))
         swept_error_message: The error message to use when sweeping jobs. (default "swept")
+        manage_pool_lifecycle: Whether to have SAQ manage the lifecycle of the connection pool. (default None)
+            If None, the pool will be managed if a pool is not provided, otherwise it will not be managed.
     """
 
     @classmethod
@@ -104,6 +106,7 @@ class PostgresQueue(Queue):
         job_lock_sweep: bool = True,
         priorities: tuple[int, int] = (0, 32767),
         swept_error_message: str | None = None,
+        manage_pool_lifecycle: bool | None = None,
     ) -> None:
         super().__init__(name=name, dump=dump, load=load, swept_error_message=swept_error_message)
 
@@ -123,7 +126,9 @@ class PostgresQueue(Queue):
         if self.pool.kwargs.get("autocommit") is False:
             raise ValueError("SAQ Connection pool must have autocommit enabled.")
         self.pool.kwargs["autocommit"] = True
-        self._is_pool_provided = pool is not None
+        self._manage_pool_lifecycle = (
+            manage_pool_lifecycle if manage_pool_lifecycle is not None else pool is None
+        )
         self.min_size = min_size
         self.max_size = max_size
         self.saq_lock_keyspace = saq_lock_keyspace
@@ -211,7 +216,7 @@ class PostgresQueue(Queue):
     async def connect(self) -> None:
         if self._connected:
             return
-        if not self._is_pool_provided:
+        if self._manage_pool_lifecycle:
             await self.pool.open()
             await self.pool.resize(min_size=self.min_size, max_size=self.max_size)
         await self.init_db()
@@ -236,7 +241,7 @@ class PostgresQueue(Queue):
                     await conn.execute("SELECT pg_advisory_unlock_all()")
                 await self.pool.putconn(self._dequeue_conn)
                 self._dequeue_conn = None
-        if not self._is_pool_provided:
+        if self._manage_pool_lifecycle:
             await self.pool.close()
         self._has_sweep_lock = False
         self._connected = False

saq/worker.py

@@ -283,7 +283,8 @@ class Worker:
 
             if task and not task.done():
                 task_data["aborted"] = "abort" if job.error is None else job.error
-                await cancel_tasks([task])
+                # abort should be a blocking operation
+                await cancel_tasks([task], 0)
 
             await self.queue.finish_abort(job)
 

{saq-0.24.0.dist-info → saq-0.24.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: saq
-Version: 0.24.0
+Version: 0.24.4
 Summary: Distributed Python job queue with asyncio and redis
 Home-page: https://github.com/tobymao/saq
 Author: Toby Mao
@@ -120,11 +120,25 @@ environment variables:
 ```
 
 ## Example
+
 ```python
 import asyncio
 
 from saq import CronJob, Queue
 
+
+class DBHelper:
+    """Helper class for demo purposes"""
+
+    async def disconnect(self):
+        print("Disconnecting from the database")
+
+    async def connect(self):
+        print("Connectiong...")
+
+    def __str__(self):
+        return "Your DBHelper at work"
+
 # all functions take in context dict and kwargs
 async def test(ctx, *, a):
     await asyncio.sleep(0.5)
@@ -133,10 +147,12 @@ async def test(ctx, *, a):
     return {"x": a}
 
 async def cron(ctx):
-  print("i am a cron job")
+    print("i am a cron job")
 
 async def startup(ctx):
-    ctx["db"] = await create_db()
+    helper = DBHelper()
+    await helper.connect()
+    ctx["db"] = helper
 
 async def shutdown(ctx):
     await ctx["db"].disconnect()

{saq-0.24.0.dist-info → saq-0.24.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-saq/__init__.py,sha256=_czOeMHM4kMpuyk4QKHSBz-o8le6NYGS_hMj_VRL-L4,218
+saq/__init__.py,sha256=n3vtr_Be-JuLNl3gVvNbfTnU8doa0pvssMn114QYFTc,218
 saq/__main__.py,sha256=N4RNqnCcj7eZbM3OyYaC03_6Cot-y-SxW5Hwx6fuzKU,2440
 saq/errors.py,sha256=XPJw6J3caSAho4ZybuodIbeuGjboVabLuf3NFOEE-4Q,112
 saq/job.py,sha256=Pion_buhc4N-5mqnqfwfpzVjv-paP3HHqtMAKB6XIcE,11327
@@ -6,11 +6,11 @@ saq/multiplexer.py,sha256=S_mjo7kObSBQ_f8epf0pT5Tjxg-LABW3fSH4dPfZxsE,2332
 saq/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 saq/types.py,sha256=GhIq2BIE_Z9hA-qS-NQXh_iPICNI0NZxOzjW0vcMgFU,3196
 saq/utils.py,sha256=NdOycT-03zxjhKM8A1i0vzKnkv1UQxvy_Zt4GnO0Zd8,1721
-saq/worker.py,sha256=w0PARNGFChpVs1BwKzut6sxshU2XSZ2tG9cKkUa-ybA,16672
+saq/worker.py,sha256=wd8LTfF7YQRRrOrxqvZcOpEF4KISD9Ws5WDXm3BFfnY,16730
 saq/queue/__init__.py,sha256=5LgBHGylCVvrLDcjMCcI2dRRgh0BPdz2TKOdc8NMs2E,87
 saq/queue/base.py,sha256=KaRv9r0fmlRf2CH6Q72MGHXIk9e3vpPEWo4vt5DL1RA,15460
 saq/queue/http.py,sha256=V9S26gJbUt5AUIR2ETasSQy4Q_K30eGtguBYHpfcLGU,7739
-saq/queue/postgres.py,sha256=UKnARw9at2b6gV3cynZ0jR46Hiir50o40dEd7gEClE4,34307
+saq/queue/postgres.py,sha256=J6yENeG3rx7IhmCmSDYqz-eyYTvBvWf7-nsVgkuu-Us,34667
 saq/queue/postgres_migrations.py,sha256=gI6j-0TzlFFSWxji3Dy9aJ-llboJBm92J4tB_YZ7qI8,2080
 saq/queue/redis.py,sha256=sa_wzUUlfPw-RZ-v_cnDEJWEFyUi3sy_3YTqG4UklOA,17754
 saq/web/__init__.py,sha256=NG9LfjgJQxNft0_iZuZ3LnX1I58SfxRwKpycjazBoGE,23
@@ -20,9 +20,9 @@ saq/web/starlette.py,sha256=i38xuNcnQvWBY3jyHHu9Uo9ILSBzOwmk5Bq06c3CQzM,4432
 saq/web/static/app.js,sha256=i6PaRvBvt96LOINBdEuKkDvVeM-GA8lJiFg4jtQ3viY,7094
 saq/web/static/pico.min.css.gz,sha256=qCxIv3wWFMQ7MkvGSHQLwxio3121VvvieOkSjw6fv6o,9263
 saq/web/static/snabbdom.js.gz,sha256=zSO3Z761TB7bYNQFFEtypD0vCuqWesqPJeE5CuV4xRg,7603
-saq-0.24.0.dist-info/LICENSE,sha256=p208OXrLf_dMcvuRHpcinfsJdihCqKWbqtFXpw4kyW0,1065
-saq-0.24.0.dist-info/METADATA,sha256=qBZMrHLODmbu30oyEVgdlT7rJkcs5S8MS0ObqnbyI34,7472
-saq-0.24.0.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-saq-0.24.0.dist-info/entry_points.txt,sha256=HkKOud1K15_DV7AEltn8G5Ua10VqIgHaZ4BQit4fdOk,42
-saq-0.24.0.dist-info/top_level.txt,sha256=FMrrc5EiGr4sQkEDtUMHIpomnWHL9i6xT7B6lvEh8xM,4
-saq-0.24.0.dist-info/RECORD,,
+saq-0.24.4.dist-info/LICENSE,sha256=p208OXrLf_dMcvuRHpcinfsJdihCqKWbqtFXpw4kyW0,1065
+saq-0.24.4.dist-info/METADATA,sha256=B9Cb8pazxjQCgnVfRoxoaOsVCPrTOdcMJUG0v-cPVfo,7781
+saq-0.24.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+saq-0.24.4.dist-info/entry_points.txt,sha256=HkKOud1K15_DV7AEltn8G5Ua10VqIgHaZ4BQit4fdOk,42
+saq-0.24.4.dist-info/top_level.txt,sha256=FMrrc5EiGr4sQkEDtUMHIpomnWHL9i6xT7B6lvEh8xM,4
+saq-0.24.4.dist-info/RECORD,,