saq 0.24.5__py3-none-any.whl → 0.24.8__py3-none-any.whl

saq/__init__.py

@@ -14,4 +14,4 @@ __all__ = [
     "Worker",
 ]
 
-__version__ = "0.24.5"
+__version__ = "0.24.8"

saq/job.py

@@ -174,6 +174,8 @@ class Job:
 
         if "queue" in kwargs:
             kwargs["queue"] = kwargs["queue"].name
+        if "status" in kwargs:
+            kwargs["status"] = kwargs["status"].name.lower()
 
         if not kwargs.get("meta"):
             kwargs.pop("meta", None)
@@ -181,6 +183,10 @@ class Job:
         info = ", ".join(f"{k}: {v}" for k, v in kwargs.items())
         return f"Job<{info}>"
 
+    def __post_init__(self) -> None:
+        if isinstance(self.status, str):
+            self.status = Status[self.status.upper()]
+
     def __repr__(self) -> str:
         return self.info(True)
 

saq/queue/base.py

@@ -118,7 +118,7 @@ class Queue(ABC):
         for k, v in kwargs.items():
             if hasattr(job, k):
                 setattr(job, k, v)
-        await self._update(job, **kwargs)
+        await self._update(self.copy(job), **kwargs)
 
     @abstractmethod
     async def _update(self, job: Job, status: Status | None = None, **kwargs: t.Any) -> None:
@@ -213,6 +213,9 @@ class Queue(ABC):
     async def connect(self) -> None:
         self._loop = asyncio.get_running_loop()
 
+    def copy(self, job: Job) -> Job:
+        return self.deserialize(job.to_dict())  # type: ignore
+
     def serialize(self, job: Job) -> bytes | str:
         return self._dump(job.to_dict())
 

saq/queue/postgres.py

@@ -138,7 +138,6 @@ class PostgresQueue(Queue):
         self._waiting = 0  # Internal counter of worker tasks waiting for dequeue
         self._dequeue_conn: AsyncConnection | None = None
         self._connection_lock = asyncio.Lock()
-        self._releasing: list[str] = []
         self._has_sweep_lock = False
         self._channel = CHANNEL.format(self.name)
         self._listener = ListenMultiplexer(self.pool, self._channel)
@@ -480,30 +479,34 @@ class PostgresQueue(Queue):
 
             job.status = status or job.status
 
-            await conn.execute(
-                SQL(
-                    dedent(
-                        """
-                        UPDATE {jobs_table} SET
-                          job = %(job)s
-                          ,status = %(status)s
-                          ,scheduled = %(scheduled)s
-                          {expire_at}
-                        WHERE key = %(key)s
-                        """
-                    )
-                ).format(
-                    jobs_table=self.jobs_table,
-                    expire_at=SQL(",expire_at = %(expire_at)s" if expire_at != -1 else ""),
-                ),
-                {
-                    "job": self.serialize(job),
-                    "status": job.status,
-                    "key": job.key,
-                    "scheduled": job.scheduled,
-                    "expire_at": expire_at,
-                },
-            )
+            try:
+                await conn.execute(
+                    SQL(
+                        dedent(
+                            """
+                            UPDATE {jobs_table} SET
+                              job = %(job)s
+                              ,status = %(status)s
+                              ,scheduled = %(scheduled)s
+                              {expire_at}
+                            WHERE key = %(key)s
+                            """
+                        )
+                    ).format(
+                        jobs_table=self.jobs_table,
+                        expire_at=SQL(",expire_at = %(expire_at)s" if expire_at != -1 else ""),
+                    ),
+                    {
+                        "job": self.serialize(job),
+                        "status": job.status,
+                        "key": job.key,
+                        "scheduled": job.scheduled,
+                        "expire_at": expire_at,
+                    },
+                )
+            finally:
+                if job.status != Status.ACTIVE:
+                    await self._release_job(job.key)
 
     async def job(self, job_key: str) -> Job | None:
         async with self.pool.connection() as conn, conn.cursor() as cursor:
@@ -643,7 +646,7 @@ class PostgresQueue(Queue):
                         dedent(
                             """
                             WITH locked_job AS (
-                              SELECT key, lock_key
+                              SELECT key
                               FROM {jobs_table}
                               WHERE status = 'queued'
                                 AND queue = %(queue)s
@@ -656,6 +659,7 @@ class PostgresQueue(Queue):
                                     AND queue = %(queue)s
                                     AND group_key IS NOT NULL
                                 )
+                                AND pg_try_advisory_lock({job_lock_keyspace}, lock_key)
                               ORDER BY priority, scheduled
                               LIMIT %(limit)s
                               FOR UPDATE SKIP LOCKED
@@ -663,7 +667,6 @@ class PostgresQueue(Queue):
                             UPDATE {jobs_table} SET status = 'active'
                             FROM locked_job
                             WHERE {jobs_table}.key = locked_job.key
-                              AND pg_try_advisory_lock({job_lock_keyspace}, locked_job.lock_key)
                             RETURNING job
                             """
                         )
