gazu 0.10.15__py2.py3-none-any.whl → 0.10.17__py2.py3-none-any.whl

gazu/__version__.py

@@ -1 +1 @@
-__version__ = "0.10.15"
+__version__ = "0.10.17"

gazu/casting.py

@@ -60,7 +60,10 @@ def update_episode_casting(project, episode, casting, client=default):
     """
     episode = normalize_model_parameter(episode)
     project = normalize_model_parameter(project)
-    path = "data/projects/%s/entities/%s/casting" % (project["id"], episode["id"])
+    path = "data/projects/%s/entities/%s/casting" % (
+        project["id"],
+        episode["id"],
+    )
     return raw.put(path, casting, client=client)
 
 

gazu/client.py

@@ -303,6 +303,32 @@ def delete(path, params=None, client=default_client):
     return response.text
 
 
+def get_message_from_response(
+    response, default_message="No additional information"
+):
+    """
+    A utility function that handles Zou's inconsistent message keys.
+    For a given request, checks if any error messages or regular messages were given and returns their value.
+    If no messages are found, returns a default message.
+
+    Args:
+        response: requests.Request - A response to check.
+        default_message: str - An optional default value to revert to if no message is detected.
+
+    Returns:
+        The message of a given response, or a default message - if any.
+    """
+    message = default_message
+    message_json = response.json()
+
+    for key in ["error", "message"]:
+        if message_json.get(key):
+            message = message_json[key]
+            break
+
+    return message
+
+
 def check_status(request, path, client=None):
     """
     Raise an exception related to status code, if the status code does not
@@ -329,8 +355,7 @@ def check_status(request, path, client=None):
     elif status_code == 403:
         raise NotAllowedException(path)
     elif status_code == 400:
-        text = request.json().get("message", "No additional information")
-        raise ParameterException(path, text)
+        raise ParameterException(path, get_message_from_response(request))
     elif status_code == 405:
         raise MethodNotAllowedException(path)
     elif status_code == 413:
@@ -359,14 +384,15 @@ def check_status(request, path, client=None):
             raise
     elif status_code in [500, 502]:
         try:
+            print("A server error occured!\n")
             stacktrace = request.json().get(
                 "stacktrace", "No stacktrace sent by the server"
             )
-            message = request.json().get(
-                "message", "No message sent by the server"
-            )
-            print("A server error occured!\n")
             print("Server stacktrace:\n%s" % stacktrace)
+            message = get_message_from_response(
+                response=request,
+                default_message="No message sent by the server",
+            )
             print("Error message:\n%s\n" % message)
         except Exception:
             print(request.text)
@@ -474,8 +500,11 @@ def upload(path, file_path, data={}, extra_files=[], client=default_client):
     except JSONDecodeError:
         print(response.text)
         raise
-    if "message" in result:
-        raise UploadFailedException(result["message"])
+
+    result_message = get_message_from_response(response, default_message="")
+    if result_message:
+        raise UploadFailedException(result_message)
+
     return result
 
 

gazu/playlist.py

@@ -166,16 +166,12 @@ def get_entity_preview_files(entity, client=default):
     entity = normalize_model_parameter(entity)
     return raw.get(
         "data/playlists/entities/%s/preview-files" % entity["id"],
-        client=client
+        client=client,
     )
 
 
 def add_entity_to_playlist(
-    playlist,
-    entity,
-    preview_file=None,
-    persist=True,
-    client=default
+    playlist, entity, preview_file=None, persist=True, client=default
 ):
     """
     Add an entity to the playlist, use the last uploaded preview as revision
@@ -197,25 +193,23 @@ def add_entity_to_playlist(
         for task_type_id in preview_files.keys():
             task_type_files = preview_files[task_type_id]
             first_file = task_type_files[0]
-            if preview_file is None or \
-               preview_file["created_at"] < first_file["created_at"]:
+            if (
+                preview_file is None
+                or preview_file["created_at"] < first_file["created_at"]
+            ):
                 preview_file = first_file
 
     preview_file = normalize_model_parameter(preview_file)
-    playlist["shots"].append({
-        "entity_id": entity["id"],
-        "preview_file_id": preview_file["id"]
-    })
+    playlist["shots"].append(
+        {"entity_id": entity["id"], "preview_file_id": preview_file["id"]}
+    )
     if persist:
         update_playlist(playlist, client=client)
     return playlist
 
 
 def remove_entity_from_playlist(
-    playlist,
-    entity,
-    persist=True,
-    client=default
+    playlist, entity, persist=True, client=default
 ):
     """
     Remove all occurences of a given entity from a playlist.
