Ayon-Python-Api 0.1.17__tar.gz → 0.1.18__tar.gz

{ayon-python-api-0.1.17 → ayon-python-api-0.1.18}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ayon-python-api
-Version: 0.1.17
+Version: 0.1.18
 Summary: AYON Python API
 Home-page: https://github.com/ynput/ayon-python-api
 Author: ynput.io

{ayon-python-api-0.1.17 → ayon-python-api-0.1.18}/ayon_api/entity_hub.py

@@ -589,12 +589,15 @@ class EntityHub(object):
             parent_id = task["folderId"]
             tasks_by_parent_id[parent_id].append(task)
 
+        lock_queue = collections.deque()
         hierarchy_queue = collections.deque()
         hierarchy_queue.append((None, project_entity))
         while hierarchy_queue:
             item = hierarchy_queue.popleft()
             parent_id, parent_entity = item
 
+            lock_queue.append(parent_entity)
+
             children_ids = set()
             for folder in folders_by_parent_id[parent_id]:
                 folder_entity = self.add_folder(folder)
@@ -604,10 +607,16 @@ class EntityHub(object):
 
             for task in tasks_by_parent_id[parent_id]:
                 task_entity = self.add_task(task)
+                lock_queue.append(task_entity)
                 children_ids.add(task_entity.id)
 
             parent_entity.fill_children_ids(children_ids)
-        self.lock()
+
+        # Lock entities when all are added to hub
+        # - lock only entities added in this method
+        while lock_queue:
+            entity = lock_queue.popleft()
+            entity.lock()
 
     def lock(self):
         if self._project_entity is None:
@@ -1198,6 +1207,7 @@ class BaseEntity(object):
         self._attribs.lock()
 
         self._immutable_for_hierarchy_cache = None
+        self._created = False
 
     def _get_entity_by_id(self, entity_id):
         return self._entity_hub.get_entity_by_id(entity_id)

{ayon-python-api-0.1.17 → ayon-python-api-0.1.18}/ayon_api/graphql_queries.py

@@ -314,7 +314,6 @@ def representations_graphql_query(fields):
 def representations_parents_qraphql_query(
     version_fields, subset_fields, folder_fields
 ):
-
     query = GraphQlQuery("RepresentationsParentsQuery")
 
     project_name_var = query.add_variable("projectName", "String!")
@@ -388,7 +387,7 @@ def workfiles_info_graphql_query(fields):
 
 
 def events_graphql_query(fields):
-    query = GraphQlQuery("WorkfilesInfo")
+    query = GraphQlQuery("Events")
     topics_var = query.add_variable("eventTopics", "[String!]")
     projects_var = query.add_variable("projectNames", "[String!]")
     states_var = query.add_variable("eventStates", "[String!]")

{ayon-python-api-0.1.17 → ayon-python-api-0.1.18}/ayon_api/server_api.py

@@ -14,6 +14,7 @@ except ImportError:
     HTTPStatus = None
 
 import requests
+from requests.exceptions import JSONDecodeError as RequestsJSONDecodeError
 
 from .constants import (
     DEFAULT_PROJECT_FIELDS,
@@ -112,9 +113,9 @@ class RestApiResponse(object):
     @property
     def data(self):
         if self._data is None:
-            if self.status != 204:
+            try:
                 self._data = self.orig_response.json()
-            else:
+            except RequestsJSONDecodeError:
                 self._data = {}
         return self._data
 
@@ -128,7 +129,10 @@ class RestApiResponse(object):
 
     @property
     def detail(self):
-        return self.get("detail", _get_description(self))
+        detail = self.get("detail")
+        if detail:
+            return detail
+        return _get_description(self)
 
     @property
     def status_code(self):
@@ -299,14 +303,6 @@ class ServerAPI(object):
             'production').
     """
 
-    _entity_types_link_mapping = {
-        "folder": ("folderIds", "folders"),
-        "task": ("taskIds", "tasks"),
-        "subset": ("subsetIds", "subsets"),
-        "version": ("versionIds", "versions"),
-        "representation": ("representationIds", "representations"),
-    }
-
     def __init__(
         self,
         base_url,
@@ -916,7 +912,7 @@ class ServerAPI(object):
             project_names = set(project_names)
             if not project_names:
                 return
-            filters["projectName"] = list(project_names)
+            filters["projectNames"] = list(project_names)
 
         if states is not None:
             states = set(states)
@@ -4514,13 +4510,34 @@ class ServerAPI(object):
             dict[str, list[dict[str, Any]]]: Link info by entity ids.
         """
 
-        mapped_type = self._entity_types_link_mapping.get(entity_type)
-        if not mapped_type:
+        if entity_type == "folder":
+            query_func = folders_graphql_query
+            id_filter_key = "folderIds"
+            project_sub_key = "folders"
+        elif entity_type == "task":
+            query_func = tasks_graphql_query
+            id_filter_key = "taskIds"
+            project_sub_key = "tasks"
+        elif entity_type == "subset":
+            query_func = subsets_graphql_query
+            id_filter_key = "subsetIds"
+            project_sub_key = "subsets"
+        elif entity_type == "version":
+            query_func = versions_graphql_query
+            id_filter_key = "versionIds"
+            project_sub_key = "versions"
+        elif entity_type == "representation":
+            query_func = representations_graphql_query
+            id_filter_key = "representationIds"
+            project_sub_key = "representations"
+        else:
             raise ValueError("Unknown type \"{}\". Expected {}".format(
-                entity_type, ", ".join(self._entity_types_link_mapping.keys())
+                entity_type,
+                ", ".join(
+                    ("folder", "task", "subset", "version", "representation")
+                )
             ))
 
-        id_filter_key, project_sub_key = mapped_type
         output = collections.defaultdict(list)
         filters = {
             "projectName": project_name
@@ -4534,7 +4551,7 @@ class ServerAPI(object):
         if not self._prepare_link_filters(filters, link_types, link_direction):
             return output
 
-        query = folders_graphql_query({"id", "links"})
+        query = query_func({"id", "links"})
         for attr, filter_value in filters.items():
             query.set_variable_value(attr, filter_value)
 

{ayon-python-api-0.1.17 → ayon-python-api-0.1.18}/ayon_api/version.py

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

{ayon-python-api-0.1.17 → ayon-python-api-0.1.18}/ayon_python_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ayon-python-api
-Version: 0.1.17
+Version: 0.1.18
 Summary: AYON Python API
 Home-page: https://github.com/ynput/ayon-python-api
 Author: ynput.io

{ayon-python-api-0.1.17 → ayon-python-api-0.1.18}/pyproject.toml

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