Merge branch 'develop' into enhancement/events-graphql-update

Author: iLLiCiTiT

ayon_api/_api.py

@@ -1276,7 +1276,6 @@ def upload_reviewable(
     content_type: Optional[str] = None,
     filename: Optional[str] = None,
     progress: Optional[TransferProgress] = None,
-    headers: Optional[dict[str, Any]] = None,
     **kwargs,
 ) -> requests.Response:
     """Upload reviewable file to server.
@@ -1291,7 +1290,6 @@ def upload_reviewable(
         filename (Optional[str]): User as original filename. Filename from
             'filepath' is used when not filled.
         progress (Optional[TransferProgress]): Progress.
-        headers (Optional[dict[str, Any]]): Headers.
 
     Returns:
         requests.Response: Server response.
@@ -1306,7 +1304,6 @@ def upload_reviewable(
         content_type=content_type,
         filename=filename,
         progress=progress,
-        headers=headers,
         **kwargs,
     )
 

ayon_api/_api_helpers/projects.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import copy
 import json
 import platform
 import warnings
@@ -810,8 +811,24 @@ def _get_graphql_projects(
             for project in parsed_data["projects"]:
                 if active is not None and active is not project["active"]:
                     continue
-                if own_attributes:
-                    fill_own_attribs(project)
+
+                if library is not None and library is not project["library"]:
+                    continue
+
+                all_attrib = project.get("allAttrib")
+                if isinstance(all_attrib, str):
+                    all_attrib = json.loads(all_attrib)
+                    project["allAttrib"] = all_attrib
+
+                if own_attributes and all_attrib:
+                    own_attrib = {}
+                    if all_attrib:
+                        own_attrib = copy.deepcopy(all_attrib)
+                    attrib = project.get("attrib", {})
+                    for key in attrib.keys():
+                        own_attrib.setdefault(key, None)
+                    project["ownAttrib"] = own_attrib
+
                 self._fill_project_entity_data(project)
                 yield project
 

ayon_api/server_api.py

@@ -1408,7 +1408,10 @@ def _download_file_to_stream(
             try:
                 with get_func(url, **kwargs) as response:
                     # Auto-fix missing 'api/'
-                    if response.status_code == 405 and not api_prepended:
+                    if (
+                        response.status_code in (404, 405)
+                        and not api_prepended
+                    ):
                         api_prepended = True
                         if (
                             not endpoint.startswith(self._base_url)
@@ -1792,7 +1795,10 @@ def _upload_file(
         url = self._endpoint_to_url(endpoint, use_rest=False)
         progress.set_destination_url(url)
 
-        headers = kwargs.setdefault("headers", {})
+        headers = kwargs.get("headers")
+        if headers is None:
+            kwargs["headers"] = headers = {}
+
         headers_keys_by_low_key = {key.lower(): key for key in headers}
         if self._session is None:
             for key, value in self.get_headers().items():
@@ -1838,7 +1844,7 @@ def _upload_file(
                     **kwargs
                 )
                 # Auto-fix missing 'api/'
-                if response.status_code == 405 and not api_prepended:
+                if response.status_code in (404, 405) and not api_prepended:
                     api_prepended = True
                     if (
                         not endpoint.startswith(self._base_url)
@@ -1982,7 +1988,6 @@ def upload_reviewable(
         content_type: Optional[str] = None,
         filename: Optional[str] = None,
         progress: Optional[TransferProgress] = None,
-        headers: Optional[dict[str, Any]] = None,
         **kwargs
     ) -> requests.Response:
         """Upload reviewable file to server.
@@ -1997,7 +2002,6 @@ def upload_reviewable(
             filename (Optional[str]): User as original filename. Filename from
                 'filepath' is used when not filled.
             progress (Optional[TransferProgress]): Progress.
-            headers (Optional[dict[str, Any]]): Headers.
 
         Returns:
             requests.Response: Server response.
@@ -2026,7 +2030,6 @@ def upload_reviewable(
             progress=progress,
             content_type=content_type,
             filename=filename,
-            headers=headers,
             request_type=RequestTypes.post,
             **kwargs
         )
@@ -2425,8 +2428,11 @@ def _prepare_fields(
             fields.remove("attrib")
             fields |= self.get_attributes_fields_for_type(entity_type)
 
-        if own_attributes and entity_type in {"project", "folder", "task"}:
-            fields.add("ownAttrib")
+        if own_attributes:
+            if entity_type == "project":
+                fields.add("allAttrib")
+            elif entity_type in {"folder", "task"}:
+                fields.add("ownAttrib")
 
         if entity_type != "project":
             return