Merge branch 'develop'

Author: iLLiCiTiT

ayon_api/entity_hub.py

@@ -673,6 +673,7 @@ def commit_changes(self):
             if entity_id in processed_ids:
                 continue
             entity = self._entities_by_id[entity_id]
+            processed_ids.add(entity_id)
             operations_body.append(self._get_create_body(entity))
 
         for entity_id in reversed(removed_entity_ids):

ayon_api/server_api.py

@@ -4156,7 +4156,13 @@ def create_thumbnail(self, project_name, src_filepath):
                 "Failed to create thumbnail.{}".format(details))
         return response.data["id"]
 
-    def send_batch_operations(self, project_name, operations, can_fail=False):
+    def send_batch_operations(
+        self,
+        project_name,
+        operations,
+        can_fail=False,
+        raise_on_fail=True
+    ):
         """Post multiple CRUD operations to server.
 
         When multiple changes should be made on server side this is the best
@@ -4169,28 +4175,32 @@ def send_batch_operations(self, project_name, operations, can_fail=False):
             operations (list[dict[str, Any]]): Operations to be processed.
             can_fail (bool): Server will try to process all operations even if
                 one of them fails.
+            raise_on_fail (bool): Raise exception if an operation fails.
+                You can handle failed operations on your own when set to
+                'False'.
 
         Raises:
-            FailedOperations: When one or more operations fail.
+            ValueError: Operations can't be converted to json string.
+            FailedOperations: When output does not contain server operations
+                or 'raise_on_fail' is enabled and any operation fails.
+
+        Returns:
+            list[dict[str, Any]]: Operations result with process details.
         """
 
         if not operations:
-            return
+            return []
 
         body_by_id = {}
+        operations_body = []
         for operation in operations:
             if not operation:
                 continue
+
             op_id = operation.get("id")
             if not op_id:
                 op_id = create_entity_id()
                 operation["id"] = op_id
-            body_by_id[op_id] = operation
-
-        operations_body = []
-        for operation in operations:
-            if not operation:
-                continue
 
             try:
                 body = json.loads(
@@ -4203,33 +4213,35 @@ def send_batch_operations(self, project_name, operations, can_fail=False):
                     )
                 ))
 
-            body_by_id[operation["id"]] = body
+            body_by_id[op_id] = body
             operations_body.append(body)
 
         if not operations_body:
-            return
+            return []
 
         result = self.post(
             "projects/{}/operations".format(project_name),
             operations=operations_body,
             canFail=can_fail
         )
 
-        if result.get("success"):
-            return
-
-        if "operations" not in result:
+        op_results = result.get("operations")
+        if op_results is None:
             raise FailedOperations(
                 "Operation failed. Content: {}".format(str(result))
             )
 
-        for op_result in result["operations"]:
+        if result.get("success") or not raise_on_fail:
+            return op_results
+
+        for op_result in op_results:
             if not op_result["success"]:
                 operation_id = op_result["id"]
                 raise FailedOperations((
-                    "Operation \"{}\" failed with data:\n{}\nError: {}."
+                    "Operation \"{}\" failed with data:\n{}\nDetail: {}."
                 ).format(
                     operation_id,
                     json.dumps(body_by_id[operation_id], indent=4),
-                    op_result["error"],
+                    op_result["detail"],
                 ))
+        return op_results

ayon_api/version.py

@@ -1,2 +1,2 @@
 """Package declaring Python API for Ayon server."""
-__version__ = "0.1.15"
+__version__ = "0.1.16"

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ayon_api"
-version = "0.1.15"
+version = "0.1.16"
 description = "Python api for AYON server"
 authors = ["ynput.io <info@ynput.io>"]