ayon-python-api 1.2.23__py3-none-any.whl → 1.2.24__py3-none-any.whl

ayon_api/_api.py

@@ -1943,6 +1943,7 @@ def create_dependency_package(
     checksum: str,
     checksum_algorithm: str,
     file_size: int,
+    python_version: str | None = None,
     sources: Optional[list[dict[str, Any]]] = None,
     platform_name: Optional[str] = None,
 ) -> None:
@@ -1968,6 +1969,8 @@ def create_dependency_package(
         checksum (str): Checksum of archive file where dependencies are.
         checksum_algorithm (str): Algorithm used to calculate checksum.
         file_size (Optional[int]): Size of file.
+        python_version (str | None): Python version for which
+            is dependency package created.
         sources (Optional[list[dict[str, Any]]]): Information about
             sources from where it is possible to get file.
         platform_name (Optional[str]): Name of platform for which is
@@ -1984,6 +1987,7 @@ def create_dependency_package(
         checksum=checksum,
         checksum_algorithm=checksum_algorithm,
         file_size=file_size,
+        python_version=python_version,
         sources=sources,
         platform_name=platform_name,
     )

ayon_api/_api_helpers/dependency_packages.py

@@ -57,6 +57,7 @@ class DependencyPackagesAPI(BaseServerAPI):
         checksum: str,
         checksum_algorithm: str,
         file_size: int,
+        python_version: str | None = None,
         sources: Optional[list[dict[str, Any]]] = None,
         platform_name: Optional[str] = None,
     ) -> None:
@@ -82,6 +83,8 @@ class DependencyPackagesAPI(BaseServerAPI):
             checksum (str): Checksum of archive file where dependencies are.
             checksum_algorithm (str): Algorithm used to calculate checksum.
             file_size (Optional[int]): Size of file.
+            python_version (str | None): Python version for which
+                is dependency package created.
             sources (Optional[list[dict[str, Any]]]): Information about
                 sources from where it is possible to get file.
             platform_name (Optional[str]): Name of platform for which is
@@ -99,6 +102,9 @@ class DependencyPackagesAPI(BaseServerAPI):
             "size": file_size,
             "platform": platform_name or platform.system().lower(),
         }
+        if python_version:
+            post_body["pythonVersion"] = python_version
+
         if sources:
             post_body["sources"] = sources
 

ayon_api/graphql.py

@@ -353,6 +353,25 @@ class GraphQlQuery:
         for child in self._children:
             child.parse_result(data, output, progress_data)
 
