taskbadger 1.3.1__tar.gz → 1.3.2__tar.gz

{taskbadger-1.3.1 → taskbadger-1.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskbadger
-Version: 1.3.1
+Version: 1.3.2
 Summary: The official Python SDK for Task Badger
 Home-page: https://taskbadger.net/
 License: Apache-2.0
@@ -23,14 +23,15 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Provides-Extra: celery
 Requires-Dist: attrs (>=21.3.0)
 Requires-Dist: celery (>=4.0.0,<6.0.0) ; extra == "celery"
-Requires-Dist: httpx (>=0.20.0,<0.25.0)
+Requires-Dist: httpx (>=0.20.0,<0.28.0)
 Requires-Dist: importlib-metadata (>=1.0,<2.0) ; python_version < "3.8"
 Requires-Dist: python-dateutil (>=2.8.0,<3.0.0)
-Requires-Dist: tomlkit (>=0.11.6,<0.12.0)
-Requires-Dist: typer[all] (>=0.9.0,<0.10.0)
+Requires-Dist: tomlkit (>=0.12.5,<0.13.0)
+Requires-Dist: typer[all] (<0.10.0)
 Requires-Dist: typing-extensions (>=4.7.1,<5.0.0) ; python_version == "3.9"
+Project-URL: Changelog, https://github.com/taskbadger/taskbadger-python/releases
 Project-URL: Documentation, https://docs.taskbadger.net/
-Project-URL: Repository, https://github.com/taskbadger/taskbadger-docs
+Project-URL: Repository, https://github.com/taskbadger/taskbadger-python
 Description-Content-Type: text/markdown
 
 # Task Badger Python Client

{taskbadger-1.3.1 → taskbadger-1.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "taskbadger"
-version = "1.3.1"
+version = "1.3.2"
 description = "The official Python SDK for Task Badger"
 license = "Apache-2.0"
 
@@ -13,7 +13,7 @@ packages = [
 include = ["CHANGELOG.md", "taskbadger/internal/py.typed"]
 
 homepage = "https://taskbadger.net/"
-repository = "https://github.com/taskbadger/taskbadger-docs"
+repository = "https://github.com/taskbadger/taskbadger-python"
 documentation = "https://docs.taskbadger.net/"
 classifiers = [
     "Development Status :: 4 - Beta",
@@ -30,13 +30,16 @@ classifiers = [
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
 
+[tool.poetry.urls]
+"Changelog" = "https://github.com/taskbadger/taskbadger-python/releases"
+
 [tool.poetry.dependencies]
 python = "^3.8"
-httpx = ">=0.20.0,<0.25.0"
+httpx = ">=0.20.0,<0.28.0"
 attrs = ">=21.3.0"
 python-dateutil = "^2.8.0"
-typer = {extras = ["all"], version = "^0.9.0"}
-tomlkit = "^0.11.6"
+typer = {extras = ["all"], version = "<0.10.0"}
+tomlkit = "^0.12.5"
 importlib-metadata = {version = "^1.0", python = "<3.8"}
 typing-extensions = {version = "^4.7.1", python = "3.9"}
 celery = {version = ">=4.0.0,<6.0.0", optional = true}
@@ -52,7 +55,8 @@ black = "^23.1.0"
 pre-commit = "^3.0.2"
 pytest-httpx = "^0.21.3"
 invoke = "^2.0.0"
-pytest-celery = "^0.0.0"
+pytest-celery = ">0.0.0"
+redis = "^5.0.4"
 
 [tool.poetry.scripts]
 taskbadger = "taskbadger.cli_main:app"

{taskbadger-1.3.1 → taskbadger-1.3.2}/taskbadger/celery.py

@@ -103,11 +103,13 @@ class Task(celery.Task):
     def apply_async(self, *args, **kwargs):
         headers = kwargs.setdefault("headers", {})
         headers["taskbadger_track"] = True
-        tb_kwargs = kwargs.pop(TB_KWARGS_ARG, {})
-        for name in list(kwargs):
-            if name.startswith(KWARG_PREFIX):
-                val = kwargs.pop(name)
-                tb_kwargs[name.removeprefix(KWARG_PREFIX)] = val
+        tb_kwargs = self._get_tb_kwargs(kwargs)
+        if kwargs.get("kwargs"):
+            # extract taskbadger options from task kwargs when supplied as keyword argument
+            tb_kwargs.update(self._get_tb_kwargs(kwargs["kwargs"]))
+        elif len(args) > 1 and isinstance(args[1], dict):
+            # extract taskbadger options from task kwargs when supplied as positional argument
+            tb_kwargs.update(self._get_tb_kwargs(args[1]))
         headers[TB_KWARGS_ARG] = tb_kwargs
         result = super().apply_async(*args, **kwargs)
 
@@ -119,6 +121,14 @@ class Task(celery.Task):
 
         return result
 
+    def _get_tb_kwargs(self, kwargs):
+        tb_kwargs = kwargs.pop(TB_KWARGS_ARG, {})
+        for name in list(kwargs):
+            if name.startswith(KWARG_PREFIX):
+                val = kwargs.pop(name)
+                tb_kwargs[name.removeprefix(KWARG_PREFIX)] = val
+        return tb_kwargs
+
     @property
     def taskbadger_task_id(self):
         return _get_taskbadger_task_id(self.request)
@@ -146,6 +156,7 @@ def task_publish_handler(sender=None, headers=None, body=None, **kwargs):
     celery_system = Badger.current.settings.get_system_by_id("celery")
     auto_track = celery_system and celery_system.track_task(sender)
     manual_track = headers.get("taskbadger_track")
+    header_kwargs = headers.pop(TB_KWARGS_ARG, {})
     if not manual_track and not auto_track:
         return
 
@@ -158,7 +169,7 @@ def task_publish_handler(sender=None, headers=None, body=None, **kwargs):
             kwargs[attr.removeprefix(KWARG_PREFIX)] = getattr(ctask, attr)
 
     # get kwargs from the task headers (set via apply_async)
-    kwargs.update(headers.get(TB_KWARGS_ARG, {}))
+    kwargs.update(header_kwargs)
     kwargs["status"] = StatusEnum.PENDING
     name = kwargs.pop("name", headers["task"])
 

{taskbadger-1.3.1 → taskbadger-1.3.2}/taskbadger/sdk.py

@@ -1,3 +1,4 @@
+import logging
 import os
 from typing import Any, List
 
@@ -15,6 +16,8 @@ from taskbadger.internal.types import UNSET
 from taskbadger.mug import Badger, Session, Settings
 from taskbadger.systems import System
 
+log = logging.getLogger("taskbadger")
+
 _TB_HOST = "https://taskbadger.net"
 
 
@@ -338,6 +341,12 @@ class Task:
     def __getattr__(self, item):
         return getattr(self._task, item)
 
+    def safe_update(self, **kwargs):
+        try:
+            self.update(**kwargs)
+        except Exception as e:
+            log.exception("Error updating task '%s'", self._task.id)
+
 
 def _none_to_unset(value):
     return UNSET if value is None else value