bfabric-web-apps 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

bfabric_web_apps/__init__.py

@@ -63,4 +63,7 @@ TRX_SSH_KEY = config.TRX_SSH_KEY
 URL = config.URL
 
 SERVICE_ID = config.SERVICE_ID
-DATASET_TEMPLATE_ID = config.DATASET_TEMPLATE_ID
+DATASET_TEMPLATE_ID = config.DATASET_TEMPLATE_ID
+
+REDIS_USERNAME = config.REDIS_USERNAME
+REDIS_PASSWORD = config.REDIS_PASSWORD

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/objects/Logger.py

@@ -18,7 +18,7 @@ class Logger:
         Args:
             jobid (int): The ID of the current job.
             username (str): The name of the user performing the operations.
-            environment (str): The environment (e.g., Production, Test).
+            environment (str): The environment (e.g., production, test).
         """
         self.jobid = jobid
         self.username = username

bfabric_web_apps/utils/callbacks.py

@@ -53,6 +53,8 @@ def process_url_and_token(url_params):
         ) if tdata else "Bfabric App Interface"
 
         environment = tdata.get("environment", "").strip().lower()  # 'test' or 'prod'
+        tdata["environment"] = environment.lower()
+
         job_id = tdata.get("jobId", None)  # Extract job ID
 
         job_link = None
@@ -114,8 +116,6 @@ def submit_bug_report(n_clicks, bug_description, token, entity_data):
     else:
         token_data = {}
 
-    print(token_data)
-
     # Extract logging-related information from token_data, with defaults for missing values
     jobId = token_data.get('jobId', None)
     username = token_data.get("user_data", "None")
@@ -184,8 +184,8 @@ def populate_workunit_details(token_data):
     """
 
     environment_urls = {
-        "Test": "https://fgcz-bfabric-test.uzh.ch/bfabric/workunit/show.html?id=",
-        "Production": "https://fgcz-bfabric.uzh.ch/bfabric/workunit/show.html?id="
+        "test": "https://fgcz-bfabric-test.uzh.ch/bfabric/workunit/show.html?id=",
+        "production": "https://fgcz-bfabric.uzh.ch/bfabric/workunit/show.html?id="
     }
 
     if token_data:
@@ -223,7 +223,7 @@ def populate_workunit_details(token_data):
                         html.P(f"Status: {wu.get('status', 'n/a')}")
                     ])
                 ], style={"width": "400px", "margin":"10px"}),
-                href=environment_urls[token_data.get("environment", "Test")] + str(wu["id"]),
+                href=environment_urls[token_data.get("environment", "test")] + str(wu["id"]),
                 target="_blank",
                 style={"text-decoration": "none"}
             )

bfabric_web_apps/utils/config.py

@@ -1,10 +1,14 @@
 from pydantic_settings import BaseSettings
 from pydantic import EmailStr
+from typing import Optional
 
 class Settings(BaseSettings):
 
     REDIS_HOST: str = "localhost"
     REDIS_PORT: int = 6379
+    
+    REDIS_USERNAME: Optional[str] = None
+    REDIS_PASSWORD: Optional[str] = None
 
     CONFIG_FILE_PATH: str = "~/.bfabricpy.yml"
 

bfabric_web_apps/utils/redis_connection.py

@@ -3,4 +3,12 @@ from .config import settings as config
 
 from redis import Redis
 
-redis_conn = Redis(host=config.REDIS_HOST, port=config.REDIS_PORT)
+if config.REDIS_USERNAME and config.REDIS_PASSWORD:
+    redis_conn = Redis(
+        host=config.REDIS_HOST,
+        port=config.REDIS_PORT,
+        username=config.REDIS_USERNAME,
+        password=config.REDIS_PASSWORD
+    )
+else:
+    redis_conn = Redis(host=config.REDIS_HOST, port=config.REDIS_PORT)

bfabric_web_apps/utils/redis_worker_init.py

@@ -20,15 +20,45 @@ def keepalive_ping(conn, interval=60):
             print("Redis keepalive ping failed:", e)
         time.sleep(interval)
 
-def run_worker(host, port, queue_names):
+def run_worker(host, port, queue_names, username=None, password=None):
     """
     Starts an RQ worker with a background Redis keepalive thread to prevent Azure from dropping idle connections.
     """
