ayon-python-api 1.2.13.dev0__tar.gz → 1.2.14.dev0__tar.gz

{ayon_python_api-1.2.13.dev0 → ayon_python_api-1.2.14.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ayon_python_api
-Version: 1.2.13.dev0
+Version: 1.2.14.dev0
 Summary: AYON Python API
 Home-page: https://github.com/ynput/ayon-python-api
 Author: ynput.io

{ayon_python_api-1.2.13.dev0 → ayon_python_api-1.2.14.dev0}/ayon_api/_api_helpers/base.py

@@ -132,6 +132,11 @@ class BaseServerAPI:
     ) -> Optional[dict[str, Any]]:
         raise NotImplementedError()
 
+    def get_attributes_for_type(
+        self, entity_type: AttributeScope
+    ) -> set[str]:
+        raise NotImplementedError()
+
     def get_attributes_fields_for_type(
         self, entity_type: AttributeScope
     ) -> set[str]:

{ayon_python_api-1.2.13.dev0 → ayon_python_api-1.2.14.dev0}/ayon_api/_api_helpers/projects.py

@@ -162,6 +162,9 @@ class ProjectsAPI(BaseServerAPI):
         if response.status != 200:
             return None
         project = response.data
+        attrib = project["attrib"]
+        for attr_name in self.get_attributes_for_type("project"):
+            attrib.setdefault(attr_name, None)
         self._fill_project_entity_data(project)
         return project
 
@@ -291,16 +294,14 @@ class ProjectsAPI(BaseServerAPI):
                 return
             projects_by_name = {p["name"]: p for p in projects}
 
-        for project in self.get_rest_projects(active, library):
+        for project in self.get_rest_projects(active=active, library=library):
+            if own_attributes:
+                fill_own_attribs(project)
+
             name = project["name"]
-            graphql_p = projects_by_name.get(name)
-            if graphql_p:
-                for key in (
-                    "productTypes",
-                    "usedTags",
-                ):
-                    if key in graphql_p:
-                        project[key] = graphql_p[key]
+            graphql_project = projects_by_name.get(name)
+            self._merge_project_graphql_data(project, graphql_project)
+
             yield project
 
     def get_project(
@@ -332,6 +333,7 @@ class ProjectsAPI(BaseServerAPI):
             graphql_project = next(self._get_graphql_projects(
                 None,
                 None,
+                project_name=project_name,
                 fields=graphql_fields,
                 own_attributes=own_attributes,
             ), None)
@@ -341,13 +343,9 @@ class ProjectsAPI(BaseServerAPI):
         project = self.get_rest_project(project_name)
         if own_attributes:
             fill_own_attribs(project)
-        if graphql_project:
-            for key in (
-                "productTypes",
-                "usedTags",
-            ):
-                if key in graphql_project:
-                    project[key] = graphql_project[key]
+
+        self._merge_project_graphql_data(project, graphql_project)
+
         return project
 
     def create_project(
@@ -817,6 +815,25 @@ class ProjectsAPI(BaseServerAPI):
                 self._fill_project_entity_data(project)
                 yield project
 
+    def _merge_project_graphql_data(
+        self,
+        rest_project: dict[str, Any],
+        graphql_project: Optional[dict[str, Any]],
+    ) -> None:
+        if not graphql_project:
+            return
+
+        for key, value in graphql_project.items():
+            if (
+                key not in rest_project
+                or key in (
+                    "productBaseTypes",
+                    "productTypes",
+                    "usedTags",
+                )
+            ):
+                rest_project[key] = value
+
     def _get_project_roots_values(
         self,
         project_name: str,

{ayon_python_api-1.2.13.dev0 → ayon_python_api-1.2.14.dev0}/ayon_api/server_api.py

@@ -1228,6 +1228,20 @@ class ServerAPI(
         for retry_idx in reversed(range(max_retries)):
             try:
                 response = function(url, **kwargs)
+
+                # Usually these mean, try later.
+                # 502: returned by the proxy: nginx
+                # 503: returned by the server: if no capacity
+                if response.status_code in {502, 503}:
+                    new_response = RestApiResponse(response)
+                    self.log.warning(
+                        "Server returned %s status code."
+                        " Retrying with longer delay...",
+                        response.status_code
+                    )
+                    if retry_idx != 0:
+                        time.sleep(2)
+                    continue
                 break
 
             except ConnectionRefusedError:
@@ -1269,7 +1283,8 @@ class ServerAPI(
                     }
                 )
 
-            time.sleep(0.1)
+            if retry_idx != 0:
+                time.sleep(0.1)
 
         if new_response is not None:
             return new_response
@@ -1419,7 +1434,7 @@ class ServerAPI(
                 requests.exceptions.Timeout,
                 requests.exceptions.ConnectionError,
             ):
-                if attempt == retries:
+                if attempt == retries - 1:
                     raise
                 progress.next_attempt()
 
@@ -1838,7 +1853,7 @@ class ServerAPI(
                 requests.exceptions.Timeout,
                 requests.exceptions.ConnectionError,
             ):
-                if attempt == retries:
+                if attempt == retries - 1:
                     raise
                 progress.next_attempt()
                 progress.reset_transferred()

{ayon_python_api-1.2.13.dev0 → ayon_python_api-1.2.14.dev0}/ayon_api/version.py

@@ -1,2 +1,2 @@
 """Package declaring Python API for AYON server."""
-__version__ = "1.2.13-dev"
+__version__ = "1.2.14-dev"

{ayon_python_api-1.2.13.dev0 → ayon_python_api-1.2.14.dev0}/ayon_python_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ayon_python_api
-Version: 1.2.13.dev0
+Version: 1.2.14.dev0
 Summary: AYON Python API
 Home-page: https://github.com/ynput/ayon-python-api
 Author: ynput.io

{ayon_python_api-1.2.13.dev0 → ayon_python_api-1.2.14.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ayon_python_api"
-version = "1.2.13-dev"
+version = "1.2.14-dev"
 description = "AYON Python API"
 license = {file = "LICENSE"}
 readme = {file = "README.md", content-type = "text/markdown"}
@@ -28,7 +28,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "ayon_python_api"
-version = "1.2.13-dev"
+version = "1.2.14-dev"
 description = "AYON Python API"
 authors = [
     "ynput.io <info@ynput.io>"