accsyn-python-api 3.0.1__tar.gz → 3.0.3__tar.gz

{accsyn-python-api-3.0.1 → accsyn-python-api-3.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accsyn-python-api
-Version: 3.0.1
+Version: 3.0.3
 Summary: A Python API for accsyn programmable fast and secure data delivery software
 Home-page: https://github.com/accsyn/accsyn-python-api.git
 Author: Henrik Norin

{accsyn-python-api-3.0.1 → accsyn-python-api-3.0.3}/doc/misc.rst

@@ -20,11 +20,11 @@ Will return a string with your session key.
 
 
 
-Check if GUI or server is running::
+Check if the accsyn app or daemon (user server) is running on the same machine and same user ID::
 
-    session.gui_is_running()
+    session.app_is_running()
 
-    session.server_is_running()
+    session.daemon_is_running()
 
 Will return True if GUI/Server is running, False if offline, None if not installed/detected.
 

{accsyn-python-api-3.0.1 → accsyn-python-api-3.0.3}/doc/release_notes.rst

@@ -13,6 +13,25 @@ Release Notes
 
     `https://support.accsyn.com <https://support.accsyn.com>`_.
 
+.. release:: 3.0.3
+    :date: 2024-11-26
+
+    .. change:: changed
+
+        * Replaced 'gui_is_running' and 'app_is_running' with 'app_is_running' and 'deamon_is_running', keeping the old names for backwards compatibility.
+        * 'daemon_is_running' now properly checks for user clients on the same machine being of type server(workspace context) or user server (run by user daemon host).
+
+    .. change:: fix
+
+        * Fixed site query bug.
+
+.. release:: 3.0.2
+    :date: 2024-11-18
+
+    .. change:: fix
+
+        * Replaced organization > workspace.
+
 .. release:: 3.0.1
     :date: 2024-11-18
 

{accsyn-python-api-3.0.1 → accsyn-python-api-3.0.3}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name='accsyn-python-api',
-    version='3.0.1',
+    version='3.0.3',
     package_dir={'': 'source'},
     packages=['accsyn_api'],
     setup_requires=[

{accsyn-python-api-3.0.1 → accsyn-python-api-3.0.3}/source/accsyn_api/session.py

@@ -55,6 +55,18 @@ CLEARANCE_STANDARD = "standard"
 CLEARANCE_CLIENT = CLEARANCE_STANDARD # BWCOMP
 CLEARANCE_NONE = "none"
 
+CLIENT_TYPE_APP = 0
+CLIENT_TYPE_SERVER = 1
+CLIENT_TYPE_USERSERVER = 2
+CLIENT_TYPE_BROWSER = 3
+CLIENT_TYPE_COMPUTE_LANE = 4
+CLIENT_TYPE_ACCSYN_VPX = 5
+
+CLIENT_STATE_INIT = "init"
+CLIENT_STATE_ONLINE = "online"
+CLIENT_STATE_OFFLINE = "offline"
+CLIENT_STATE_DISABLED = "disabled"
+CLIENT_STATE_DISABLED_OFFLINE = "disabled-offline"
 
 class JSONEncoder(json.JSONEncoder):
     """JSON serialiser."""
@@ -187,7 +199,7 @@ class Session(object):
             )
         if not domain:
             raise AccsynException(
-                "Please supply your accsyn domain/organization or set " "ACCSYN_DOMAIN environment!"
+                "Please supply your accsyn domain/workspace or set " "ACCSYN_DOMAIN environment!"
             )
         if not username:
             username = os.environ.get("ACCSYN_API_USER")
@@ -430,7 +442,7 @@ class Session(object):
                 data["skip"] = skip
             if attributes:
                 data["attributes"] = attributes
-            d = self._event("GET", "%s/find" % uri_base, data, query=d.get("expression"))
+            d = self._event("GET", "{}/find".format(uri_base), data, query=d.get("expression"))
             if d:
                 retval = d["result"]
         return retval
@@ -802,7 +814,7 @@ class Session(object):
             data["include"] = include
         if exclude:
             data["exclude"] = exclude
-        response = self._event("GET", "organization/file", data)
+        response = self._event("GET", "workspace/file", data)
         if response:
             return response["result"]
 
@@ -831,7 +843,7 @@ class Session(object):
             data["include"] = include
         if exclude:
             data["exclude"] = exclude
-        response = self._event("GET", "organization/file", data)
+        response = self._event("GET", "workspace/file", data)
         if response:
             return response["result"]
 
@@ -849,7 +861,7 @@ class Session(object):
             "op": "exists",
             "path": path,
         }
-        response = self._event("GET", "organization/file", data)
+        response = self._event("GET", "workspace/file", data)
         if response:
             return response["result"]
 