+    def _query_data(self, con: ServerAPI) -> dict[str, Any]:
+        """Send single query to server and return 'data' of the response."""
+        query_str = self.calculate_query()
+        variables = self.get_variables_values()
+        response = con.query_graphql(query_str, variables)
+        if response.errors:
+            raise GraphQlQueryFailed(response.errors, query_str, variables)
+
+        data = response.data.get("data")
+        if data is None:
+            # Parsing 'None' would not change pagination state and the same
+            #   query would be sent again in an infinite loop.
+            raise GraphQlQueryError(
+                f"GraphQl query '{self._name}' response does not contain"
+                f" 'data'. Response: {str(response.data)[:1000]}"
+                f"\nQuery:\n{query_str}\nVariables: {variables}"
+            )
+        return data
+
     def query(self, con: ServerAPI) -> dict[str, Any]:
         """Do a query from server.
 
@@ -366,15 +385,8 @@ class GraphQlQuery:
         progress_data = {}
         output = {}
         while self.need_query:
-            query_str = self.calculate_query()
-            variables = self.get_variables_values()
-            response = con.query_graphql(
-                query_str,
-                variables
-            )
-            if response.errors:
-                raise GraphQlQueryFailed(response.errors, query_str, variables)
-            self.parse_result(response.data["data"], output, progress_data)
+            data = self._query_data(con)
+            self.parse_result(data, output, progress_data)
 
         return output
 
@@ -394,30 +406,16 @@ class GraphQlQuery:
         if self.has_multiple_edge_fields:
             output = {}
             while self.need_query:
-                query_str = self.calculate_query()
-                variables = self.get_variables_values()
-
-                response = con.query_graphql(query_str, variables)
-                if response.errors:
-                    raise GraphQlQueryFailed(
-                        response.errors, query_str, variables
-                    )
-                self.parse_result(response.data["data"], output, progress_data)
+                data = self._query_data(con)
+                self.parse_result(data, output, progress_data)
 
             yield output
 
         else:
             while self.need_query:
                 output = {}
-                query_str = self.calculate_query()
-                variables = self.get_variables_values()
-                response = con.query_graphql(query_str, variables)
-                if response.errors:
-                    raise GraphQlQueryFailed(
-                        response.errors, query_str, variables
-                    )
-
-                self.parse_result(response.data["data"], output, progress_data)
+                data = self._query_data(con)
+                self.parse_result(data, output, progress_data)
 
                 yield output
 
@@ -903,11 +901,13 @@ class GraphQlQueryEdgeField(BaseGraphQlQueryField):
                 progress_data[cursor_key] = nodes_by_cursor
 
         page_info = value["pageInfo"]
+        # Continue from the last received edge for both orders. Server
+        #   returns edges of 'last' page from the newest item, so
+        #   'startCursor' would move the cursor back only by one item.
+        new_cursor = page_info["endCursor"]
         if self._order == SortOrder.ascending:
-            new_cursor = page_info["endCursor"]
             self._need_query = page_info["hasNextPage"]
         else:
-            new_cursor = page_info["startCursor"]
             self._need_query = page_info["hasPreviousPage"]
 
         edges = value["edges"]
@@ -943,6 +943,14 @@ class GraphQlQueryEdgeField(BaseGraphQlQueryField):
                 change_cursor = False
 
         if change_cursor and self._need_query:
+            if new_cursor is None:
+                # Without cursor the pagination would start from beginning
+                raise GraphQlQueryError(
+                    f"Field '{self.path}' reported another page without"
+                    " a cursor. Stopped pagination after"
+                    f" {self._fetched_counter} items."
+                )
+
             if new_cursor == self._cursor:
                 raise GraphQlQueryError(
                     "Cursor didn't change during pagination."
@@ -1016,11 +1024,7 @@ class GraphQlQueryEdgeField(BaseGraphQlQueryField):
         # Add page information
         output.append(edges_offset + "pageInfo {")
         for page_key in (
-            (
-                "endCursor"
-                if self._order == SortOrder.ascending
-                else "startCursor"
-            ),
+            "endCursor",
             (
                 "hasNextPage"
                 if self._order == SortOrder.ascending

ayon_api/server_api.py

@@ -1489,6 +1489,8 @@ class ServerAPI(
         response = self.raw_get(
             "info",
             handle_invalid_token=False,
+            verify=self.ssl_verify,
+            cert=self.cert
         )
         response.raise_for_status()
         return response.data
@@ -1519,7 +1521,7 @@ class ServerAPI(
         **kwargs
     ) -> RestApiResponse:
         kwargs.setdefault("timeout", self.timeout)
-        max_retries = kwargs.get("max_retries", self.max_retries)
+        max_retries = kwargs.pop("max_retries", self.max_retries)
         if max_retries < 1:
             max_retries = 1
 
@@ -1558,6 +1560,7 @@ class ServerAPI(
         response = None
         new_response = None
         for retry_idx in reversed(range(max_retries)):
+            new_response = None
             try:
                 response = function(url, **kwargs)
 
@@ -1658,7 +1661,7 @@ class ServerAPI(
         url = self._endpoint_to_url(endpoint, use_rest=False)
         progress.set_source_url(url)
 
-        retries = self.get_default_max_retries()
+        retries = max(self.max_retries, 1)
         api_prepended = False
         for attempt in range(retries):
             # Continue in download
@@ -1684,6 +1687,14 @@ class ServerAPI(
                             progress.set_destination_url(url)
                             continue
                     response.raise_for_status()
+                    if offset > 0 and response.status_code != 206:
+                        # Server ignored 'Range' and sends whole file again,
+                        #   already downloaded content must be discarded
+                        stream.seek(0)
+                        stream.truncate()
+                        progress.reset_transferred()
+                        headers.pop("Range", None)
+
                     if progress.get_content_size() is None:
                         progress.set_content_size(
                             response.headers["Content-length"]
@@ -1692,11 +1703,21 @@ class ServerAPI(
                     for chunk in response.iter_content(chunk_size=chunk_size):
                         stream.write(chunk)
                         progress.add_transferred_chunk(len(chunk))
+
+                content_size = progress.get_content_size()
+                transferred = progress.get_transferred_size()
+                if content_size is not None and transferred != content_size:
+                    # Connection was closed before all content was received
+                    raise requests.exceptions.ConnectionError(
+                        f"Downloaded {transferred} out of {content_size}"
+                        f" bytes from '{url}'."
+                    )
                 break
 
             except (
                 requests.exceptions.Timeout,
                 requests.exceptions.ConnectionError,
+                requests.exceptions.ChunkedEncodingError,
             ):
                 if attempt == retries - 1:
                     raise
@@ -2093,7 +2114,7 @@ class ServerAPI(
                 headers.pop(orig_key)
             headers[key] = value
 
-        retries = self.get_default_max_retries()
+        retries = max(self.max_retries, 1)
         response = None
 
         # Get size of file
@@ -2676,24 +2697,32 @@ class ServerAPI(
         if result.get("success"):
             return None
 
-        print(result)
-        for op_result in result["operations"]:
+        self.log.warning(
+            "Operations failed. Server response:\n%s",
+            json.dumps(result, indent=4, default=str),
+        )
+        for op_result in result.get("operations") or []:
             if op_result["success"]:
                 continue
 
             operation_id = op_result["id"]
             operation = next(
-                op
-                for op in operations_body
-                if op["id"] == operation_id
+                (op for op in operations_body if op["id"] == operation_id),
+                op_result,
             )
             detail = op_result["detail"]
             raise FailedOperations(
                 f"Operation \"{operation_id}\" failed with data:"
-                f"\n{json.dumps(operation, indent=4)}"
+                f"\n{json.dumps(operation, indent=4, default=str)}"
                 f"\nDetail: {detail}."
             )
 
+        # Server did not report which operation failed
+        raise FailedOperations(
+            "Operations failed. Server response:"
+            f"\n{json.dumps(result, indent=4, default=str)}"
+        )
+
     def _prepare_fields(
         self,
         entity_type: str,

ayon_api/utils.py

@@ -955,7 +955,7 @@ class TransferProgress:
         """
         return self._content_size
 
