ayon-python-api 1.2.5__tar.gz → 1.2.7__tar.gz

{ayon_python_api-1.2.5/ayon_python_api.egg-info → ayon_python_api-1.2.7}/PKG-INFO

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

{ayon_python_api-1.2.5 → ayon_python_api-1.2.7}/ayon_api/_api_helpers/projects.py

@@ -684,7 +684,7 @@ class ProjectsAPI(BaseServerAPI):
                 must_use_graphql = True
                 fields.discard(field)
                 for f_name in DEFAULT_PRODUCT_TYPE_FIELDS:
-                    fields.add(f"{field}.{f_name}")
+                    graphql_fields.add(f"{field}.{f_name}")
 
             elif field.startswith("productTypes"):
                 must_use_graphql = True
@@ -694,7 +694,7 @@ class ProjectsAPI(BaseServerAPI):
                 must_use_graphql = True
                 fields.discard(field)
                 for f_name in DEFAULT_PRODUCT_BASE_TYPE_FIELDS:
-                    fields.add(f"{field}.{f_name}")
+                    graphql_fields.add(f"{field}.{f_name}")
 
             elif field.startswith("productBaseTypes"):
                 must_use_graphql = True

{ayon_python_api-1.2.5 → ayon_python_api-1.2.7}/ayon_api/entity_hub.py

@@ -1418,7 +1418,9 @@ class EntityData(dict):
     """
     def __init__(self, *args, **kwargs) -> None:
         super().__init__(*args, **kwargs)
-        self._orig_data = copy.deepcopy(self)
+        self._orig_data = {}
+        # Fill orig data
+        self.lock()
 
     def get_changes(self) -> dict[str, Any]:
         """Changes in entity data.
@@ -1437,10 +1439,10 @@ class EntityData(dict):
                 output[key] = None
             elif key not in self._orig_data:
                 # New value was set
-                output[key] = self[key]
+                output[key] = copy.deepcopy(self[key])
             elif self[key] != self._orig_data[key]:
                 # Value was changed
-                output[key] = self[key]
+                output[key] = copy.deepcopy(self[key])
         return output
 
     def get_new_entity_value(self) -> dict[str, AttributeValueType]:
@@ -1460,7 +1462,25 @@ class EntityData(dict):
     def lock(self) -> None:
         """Lock changes of entity data."""
 
-        self._orig_data = copy.deepcopy(self)
+        orig_data = {}
+        for key, value in self.items():
+            try:
+                key = copy.deepcopy(key)
+            except RecursionError:
+                raise RuntimeError(
+                    f"Failed to create copy of key '{key}'"
+                    " because of recursion."
+                )
+
+            try:
+                orig_data[key] = copy.deepcopy(value)
+            except RecursionError:
+                raise RuntimeError(
+                    f"Failed to create copy of value '{key}'"
+                    " because of recursion."
+                )
+
+        self._orig_data = orig_data
 
 
 class BaseEntity(ABC):

{ayon_python_api-1.2.5 → ayon_python_api-1.2.7}/ayon_api/server_api.py

