taskbadger 1.3.2__tar.gz → 1.3.4__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: taskbadger
-Version: 1.3.2
+Version: 1.3.4
 Summary: The official Python SDK for Task Badger
 Home-page: https://taskbadger.net/
 License: Apache-2.0

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

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "taskbadger"
-version = "1.3.2"
+version = "1.3.4"
 description = "The official Python SDK for Task Badger"
 license = "Apache-2.0"
 
@@ -10,7 +10,7 @@ readme = "README.md"
 packages = [
     {include = "taskbadger"},
 ]
-include = ["CHANGELOG.md", "taskbadger/internal/py.typed"]
+include = ["taskbadger/internal/py.typed"]
 
 homepage = "https://taskbadger.net/"
 repository = "https://github.com/taskbadger/taskbadger-python"

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

@@ -102,7 +102,6 @@ class Task(celery.Task):
 
     def apply_async(self, *args, **kwargs):
         headers = kwargs.setdefault("headers", {})
-        headers["taskbadger_track"] = True
         tb_kwargs = self._get_tb_kwargs(kwargs)
         if kwargs.get("kwargs"):
             # extract taskbadger options from task kwargs when supplied as keyword argument
@@ -110,7 +109,11 @@ class Task(celery.Task):
         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
+
+        if Badger.is_configured():
+            headers["taskbadger_track"] = True
+            headers[TB_KWARGS_ARG] = tb_kwargs
+
         result = super().apply_async(*args, **kwargs)
 
         tb_task_id = result.info.get(TB_TASK_ID) if result.info else None
@@ -150,13 +153,13 @@ class Task(celery.Task):
 @before_task_publish.connect
 def task_publish_handler(sender=None, headers=None, body=None, **kwargs):
     headers = headers if "task" in headers else body
+    header_kwargs = headers.pop(TB_KWARGS_ARG, {})  # always remove TB headers
     if sender.startswith("celery.") or not Badger.is_configured():
         return
 
     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
 
@@ -260,8 +263,8 @@ def exit_session(signal_sender):
 def safe_get_task(task_id: str):
     try:
         return get_task(task_id)
-    except Exception:
-        log.exception("Error fetching task '%s'", task_id)
+    except Exception as e:
+        log.warning("Error fetching task '%s': %s", task_id, e)
 
 
 def _get_taskbadger_task_id(request):

{taskbadger-1.3.2 → taskbadger-1.3.4}/taskbadger/decorators.py

@@ -63,5 +63,5 @@ def _update_task(task, **kwargs):
 def _update_safe(task, **kwargs):
     try:
         task.update(**kwargs)
-    except Exception:
-        log.exception("Error updating task '%s'", task.id)
+    except Exception as e:
+        log.warning("Error updating task '%s': %s", task.id, e)

{taskbadger-1.3.2 → taskbadger-1.3.4}/taskbadger/safe_sdk.py

@@ -29,8 +29,8 @@ def create_task_safe(name: str, **kwargs: P.kwargs) -> Optional[Task]:
 
     try:
         return create_task(name, **kwargs)
-    except Exception:
-        log.exception("Error creating task '%s'", name)
+    except Exception as e:
+        log.warning("Error creating task '%s': %s", name, e)
 
 
 def update_task_safe(task_id: str, **kwargs: P.kwargs) -> Optional[Task]:
@@ -48,5 +48,5 @@ def update_task_safe(task_id: str, **kwargs: P.kwargs) -> Optional[Task]:
 
     try:
         return update_task(task_id, **kwargs)
-    except Exception:
-        log.exception("Error updating task '%s'", task_id)
+    except Exception as e:
+        log.warning("Error updating task '%s': %s", task_id, e)

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

@@ -345,7 +345,7 @@ class Task:
         try:
             self.update(**kwargs)
         except Exception as e:
-            log.exception("Error updating task '%s'", self._task.id)
+            log.warning("Error updating task '%s': %s", self._task.id, e)
 
 
 def _none_to_unset(value):