taskbadger 1.6.2__tar.gz → 1.7.0__tar.gz

{taskbadger-1.6.2 → taskbadger-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: taskbadger
-Version: 1.6.2
+Version: 1.7.0
 Summary: The official Python SDK for Task Badger
 Project-URL: Changelog, https://github.com/taskbadger/taskbadger-python/releases
 Project-URL: homepage, https://taskbadger.net/

{taskbadger-1.6.2 → taskbadger-1.7.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "taskbadger"
-version = "1.6.2"
+version = "1.7.0"
 description = "The official Python SDK for Task Badger"
 requires-python = ">=3.9"
 authors = []

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/celery.py

@@ -131,7 +131,8 @@ class Task(celery.Task):
 
         result = super().apply_async(*args, **kwargs)
 
-        tb_task_id = result.info.get(TB_TASK_ID) if result.info else None
+        info = result.info
+        tb_task_id = info.get(TB_TASK_ID) if isinstance(info, dict) else None
         setattr(result, TB_TASK_ID, tb_task_id)
 
         _get_task = functools.partial(get_task, tb_task_id) if tb_task_id else lambda: None
@@ -212,8 +213,91 @@ def task_publish_handler(sender=None, headers=None, body=None, **kwargs):
         ctask.update_state(task_id=headers["id"], state="PENDING", meta=meta)
 
 
+def _maybe_create_task(signal_sender):
+    """Create a TaskBadger task if one doesn't exist yet.
+
+    This handles cases where before_task_publish didn't fire or was skipped:
+    - Eager mode (before_task_publish doesn't fire)
+    - Canvas primitives like map/starmap/chunks (fire for celery.* tasks)
+    """
+    # Check if task was already created FIRST (before accessing Badger)
+    # This avoids initializing thread-local Badger state for tasks like celery.ping
+    task_id = _get_taskbadger_task_id(signal_sender.request)
+    if task_id:
+        return
+
+    task_name = signal_sender.name
+
+    # Skip built-in celery tasks that we don't track (like celery.ping)
+    # Only handle celery.map and celery.starmap specially
+    if task_name.startswith("celery.") and task_name not in ("celery.map", "celery.starmap"):
+        return
+
+    # For non-canvas tasks, only create if there was an explicit intent to track
+    # (indicated by taskbadger_track header). This prevents creating tasks when
+    # Badger wasn't configured at publish time but has stale config in worker.
+    headers = signal_sender.request.headers or {}
+    is_canvas_task = task_name in ("celery.map", "celery.starmap")
+    if not is_canvas_task and not headers.get("taskbadger_track"):
+        return
+
+    # NOW it's safe to check Badger configuration
+    if not Badger.is_configured():
+        return
+
+    celery_system = Badger.current.settings.get_system_by_id("celery")
+    data = None
+    inner_task = None
+
+    # Handle celery.map and celery.starmap - extract the inner task name
+    if task_name in ("celery.map", "celery.starmap"):
+        canvas_type = task_name.split(".")[-1]  # "map" or "starmap"
+        inner_task_info = signal_sender.request.kwargs.get("task")
+        if inner_task_info:
+            # inner_task_info can be a dict (serialized signature) or a Signature object
+            if isinstance(inner_task_info, dict):
+                task_name = inner_task_info.get("task", task_name)
+            elif hasattr(inner_task_info, "name"):
+                task_name = inner_task_info.name
+            # Get the actual task class to check if it uses Task base
+            inner_task = celery.current_app.tasks.get(task_name)
+        items = signal_sender.request.kwargs.get("it", [])
+        # Convert to list if needed for counting and potential recording
+        items_list = list(items) if not isinstance(items, (list, tuple)) else items
+        item_count = len(items_list)
+        # Append canvas type and item count to task name
+        task_name = f"{task_name} ({canvas_type} {item_count})"
+        data = {"canvas_type": signal_sender.name, "item_count": item_count}
+
+        # Include task items if record_task_args is enabled
+        if celery_system and celery_system.record_task_args:
+            try:
+                _, _, value = serialization.dumps({"items": items_list}, serializer="json")
+                items_data = json.loads(value)
+                data["celery_task_items"] = items_data["items"]
+            except Exception:
+                log.warning("Error serializing canvas items for task '%s'", task_name)
+
+    # Check if we should track this task
+    auto_track = celery_system and celery_system.track_task(task_name)
+    # Check if the task (or inner task for map/starmap) uses our Task base class
+    task_to_check = inner_task if inner_task else signal_sender
+    manual_track = isinstance(task_to_check, Task)
+    if not manual_track and not auto_track:
+        return
+
+    enter_session()
+
+    task = create_task_safe(task_name, status=StatusEnum.PENDING, data=data)
+    if task:
+        # Store the task ID in the request so _update_task can find it
+        signal_sender.request.update({TB_TASK_ID: task.id})
+        safe_get_task.cache.set((task.id,), task)
+
+
 @task_prerun.connect
 def task_prerun_handler(sender=None, **kwargs):
+    _maybe_create_task(sender)
     _update_task(sender, StatusEnum.PROCESSING)
 
 

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/cli_main.py

@@ -6,6 +6,7 @@ from rich import print
 from taskbadger import __version__
 from taskbadger.cli import create, get, list_tasks_command, run, update
 from taskbadger.config import get_config, write_config
+from taskbadger.sdk import _parse_token
 
 app = typer.Typer(
     rich_markup_mode="rich",
@@ -30,9 +31,18 @@ def version_callback(value: bool):
 def configure(ctx: typer.Context):
     """Update CLI configuration."""
     config = ctx.meta["tb_config"]
-    config.organization_slug = typer.prompt("Organization slug", default=config.organization_slug)
-    config.project_slug = typer.prompt("Project slug", default=config.project_slug)
-    config.token = typer.prompt("API Key", default=config.token)
+    token = typer.prompt("API Key", default=config.token)
+    parsed = _parse_token(token)
+    if parsed:
+        org_slug, project_slug, api_key = parsed
+        print(f"Project key detected — organization: [green]{org_slug}[/green], project: [green]{project_slug}[/green]")
+        config.organization_slug = org_slug
+        config.project_slug = project_slug
+        config.token = token
+    else:
+        config.organization_slug = typer.prompt("Organization slug", default=config.organization_slug)
+        config.project_slug = typer.prompt("Project slug", default=config.project_slug)
+        config.token = token
     path = write_config(config)
     print(f"Config written to [green]{path}[/green]")
 

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/config.py

@@ -7,7 +7,7 @@ import tomlkit
 import typer
 from tomlkit import document, table
 
-from taskbadger.sdk import _TB_HOST, _init
+from taskbadger.sdk import _TB_HOST, _init, _parse_token
 
 APP_NAME = "taskbadger"
 
@@ -47,10 +47,20 @@ class Config:
         """
         defaults = config_dict.get("defaults", {})
         auth = config_dict.get("auth", {})
+        token = overrides.get("token") or _from_env("API_KEY", auth.get("token"))
+        organization_slug = overrides.get("org") or _from_env("ORG", defaults.get("org"))
+        project_slug = overrides.get("project") or _from_env("PROJECT", defaults.get("project"))
+
+        if token:
+            parsed = _parse_token(token)
+            if parsed:
+                organization_slug = parsed[0]
+                project_slug = parsed[1]
+
         return Config(
-            token=overrides.get("token") or _from_env("API_KEY", auth.get("token")),
-            organization_slug=overrides.get("org") or _from_env("ORG", defaults.get("org")),
-            project_slug=overrides.get("project") or _from_env("PROJECT", defaults.get("project")),
+            token=token,
+            organization_slug=organization_slug,
+            project_slug=project_slug,
             host=overrides.get("host") or auth.get("host"),
             tags=config_dict.get("tags", {}),
         )

taskbadger-1.7.0/taskbadger/internal/api/action_endpoints/__init__.py

@@ -0,0 +1 @@
+"""Contains endpoint functions for accessing the API"""

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/action_endpoints/action_cancel.py

@@ -26,6 +26,7 @@ def _get_kwargs(
 def _parse_response(*, client: Union[AuthenticatedClient, Client], response: httpx.Response) -> Optional[Any]:
     if response.status_code == 204:
         return None
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/action_endpoints/action_create.py

@@ -24,9 +24,8 @@ def _get_kwargs(
         "url": f"/api/{organization_slug}/{project_slug}/tasks/{task_id}/actions/",
     }
 
-    _body = body.to_dict()
+    _kwargs["json"] = body.to_dict()
 
-    _kwargs["json"] = _body
     headers["Content-Type"] = "application/json"
 
     _kwargs["headers"] = headers
@@ -38,6 +37,7 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
         response_201 = Action.from_dict(response.json())
 
         return response_201
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/action_endpoints/action_get.py

@@ -29,6 +29,7 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
         response_200 = Action.from_dict(response.json())
 
         return response_200
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/action_endpoints/action_list.py

@@ -34,6 +34,7 @@ def _parse_response(
             response_200.append(response_200_item)
 
         return response_200
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/action_endpoints/action_partial_update.py

@@ -26,9 +26,8 @@ def _get_kwargs(
         "url": f"/api/{organization_slug}/{project_slug}/tasks/{task_id}/actions/{id}/",
     }
 
-    _body = body.to_dict()
+    _kwargs["json"] = body.to_dict()
 
-    _kwargs["json"] = _body
     headers["Content-Type"] = "application/json"
 
     _kwargs["headers"] = headers
@@ -40,6 +39,7 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
         response_200 = Action.from_dict(response.json())
 
         return response_200
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/action_endpoints/action_update.py

@@ -26,9 +26,8 @@ def _get_kwargs(
         "url": f"/api/{organization_slug}/{project_slug}/tasks/{task_id}/actions/{id}/",
     }
 
-    _body = body.to_dict()
+    _kwargs["json"] = body.to_dict()
 
-    _kwargs["json"] = _body
     headers["Content-Type"] = "application/json"
 
     _kwargs["headers"] = headers
@@ -40,6 +39,7 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
         response_200 = Action.from_dict(response.json())
 
         return response_200
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

taskbadger-1.7.0/taskbadger/internal/api/task_endpoints/__init__.py

@@ -0,0 +1 @@
+"""Contains endpoint functions for accessing the API"""

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/task_endpoints/task_cancel.py

@@ -25,6 +25,7 @@ def _get_kwargs(
 def _parse_response(*, client: Union[AuthenticatedClient, Client], response: httpx.Response) -> Optional[Any]:
     if response.status_code == 204:
         return None
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/task_endpoints/task_create.py

@@ -27,9 +27,8 @@ def _get_kwargs(
         "url": f"/api/{organization_slug}/{project_slug}/tasks/",
     }
 
-    _body = body.to_dict()
+    _kwargs["json"] = body.to_dict()
 
-    _kwargs["json"] = _body
     headers["Content-Type"] = "application/json"
 
     _kwargs["headers"] = headers
@@ -41,6 +40,7 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
         response_201 = Task.from_dict(response.json())
 
         return response_201
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/task_endpoints/task_get.py

@@ -28,6 +28,7 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
         response_200 = Task.from_dict(response.json())
 
         return response_200
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/task_endpoints/task_list.py

@@ -40,6 +40,7 @@ def _parse_response(
         response_200 = PaginatedTaskList.from_dict(response.json())
 
         return response_200
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/task_endpoints/task_partial_update.py

@@ -25,9 +25,8 @@ def _get_kwargs(
         "url": f"/api/{organization_slug}/{project_slug}/tasks/{id}/",
     }
 
-    _body = body.to_dict()
+    _kwargs["json"] = body.to_dict()
 
-    _kwargs["json"] = _body
     headers["Content-Type"] = "application/json"
 
     _kwargs["headers"] = headers
@@ -39,6 +38,7 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
         response_200 = Task.from_dict(response.json())
 
         return response_200
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/api/task_endpoints/task_update.py

@@ -25,9 +25,8 @@ def _get_kwargs(
         "url": f"/api/{organization_slug}/{project_slug}/tasks/{id}/",
     }
 
-    _body = body.to_dict()
+    _kwargs["json"] = body.to_dict()
 
-    _kwargs["json"] = _body
     headers["Content-Type"] = "application/json"
 
     _kwargs["headers"] = headers
@@ -39,6 +38,7 @@ def _parse_response(*, client: Union[AuthenticatedClient, Client], response: htt
         response_200 = Task.from_dict(response.json())
 
         return response_200
+
     if client.raise_on_unexpected_status:
         raise errors.UnexpectedStatus(response.status_code, response.content)
     else:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/action.py

@@ -1,4 +1,5 @@
 import datetime
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -70,8 +71,8 @@ class Action:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         id = d.pop("id")
 
         task = d.pop("task")

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/action_request.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -43,8 +44,8 @@ class ActionRequest:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         trigger = d.pop("trigger")
 
         integration = d.pop("integration")

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/paginated_task_list.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar, Union, cast
 
 from attrs import define as _attrs_define
@@ -59,10 +60,10 @@ class PaginatedTaskList:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.task import Task
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         results = []
         _results = d.pop("results")
         for results_item_data in _results:

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/patched_action_request.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
@@ -42,8 +43,8 @@ class PatchedActionRequest:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         trigger = d.pop("trigger", UNSET)
 
         integration = d.pop("integration", UNSET)

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/patched_task_request.py

@@ -1,4 +1,5 @@
 import datetime
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar, Union, cast
 
 from attrs import define as _attrs_define
@@ -35,6 +36,8 @@ class PatchedTaskRequest:
             set via the API.
         end_time (Union[None, Unset, datetime.datetime]): Datetime when status is set to a terminal value.Can be set via
             the API.
+        time_to_start (Union[None, Unset, str]): Duration between task creation and when status first changes from
+            pending. (seconds)
         max_runtime (Union[None, Unset, int]): Maximum duration the task can be running for before being considered
             failed. (seconds)
         stale_timeout (Union[None, Unset, int]): Maximum time to allow between task updates before considering the task
@@ -50,6 +53,7 @@ class PatchedTaskRequest:
     data: Union[Unset, Any] = UNSET
     start_time: Union[None, Unset, datetime.datetime] = UNSET
     end_time: Union[None, Unset, datetime.datetime] = UNSET
+    time_to_start: Union[None, Unset, str] = UNSET
     max_runtime: Union[None, Unset, int] = UNSET
     stale_timeout: Union[None, Unset, int] = UNSET
     tags: Union[Unset, "PatchedTaskRequestTags"] = UNSET
@@ -88,6 +92,12 @@ class PatchedTaskRequest:
         else:
             end_time = self.end_time
 
+        time_to_start: Union[None, Unset, str]
+        if isinstance(self.time_to_start, Unset):
+            time_to_start = UNSET
+        else:
+            time_to_start = self.time_to_start
+
         max_runtime: Union[None, Unset, int]
         if isinstance(self.max_runtime, Unset):
             max_runtime = UNSET
@@ -121,6 +131,8 @@ class PatchedTaskRequest:
             field_dict["start_time"] = start_time
         if end_time is not UNSET:
             field_dict["end_time"] = end_time
+        if time_to_start is not UNSET:
+            field_dict["time_to_start"] = time_to_start
         if max_runtime is not UNSET:
             field_dict["max_runtime"] = max_runtime
         if stale_timeout is not UNSET:
@@ -131,10 +143,10 @@ class PatchedTaskRequest:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.patched_task_request_tags import PatchedTaskRequestTags
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         name = d.pop("name", UNSET)
 
         _status = d.pop("status", UNSET)
@@ -191,6 +203,15 @@ class PatchedTaskRequest:
 
         end_time = _parse_end_time(d.pop("end_time", UNSET))
 
+        def _parse_time_to_start(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        time_to_start = _parse_time_to_start(d.pop("time_to_start", UNSET))
+
         def _parse_max_runtime(data: object) -> Union[None, Unset, int]:
             if data is None:
                 return data
@@ -224,6 +245,7 @@ class PatchedTaskRequest:
             data=data,
             start_time=start_time,
             end_time=end_time,
+            time_to_start=time_to_start,
             max_runtime=max_runtime,
             stale_timeout=stale_timeout,
             tags=tags,

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/patched_task_request_tags.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar
 
 from attrs import define as _attrs_define
@@ -19,8 +20,8 @@ class PatchedTaskRequestTags:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         patched_task_request_tags = cls()
 
         patched_task_request_tags.additional_properties = d

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/task.py

@@ -1,4 +1,5 @@
 import datetime
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar, Union, cast
 
 from attrs import define as _attrs_define
@@ -43,6 +44,8 @@ class Task:
             set via the API.
         end_time (Union[None, Unset, datetime.datetime]): Datetime when status is set to a terminal value.Can be set via
             the API.
+        time_to_start (Union[None, Unset, str]): Duration between task creation and when status first changes from
+            pending. (seconds)
         max_runtime (Union[None, Unset, int]): Maximum duration the task can be running for before being considered
             failed. (seconds)
         stale_timeout (Union[None, Unset, int]): Maximum time to allow between task updates before considering the task
@@ -65,6 +68,7 @@ class Task:
     data: Union[Unset, Any] = UNSET
     start_time: Union[None, Unset, datetime.datetime] = UNSET
     end_time: Union[None, Unset, datetime.datetime] = UNSET
+    time_to_start: Union[None, Unset, str] = UNSET
     max_runtime: Union[None, Unset, int] = UNSET
     stale_timeout: Union[None, Unset, int] = UNSET
     tags: Union[Unset, "TaskTags"] = UNSET
@@ -120,6 +124,12 @@ class Task:
         else:
             end_time = self.end_time
 
+        time_to_start: Union[None, Unset, str]
+        if isinstance(self.time_to_start, Unset):
+            time_to_start = UNSET
+        else:
+            time_to_start = self.time_to_start
+
         max_runtime: Union[None, Unset, int]
         if isinstance(self.max_runtime, Unset):
             max_runtime = UNSET
@@ -163,6 +173,8 @@ class Task:
             field_dict["start_time"] = start_time
         if end_time is not UNSET:
             field_dict["end_time"] = end_time
+        if time_to_start is not UNSET:
+            field_dict["time_to_start"] = time_to_start
         if max_runtime is not UNSET:
             field_dict["max_runtime"] = max_runtime
         if stale_timeout is not UNSET:
@@ -173,10 +185,10 @@ class Task:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.task_tags import TaskTags
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         id = d.pop("id")
 
         organization = d.pop("organization")
@@ -254,6 +266,15 @@ class Task:
 
         end_time = _parse_end_time(d.pop("end_time", UNSET))
 
+        def _parse_time_to_start(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        time_to_start = _parse_time_to_start(d.pop("time_to_start", UNSET))
+
         def _parse_max_runtime(data: object) -> Union[None, Unset, int]:
             if data is None:
                 return data
@@ -295,6 +316,7 @@ class Task:
             data=data,
             start_time=start_time,
             end_time=end_time,
+            time_to_start=time_to_start,
             max_runtime=max_runtime,
             stale_timeout=stale_timeout,
             tags=tags,

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/task_request.py

@@ -1,4 +1,5 @@
 import datetime
+from collections.abc import Mapping
 from typing import TYPE_CHECKING, Any, TypeVar, Union, cast
 
 from attrs import define as _attrs_define
@@ -35,6 +36,8 @@ class TaskRequest:
             set via the API.
         end_time (Union[None, Unset, datetime.datetime]): Datetime when status is set to a terminal value.Can be set via
             the API.
+        time_to_start (Union[None, Unset, str]): Duration between task creation and when status first changes from
+            pending. (seconds)
         max_runtime (Union[None, Unset, int]): Maximum duration the task can be running for before being considered
             failed. (seconds)
         stale_timeout (Union[None, Unset, int]): Maximum time to allow between task updates before considering the task
@@ -49,6 +52,7 @@ class TaskRequest:
     data: Union[Unset, Any] = UNSET
     start_time: Union[None, Unset, datetime.datetime] = UNSET
     end_time: Union[None, Unset, datetime.datetime] = UNSET
+    time_to_start: Union[None, Unset, str] = UNSET
     max_runtime: Union[None, Unset, int] = UNSET
     stale_timeout: Union[None, Unset, int] = UNSET
     tags: Union[Unset, "TaskRequestTags"] = UNSET
@@ -87,6 +91,12 @@ class TaskRequest:
         else:
             end_time = self.end_time
 
+        time_to_start: Union[None, Unset, str]
+        if isinstance(self.time_to_start, Unset):
+            time_to_start = UNSET
+        else:
+            time_to_start = self.time_to_start
+
         max_runtime: Union[None, Unset, int]
         if isinstance(self.max_runtime, Unset):
             max_runtime = UNSET
@@ -122,6 +132,8 @@ class TaskRequest:
             field_dict["start_time"] = start_time
         if end_time is not UNSET:
             field_dict["end_time"] = end_time
+        if time_to_start is not UNSET:
+            field_dict["time_to_start"] = time_to_start
         if max_runtime is not UNSET:
             field_dict["max_runtime"] = max_runtime
         if stale_timeout is not UNSET:
@@ -132,10 +144,10 @@ class TaskRequest:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
         from ..models.task_request_tags import TaskRequestTags
 
-        d = src_dict.copy()
+        d = dict(src_dict)
         name = d.pop("name")
 
         _status = d.pop("status", UNSET)
@@ -192,6 +204,15 @@ class TaskRequest:
 
         end_time = _parse_end_time(d.pop("end_time", UNSET))
 
+        def _parse_time_to_start(data: object) -> Union[None, Unset, str]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            return cast(Union[None, Unset, str], data)
+
+        time_to_start = _parse_time_to_start(d.pop("time_to_start", UNSET))
+
         def _parse_max_runtime(data: object) -> Union[None, Unset, int]:
             if data is None:
                 return data
@@ -225,6 +246,7 @@ class TaskRequest:
             data=data,
             start_time=start_time,
             end_time=end_time,
+            time_to_start=time_to_start,
             max_runtime=max_runtime,
             stale_timeout=stale_timeout,
             tags=tags,

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/task_request_tags.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar
 
 from attrs import define as _attrs_define
@@ -19,8 +20,8 @@ class TaskRequestTags:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         task_request_tags = cls()
 
         task_request_tags.additional_properties = d

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/models/task_tags.py

@@ -1,3 +1,4 @@
+from collections.abc import Mapping
 from typing import Any, TypeVar
 
 from attrs import define as _attrs_define
@@ -19,8 +20,8 @@ class TaskTags:
         return field_dict
 
     @classmethod
-    def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        d = src_dict.copy()
+    def from_dict(cls: type[T], src_dict: Mapping[str, Any]) -> T:
+        d = dict(src_dict)
         task_tags = cls()
 
         task_tags.additional_properties = d

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/internal/types.py

@@ -1,8 +1,8 @@
 """Contains some shared types for properties"""
 
-from collections.abc import MutableMapping
+from collections.abc import Mapping, MutableMapping
 from http import HTTPStatus
-from typing import BinaryIO, Generic, Literal, Optional, TypeVar
+from typing import IO, BinaryIO, Generic, Literal, Optional, TypeVar, Union
 
 from attrs import define
 
@@ -14,7 +14,15 @@ class Unset:
 
 UNSET: Unset = Unset()
 
-FileJsonType = tuple[Optional[str], BinaryIO, Optional[str]]
+# The types that `httpx.Client(files=)` can accept, copied from that library.
+FileContent = Union[IO[bytes], bytes, str]
+FileTypes = Union[
+    # (filename, file (or bytes), content_type)
+    tuple[Optional[str], FileContent, Optional[str]],
+    # (filename, file (or bytes), content_type, headers)
+    tuple[Optional[str], FileContent, Optional[str], Mapping[str, str]],
+]
+RequestFiles = list[tuple[str, FileTypes]]
 
 
 @define
@@ -25,7 +33,7 @@ class File:
     file_name: Optional[str] = None
     mime_type: Optional[str] = None
 
-    def to_tuple(self) -> FileJsonType:
+    def to_tuple(self) -> FileTypes:
         """Return a tuple representation that httpx will accept for multipart/form-data"""
         return self.file_name, self.payload, self.mime_type
 
@@ -43,4 +51,4 @@ class Response(Generic[T]):
     parsed: Optional[T]
 
 
-__all__ = ["UNSET", "File", "FileJsonType", "Response", "Unset"]
+__all__ = ["UNSET", "File", "FileTypes", "RequestFiles", "Response", "Unset"]

{taskbadger-1.6.2 → taskbadger-1.7.0}/taskbadger/sdk.py

@@ -1,3 +1,4 @@
+import base64
 import datetime
 import logging
 import os
@@ -35,6 +36,26 @@ log = logging.getLogger("taskbadger")
 _TB_HOST = "https://taskbadger.net"
 
 
+def _parse_token(token):
+    """Try to decode a project API key.
+
+    Project keys are base64-encoded strings in the format ``org/project/key``.
+
+    Returns:
+        A tuple of ``(organization_slug, project_slug, api_key)`` if *token*
+        is a valid project key, otherwise ``None``.
+    """
+    try:
+        decoded = base64.b64decode(token, validate=True).decode("utf-8")
+    except Exception:
+        return None
+
+    parts = decoded.split("/")
+    if len(parts) == 3 and all(parts):
+        return tuple(parts)
+    return None
+
+
 def init(
     organization_slug: str = None,
     project_slug: str = None,
@@ -43,9 +64,16 @@ def init(
     tags: dict[str, str] = None,
     before_create: Callback = None,
 ):
-    """Initialize Task Badger client
+    """Initialize Task Badger client.
+
+    If *token* is a project API key (base64-encoded ``org/project/key``),
+    the organization and project slugs are extracted automatically and
+    *organization_slug* / *project_slug* are ignored.
 
-    Call this function once per thread
+    For legacy API keys, *organization_slug* and *project_slug* are
+    required and a deprecation warning is emitted.
+
+    Call this function once per thread.
     """
     _init(_TB_HOST, organization_slug, project_slug, token, systems, tags, before_create)
 
@@ -64,6 +92,17 @@ def _init(
     project_slug = project_slug or os.environ.get("TASKBADGER_PROJECT")
     token = token or os.environ.get("TASKBADGER_API_KEY")
 
+    if token:
+        parsed = _parse_token(token)
+        if parsed:
+            organization_slug, project_slug, token = parsed
+        else:
+            warnings.warn(
+                "Legacy API keys are deprecated. Please switch to a project API key.",
+                DeprecationWarning,
+                stacklevel=3,
+            )
+
     if before_create and isinstance(before_create, str):
         try:
             before_create = import_string(before_create)