accsyn-python-api 2.1.0__tar.gz → 2.1.2__tar.gz

accsyn-python-api-2.1.2/.github/workflows/github-actions-black.yml

@@ -0,0 +1,11 @@
+name: black-action
+on: [push, pull_request]
+jobs:
+  linter_name:
+    name: runner / black formatter
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: rickstaa/action-black@v1
+        with:
+          black_args: "--check -l 119 --skip-string-normalization ."

accsyn-python-api-2.1.2/.gitignore

@@ -0,0 +1 @@
+*.pyc

accsyn-python-api-2.1.2/.pre-commit-config.yaml

@@ -0,0 +1,6 @@
+repos:
+-   repo: https://github.com/psf/black
+    rev: stable
+    hooks:
+    - id: black
+      language_version: python3.7

{accsyn-python-api-2.1.0 → accsyn-python-api-2.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accsyn-python-api
-Version: 2.1.0
+Version: 2.1.2
 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-2.1.0 → accsyn-python-api-2.1.2}/doc/jobs.rst

@@ -186,7 +186,7 @@ If successful, a list of dictionaries is returned on the same form as returned b
 
 .. note::
 
-    For more examples of the accsyn jobmit syntax, see: `https://https://support.accsyn.com/job-specification <https://support.accsyn.com/job-specification>`_.
+    For more examples of the accsyn jobmit syntax, see: `https://support.accsyn.com/job-specification <https://support.accsyn.com/job-specification>`_.
 
 Modify
 ======

{accsyn-python-api-2.1.0 → accsyn-python-api-2.1.2}/doc/release_notes.rst

@@ -13,6 +13,7 @@ Release Notes
 
     `https://support.accsyn.com <https://support.accsyn.com>`_.
 
+
 .. release:: 2.1.0
     :date: 2022-12-02
 

accsyn-python-api-2.1.2/pyproject.toml

@@ -0,0 +1,3 @@
+[tool.black]
+line-length = 119
+skip-string-normalization = true

{accsyn-python-api-2.1.0 → accsyn-python-api-2.1.2}/setup.py

@@ -1,12 +1,11 @@
 import setuptools
 
 with open("README.md", "r") as fh:
-
     long_description = fh.read()
 
 setuptools.setup(
     name='accsyn-python-api',
-    version='2.1.0',
+    version='2.1.2',
     package_dir={'': 'source'},
     packages=['accsyn_api'],
     setup_requires=[

accsyn-python-api-2.1.2/source/accsyn_api/_version.py

@@ -0,0 +1,4 @@
+# :coding: utf-8
+# :copyright: Copyright (c) 2015-2023 accsyn/HDR AB
+
+__version__ = "2.1.2-0"

{accsyn-python-api-2.1.0 → accsyn-python-api-2.1.2}/source/accsyn_api/session.py

@@ -26,11 +26,9 @@ import requests
 from ._version import __version__
 
 if sys.version_info.major >= 3:
-
     import io
 
 else:
-
     # Python 2 backward compability
     import binascii
 
@@ -115,10 +113,21 @@ class JSONDecoder(json.JSONDecoder):
 class Session(object):
     """accsyn API session object."""
 
+    DEFAULT_CONNECT_TIMEOUT = 10  # Wait 10 seconds for connection
+    DEFAULT_TIMEOUT = 2 * 60  # Wait 2 minutes for response
+
     @property
     def username(self):
         return self._username
 
+    @property
+    def timeout(self):
+        return self._timeout
+
+    @property
+    def connect_timeout(self):
+        return self._connect_timeout
+
     def __init__(
         self,
         domain=None,
@@ -133,6 +142,8 @@ class Session(object):
         pretty_json=False,
         dev=False,
         path_logfile=None,
+        timeout=None,
+        connect_timeout=None,
     ):
         """
         Initiate a new API session object. Throws exception upon authentication failure.
@@ -149,6 +160,8 @@ class Session(object):
         :param pretty_json: (verbose) Print pretty formatted JSON.
         :param dev: Dev mode.
         :param path_logfile: Output all log messages to this logfile instead of stdout.
+        :param timeout: Timeout in seconds for API calls - waiting for response.
+        :param connect_timeout: Timeout in seconds for API calls - waiting for connection.
         """
         # Generate a session ID
         self.__version__ = __version__
@@ -159,7 +172,7 @@ class Session(object):
         self._be_verbose = verbose
         self._pretty_json = pretty_json
         self._proxy = proxy
-        self._dev = dev
+        self._dev = dev is True or os.environ.get('ACCSYN_DEV', 'false') in ['true', '1']
         Session._p_logfile = path_logfile
         self._clearance = CLEARANCE_NONE
         self._verbose("Creating accsyn Python API session (v{})".format(__version__))
@@ -226,6 +239,8 @@ class Session(object):
                     ACCSYN_CLOUD_DOMAIN,
                 )
         self._last_message = None
+        self._timeout = timeout or Session.DEFAULT_TIMEOUT
+        self._connect_timeout = connect_timeout or Session.DEFAULT_CONNECT_TIMEOUT
         self.login()
 
     @staticmethod
@@ -960,6 +975,7 @@ class Session(object):
         """
         if data is None or not isinstance(data, list):
             raise accsynException("None or empty data supplied!")
+
         # Check entries, calculate size
         def recursive_get_size(files):
             result = 0
@@ -1152,7 +1168,7 @@ class Session(object):
             ssl = False
         if self._dev and (uri or "").find("registry") != 0:
             ssl = False
-            port = 80
+            port = 8181
         if proxy_type == "accsyn":
             if proxy_port == -1:
                 proxy_port = 80
@@ -1178,13 +1194,12 @@ class Session(object):
             ("/" if not uri.startswith("/") else "") + uri,
         )
         if timeout is None:
-            timeout = 999999
+            timeout = self.timeout
         if data is None:
             data = {}
         # Wait 10s to reach machine, 2min for it to send back data
-        CONNECT_TO, READ_TO = (10, 2 * 60)
+        CONNECT_TO, READ_TO = (self.connect_timeout, timeout)
         r = None
-        initial_timeout = timeout
         for iteration in range(0, 2):
             if headers:
                 headers_effective = copy.deepcopy(headers)

{accsyn-python-api-2.1.0 → accsyn-python-api-2.1.2}/source/accsyn_python_api.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accsyn-python-api
-Version: 2.1.0
+Version: 2.1.2
 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-2.1.0 → accsyn-python-api-2.1.2}/source/accsyn_python_api.egg-info/SOURCES.txt

@@ -1,7 +1,11 @@
+.gitignore
+.pre-commit-config.yaml
 README.md
+pyproject.toml
 readthedocs.yaml
 setup.cfg
 setup.py
+.github/workflows/github-actions-black.yml
 doc/clients.rst
 doc/compute.rst
 doc/conf.py

accsyn-python-api-2.1.0/source/accsyn_api/_version.py

@@ -1,4 +0,0 @@
-# :coding: utf-8
-# :copyright: Copyright (c) 2015-2022 accsyn/HDR AB
-
-__version__ = "2.1.0-1"