plain.jobs 0.35.0__tar.gz → 0.36.0__tar.gz

{plain_jobs-0.35.0 → plain_jobs-0.36.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: plain.jobs
-Version: 0.35.0
+Version: 0.36.0
 Summary: Process background jobs with a database-driven job queue.
 Author-email: Dave Gaeddert <dave.gaeddert@dropseed.dev>
 License-File: LICENSE

{plain_jobs-0.35.0 → plain_jobs-0.36.0}/plain/jobs/CHANGELOG.md

@@ -1,5 +1,29 @@
 # plain-jobs changelog
 
+## [0.36.0](https://github.com/dropseed/plain/releases/plain-jobs@0.36.0) (2025-10-17)
+
+### What's changed
+
+- Removed internal memory optimization attempts including manual garbage collection and object deletion in worker processes ([c7064ba329](https://github.com/dropseed/plain/commit/c7064ba329))
+- Increased worker sleep interval from 0.1s to 0.5s when no jobs are available, reducing CPU usage during idle periods ([c7064ba329](https://github.com/dropseed/plain/commit/c7064ba329))
+
+### Upgrade instructions
+
+- No changes required
+
+## [0.35.1](https://github.com/dropseed/plain/releases/plain-jobs@0.35.1) (2025-10-17)
+
+### What's changed
+
+- The `run_in_worker()` method now returns `None` when a duplicate job is detected instead of attempting to return the list of in-progress jobs ([72f48d21bc](https://github.com/dropseed/plain/commit/72f48d21bc))
+- Fixed type annotations for `run_in_worker()` to properly indicate it can return `JobRequest | None` ([72f48d21bc](https://github.com/dropseed/plain/commit/72f48d21bc))
+- The `retry_job()` method now properly handles explicit `delay=0` parameter to intentionally retry immediately ([72f48d21bc](https://github.com/dropseed/plain/commit/72f48d21bc))
+- Fixed type annotations for `retry_job()` to properly indicate it can return `JobRequest | None` ([72f48d21bc](https://github.com/dropseed/plain/commit/72f48d21bc))
+
+### Upgrade instructions
+
+- No changes required
+
 ## [0.35.0](https://github.com/dropseed/plain/releases/plain-jobs@0.35.0) (2025-10-17)
 
 ### What's changed

{plain_jobs-0.35.0 → plain_jobs-0.36.0}/plain/jobs/jobs.py

@@ -62,7 +62,7 @@ class Job(metaclass=JobType):
         retries: int | None = None,
         retry_attempt: int = 0,
         unique_key: str | None = None,
-    ) -> JobRequest | list[JobRequest | JobProcess]:
+    ) -> JobRequest | None:
         from .models import JobRequest
 
         job_class_name = jobs_registry.get_job_class_name(self.__class__)
@@ -170,8 +170,7 @@ class Job(metaclass=JobType):
                 span.set_attribute(ERROR_TYPE, "IntegrityError")
                 span.set_status(trace.Status(trace.StatusCode.ERROR, "Duplicate job"))
                 logger.warning("Job already in progress: %s", e)
-                # Try to return the _in_progress list again
-                return self._in_progress(unique_key)
+                return None
 
     def _in_progress(self, unique_key: str) -> list[JobRequest | JobProcess]:
         """Get all JobRequests and JobProcess that are currently in progress, regardless of queue."""

{plain_jobs-0.35.0 → plain_jobs-0.36.0}/plain/jobs/models.py

@@ -412,10 +412,14 @@ class JobResult(models.Model):
         ],
     )
 
-    def retry_job(self, delay: int | None = None) -> JobRequest:
+    def retry_job(self, delay: int | None = None) -> JobRequest | None:
         retry_attempt = self.retry_attempt + 1
         job = jobs_registry.load_job(self.job_class, self.parameters)
-        retry_delay = delay or job.get_retry_delay(retry_attempt)
+
+        if delay is None:
+            retry_delay = job.get_retry_delay(retry_attempt)
+        else:
+            retry_delay = delay
 
         with transaction.atomic():
             result = job.run_in_worker(
@@ -427,12 +431,9 @@ class JobResult(models.Model):
                 retry_attempt=retry_attempt,
                 # Unique key could be passed also?
             )
+            if result:
+                self.retry_job_request_uuid = result.uuid
+                self.save(update_fields=["retry_job_request_uuid"])
+                return result
 
-            # TODO it is actually possible that result is a list
-            # of pending jobs, which would need to be handled...
-            # Right now it will throw an exception which could be caught by retry_failed_jobs.
-
-            self.retry_job_request_uuid = result.uuid  # type: ignore
-            self.save(update_fields=["retry_job_request_uuid"])
-
-        return result  # type: ignore
+        return None

{plain_jobs-0.35.0 → plain_jobs-0.36.0}/plain/jobs/workers.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import gc
 import logging
 import multiprocessing
 import os
@@ -122,7 +121,7 @@ class Worker:
                 # We don't want to convert too many JobRequests to Jobs,
                 # because anything not started yet will be cancelled on deploy etc.
                 # It's easier to leave them in the JobRequest db queue as long as possible.
-                time.sleep(0.1)
+                time.sleep(0.5)
                 continue
 
             with transaction.atomic():
@@ -157,19 +156,11 @@ class Worker:
 
             job_process_uuid = str(job.uuid)  # Make a str copy
 
-            # Release these now
-            del job_request
-            del job
-
             future = self.executor.submit(process_job, job_process_uuid)
             future.add_done_callback(
                 partial(future_finished_callback, job_process_uuid)
             )
 
-            # Do a quick sleep regardless to see if it
-            # gives processes a chance to start up
-            time.sleep(0.1)
-
     def shutdown(self) -> None:
         if self._is_shutting_down:
             # Already shutting down somewhere else
@@ -339,9 +330,6 @@ def process_job(job_process_uuid: str) -> None:
 
         job_result = middleware_chain(job_process)
 
-        # Release it now
-        del job_process
-
         duration = job_result.ended_at - job_result.started_at  # type: ignore[unsupported-operator]
         duration = duration.total_seconds()
 
@@ -357,8 +345,6 @@ def process_job(job_process_uuid: str) -> None:
             job_result.queue,
             duration,
         )
-
-        del job_result
     except Exception as e:
         # Raising exceptions inside the worker process doesn't
         # seem to be caught/shown anywhere as configured.
@@ -367,4 +353,3 @@ def process_job(job_process_uuid: str) -> None:
         logger.exception(e)
     finally:
         request_finished.send(sender=None)
-        gc.collect()

{plain_jobs-0.35.0 → plain_jobs-0.36.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plain.jobs"
-version = "0.35.0"
+version = "0.36.0"
 description = "Process background jobs with a database-driven job queue."
 authors = [{name = "Dave Gaeddert", email = "dave.gaeddert@dropseed.dev"}]
 readme = "README.md"