kardioutils 1.0.15__tar.gz → 1.0.16__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {kardioutils-1.0.15/kardioutils.egg-info → kardioutils-1.0.16}/PKG-INFO +1 -1
- kardioutils-1.0.16/dl2050utils/__version__.py +1 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/gs.py +5 -6
- {kardioutils-1.0.15 → kardioutils-1.0.16/kardioutils.egg-info}/PKG-INFO +1 -1
- kardioutils-1.0.15/dl2050utils/__version__.py +0 -1
- {kardioutils-1.0.15 → kardioutils-1.0.16}/LICENSE.txt +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/README.md +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/__config__.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/__init__.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/api.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/auth.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/com.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/common.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/core.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/db copy.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/db.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/dbdf.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/dbutils.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/df.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/df_utils.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/env.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/etl.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/fdb.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/fs.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/graphql.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/ju.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/log.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/mq.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/rest.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/restapp.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/restutils.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/sqlite.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/ulists.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/dl2050utils/wsgi.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/kardioutils.egg-info/SOURCES.txt +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/kardioutils.egg-info/dependency_links.txt +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/kardioutils.egg-info/top_level.txt +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/setup.cfg +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/setup.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/test/test_core.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/test/test_db.py +0 -0
- {kardioutils-1.0.15 → kardioutils-1.0.16}/test/test_env.py +0 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
version = "1.0.16"
|
|
@@ -64,7 +64,9 @@ class GS:
|
|
|
64
64
|
# Try Google Cloud first
|
|
65
65
|
key_dict = oget(cfg, ["gcloud", "gs_key"])
|
|
66
66
|
fs_cfg = oget(cfg, ["fs"]) or {}
|
|
67
|
-
|
|
67
|
+
self.internal_token = fs_cfg.get("internal_token")
|
|
68
|
+
if self.internal_token:
|
|
69
|
+
os.environ["FS_INTERNAL_TOKEN"] = self.internal_token
|
|
68
70
|
self.mode = None # 'gcloud' or 'local'
|
|
69
71
|
|
|
70
72
|
if key_dict is not None:
|
|
@@ -82,9 +84,6 @@ class GS:
|
|
|
82
84
|
self.mode = "local"
|
|
83
85
|
self.default_location = "local"
|
|
84
86
|
self.gc = None # not used
|
|
85
|
-
token = fs_cfg["internal_token"]
|
|
86
|
-
os.environ["FS_INTERNAL_TOKEN"] = token
|
|
87
|
-
|
|
88
87
|
|
|
89
88
|
self.root_dir = Path(fs_cfg.get("root_dir", f"/data/{service}/fs"))
|
|
90
89
|
self.root_dir.mkdir(parents=True, exist_ok=True)
|
|
@@ -310,7 +309,7 @@ class GS:
|
|
|
310
309
|
if not download_url:
|
|
311
310
|
print("download_mem (local) ERROR: could not generate download_url")
|
|
312
311
|
return None
|
|
313
|
-
internal_token =
|
|
312
|
+
internal_token = self.internal_token
|
|
314
313
|
headers = {}
|
|
315
314
|
if internal_token:
|
|
316
315
|
headers["X-Internal-Token"] = internal_token
|
|
@@ -393,7 +392,7 @@ class GS:
|
|
|
393
392
|
print("download_file (local) ERROR: could not generate download_url")
|
|
394
393
|
return 1
|
|
395
394
|
|
|
396
|
-
internal_token =
|
|
395
|
+
internal_token = self.internal_token
|
|
397
396
|
|
|
398
397
|
headers = {}
|
|
399
398
|
if internal_token:
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
version = "1.0.15"
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|