@@ -239,11 +233,7 @@ def remove_entity_from_playlist(
 
 
 def update_entity_preview(
-    playlist,
-    entity,
-    preview_file,
-    persist=True,
-    client=default
+    playlist, entity, preview_file, persist=True, client=default
 ):
     """
     Remove all occurences of a given entity from a playlist.

gazu/task.py

@@ -257,12 +257,7 @@ def all_tasks_for_task_status(project, task_type, task_status, client=default):
 
 
 @cache
-def all_tasks_for_task_type(
-    project,
-    task_type,
-    episode=None,
-    client=default
-):
+def all_tasks_for_task_type(project, task_type, episode=None, client=default):
     """
     Args:
         project (str / dict): The project dict or the project ID.
@@ -532,18 +527,6 @@ def get_task_status_by_name(name, client=default):
     return raw.fetch_first("task-status", {"name": name}, client=client)
 
 
-@cache
-def get_default_task_status(client=default):
-    """
-    Args:
-        name (str / dict): The name of claimed task status.
-
-    Returns:
-        dict: Task status matching given name.
-    """
-    return raw.fetch_first("task-status", {"is_default": True}, client=client)
-
-
 @cache
 def get_task_status_by_short_name(task_status_short_name, client=default):
     """
@@ -661,7 +644,7 @@ def new_task(
     entity = normalize_model_parameter(entity)
     task_type = normalize_model_parameter(task_type)
     if task_status is None:
-        task_status = get_default_task_status()
+        task_status = get_default_task_status(client=client)
 
     data = {
         "project_id": entity["project_id"],
@@ -1267,10 +1250,7 @@ def get_task_url(task, client=default):
 
 
 def all_tasks_for_project(
-    project,
-    task_type=None,
-    episode=None,
-    client=default
+    project, task_type=None, episode=None, client=default
 ):
     """
     Args:

{gazu-0.10.15.dist-info → gazu-0.10.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: gazu
-Version: 0.10.15
+Version: 0.10.17
 Summary: Gazu is a client for Zou, the API to store the data of your CG production.
 Home-page: https://gazu.cg-wire.com/
 Author: CG Wire
@@ -32,8 +32,8 @@ Provides-Extra: dev
 Requires-Dist: wheel ; extra == 'dev'
 Provides-Extra: lint
 Requires-Dist: autoflake ==2.3.1 ; (python_version >= "3.8") and extra == 'lint'
-Requires-Dist: black ==24.8.0 ; (python_version >= "3.8") and extra == 'lint'
-Requires-Dist: pre-commit ==3.8.0 ; (python_version >= "3.9") and extra == 'lint'
+Requires-Dist: black ==24.10.0 ; (python_version >= "3.9") and extra == 'lint'
+Requires-Dist: pre-commit ==4.0.1 ; (python_version >= "3.9") and extra == 'lint'
 Provides-Extra: test
 Requires-Dist: pytest ; extra == 'test'
 Requires-Dist: pytest-cov ; extra == 'test'

{gazu-0.10.15.dist-info → gazu-0.10.17.dist-info}/RECORD

@@ -1,9 +1,9 @@
 gazu/__init__.py,sha256=gVhtpZsvDiPuqvsEbCrgm6fKw8hluUhqspmlgGNIAvQ,3020
-gazu/__version__.py,sha256=Ekb_4LQjlZ2bVxwQ_J1gKNKW_wEoNM4jiaZELELP1EY,24
+gazu/__version__.py,sha256=S5Wijq3rq4_r-gYF455YCj2KcVfNM-QJlkM_f8Ti4x0,24
 gazu/asset.py,sha256=GWwam0yqHna_b9_5g5r0-O2zhMb7KlhfbIC17IOXKkY,14488
 gazu/cache.py,sha256=MnxrnfYN7wHNTTL7qzkEpYCYzWcolT56fqQ0_RegMbE,5879
-gazu/casting.py,sha256=bNPNXywbUqguNU8Oj6psMUGdN2jKUCv0dt3GcKPMqok,5036
-gazu/client.py,sha256=YRIxX7u095XTe28JM0tMZ05WoTcYexJGS2jrxXSAQvs,14640
+gazu/casting.py,sha256=0LTdsHaCTHSKEflBWFeuraSaYNYetGkMHAIdg6Lv81U,5059
+gazu/client.py,sha256=1Ak9gXp-3tTAHgXYzY_y5CVt1vQjocvtkOGgOrEe_PY,15527
 gazu/concept.py,sha256=GcOPEmkbtZcSwlX8tnUj9Q5DTPBprSxtmXhlq7ioPwk,3727
 gazu/context.py,sha256=iUyug8EUz3kkF-kmYlH5JuLp66TUqR3uhAq7CouVd_U,4349
 gazu/edit.py,sha256=sPSsnzykGr1Htl6ceKulUSVHGhoQLGLeWDni3Pul7BE,4609
@@ -14,16 +14,16 @@ gazu/exception.py,sha256=Y0kVNm6h-uXLEU1sNIbMSUep7Zxk738uYHOIVs2waM8,1880
 gazu/files.py,sha256=L82d5Bx3TkcaNczQ5t9s8DTKAcYXiqGaKUrag2cKjqI,39645
 gazu/helpers.py,sha256=Qa4JlZitiXsfYMJGGuwVaedLvHQVMbIwcqEZ099EjMw,3916
 gazu/person.py,sha256=BFh54J_R6_pIgYxAF_yAxFzjsO98hTLeBAKiZxewiK0,11098
-gazu/playlist.py,sha256=EM--UZGQmvAc3586JKVKiYCwbHdpPYJAyG-rX-AlL34,6760
+gazu/playlist.py,sha256=fzrhVY0fhxp5rSlvrowZPWEOqdl4rEYD4TKmnuvyKHg,6740
 gazu/project.py,sha256=fssI_Bf5UqqRd9bfM68oyfkhjxwWvjdiAcYvvUhI5LY,12649
 gazu/scene.py,sha256=bYsy7zKdQfDTfeqNAlgaqGMs2Hhxdy40NGt6TX_FBdA,5307
 gazu/shot.py,sha256=mHg-8B7xk3PXMqbPo0oCx2X7br2sGCBmuM7hEhpXRas,18942
 gazu/sorting.py,sha256=qSIO0pOHkj0Tl4gm9BJrYrcifWGGGmsW68Pl86zB_bg,266
 gazu/sync.py,sha256=0ZJ5Z7Nuh5Kj4cswZCXLpXTLf8zQRcXsBLnurMw-i_E,21627
-gazu/task.py,sha256=DWMOrIlIsXR2v83BLwqQp3aVs5T7CDRVvD2LL-xFArU,36709
+gazu/task.py,sha256=rnOKunR-vXLQPkD5nOufPhppYLLkgAWZS9tYlutCMp0,36412
 gazu/user.py,sha256=GyJf6mrynHvLllw3Hsiv-6wjaYTHO_PBNkJzyJjJA1A,9556
-gazu-0.10.15.dist-info/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
-gazu-0.10.15.dist-info/METADATA,sha256=_xEoH8Gs-2ILfE8jq92C2BjUhyLBZMQQfVVBYbkT25M,5263
-gazu-0.10.15.dist-info/WHEEL,sha256=O8iI_RpvXnU2dkdPNf_wSffaC9hi-VsSQKnuYEptk_s,109
-gazu-0.10.15.dist-info/top_level.txt,sha256=nv7fRIVpYYyIlk_66hBmMyvWcSC7UU-r-GE8uC1u1Go,5
-gazu-0.10.15.dist-info/RECORD,,
+gazu-0.10.17.dist-info/LICENSE,sha256=2n6rt7r999OuXp8iOqW9we7ORaxWncIbOwN1ILRGR2g,7651
+gazu-0.10.17.dist-info/METADATA,sha256=Gt-aWHEx66R7KrBHVndGK13GTa-xLnSV-WQsjFTvaKE,5264
+gazu-0.10.17.dist-info/WHEEL,sha256=0VNUDWQJzfRahYI3neAhz2UVbRCtztpN5dPHAGvmGXc,109
+gazu-0.10.17.dist-info/top_level.txt,sha256=nv7fRIVpYYyIlk_66hBmMyvWcSC7UU-r-GE8uC1u1Go,5
+gazu-0.10.17.dist-info/RECORD,,

{gazu-0.10.15.dist-info → gazu-0.10.17.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.1.1)
+Generator: setuptools (75.5.0)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any