ayon-python-api 1.2.13.dev0__py3-none-any.whl → 1.2.14.dev0__py3-none-any.whl

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_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_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_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.dist-info → ayon_python_api-1.2.14.dev0.dist-info}/METADATA

@@ -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.dist-info → ayon_python_api-1.2.14.dev0.dist-info}/RECORD

@@ -7,15 +7,15 @@ ayon_api/exceptions.py,sha256=FOOSgShGEqno6U3kxSOdALkWuIhfhuYzSup0TjwkgkM,3495
 ayon_api/graphql.py,sha256=PgsdNVAwZymEOoFqUuTtnswv8bjtV0IIfBij2R9WKPU,29749
 ayon_api/graphql_queries.py,sha256=ro75ILIz47TEHKgCraUaQiLzy1q5ijUpP2E27jhRWFc,28253
 ayon_api/operations.py,sha256=BL9r5V8wXqHx63FhQOUpayceuMd0A5B-vJIb5TcKynQ,55501
-ayon_api/server_api.py,sha256=w_n01YUR2LR822Hm8lOQXEA58CbyM9e7fploQgPzhuw,79447
+ayon_api/server_api.py,sha256=5h_y3TEILyoX-9cR44MpZimb75I8ZeutHhFifAUhxxY,80097
 ayon_api/typing.py,sha256=aawFfY4pJ3Vuh-N4GHpAForH1y8K5xffuSdHBhUOTPM,11997
 ayon_api/utils.py,sha256=QVWtS-29dRFJ6SKSc5GZce9iRHod2AWPC9SfJ40iIOI,32972
-ayon_api/version.py,sha256=PJEITRxr4ePjtmsUccPR1aLUq17-Nn-oyhaweQVW4UA,79
+ayon_api/version.py,sha256=-Am2rynZn8snPA7l06TGSRpTIgaRbgbFL31Xis_dt6c,79
 ayon_api/_api_helpers/__init__.py,sha256=15wxNshWe1htzZhFnwTTflBfQ3tYJzTe6-0hrEUCQbw,1076
 ayon_api/_api_helpers/actions.py,sha256=OBRAEJSVnhGP0xf8ktQL3M7Ubz64nDmn957qZehaRQ0,10578
 ayon_api/_api_helpers/activities.py,sha256=0iknRHukYsVf0M6KRChBs3EsQH8bgg-yzhAx-1VivYs,10445
 ayon_api/_api_helpers/attributes.py,sha256=bdC6KzoszFZmwBGmbwcGdG5jZDmGHW9wQ0z-ffCvn1w,4674
-ayon_api/_api_helpers/base.py,sha256=bm1hWBswfwisOxqWpaEC_ttDi_leXP9E7zNuIvVMyFo,4361
+ayon_api/_api_helpers/base.py,sha256=COGf9b8EtJbtPal17Hkgohdc4xzQ1wUBcjww87h07Gc,4492
 ayon_api/_api_helpers/bundles_addons.py,sha256=_AvquS0GZuUiGbCapRYu3vb_5Pp835HlbNfg9ipD3VU,31087
 ayon_api/_api_helpers/dependency_packages.py,sha256=nghndRoxwLCo1j9EvBtYRQYBHGoGljuUOGFpYGI7PwE,8211
 ayon_api/_api_helpers/events.py,sha256=vCH5L4whFlx44nH0bRWuZhyy7F4Uw1uTpcCkDMKTYwk,16572
@@ -24,15 +24,15 @@ ayon_api/_api_helpers/installers.py,sha256=Q45sg6rfKUht6g4bSPHHYFj8mDo_EAm9ahg9Z
 ayon_api/_api_helpers/links.py,sha256=ylbk7J3fzGstKI3sWdrpYHbodBuxcBhHvMe2r3AFO8E,22186
 ayon_api/_api_helpers/lists.py,sha256=W1YHFVByPF9jzrJWQ3Dy4Cmvf5-YHS2zkZjgaGcsXBo,15109
 ayon_api/_api_helpers/products.py,sha256=fX9Ez_2RGRhDmZU02ucULZzfe8FGZAOFK7Qze1BTI1c,18521
-ayon_api/_api_helpers/projects.py,sha256=t1rD5cUTR6csAHkzO-n-YPUG9xC_bcoB7U5-cdAX98Y,28804
+ayon_api/_api_helpers/projects.py,sha256=CI-M5KKmAbqrcSqpGsawGQ7JAQjUioNFT2a3O3aeQGw,29294
 ayon_api/_api_helpers/representations.py,sha256=BU0Oq_JOh6F6zIoiEtTGhRoHdr9WwMXMiaDDs-Oc7Yg,27736
 ayon_api/_api_helpers/secrets.py,sha256=L74qN38Bp22tDs9CQHWdgw3gsJm7GbnHKU75mCaWuj8,1955
 ayon_api/_api_helpers/tasks.py,sha256=1bqGOFbbtM_RSHWIirzj1201MsJfe1WAD2zZkVW9UTg,18770
 ayon_api/_api_helpers/thumbnails.py,sha256=2mQWU4cSY98J18ImYYt_5CRpm7DyOCO2wCmcLXwtdhk,12281
 ayon_api/_api_helpers/versions.py,sha256=c9ebZdM9i3J24B4bs2BRRoH937JWvRTWlJ3cFRscdug,22413
 ayon_api/_api_helpers/workfiles.py,sha256=8ksjCZ5xn7nEAKX792PeIwFNF5flslQwzbcHnJZwcu8,17679
-ayon_python_api-1.2.13.dev0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ayon_python_api-1.2.13.dev0.dist-info/METADATA,sha256=azgodGr-b5gK2gpqcA-17N131ZT7dWrz191I93FNHAs,16271
-ayon_python_api-1.2.13.dev0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-ayon_python_api-1.2.13.dev0.dist-info/top_level.txt,sha256=PKrQbX5Cz53_UmSTR_nIySnBkGyHcBTS88SCw9tuVlc,9
-ayon_python_api-1.2.13.dev0.dist-info/RECORD,,
+ayon_python_api-1.2.14.dev0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ayon_python_api-1.2.14.dev0.dist-info/METADATA,sha256=zUXjVmEKICkcWk8hMvVRE_rE7chvaXf5NED8lpU_6Xc,16271
+ayon_python_api-1.2.14.dev0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+ayon_python_api-1.2.14.dev0.dist-info/top_level.txt,sha256=PKrQbX5Cz53_UmSTR_nIySnBkGyHcBTS88SCw9tuVlc,9
+ayon_python_api-1.2.14.dev0.dist-info/RECORD,,