tasq-client-python 0.1.10__tar.gz → 0.1.12__tar.gz

{tasq-client-python-0.1.10 → tasq-client-python-0.1.12}/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: tasq-client-python
-Version: 0.1.10
+Version: 0.1.12

{tasq-client-python-0.1.10 → tasq-client-python-0.1.12}/setup.py

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

{tasq-client-python-0.1.10 → tasq-client-python-0.1.12}/tasq_client/client.py

@@ -30,6 +30,10 @@ class QueueCounts:
     expired: int
     completed: int
 
+    # Won't be set if a time window wasn't specified in the request, or if the
+    # server is old enough to not support rate estimation.
+    rate: Optional[float] = None
+
 
 class TasqClient:
     """
@@ -193,16 +197,17 @@ class TasqClient:
                 yield None
                 return
 
-    def counts(self) -> QueueCounts:
+    def counts(self, rate_window: int = 0) -> QueueCounts:
         """Get the number of tasks in each state within the queue."""
         data = self._get(
-            "/counts",
-            dict(
-                pending=int,
-                running=int,
-                expired=int,
-                completed=int,
-            ),
+            f"/counts?window={rate_window}",
+            {
+                "pending": int,
+                "running": int,
+                "expired": int,
+                "completed": int,
+                OptionalKey("minute_rate"): float,
+            },
         )
         return QueueCounts(**data)
 
@@ -223,7 +228,12 @@ class TasqClient:
             assert self.username is not None and self.password is not None
             self.session.auth = (self.username, self.password)
         if self.retry_server_errors:
-            retries = Retry(total=10, backoff_factor=1.0, status_forcelist=[500, 502, 503, 504])
+            retries = Retry(
+                total=10,
+                backoff_factor=1.0,
+                status_forcelist=[500, 502, 503, 504],
+                allowed_methods=False,
+            )
             for schema in ("http://", "https://"):
                 self.session.mount(schema, HTTPAdapter(max_retries=retries))
 
@@ -257,7 +267,8 @@ class TasqClient:
         )
 
     def _url_for_path(self, path: str, supports_timeout: bool) -> str:
-        result = self.base_url + path + "?context=" + urllib.parse.quote(self.context)
+        separator = "?" if "?" not in path else "&"
+        result = self.base_url + path + separator + "context=" + urllib.parse.quote(self.context)
         if supports_timeout and self.task_timeout is not None:
             result += "&timeout=" + urllib.parse.quote(f"{self.task_timeout:f}")
         return result

{tasq-client-python-0.1.10 → tasq-client-python-0.1.12}/tasq_client_python.egg-info/PKG-INFO

@@ -1,3 +1,3 @@
 Metadata-Version: 2.1
 Name: tasq-client-python
-Version: 0.1.10
+Version: 0.1.12