@@ -869,7 +881,7 @@ class Session(object):
             "op": "mkdir",
             "path": path,
         }
-        response = self._event("POST", "organization/file", data)
+        response = self._event("POST", "workspace/file", data)
         if response:
             return response["result"]
 
@@ -894,7 +906,7 @@ class Session(object):
             "path": path,
             "path_to": path_to,
         }
-        response = self._event("PUT", "organization/file", data)
+        response = self._event("PUT", "workspace/file", data)
         if response:
             return response["result"]
 
@@ -919,7 +931,7 @@ class Session(object):
             "path": path_src,
             "path_to": path_dst,
         }
-        response = self._event("PUT", "organization/file", data)
+        response = self._event("PUT", "workspace/file", data)
         if response:
             return response["result"]
 
@@ -939,7 +951,7 @@ class Session(object):
             "op": "mkdir",
             "path": path,
         }
-        response = self._event("POST", "organization/file", data)
+        response = self._event("POST", "workspace/file", data)
         if response:
             return response["result"]
 
@@ -966,7 +978,7 @@ class Session(object):
             return result
 
         event_data = {"files": data, "size": recursive_get_size(data)}
-        response = self._event("PUT", "organization/publish/preprocess", event_data)
+        response = self._event("PUT", "workspace/publish/preprocess", event_data)
         return response["result"]
 
     # Settings
@@ -1001,8 +1013,14 @@ class Session(object):
         return self._event("GET", "user/api_key", {})["api_key"]
 
     def gui_is_running(self):
+        """ Backward compability """
+        return self.app_is_running()
+
+    def app_is_running(self):
         """
-        Check if a GUI is running on the same machine (hostname match) and with same username.
+        Check if the accsyn desktop app is running on the same machine (code/hostname match) and with same user ID.
+
+        Equivalent to do client query with user, code and type.
 
         :return: True if found, False otherwise.
         """
@@ -1010,19 +1028,25 @@ class Session(object):
             "GET",
             "client/find",
             {},
-            query="user={0} AND code={1} AND type={2}".format(self._uid, Session.get_hostname(), 0),
+            query="user={0} AND code={1} AND type={2}".format(self._uid, Session.get_hostname(), CLIENT_TYPE_APP),
         )["result"]
         retval = None
         if 0 < len(result):
             for c in result:
-                retval = c["status"] in ["online", "disabled"]
+                retval = c["status"] in [CLIENT_STATE_ONLINE, CLIENT_STATE_DISABLED]
                 if retval is True:
                     break
         return retval
 
     def server_is_running(self):
+        """ Backward compatibility """
+        return self.daemon_is_running()
+
+    def daemon_is_running(self):
         """
-        Check if a server is running on the same machine with same username.
+        Check if a daemon is running on the same machine (code/hostname match) with same user ID.
+
+        Equivalent to do client query with user, code and type.
 
         :return: True if found, False otherwise.
         """
@@ -1030,12 +1054,13 @@ class Session(object):
             "GET",
             "client/find",
             {},
-            query="user={0} AND code={1} AND type!={2}".format(self._uid, Session.get_hostname(), 0),
+            query="user={0} AND code={1} AND (type={2} OR type={3})".format(self._uid, Session.get_hostname(),
+                                                                            CLIENT_TYPE_SERVER, CLIENT_TYPE_USERSERVER),
         )["result"]
         retval = None
         if 0 < len(result):
             for c in result:
-                retval = c["status"] in ["online", "disabled"]
+                retval = c["status"] in [CLIENT_STATE_ONLINE, CLIENT_STATE_DISABLED]
                 if retval is True:
                     break
         return retval
@@ -1046,7 +1071,7 @@ class Session(object):
         assert len(operation) > 0, 'No operation provided'
         return self._event(
             "PUT",
-            "organization/integration/{}/utility".format(name),
+            "workspace/integration/{}/utility".format(name),
             {
                 'operation': operation,
                 'data': data,
@@ -1430,11 +1455,7 @@ class Session(object):
     def _get_base_uri(entitytype):
         uri_base = entitytype
         # Send query to server, first determine uri
-        # if entitytype == 'share':
-        #   uri_base = 'organization/share'
-        if entitytype == "site":
-            uri_base = "organization/site"
-        elif entitytype == "queue":
+        if entitytype == "queue":
             uri_base = "job"
         elif entitytype == "task":
             uri_base = "job/task"

{accsyn-python-api-3.0.1 → accsyn-python-api-3.0.3}/source/accsyn_python_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accsyn-python-api
-Version: 3.0.1
+Version: 3.0.3
 Summary: A Python API for accsyn programmable fast and secure data delivery software
 Home-page: https://github.com/accsyn/accsyn-python-api.git
 Author: Henrik Norin