fixes

Author: snopoke

taskbadger/sdk.py

@@ -18,10 +18,10 @@
 )
 from taskbadger.internal.models import (
     PatchedTaskRequest,
-    PatchedTaskRequestData,
+    PatchedTaskRequestDataType0,
     StatusEnum,
     TaskRequest,
-    TaskRequestData,
+    TaskRequestDataType0,
 )
 from taskbadger.internal.types import UNSET
 from taskbadger.mug import Badger, Session, Settings
@@ -131,10 +131,10 @@ def create_task(
     scope_data = Badger.current.scope().context
     if scope_data or data:
         data = data or {}
-        task.data = TaskRequestData.from_dict({**scope_data, **data})
+        task.data = TaskRequestDataType0.from_dict({**scope_data, **data})
     if actions:
         task.additional_properties = {"actions": [a.to_dict() for a in actions]}
-    kwargs = _make_args(json_body=task)
+    kwargs = _make_args(body=task)
     if monitor_id:
         kwargs["x_taskbadger_monitor"] = monitor_id
     with Session() as client:
@@ -179,7 +179,7 @@ def update_task(
     max_runtime = _none_to_unset(max_runtime)
     stale_timeout = _none_to_unset(stale_timeout)
 
-    data = UNSET if not data else PatchedTaskRequestData.from_dict(data)
+    data = UNSET if not data else PatchedTaskRequestDataType0.from_dict(data)
     body = PatchedTaskRequest(
         name=name,
         status=status,
@@ -191,7 +191,7 @@ def update_task(
     )
     if actions:
         body.additional_properties = {"actions": [a.to_dict() for a in actions]}
-    kwargs = _make_args(id=task_id, json_body=body)
+    kwargs = _make_args(id=task_id, body=body)
     with Session() as client:
         response = task_partial_update.sync_detailed(client=client, **kwargs)
     _check_response(response)

tests/test_cli_create_update.py

@@ -10,7 +10,7 @@
     PatchedTaskRequest,
     StatusEnum,
     TaskRequest,
-    TaskRequestData,
+    TaskRequestDataType0,
 )
 from taskbadger.internal.types import Response
 from tests.utils import task_for_test
@@ -19,7 +19,7 @@
 
 
 @pytest.fixture(autouse=True)
-def mock_env():
+def _mock_env():
     with mock.patch.dict(
         os.environ,
         {
@@ -56,13 +56,13 @@ def test_cli_create():
             name="my-task",
             status=StatusEnum.PROCESSING,
             value_max=100,
-            data=TaskRequestData.from_dict({"b": "2", "a": 1, "c": 1}),
+            data=TaskRequestDataType0.from_dict({"b": "2", "a": 1, "c": 1}),
         )
         create.assert_called_with(
             client=mock.ANY,
             organization_slug="org",
             project_slug="project",
-            json_body=request,
+            body=request,
         )
 
 
@@ -85,5 +85,5 @@ def test_cli_update():
             organization_slug="org",
             project_slug="project",
             id="task123",
-            json_body=body,
+            body=body,
         )

tests/test_cli_run.py

@@ -8,7 +8,7 @@
 from taskbadger.cli_main import app
 from taskbadger.internal.models import (
     PatchedTaskRequest,
-    PatchedTaskRequestData,
+    PatchedTaskRequestDataType0,
     StatusEnum,
     TaskRequest,
 )
@@ -49,13 +49,13 @@ def _should_update_task(last_update, update_frequency_seconds):
 def test_cli_capture_output():
     update_patch = _test_cli_run(["echo test"], 0, args=["task_name", "--capture-output"], update_call_count=2)
 
-    body = PatchedTaskRequest(status=UNSET, data=PatchedTaskRequestData.from_dict({"stdout": "test\n"}))
+    body = PatchedTaskRequest(status=UNSET, data=PatchedTaskRequestDataType0.from_dict({"stdout": "test\n"}))
     update_patch.assert_any_call(
         client=mock.ANY,
         organization_slug="org",
         project_slug="project",
         id=mock.ANY,
-        json_body=body,
+        body=body,
     )
 
 
@@ -71,13 +71,13 @@ def _should_update_task(last_update, update_frequency_seconds):
             update_call_count=3,
         )
 
-    body = PatchedTaskRequest(status=UNSET, data=PatchedTaskRequestData.from_dict({"stdout": "test\n123\n"}))
+    body = PatchedTaskRequest(status=UNSET, data=PatchedTaskRequestDataType0.from_dict({"stdout": "test\n123\n"}))
     update_patch.assert_any_call(
         client=mock.ANY,
         organization_slug="org",
         project_slug="project",
         id=mock.ANY,
-        json_body=body,
+        body=body,
     )
 
 
@@ -115,7 +115,7 @@ def _update(*args, **kwargs):
         update_mock(*args, **kwargs)
 
         # handle updating task data
-        data = kwargs["json_body"].data
+        data = kwargs["body"].data
         task_return = task_for_test(id=task_id, data=data.additional_properties if data else None)
         return Response(HTTPStatus.OK, b"", {}, task_return)
 
@@ -138,15 +138,15 @@ def _update(*args, **kwargs):
             client=mock.ANY,
             organization_slug="org",
             project_slug="project",
-            json_body=request,
+            body=request,
         )
 
         if return_code == 0:
             body = PatchedTaskRequest(status=StatusEnum.SUCCESS, value=100)
         else:
             body = PatchedTaskRequest(
                 status=StatusEnum.ERROR,
-                data=PatchedTaskRequestData.from_dict({"return_code": return_code}),
+                data=PatchedTaskRequestDataType0.from_dict({"return_code": return_code}),
             )
 
         assert update_mock.call_count == update_call_count