@@ -784,7 +787,7 @@ class PostgresQueue(Queue):
                 SQL(
                     dedent(
                         """
-                        SELECT status
+                        SELECT UPPER(status)
                         FROM {jobs_table}
                         WHERE key = %(key)s
                         {for_update}
@@ -800,7 +803,7 @@ class PostgresQueue(Queue):
             )
             result = await cursor.fetchone()
             if result:
-                return result[0]
+                return Status[result[0]]
             return None
 
     async def _retry(self, job: Job, error: str | None) -> None:
@@ -839,7 +842,7 @@ class PostgresQueue(Queue):
                     ).format(jobs_table=self.jobs_table),
                     {"key": key},
                 )
-            await self._release_job(key)
+                await self._release_job(key)
 
     async def _notify(self, key: str, connection: AsyncConnection | None = None) -> None:
         async with self.nullcontext(connection) if connection else self.pool.connection() as conn:
@@ -871,26 +874,22 @@ class PostgresQueue(Queue):
         yield enter_result
 
     async def _release_job(self, key: str) -> None:
-        self._releasing.append(key)
-        if self._connection_lock.locked():
-            return
-        async with self._get_dequeue_conn() as conn:
+        async with self._get_dequeue_conn() as conn, conn:
             await conn.execute(
                 SQL(
                     dedent(
                         """
                         SELECT pg_advisory_unlock({job_lock_keyspace}, lock_key)
                         FROM {jobs_table}
-                        WHERE key = ANY(%(keys)s)
+                        WHERE key = %(key)s
                         """
                     )
                 ).format(
                     jobs_table=self.jobs_table,
                     job_lock_keyspace=self.job_lock_keyspace,
                 ),
-                {"keys": self._releasing},
+                {"key": key},
             )
-        self._releasing.clear()
 
     @cached_property
     def _job_queue(self) -> asyncio.Queue:

{saq-0.24.5.dist-info → saq-0.24.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: saq
-Version: 0.24.5
+Version: 0.24.8
 Summary: Distributed Python job queue with asyncio and redis
 Home-page: https://github.com/tobymao/saq
 Author: Toby Mao

{saq-0.24.5.dist-info → saq-0.24.8.dist-info}/RECORD

@@ -1,16 +1,16 @@
-saq/__init__.py,sha256=p8_e3CZvOzoEqFNkshhh1z1vvIguuNtn21nOE90zfws,218
+saq/__init__.py,sha256=8Yq6PVEa09HJzvRvQV0TUGSmOPqkdsJfNGYooR-DZ10,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
+saq/job.py,sha256=X49OuSqZeN-RVmh4AonZRrwk2wU8MeukLSxrvjGLm7E,11552
 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=W9rqK_u0bbvUbdb879pvf1f-suNnesKk1TjYqHQREc8,16817
 saq/queue/__init__.py,sha256=5LgBHGylCVvrLDcjMCcI2dRRgh0BPdz2TKOdc8NMs2E,87
-saq/queue/base.py,sha256=KaRv9r0fmlRf2CH6Q72MGHXIk9e3vpPEWo4vt5DL1RA,15460
+saq/queue/base.py,sha256=vRSr4ExGETlkjc9bLrtqfi_A7Zsr_IQzCMyN_b70-UM,15572
 saq/queue/http.py,sha256=V9S26gJbUt5AUIR2ETasSQy4Q_K30eGtguBYHpfcLGU,7739
-saq/queue/postgres.py,sha256=J6yENeG3rx7IhmCmSDYqz-eyYTvBvWf7-nsVgkuu-Us,34667
+saq/queue/postgres.py,sha256=Zb59GWPy36K6FaW3atdYOl4KBykoFVkW8S3gwX59nAc,34719
 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.5.dist-info/LICENSE,sha256=p208OXrLf_dMcvuRHpcinfsJdihCqKWbqtFXpw4kyW0,1065
-saq-0.24.5.dist-info/METADATA,sha256=rSwLcz-zNI6vH0d619vqBNmSncV70QdQc39QaaA7WuI,7781
-saq-0.24.5.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-saq-0.24.5.dist-info/entry_points.txt,sha256=HkKOud1K15_DV7AEltn8G5Ua10VqIgHaZ4BQit4fdOk,42
-saq-0.24.5.dist-info/top_level.txt,sha256=FMrrc5EiGr4sQkEDtUMHIpomnWHL9i6xT7B6lvEh8xM,4
-saq-0.24.5.dist-info/RECORD,,
+saq-0.24.8.dist-info/LICENSE,sha256=p208OXrLf_dMcvuRHpcinfsJdihCqKWbqtFXpw4kyW0,1065
+saq-0.24.8.dist-info/METADATA,sha256=SlpZba2Kq2khnXyF5ik6kjBzcY5FqwypKbn91EbrTSM,7781
+saq-0.24.8.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+saq-0.24.8.dist-info/entry_points.txt,sha256=HkKOud1K15_DV7AEltn8G5Ua10VqIgHaZ4BQit4fdOk,42
+saq-0.24.8.dist-info/top_level.txt,sha256=FMrrc5EiGr4sQkEDtUMHIpomnWHL9i6xT7B6lvEh8xM,4
+saq-0.24.8.dist-info/RECORD,,