@@ -1329,7 +1329,7 @@ class ServerAPI(
     def _endpoint_to_url(
         self,
         endpoint: str,
-        use_rest: Optional[bool] = True
+        use_rest: bool = True,
     ) -> str:
         """Cleanup endpoint and return full url to AYON server.
 
@@ -1347,25 +1347,51 @@ class ServerAPI(
         endpoint = endpoint.lstrip("/").rstrip("/")
         if endpoint.startswith(self._base_url):
             return endpoint
-        base_url = self._rest_url if use_rest else self._graphql_url
+        base_url = self._rest_url if use_rest else self._base_url
         return f"{base_url}/{endpoint}"
 
     def _download_file_to_stream(
-        self, url: str, stream, chunk_size, progress
+        self,
+        url: str,
+        stream: StreamType,
+        chunk_size: int,
+        progress: TransferProgress,
     ):
-        kwargs = {"stream": True}
+        headers = self.get_headers()
+        kwargs = {
+            "stream": True,
+            "headers": headers,
+        }
         if self._session is None:
-            kwargs["headers"] = self.get_headers()
             get_func = self._base_functions_mapping[RequestTypes.get]
         else:
             get_func = self._session_functions_mapping[RequestTypes.get]
 
-        with get_func(url, **kwargs) as response:
-            response.raise_for_status()
-            progress.set_content_size(response.headers["Content-length"])
-            for chunk in response.iter_content(chunk_size=chunk_size):
-                stream.write(chunk)
-                progress.add_transferred_chunk(len(chunk))
+        retries = self.get_default_max_retries()
+        for attempt in range(retries):
+            # Continue in download
+            offset = progress.get_transferred_size()
+            if offset > 0:
+                headers["Range"] = f"bytes={offset}-"
+
+            try:
+                with get_func(url, **kwargs) as response:
+                    response.raise_for_status()
+                    progress.set_content_size(
+                        response.headers["Content-length"]
+                    )
+                    for chunk in response.iter_content(chunk_size=chunk_size):
+                        stream.write(chunk)
+                        progress.add_transferred_chunk(len(chunk))
+                break
+
+            except (
+                requests.exceptions.Timeout,
+                requests.exceptions.ConnectionError,
+            ):
+                if attempt == retries:
+                    raise
+                progress.next_attempt()
 
     def download_file_to_stream(
         self,
@@ -1399,7 +1425,7 @@ class ServerAPI(
         if not chunk_size:
             chunk_size = self.default_download_chunk_size
 
-        url = self._endpoint_to_url(endpoint)
+        url = self._endpoint_to_url(endpoint, use_rest=False)
 
         if progress is None:
             progress = TransferProgress()
@@ -1543,11 +1569,27 @@ class ServerAPI(
         if not chunk_size:
             chunk_size = self.default_upload_chunk_size
 
-        response = post_func(
-            url,
-            data=self._upload_chunks_iter(stream, progress, chunk_size),
-            **kwargs
-        )
+        retries = self.get_default_max_retries()
+        response = None
+        for attempt in range(retries):
+            try:
+                response = post_func(
+                    url,
+                    data=self._upload_chunks_iter(
+                        stream, progress, chunk_size
+                    ),
+                    **kwargs
+                )
+                break
+
+            except (
+                requests.exceptions.Timeout,
+                requests.exceptions.ConnectionError,
+            ):
+                if attempt == retries:
+                    raise
+                progress.next_attempt()
+                progress.reset_transferred()
 
         response.raise_for_status()
         return response

{ayon_python_api-1.2.5 → ayon_python_api-1.2.7}/ayon_api/utils.py

@@ -796,6 +796,7 @@ class TransferProgress:
     """Object to store progress of download/upload from/to server."""
 
     def __init__(self):
+        self._attempt: int = 0
         self._started: bool = False
         self._transfer_done: bool = False
         self._transferred: int = 0
@@ -850,6 +851,17 @@ class TransferProgress:
         if self._started:
             raise ValueError("Progress already started")
         self._started = True
+        self._attempt = 1
+
+    def get_attempt(self) -> int:
+        """Find out which attempt of progress it is."""
+        return self._attempt
+
+    def next_attempt(self) -> None:
+        """Start new attempt of progress."""
+        if not self._started:
+            raise ValueError("Progress did not start yet")
+        self._attempt += 1
 
     def get_transfer_done(self) -> bool:
         """Transfer finished.
@@ -921,6 +933,10 @@ class TransferProgress:
         """
         self._transferred = transferred
 
+    def reset_transferred(self) -> None:
+        """Reset transferred size to initial value."""
+        self._transferred = 0
+
     def add_transferred_chunk(self, chunk_size: int):
         """Add transferred chunk size in bytes.
 

{ayon_python_api-1.2.5 → ayon_python_api-1.2.7}/ayon_api/version.py

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

{ayon_python_api-1.2.5 → ayon_python_api-1.2.7/ayon_python_api.egg-info}/PKG-INFO

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

{ayon_python_api-1.2.5 → ayon_python_api-1.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ayon_python_api"
-version = "1.2.5"
+version = "1.2.7"
 description = "AYON Python API"
 license = {file = "LICENSE"}
 readme = {file = "README.md", content-type = "text/markdown"}