bfabric-web-apps 0.2.0__tar.gz → 0.2.1__tar.gz

{bfabric_web_apps-0.2.0 → bfabric_web_apps-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bfabric-web-apps
-Version: 0.2.0
+Version: 0.2.1
 Summary: A package containing handy boilerplate utilities for developing bfabric web-applications
 Author: Marc Zuber, Griffin White, GWC GmbH
 Requires-Python: >=3.10,<4.0

{bfabric_web_apps-0.2.0 → bfabric_web_apps-0.2.1}/bfabric_web_apps/objects/BfabricInterface.py

@@ -88,7 +88,8 @@ class BfabricInterface( Bfabric ):
             if current_time > datetime.datetime.strptime(expiry_time, "%Y-%m-%d %H:%M:%S") + datetime.timedelta(days=7):
                 return "EXPIRED"
             
-            environment_dict = {"Production":"https://fgcz-bfabric.uzh.ch/bfabric","Test":"https://fgcz-bfabric-test.uzh.ch/bfabric"}
+            envioronment_name = str(userinfo['environment']).strip().lower()
+            environment_dict = {"production":"https://fgcz-bfabric.uzh.ch/bfabric","prod":"https://fgcz-bfabric.uzh.ch/bfabric","test":"https://fgcz-bfabric-test.uzh.ch/bfabric"}
             
             token_data = dict(
                 environment = userinfo['environment'],
@@ -96,7 +97,7 @@ class BfabricInterface( Bfabric ):
                 token_expires = expiry_time,
                 entity_id_data = userinfo['entityId'],
                 entityClass_data = userinfo['entityClassName'],
-                webbase_data = environment_dict.get(userinfo['environment'], None),
+                webbase_data = environment_dict[envioronment_name],
                 application_params_data = {},
                 application_data = str(userinfo['applicationId']),
                 userWsPassword = userinfo['userWsPassword'],
@@ -129,10 +130,9 @@ class BfabricInterface( Bfabric ):
         Returns:
             Bfabric: An authenticated Bfabric instance.
         """
-
+     
         bfabric_auth = BfabricAuth(login=token_response.get('user_data'), password=token_response.get('userWsPassword'))
-        bfabric_client_config = BfabricClientConfig(base_url=token_response.get('webbase_data')) 
-
+        bfabric_client_config = BfabricClientConfig(base_url=token_response['webbase_data'])
         bfabric_wrapper = bfabric.Bfabric(config=bfabric_client_config, auth=bfabric_auth)
 
         return bfabric_wrapper

{bfabric_web_apps-0.2.0 → bfabric_web_apps-0.2.1}/bfabric_web_apps/utils/run_main_pipeline.py

@@ -211,6 +211,8 @@ def save_files_from_bytes(files_as_byte_strings: dict, logger):
     for destination, file_bytes in files_as_byte_strings.items():
         try:
             # Write file from byte string
+            if destination.startswith("~"): 
+                destination = os.path.expanduser(destination)
             with open(destination, "+wb") as f:
                 f.write(file_bytes)
             logger.log_operation("File saved | ORIGIN: run_main_job function", f"File {destination} saved successfully.", params=None, flush_logs=True)

{bfabric_web_apps-0.2.0 → bfabric_web_apps-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "bfabric-web-apps"
-version = "0.2.0"
+version = "0.2.1"
 description = "A package containing handy boilerplate utilities for developing bfabric web-applications"
 authors = ["Marc Zuber, Griffin White, GWC GmbH"]