ayon-python-api 1.2.14.dev0__tar.gz → 1.2.15__tar.gz

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

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

{ayon_python_api-1.2.14.dev0 → ayon_python_api-1.2.15}/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,
     )
 
@@ -3248,6 +3245,7 @@ def get_events(
     project_names: Optional[Iterable[str]] = None,
     statuses: Optional[Iterable[EventStatus]] = None,
     users: Optional[Iterable[str]] = None,
+    text_filter: Optional[str] = None,
     include_logs: Optional[bool] = None,
     has_children: Optional[bool] = None,
     newer_than: Optional[str] = None,
@@ -3255,6 +3253,8 @@ def get_events(
     fields: Optional[Iterable[str]] = None,
     limit: Optional[int] = None,
     order: Optional[SortOrder] = None,
+    first: Optional[int] = None,
+    last: Optional[int] = None,
     states: Optional[Iterable[str]] = None,
 ) -> Generator[dict[str, Any], None, None]:
     """Get events from server with filtering options.
@@ -3270,6 +3270,7 @@ def get_events(
         statuses (Optional[Iterable[EventStatus]]): Filtering by statuses.
         users (Optional[Iterable[str]]): Filtering by users
             who created/triggered an event.
+        text_filter (Optional[str]): Filtering by text in event payload.
         include_logs (Optional[bool]): Query also log events.
         has_children (Optional[bool]): Event is with/without children
             events. If 'None' then all events are returned, default.
@@ -3283,6 +3284,8 @@ def get_events(
         order (Optional[SortOrder]): Order events in ascending
             or descending order. It is recommended to set 'limit'
             when used descending.
+        first (Optional[int]): Get first n events.
+        last (Optional[int]): Get last n events.
         states (Optional[Iterable[str]]): DEPRECATED Filtering by states.
             Use 'statuses' instead.
 
@@ -3297,6 +3300,7 @@ def get_events(
         project_names=project_names,
         statuses=statuses,
         users=users,
+        text_filter=text_filter,
         include_logs=include_logs,
         has_children=has_children,
         newer_than=newer_than,
@@ -3304,6 +3308,8 @@ def get_events(
         fields=fields,
         limit=limit,
         order=order,
+        first=first,
+        last=last,
         states=states,
     )
 

{ayon_python_api-1.2.14.dev0 → ayon_python_api-1.2.15}/ayon_api/_api_helpers/events.py

@@ -40,6 +40,7 @@ class EventsAPI(BaseServerAPI):
         project_names: Optional[Iterable[str]] = None,
         statuses: Optional[Iterable[EventStatus]] = None,
         users: Optional[Iterable[str]] = None,
+        text_filter: Optional[str] = None,
         include_logs: Optional[bool] = None,
         has_children: Optional[bool] = None,
         newer_than: Optional[str] = None,
@@ -47,6 +48,8 @@ class EventsAPI(BaseServerAPI):
         fields: Optional[Iterable[str]] = None,
         limit: Optional[int] = None,
         order: Optional[SortOrder] = None,
+        first: Optional[int] = None,
+        last: Optional[int] = None,
         states: Optional[Iterable[str]] = None,
     ) -> Generator[dict[str, Any], None, None]:
         """Get events from server with filtering options.
@@ -62,6 +65,7 @@ class EventsAPI(BaseServerAPI):
             statuses (Optional[Iterable[EventStatus]]): Filtering by statuses.
             users (Optional[Iterable[str]]): Filtering by users
                 who created/triggered an event.
+            text_filter (Optional[str]): Filtering by text in event payload.
             include_logs (Optional[bool]): Query also log events.
             has_children (Optional[bool]): Event is with/without children
                 events. If 'None' then all events are returned, default.
@@ -75,6 +79,8 @@ class EventsAPI(BaseServerAPI):
             order (Optional[SortOrder]): Order events in ascending
                 or descending order. It is recommended to set 'limit'
                 when used descending.
+            first (Optional[int]): Get first n events.
+            last (Optional[int]): Get last n events.
             states (Optional[Iterable[str]]): DEPRECATED Filtering by states.
                 Use 'statuses' instead.
 
@@ -111,6 +117,7 @@ class EventsAPI(BaseServerAPI):
             ("hasChildrenFilter", has_children),
             ("newerThanFilter", newer_than),
             ("olderThanFilter", older_than),
+            ("textFilter", text_filter),
         ):
             if filter_value is not None:
                 filters[filter_key] = filter_value
@@ -125,6 +132,14 @@ class EventsAPI(BaseServerAPI):
         for attr, filter_value in filters.items():
             query.set_variable_value(attr, filter_value)
 
+        events_field = query.get_field_by_path("events")
+        if last is not None:
+            events_field.set_limit(last)
+            events_field.set_order(SortOrder.descending)
+        elif first is not None:
+            events_field.set_limit(first)
+            events_field.set_order(SortOrder.ascending)
+
         if limit:
             events_field = query.get_field_by_path("events")
             events_field.set_limit(limit)

{ayon_python_api-1.2.14.dev0 → ayon_python_api-1.2.15}/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 @@ class ProjectsAPI(BaseServerAPI):
             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_python_api-1.2.14.dev0 → ayon_python_api-1.2.15}/ayon_api/graphql_queries.py

@@ -593,6 +593,7 @@ def events_graphql_query(fields, order, use_states=False):
     has_children_var = query.add_variable("hasChildrenFilter", "Boolean!")
     newer_than_var = query.add_variable("newerThanFilter", "String!")
     older_than_var = query.add_variable("olderThanFilter", "String!")
+    text_filter_var = query.add_variable("textFilter", "String!")
 
     statuses_filter_name = "statuses"
     if use_states:
@@ -607,6 +608,7 @@ def events_graphql_query(fields, order, use_states=False):
     events_field.set_filter("hasChildren", has_children_var)
     events_field.set_filter("newerThan", newer_than_var)
     events_field.set_filter("olderThan", older_than_var)
+    events_field.set_filter("filter", text_filter_var)
 
     nested_fields = fields_to_dict(set(fields))
 

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

@@ -1408,7 +1408,10 @@ class ServerAPI(
             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 @@ class ServerAPI(
         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 @@ class ServerAPI(
                     **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 @@ class ServerAPI(
         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 @@ class ServerAPI(
             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 @@ class ServerAPI(
             progress=progress,
             content_type=content_type,
             filename=filename,
-            headers=headers,
             request_type=RequestTypes.post,
             **kwargs
         )
@@ -2425,8 +2428,11 @@ class ServerAPI(
             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

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

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

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

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

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

@@ -1,6 +1,6 @@
 [project]
 name = "ayon_python_api"
-version = "1.2.14-dev"
+version = "1.2.15"
 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.14-dev"
+version = "1.2.15"
 description = "AYON Python API"
 authors = [
     "ynput.io <info@ynput.io>"