-    conn = redis.Redis(
-        host=host,
-        port=port,
-        socket_keepalive=True
-    )
+
+    def build_redis(protocol=2):
+        
+        if username and password:
+
+            print("Connecting to Redis with authentication.")
+            print(f"Host: {host}, Port: {port}, Username: {username}")
+
+            conn = redis.Redis(
+                host=host,
+                port=port,
+                username=username,
+                password=password,
+                socket_keepalive=True,
+                protocol=protocol
+            )
+
+        else:
+
+            print("Connecting to Redis without authentication.")
+            print(f"Host: {host}, Port: {port}")
+            
+            conn = redis.Redis(
+                host=host,
+                port=port,
+                socket_keepalive=True,
+                protocol=protocol
+            )
+        return conn
+    
+    try:
+        conn = build_redis(protocol=2)
+    except Exception as e: 
+        print("Failed to connect to Redis with protocol 2, trying protocol 3...")
+        conn = build_redis(protocol=3)
 
     # Start Redis keepalive thread
     threading.Thread(target=keepalive_ping, args=(conn,), daemon=True).start()

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.dist-info → bfabric_web_apps-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bfabric-web-apps
-Version: 0.2.0
+Version: 0.2.2
 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.2.dist-info/RECORD

@@ -0,0 +1,22 @@
+bfabric_web_apps/__init__.py,sha256=4ldtAK1Qs9l5xb8t2M3VL4oRmpQB5Qi71z2VZtfJGRI,1794
+bfabric_web_apps/layouts/layouts.py,sha256=z8gL4n4wwLdpLGomO9CftBLnGpc3r6OpmUc2-wBg8uo,14661
+bfabric_web_apps/objects/BfabricInterface.py,sha256=iz3m3SXtUVaEMm0ZRm-2IFePd2UkVu1ob87mq1ogLXA,10751
+bfabric_web_apps/objects/Logger.py,sha256=TdioFzxTHuXTRD1X2N9Pm2OlqcoPTzzXy_WQyt7lSNA,5224
+bfabric_web_apps/utils/app_init.py,sha256=RCdpCXp19cF74bouYJLPe-KSETZ0Vwqtd02Ta2VXEF8,428
+bfabric_web_apps/utils/callbacks.py,sha256=6ji5qsJpJa6MUnrwF_ypGRkSxjOv24-X-o9HREyjGQA,12716
+bfabric_web_apps/utils/charging.py,sha256=oNNazH59SFkbxJKPvCel0IxdsRHC8xpJ0AXCLvI88FI,1069
+bfabric_web_apps/utils/components.py,sha256=X3NRnv--LsHWMtWL83Pzr2whOZLSEJIwXTklQdAQpZE,984
+bfabric_web_apps/utils/config.py,sha256=gqTsO5tFWL7JVTzZgSk5xiyCrhJsBz3veoPBqHWAKC4,1324
+bfabric_web_apps/utils/create_app_in_bfabric.py,sha256=Z7puke8QB4SBuDJ9x3_OjgApzovKu0Nt1g8EqkOHJpc,2758
+bfabric_web_apps/utils/dataset_utils.py,sha256=p_UtoOl1kJpSm2BGdg31Ji0C7ctst40wp4LX1tUe4tI,3360
+bfabric_web_apps/utils/get_logger.py,sha256=0Y3SrXW93--eglS0_ZOc34NOriAt6buFPik5n0ltzRA,434
+bfabric_web_apps/utils/get_power_user_wrapper.py,sha256=T33z64XjmJ0KSlmfEmrEP8eYpbpINCVD6Xld_V7PR2g,1027
+bfabric_web_apps/utils/redis_connection.py,sha256=TPROVkI_gqlbiOorADfhpt26gby4xe7ppmxe8paVh8A,368
+bfabric_web_apps/utils/redis_queue.py,sha256=MCx7z_I2NusJ4P42mcLvV7STtXBFMIIvun83fM8zOGI,168
+bfabric_web_apps/utils/redis_worker_init.py,sha256=W_7XbvbGK7yDi2v7wO0WQJls0XYCsjs9ucn6-DLkPWc,1939
+bfabric_web_apps/utils/resource_utilities.py,sha256=N4EiUkxXHZ18jnU2OuRqaGSroCZ73Ogb9lkeA21Kvq4,5716
+bfabric_web_apps/utils/run_main_pipeline.py,sha256=-5o2QZW27OIvPJ_BtJ3s5UXoONOUcgUeXH4RSTN8oZg,23219
+bfabric_web_apps-0.2.2.dist-info/LICENSE,sha256=k0O_i2k13i9e35aO-j7FerJafAqzzu8x0kkBs0OWF3c,1065
+bfabric_web_apps-0.2.2.dist-info/METADATA,sha256=FpsbVNdputwhaI3gZLnMms1F0inGRMKdatzZh89uycQ,687
+bfabric_web_apps-0.2.2.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
+bfabric_web_apps-0.2.2.dist-info/RECORD,,

