update schema and client with tags

Author: snopoke

taskbadger.yaml

@@ -47,20 +47,23 @@ paths:
               examples:
                 ListResponse:
                   value:
-                    previous: string
-                    next: string
+                    next: http://api.example.org/accounts/?cursor=cD00ODY%3D"
+                    previous: http://api.example.org/accounts/?cursor=cj0xJnA9NDg3
                     results:
-                    - id: 57ae8eVBrH7jbDgmYj6Ut2vR9S
-                      organization: example_org
-                      project: example_org
-                      name: example task
-                      status: processing
-                      value: 63
-                      value_percent: 63
-                      data:
-                        property1: customValue
-                      created: '2022-08-24T14:15:22Z'
-                      updated: '2022-08-24T16:15:22Z'
+                    - previous: string
+                      next: string
+                      results:
+                      - id: 57ae8eVBrH7jbDgmYj6Ut2vR9S
+                        organization: example_org
+                        project: example_org
+                        name: example task
+                        status: processing
+                        value: 63
+                        value_percent: 63
+                        data:
+                          property1: customValue
+                        created: '2022-08-24T14:15:22Z'
+                        updated: '2022-08-24T16:15:22Z'
                   summary: List Response
           description: ''
     post:
@@ -100,6 +103,9 @@ paths:
                   status: pending
                   data:
                     property1: customValue
+                  tags:
+                    project: demo
+                    user: admin
                 summary: Create Payload
         required: true
       security:
@@ -601,9 +607,7 @@ components:
         status:
           type: string
           readOnly: true
-        config:
-          type: object
-          additionalProperties: {}
+        config: {}
         created:
           type: string
           format: date-time
@@ -631,21 +635,25 @@ components:
           type: string
           minLength: 1
           maxLength: 50
-        config:
-          type: object
-          additionalProperties: {}
+        config: {}
       required:
       - integration
       - trigger
     PaginatedTaskList:
       type: object
+      required:
+      - results
       properties:
         next:
           type: string
           nullable: true
+          format: uri
+          example: http://api.example.org/accounts/?cursor=cD00ODY%3D"
         previous:
           type: string
           nullable: true
+          format: uri
+          example: http://api.example.org/accounts/?cursor=cj0xJnA9NDg3
         results:
           type: array
           items:
@@ -661,9 +669,7 @@ components:
           type: string
           minLength: 1
           maxLength: 50
-        config:
-          type: object
-          additionalProperties: {}
+        config: {}
     PatchedTaskRequest:
       type: object
       properties:
@@ -675,15 +681,6 @@ components:
         status:
           allOf:
           - $ref: '#/components/schemas/StatusEnum'
-          description: |-
-            * `pending` - pending
-            * `pre_processing` - pre_processing
-            * `processing` - processing
-            * `post_processing` - post_processing
-            * `success` - success
-            * `error` - error
-            * `cancelled` - cancelled
-            * `stale` - stale
           default: pending
         value:
           type: integer
@@ -699,8 +696,6 @@ components:
           format: int64
           description: Maximum value of the task. Defaults to 100.
         data:
-          type: object
-          additionalProperties: {}
           nullable: true
           description: Custom metadata
         start_time:
@@ -728,7 +723,15 @@ components:
           minimum: 1
           nullable: true
           description: Maximum time to allow between task updates before considering
-            the task stale. Only applies when task is in a running state. (seconds)
+            the task stale. (seconds)
+        tags:
+          type: object
+          additionalProperties:
+            type: string
+            minLength: 2
+            maxLength: 255
+          description: Tags for the task represented as a mapping from 'namespace'
+            to 'value'.
     StatusEnum:
       enum:
       - pending
@@ -740,6 +743,15 @@ components:
       - cancelled
       - stale
       type: string
+      description: |-
+        * `pending` - pending
+        * `pre_processing` - pre_processing
+        * `processing` - processing
+        * `post_processing` - post_processing
+        * `success` - success
+        * `error` - error
+        * `cancelled` - cancelled
+        * `stale` - stale
     Task:
       type: object
       properties:
@@ -760,15 +772,6 @@ components:
         status:
           allOf:
           - $ref: '#/components/schemas/StatusEnum'
-          description: |-
-            * `pending` - pending
-            * `pre_processing` - pre_processing
-            * `processing` - processing
-            * `post_processing` - post_processing
-            * `success` - success
-            * `error` - error
-            * `cancelled` - cancelled
-            * `stale` - stale
           default: pending
         value:
           type: integer
@@ -788,8 +791,6 @@ components:
           readOnly: true
           nullable: true
         data:
-          type: object
-          additionalProperties: {}
           nullable: true
           description: Custom metadata
         created:
@@ -825,13 +826,21 @@ components:
           minimum: 1
           nullable: true
           description: Maximum time to allow between task updates before considering
-            the task stale. Only applies when task is in a running state. (seconds)
+            the task stale. (seconds)
         url:
           type: string
           readOnly: true
         public_url:
           type: string
           readOnly: true
+        tags:
+          type: object
+          additionalProperties:
+            type: string
+            maxLength: 255
+            minLength: 2
+          description: Tags for the task represented as a mapping from 'namespace'
+            to 'value'.
       required:
       - created
       - id
@@ -853,15 +862,6 @@ components:
         status:
           allOf:
           - $ref: '#/components/schemas/StatusEnum'
