Merge pull request #17 from als-computing/refactor_nersc_class_sfapi

Small modifications to PR #16: Adding .env vars for sfapi credentials, import dependency fix
als-computing · Apr 17, 2024 · 4a8eb64 · 4a8eb64
2 parents fbc221f + 914ceee
commit 4a8eb64
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/orchestration/flows/bl7012/config.py b/orchestration/flows/bl7012/config.py
@@ -3,20 +3,19 @@
 from orchestration import globus
 from ptycho_nersc import NerscPtychoClient
 
+import os
 
 class Config7012:
     def __init__(
         self,
-        path_client_id,
-        path_priv_key,
     ) -> None:
         config = globus.get_config()
         self.endpoints = globus.build_endpoints(config)
         self.apps = globus.build_apps(config)
         self.tc: TransferClient = globus.init_transfer_client(self.apps["als_transfer"])
         self.nersc = NerscPtychoClient(
-            path_client_id,
-            path_priv_key,
+            os.getenv("PATH_NERSC_ID"),
+            os.getenv("PATH_NERSC_PRI_KEY"),
         )
         self.nersc7012 = self.endpoints["nersc7012"]
         self.data7012 = self.endpoints["data7012"]
diff --git a/orchestration/flows/bl7012/ptycho_nersc.py b/orchestration/flows/bl7012/ptycho_nersc.py
@@ -1,4 +1,4 @@
-from orchestration.ptycho_jobscript import (
+from orchestration.flows.bl7012.ptycho_jobscript import (
     get_job_script,
     cdtool_args_string,
     ptychocam_args_string,