kardioutils 1.0.15__tar.gz → 1.0.17__tar.gz

{kardioutils-1.0.15/kardioutils.egg-info → kardioutils-1.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kardioutils
-Version: 1.0.15
+Version: 1.0.17
 Summary: Utils lib
 Author: João Neto
 Author-email: joao.filipe.neto@gmail.com

kardioutils-1.0.17/dl2050utils/__version__.py

@@ -0,0 +1 @@
+version = "1.0.17"

{kardioutils-1.0.15 → kardioutils-1.0.17}/dl2050utils/gs.py

@@ -64,7 +64,9 @@ class GS:
         # Try Google Cloud first
         key_dict = oget(cfg, ["gcloud", "gs_key"])
         fs_cfg = oget(cfg, ["fs"]) or {}
-
+        self.internal_token = fs_cfg.get("internal_token")
+        if self.internal_token:
+            os.environ["FS_INTERNAL_TOKEN"] = self.internal_token
         self.mode = None  # 'gcloud' or 'local'
 
         if key_dict is not None:
@@ -82,9 +84,6 @@ class GS:
             self.mode = "local"
             self.default_location = "local"
             self.gc = None  # not used
-            token = fs_cfg["internal_token"]
-            os.environ["FS_INTERNAL_TOKEN"] = token
-
 
             self.root_dir = Path(fs_cfg.get("root_dir", f"/data/{service}/fs"))
             self.root_dir.mkdir(parents=True, exist_ok=True)
@@ -310,7 +309,7 @@ class GS:
                 if not download_url:
                     print("download_mem (local) ERROR: could not generate download_url")
                     return None
-                internal_token = os.environ.get("FS_INTERNAL_TOKEN")
+                internal_token = self.internal_token
                 headers = {}
                 if internal_token:
                     headers["X-Internal-Token"] = internal_token
@@ -393,7 +392,7 @@ class GS:
                     print("download_file (local) ERROR: could not generate download_url")
                     return 1
 
-                internal_token = os.environ.get("FS_INTERNAL_TOKEN")
+                internal_token = self.internal_token
 
                 headers = {}
                 if internal_token:

{kardioutils-1.0.15 → kardioutils-1.0.17}/dl2050utils/restapp.py

@@ -202,7 +202,7 @@ class App():
             Uploads a workfile file fname belonging to a registered user.
             Workfiles for upload are usually content produced by the users.
             Workfiles are stored in the folder '$DATAPATH/workfiles/<service>'.
-        """<
+        """
         u = await self.auth.check_auth(request)
         uid = u['uid']
         fname = request.path_params['fname']

{kardioutils-1.0.15 → kardioutils-1.0.17/kardioutils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kardioutils
-Version: 1.0.15
+Version: 1.0.17
 Summary: Utils lib
 Author: João Neto
 Author-email: joao.filipe.neto@gmail.com

kardioutils-1.0.15/dl2050utils/__version__.py

@@ -1 +0,0 @@
-version = "1.0.15"