-          description: |-
-            * `pending` - pending
-            * `pre_processing` - pre_processing
-            * `processing` - processing
-            * `post_processing` - post_processing
-            * `success` - success
-            * `error` - error
-            * `cancelled` - cancelled
-            * `stale` - stale
           default: pending
         value:
           type: integer
@@ -877,8 +877,6 @@ components:
           format: int64
           description: Maximum value of the task. Defaults to 100.
         data:
-          type: object
-          additionalProperties: {}
           nullable: true
           description: Custom metadata
         start_time:
@@ -906,7 +904,15 @@ components:
           minimum: 1
           nullable: true
           description: Maximum time to allow between task updates before considering
-            the task stale. Only applies when task is in a running state. (seconds)
+            the task stale. (seconds)
+        tags:
+          type: object
+          additionalProperties:
+            type: string
+            minLength: 2
+            maxLength: 255
+          description: Tags for the task represented as a mapping from 'namespace'
+            to 'value'.
       required:
       - name
   securitySchemes:

taskbadger/integrations.py

@@ -2,7 +2,7 @@
 from typing import Any
 
 from taskbadger.exceptions import TaskbadgerException
-from taskbadger.internal.models import ActionRequest, ActionRequestConfig
+from taskbadger.internal.models import ActionRequest
 
 
 def from_config(integration_id: str, config: str):
@@ -47,17 +47,17 @@ class EmailIntegration(Integration):
     to: str  # custom type
     id: str = "email"
 
-    def request_config(self) -> ActionRequestConfig:
-        return ActionRequestConfig.from_dict({"to": self.to})
+    def request_config(self) -> dict:
+        return {"to": self.to}
 
 
 @dataclasses.dataclass
 class WebhookIntegration(Integration):
     type = "webhook"
     id: str
 
-    def request_config(self) -> ActionRequestConfig:
-        return ActionRequestConfig.from_dict({})
+    def request_config(self) -> dict:
+        return {}
 
 
 ALL = [EmailIntegration, WebhookIntegration]

taskbadger/internal/models/__init__.py

@@ -1,33 +1,27 @@
 """Contains all the data models used in inputs/outputs"""
 
 from .action import Action
-from .action_config import ActionConfig
 from .action_request import ActionRequest
-from .action_request_config import ActionRequestConfig
 from .paginated_task_list import PaginatedTaskList
 from .patched_action_request import PatchedActionRequest
-from .patched_action_request_config import PatchedActionRequestConfig
 from .patched_task_request import PatchedTaskRequest
-from .patched_task_request_data_type_0 import PatchedTaskRequestDataType0
+from .patched_task_request_tags import PatchedTaskRequestTags
 from .status_enum import StatusEnum
 from .task import Task
-from .task_data_type_0 import TaskDataType0
 from .task_request import TaskRequest
-from .task_request_data_type_0 import TaskRequestDataType0
+from .task_request_tags import TaskRequestTags
+from .task_tags import TaskTags
 
 __all__ = (
     "Action",
-    "ActionConfig",
     "ActionRequest",
-    "ActionRequestConfig",
     "PaginatedTaskList",
     "PatchedActionRequest",
-    "PatchedActionRequestConfig",
     "PatchedTaskRequest",
-    "PatchedTaskRequestDataType0",
+    "PatchedTaskRequestTags",
     "StatusEnum",
     "Task",
-    "TaskDataType0",
     "TaskRequest",
-    "TaskRequestDataType0",
+    "TaskRequestTags",
+    "TaskTags",
 )

taskbadger/internal/models/action.py

@@ -1,16 +1,12 @@
 import datetime
-from typing import TYPE_CHECKING, Any, TypeVar, Union
+from typing import Any, TypeVar, Union
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 from dateutil.parser import isoparse
 
 from ..types import UNSET, Unset
 
-if TYPE_CHECKING:
-    from ..models.action_config import ActionConfig
-
-
 T = TypeVar("T", bound="Action")
 
 
@@ -25,7 +21,7 @@ class Action:
         status (str):
         created (datetime.datetime):
         updated (datetime.datetime):
-        config (Union[Unset, ActionConfig]):
+        config (Union[Unset, Any]):
     """
 
     id: int
@@ -35,7 +31,7 @@ class Action:
     status: str
     created: datetime.datetime
     updated: datetime.datetime
-    config: Union[Unset, "ActionConfig"] = UNSET
+    config: Union[Unset, Any] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -53,9 +49,7 @@ def to_dict(self) -> dict[str, Any]:
 
         updated = self.updated.isoformat()
 
-        config: Union[Unset, dict[str, Any]] = UNSET
-        if not isinstance(self.config, Unset):
-            config = self.config.to_dict()
+        config = self.config
 
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
@@ -77,8 +71,6 @@ def to_dict(self) -> dict[str, Any]:
 
     @classmethod
     def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
-        from ..models.action_config import ActionConfig
-
         d = src_dict.copy()
         id = d.pop("id")
 
@@ -94,12 +86,7 @@ def from_dict(cls: type[T], src_dict: dict[str, Any]) -> T:
 
         updated = isoparse(d.pop("updated"))
 
-        _config = d.pop("config", UNSET)
-        config: Union[Unset, ActionConfig]
-        if isinstance(_config, Unset):
-            config = UNSET
-        else:
-            config = ActionConfig.from_dict(_config)
+        config = d.pop("config", UNSET)
 
         action = cls(
             id=id,