-    def set_content_size(self, content_size: int) -> None:
+    def set_content_size(self, content_size: int | str) -> None:
         """Set content size in bytes.
 
         Args:
@@ -967,7 +967,7 @@ class TransferProgress:
         """
         if self._content_size is not None:
             raise ValueError("Content size was set more then once")
-        self._content_size = content_size
+        self._content_size = int(content_size)
 
     def get_started(self) -> bool:
         """Transfer was started.

ayon_api/version.py

@@ -1,2 +1,2 @@
 """Package declaring Python API for AYON server."""
-__version__ = "1.2.23"
+__version__ = "1.2.24"

{ayon_python_api-1.2.23.dist-info → ayon_python_api-1.2.24.dist-info}/METADATA

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

{ayon_python_api-1.2.23.dist-info → ayon_python_api-1.2.24.dist-info}/RECORD

@@ -1,23 +1,23 @@
 ayon_api/__init__.py,sha256=_54OHR1kxUb07F9ck43MsOX_aTqN97G2itxSgqlENjo,16313
-ayon_api/_api.py,sha256=zTVzizvV6-kvPvs3uElygMT5c4KsByrsU0P9ETbssZc,262088
+ayon_api/_api.py,sha256=EGHH53Kzt9JWGRIMzcLN48_QYaaIQoz7ozQNndSqJyo,262271
 ayon_api/constants.py,sha256=wnBse4dsk9zoeJOkayya3cFiGu00EXfebMNTioUclh0,4113
 ayon_api/entity_hub.py,sha256=MaMl2zbiPDbQNwaSlDV65NOCscPQqgLzIrfAqAq5LxU,119854
 ayon_api/events.py,sha256=RQ_ct_GTb3KbZ6QWBkYn5m-ZUc6NJDAFFsoy2P_w3dQ,1370
 ayon_api/exceptions.py,sha256=9inI-TkAGMKuhF84O3FwikW2esgmCdPIeRhbj2ithQU,3692
-ayon_api/graphql.py,sha256=9ve_6wtbm_kpItttAF4Shaaj5ARAJfssnFbM5NEZXcI,30695
+ayon_api/graphql.py,sha256=I6_PQTxGkgPxLl7e0BKy4V7htV5Z8yw9OvXG9FDj1dU,31037
 ayon_api/graphql_queries.py,sha256=atupD5oe9t6WCyHy3YSY_0_uR8_c4ysb7d8SxbfZAvk,26455
 ayon_api/operations.py,sha256=Cqm9GjqO_9S55dLZ07GIZVlCuCKQ7_fX2MfhPJvKt2A,56235
-ayon_api/server_api.py,sha256=JorRDuYG5gGButUeJdamtu0NejiOIj6ZjTwwhIJBNng,89400
+ayon_api/server_api.py,sha256=Hu1z1OZItqOxglycGDh44nVHsZwePPzv1Vq_uTU7hM8,90780
 ayon_api/typing.py,sha256=p2jNqGoh1m9_IUS0Dfr8sMoqjt60UycAkLuSbYtLY14,12286
-ayon_api/utils.py,sha256=0K1uY5eqZgDY5tG_vVwf9kiIqohC4x0pw-rkYpOn9mQ,36377
-ayon_api/version.py,sha256=X3eIgeewLKdOxtTfia6W-cZ4A_nA9E1DFQ1qkdcn9As,75
+ayon_api/utils.py,sha256=DHQXzByX4m2F_9MDaL1WaI__u0f22bonDPOchIq7lno,36388
+ayon_api/version.py,sha256=iyZ9soTd1NAp6X8Qui-VR3zSWsWs7VJi2viiasWmmzg,75
 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=3U-0JA_F9-FlR9Tv6JPZZ2cpo6YegXQG4yNDB0wuhF8,14029
 ayon_api/_api_helpers/attributes.py,sha256=ur9FsMWWY1K1Paw966srRj-z4EDx3nCVDLdLm9Yxn44,6949
 ayon_api/_api_helpers/base.py,sha256=I5ejQN-WNxjmsWLBcGVTnMB834T8ZzEWcezyQ6Q4Hl8,4582
 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/dependency_packages.py,sha256=_ADSpLDcWlsuqUppQNfMVHC_DDnZeDFvUFunP2PWx3A,8451
 ayon_api/_api_helpers/events.py,sha256=j89YfsYXox_wIvMkiyxr3l2dzkA8x-JOgGy6p-7-ndU,17229
 ayon_api/_api_helpers/folders.py,sha256=AvRx5r2V0luERFZ2Z6EOSIRh3Pe_OmLwR-HrrVrrVms,22279
 ayon_api/_api_helpers/installers.py,sha256=Q45sg6rfKUht6g4bSPHHYFj8mDo_EAm9ahg9Zk3pSUs,5552
@@ -31,8 +31,8 @@ ayon_api/_api_helpers/tasks.py,sha256=gW8QbC2V7fNQeirViKyQVugnxfnYkQGGxiv3btYRn3
 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.23.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-ayon_python_api-1.2.23.dist-info/METADATA,sha256=lNYh638eXxiuuZXueldiKgxY_ZfepFx0RgB_Sd07bcI,16266
-ayon_python_api-1.2.23.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-ayon_python_api-1.2.23.dist-info/top_level.txt,sha256=PKrQbX5Cz53_UmSTR_nIySnBkGyHcBTS88SCw9tuVlc,9
-ayon_python_api-1.2.23.dist-info/RECORD,,
+ayon_python_api-1.2.24.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+ayon_python_api-1.2.24.dist-info/METADATA,sha256=rt7sHv_R3L4FSUGsm7bL3oSGO2GtYL4P4Fm_M9IJp6E,16266
+ayon_python_api-1.2.24.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+ayon_python_api-1.2.24.dist-info/top_level.txt,sha256=PKrQbX5Cz53_UmSTR_nIySnBkGyHcBTS88SCw9tuVlc,9
+ayon_python_api-1.2.24.dist-info/RECORD,,