bfabric_web_apps-0.2.0.dist-info/RECORD

@@ -1,22 +0,0 @@
-bfabric_web_apps/__init__.py,sha256=eRYBvXrDM8Bhdm7cbI80L1hjtbRFqUasJiBW52Hx3TI,1715
-bfabric_web_apps/layouts/layouts.py,sha256=z8gL4n4wwLdpLGomO9CftBLnGpc3r6OpmUc2-wBg8uo,14661
-bfabric_web_apps/objects/BfabricInterface.py,sha256=cEUcAdr4iUH8aS2VGe3CFnAbNQiTj13hYuSVcDg725A,10646
-bfabric_web_apps/objects/Logger.py,sha256=62LC94xhm7YG5LUw3yH46NqvJQsAX7wnc9D4zbY16rA,5224
-bfabric_web_apps/utils/app_init.py,sha256=RCdpCXp19cF74bouYJLPe-KSETZ0Vwqtd02Ta2VXEF8,428
-bfabric_web_apps/utils/callbacks.py,sha256=tB1xtHl_ePY6KJWNz3erkrZw3HFhRneewGqZm9xIYtI,12687
-bfabric_web_apps/utils/charging.py,sha256=oNNazH59SFkbxJKPvCel0IxdsRHC8xpJ0AXCLvI88FI,1069
-bfabric_web_apps/utils/components.py,sha256=X3NRnv--LsHWMtWL83Pzr2whOZLSEJIwXTklQdAQpZE,984
-bfabric_web_apps/utils/config.py,sha256=F4EExu7EkY7upOnxk6BU6zTLt9eU6_iy2y8esIlxTSc,1209
-bfabric_web_apps/utils/create_app_in_bfabric.py,sha256=Z7puke8QB4SBuDJ9x3_OjgApzovKu0Nt1g8EqkOHJpc,2758
-bfabric_web_apps/utils/dataset_utils.py,sha256=p_UtoOl1kJpSm2BGdg31Ji0C7ctst40wp4LX1tUe4tI,3360
-bfabric_web_apps/utils/get_logger.py,sha256=0Y3SrXW93--eglS0_ZOc34NOriAt6buFPik5n0ltzRA,434
-bfabric_web_apps/utils/get_power_user_wrapper.py,sha256=T33z64XjmJ0KSlmfEmrEP8eYpbpINCVD6Xld_V7PR2g,1027
-bfabric_web_apps/utils/redis_connection.py,sha256=qXSPxW6m55Ogv44BhmPCl9ACuvzmpfZNU73UJhHRXL4,133
-bfabric_web_apps/utils/redis_queue.py,sha256=MCx7z_I2NusJ4P42mcLvV7STtXBFMIIvun83fM8zOGI,168
-bfabric_web_apps/utils/redis_worker_init.py,sha256=wtjQL48PLNXD1s-5s3Oq5EC8BmcfKcd7IhUbTH_EYz8,1014
-bfabric_web_apps/utils/resource_utilities.py,sha256=N4EiUkxXHZ18jnU2OuRqaGSroCZ73Ogb9lkeA21Kvq4,5716
-bfabric_web_apps/utils/run_main_pipeline.py,sha256=whmUbO9mMom9voOCv7iS51wh6St4DfawCD337BuPvtY,23112
-bfabric_web_apps-0.2.0.dist-info/LICENSE,sha256=k0O_i2k13i9e35aO-j7FerJafAqzzu8x0kkBs0OWF3c,1065
-bfabric_web_apps-0.2.0.dist-info/METADATA,sha256=vhqne76HPRsHA9uFhTPgP7wudTKYJq74V7GEQYR9S1I,687
-bfabric_web_apps-0.2.0.dist-info/WHEEL,sha256=d2fvjOD7sXsVzChCqf0Ty0JbHKBaLYwDbGQDwQTnJ50,88
-bfabric_web_apps-0.2.0.dist-info/RECORD,,