kardioutils 1.0.11__tar.gz → 1.0.13__tar.gz

{kardioutils-1.0.11/kardioutils.egg-info → kardioutils-1.0.13}/PKG-INFO

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

kardioutils-1.0.13/dl2050utils/__version__.py

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

{kardioutils-1.0.11 → kardioutils-1.0.13}/dl2050utils/api.py

@@ -222,7 +222,7 @@ class APIServer:
         self.db = Sqlite(p0/'api-db')
         self.skey,self.wkey = oget(cfg,['apiserver','skey']),oget(cfg,['apiserver','wkey'])
         if self.wkey is None: raise Exception('Worker key not defined')
-        self.fs = GS(service) if oget(cfg,['gcloud','gs_key']) is not None else None
+        self.fs = GS(service)
         self.bucket = f'{service}-apiserver'
         self.sync_worker_url = sync_worker_url
         self.port = 9000

{kardioutils-1.0.11 → kardioutils-1.0.13}/dl2050utils/gs.py

@@ -71,8 +71,11 @@ class GS:
             # ---------- GCS MODE ----------
             assert key_dict["type"] == "service_account"
             credentials_p = "./gs-keyfile.json"
+            token = fs_cfg["internal_token"]
             json_save(credentials_p, key_dict)
             os.environ["GOOGLE_APPLICATION_CREDENTIALS"] = credentials_p
+            os.environ["FS_INTERNAL_TOKEN"] = token
+
             self.default_location = default_location
             self.gc = storage.Client()
             self.mode = "gcloud"
@@ -251,7 +254,7 @@ class GS:
                     size=size,
                 )
                 if not upload_url:
-                    print("upload_mem (local) ERROR: could not generate upload_url")
+                    print("upload_mem (local) ERROR: could not use upload_url")
                     return 1
 
                 resp = requests.put(
@@ -390,6 +393,7 @@ class GS:
                     return 1
 
                 internal_token = os.environ.get("FS_INTERNAL_TOKEN")
+
                 headers = {}
                 if internal_token:
                     headers["X-Internal-Token"] = internal_token
@@ -556,7 +560,7 @@ class GS:
                 blob=blob_name,
                 timeout=timeout,
                 max_size=None,
-            )
+            ) 
         except Exception as exc:
             print(f"download_url (local) EXCEPTION: {str(exc)}")
             return None

{kardioutils-1.0.11 → kardioutils-1.0.13/kardioutils.egg-info}/PKG-INFO

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

kardioutils-1.0.11/dl2050utils/__version__.py

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