tasq-client-python 0.1.13__tar.gz → 0.1.15__tar.gz

{tasq-client-python-0.1.13 → tasq-client-python-0.1.15}/PKG-INFO

@@ -1,3 +1,4 @@
 Metadata-Version: 2.1
 Name: tasq-client-python
-Version: 0.1.13
+Version: 0.1.15
+Requires-Dist: requests

{tasq-client-python-0.1.13 → tasq-client-python-0.1.15}/setup.py

@@ -4,5 +4,5 @@ setup(
     name="tasq-client-python",
     packages=["tasq_client"],
     install_requires=["requests"],
-    version="0.1.13",
+    version="0.1.15",
 )

{tasq-client-python-0.1.13 → tasq-client-python-0.1.15}/tasq_client/client.py

@@ -1,11 +1,11 @@
-import multiprocessing
 import random
 import sys
 import time
 import urllib.parse
 from contextlib import contextmanager
 from dataclasses import dataclass
-from multiprocessing.context import BaseContext
+from queue import Empty, Queue
+from threading import Thread
 from typing import Any, Dict, List, Optional, Tuple
 
 import requests
@@ -35,6 +35,8 @@ class QueueCounts:
     # server is old enough to not support rate estimation.
     rate: Optional[float] = None
 
+    modtime: Optional[int] = None
+
 
 class TasqClient:
     """
@@ -82,7 +84,6 @@ class TasqClient:
         self.retry_server_errors = retry_server_errors
         self.session = requests.Session()
         self._configure_session()
-        self.mp_context = multiprocessing.get_context("spawn")
 
     def push(self, contents: str, limit: int = 0) -> Optional[str]:
         """
@@ -240,9 +241,7 @@ class TasqClient:
         while True:
             task, timeout = self.pop()
             if task is not None:
-                rt = RunningTask(
-                    self, id=task.id, contents=task.contents, mp_context=self.mp_context
-                )
+                rt = RunningTask(self, id=task.id, contents=task.contents)
                 try:
                     yield rt
                     rt.completed()
@@ -258,7 +257,7 @@ class TasqClient:
     def counts(self, rate_window: int = 0) -> QueueCounts:
         """Get the number of tasks in each state within the queue."""
         data = self._get(
-            f"/counts?window={rate_window}",
+            f"/counts?window={rate_window}&includeModtime=1",
             {
                 "pending": int,
                 "running": int,
@@ -339,28 +338,28 @@ class RunningTask(Task):
     cancel() or completed() is called.
     """
 
-    def __init__(
-        self, client: TasqClient, *args, mp_context: Optional[BaseContext] = None, **kwargs
-    ):
+    def __init__(self, client: TasqClient, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.client = client
-        self._proc = (mp_context or multiprocessing).Process(
+        self._kill_queue = Queue()
+        self._thread = Thread(
             target=RunningTask._keepalive_worker,
             name="tasq-keepalive-worker",
             args=(
+                self._kill_queue,
                 client,
                 self.id,
             ),
             daemon=True,
         )
-        self._proc.start()
+        self._thread.start()
 
     def cancel(self):
-        if self._proc is None:
+        if self._thread is None:
             return
-        self._proc.kill()
-        self._proc.join()
-        self._proc = None
+        self._kill_queue.put(None)
+        self._thread.join()
+        self._thread = None
 
     def completed(self):
         self.cancel()
@@ -368,6 +367,7 @@ class RunningTask(Task):
 
     @staticmethod
     def _keepalive_worker(
+        kill_queue: Queue,
         client: TasqClient,
         task_id: str,
     ):
@@ -375,8 +375,19 @@ class RunningTask(Task):
             try:
                 client.keepalive(task_id)
             except Exception as exc:  # pylint: disable=broad-except
+                # Ignore the error if we killed the thread during the
+                # keepalive call.
+                try:
+                    kill_queue.get(block=False)
+                    return
+                except Empty:
+                    pass
                 print(f"exception in tasq keepalive worker: {exc}", file=sys.stderr)
-            time.sleep(client.keepalive_interval)
+            try:
+                kill_queue.get(timeout=client.keepalive_interval)
+                return
+            except Empty:
+                pass
 
 
 class TasqRemoteError(Exception):

{tasq-client-python-0.1.13 → tasq-client-python-0.1.15}/tasq_client_python.egg-info/PKG-INFO

@@ -1,3 +1,4 @@
 Metadata-Version: 2.1
 Name: tasq-client-python
-Version: 0.1.13
+Version: 0.1.15
+Requires-Dist: requests