ayon-python-api 1.1.0__tar.gz → 1.1.2__tar.gz

{ayon-python-api-1.1.0 → ayon-python-api-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ayon-python-api
-Version: 1.1.0
+Version: 1.1.2
 Summary: AYON Python API
 Home-page: https://github.com/ynput/ayon-python-api
 Author: ynput.io

{ayon-python-api-1.1.0 → ayon-python-api-1.1.2}/ayon_api/server_api.py

@@ -96,6 +96,7 @@ from .utils import (
     NOT_SET,
     get_media_mime_type,
     SortOrder,
+    get_machine_name,
 )
 
 if typing.TYPE_CHECKING:
@@ -1187,8 +1188,13 @@ class ServerAPI(object):
 
         for parsed_data in query.continuous_query(self):
             for user in parsed_data["users"]:
-                user["accessGroups"] = json.loads(
-                    user["accessGroups"])
+                access_groups = user.get("accessGroups")
+                if isinstance(access_groups, str):
+                    user["accessGroups"] = json.loads(access_groups)
+                all_attrib = user.get("allAttrib")
+                if isinstance(all_attrib, str):
+                    user["allAttrib"] = json.loads(all_attrib)
+                fill_own_attribs(user)
                 yield user
 
     def get_user_by_name(
@@ -1245,7 +1251,9 @@ class ServerAPI(object):
 
         response = self.get(f"users/{username}")
         response.raise_for_status()
-        return response.data
+        user = response.data
+        fill_own_attribs(user)
+        return user
 
     def get_headers(
         self, content_type: Optional[str] = None
@@ -1256,7 +1264,8 @@ class ServerAPI(object):
         headers = {
             "Content-Type": content_type,
             "x-ayon-platform": platform.system().lower(),
-            "x-ayon-hostname": platform.node(),
+            "x-ayon-hostname": get_machine_name(),
+            "referer": self.get_base_url(),
         }
         if self._site_id is not None:
             headers["x-ayon-site-id"] = self._site_id

{ayon-python-api-1.1.0 → ayon-python-api-1.1.2}/ayon_api/utils.py

@@ -4,6 +4,7 @@ import datetime
 import uuid
 import string
 import platform
+import traceback
 import collections
 from urllib.parse import urlparse, urlencode
 import typing
@@ -88,6 +89,17 @@ def get_default_settings_variant() -> str:
     return os.environ.get(DEFAULT_VARIANT_ENV_KEY) or "production"
 
 
+def get_machine_name() -> str:
+    """Get machine name.
+
+    Returns:
+        str: Machine name.
+
+    """
+    return platform.node()
+    return unidecode.unidecode(platform.node())
+
+
 def get_default_site_id() -> Optional[str]:
     """Site id used for server connection.
 
@@ -322,18 +334,38 @@ def _try_parse_url(url: str) -> Optional[str]:
 
 
 def _try_connect_to_server(
-    url: str, timeout: Optional[float] = None
-) -> bool:
+    url: str,
+    timeout: Optional[float],
+    verify: Optional["Union[str, bool]"],
+    cert: Optional[str],
+) -> Optional[str]:
     if timeout is None:
         timeout = get_default_timeout()
+
+    if verify is None:
+        verify = os.environ.get("AYON_CA_FILE") or True
+
+    if cert is None:
+        cert = os.environ.get("AYON_CERT_FILE") or None
+
     try:
         # TODO add validation if the url lead to AYON server
         #   - this won't validate if the url lead to 'google.com'
-        requests.get(url, timeout=timeout)
+        response = requests.get(
+            url,
+            timeout=timeout,
+            verify=verify,
+            cert=cert,
+        )
+        if response.history:
+            return response.history[-1].headers["location"].rstrip("/")
+        return url
 
-    except BaseException:
-        return False
-    return True
+    except Exception:
+        print(f"Failed to connect to '{url}'")
+        traceback.print_exc()
+
+    return None
 
 
 def login_to_server(
@@ -463,7 +495,12 @@ def is_token_valid(
     return False
 
 
-def validate_url(url: str, timeout: Optional[int] = None) -> str:
+def validate_url(
+    url: str,
+    timeout: Optional[int] = None,
+    verify: Optional["Union[str, bool]"] = None,
+    cert: Optional[str] = None,
+) -> str:
     """Validate url if is valid and server is available.
 
     Validation checks if can be parsed as url and contains scheme.
@@ -520,12 +557,23 @@ def validate_url(url: str, timeout: Optional[int] = None) -> str:
     # Try add 'https://' scheme if is missing
     # - this will trigger UrlError if both will crash
     if not parsed_url.scheme:
-        new_url = "https://" + modified_url
-        if _try_connect_to_server(new_url, timeout=timeout):
+        new_url = _try_connect_to_server(
+            "http://" + modified_url,
+            timeout=timeout,
+            verify=verify,
+            cert=cert,
+        )
+        if new_url:
             return new_url
 
-    if _try_connect_to_server(modified_url, timeout=timeout):
-        return modified_url
+    new_url = _try_connect_to_server(
+        modified_url,
+        timeout=timeout,
+        verify=verify,
+        cert=cert,
+    )
+    if new_url:
+        return new_url
 
     hints = []
     if "/" in parsed_url.path or not parsed_url.scheme:

{ayon-python-api-1.1.0 → ayon-python-api-1.1.2}/ayon_api/version.py

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

{ayon-python-api-1.1.0 → ayon-python-api-1.1.2}/ayon_python_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ayon-python-api
-Version: 1.1.0
+Version: 1.1.2
 Summary: AYON Python API
 Home-page: https://github.com/ynput/ayon-python-api
 Author: ynput.io

{ayon-python-api-1.1.0 → ayon-python-api-1.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ayon-python-api"
-version = "1.1.0"
+version = "1.1.2"
 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.1.0"
+version = "1.1.2"
 description = "AYON Python API"
 authors = [
     "ynput.io <info@ynput.io>"