@@ -155,7 +155,7 @@ def _update(*args, **kwargs):
             organization_slug="org",
             project_slug="project",
             id=task.id,
-            json_body=body,
+            body=body,
         )
         return update_mock
 

tests/test_sdk.py

@@ -7,9 +7,9 @@
 from taskbadger.exceptions import TaskbadgerException
 from taskbadger.internal.models import (
     PatchedTaskRequest,
-    PatchedTaskRequestData,
+    PatchedTaskRequestDataType0,
     TaskRequest,
-    TaskRequestData,
+    TaskRequestDataType0,
 )
 from taskbadger.internal.types import UNSET, Response
 from taskbadger.mug import Badger
@@ -76,7 +76,7 @@ def test_create(settings, patched_create):
         status=StatusEnum.PRE_PROCESSING,
         value=13,
         value_max=UNSET,
-        data=TaskRequestData.from_dict(data),
+        data=TaskRequestDataType0.from_dict(data),
         max_runtime=10,
         stale_timeout=2,
     )
@@ -93,7 +93,7 @@ def test_create(settings, patched_create):
         client=mock.ANY,
         organization_slug="org",
         project_slug="project",
-        json_body=request,
+        body=request,
     )
 
 
@@ -188,7 +188,7 @@ def _verify_update(settings, patched_update, **kwargs):
     request_params.update(kwargs)
 
     if kwargs.get("data"):
-        request_params["data"] = PatchedTaskRequestData.from_dict(kwargs["data"])
+        request_params["data"] = PatchedTaskRequestDataType0.from_dict(kwargs["data"])
 
     request = PatchedTaskRequest(**request_params)
     if actions:
@@ -200,5 +200,5 @@ def _verify_update(settings, patched_update, **kwargs):
         organization_slug="org",
         project_slug="project",
         id=mock.ANY,
-        json_body=request,
+        body=request,
     )

tests/utils.py

@@ -2,23 +2,23 @@
 from uuid import uuid4
 
 from taskbadger.internal.models import Task as TaskInternal
-from taskbadger.internal.models import TaskData
+from taskbadger.internal.models import TaskDataType0
 
 
 def task_for_test(**kwargs):
     task_id = kwargs.pop("id", uuid4().hex)
     data = kwargs.pop("data", None)
     if data:
-        kwargs["data"] = TaskData.from_dict(data)
+        kwargs["data"] = TaskDataType0.from_dict(data)
     kwargs["url"] = None
     kwargs["public_url"] = None
     kwargs["value_percent"] = None
+    kwargs["created"] = datetime.utcnow()
+    kwargs["updated"] = datetime.utcnow()
     return TaskInternal(
         task_id,
         "org",
         "project",
         "task_name",
-        datetime.utcnow(),
-        datetime.utcnow(),
         **kwargs,
     )