scientiflow-cli 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

scientiflow_cli/pipeline/decode_and_execute.py

@@ -109,34 +109,27 @@ class PipelineExecutor:
         except Exception as e:
             print(f"[ERROR] Failed to update terminal output: {e}")
 
+
     # def replace_variables(self, command: str) -> str:
     #     """Replace placeholders like ${VAR} with environment values."""
+    #     print(self.environment_variables)
     #     return re.sub(r'\$\{(\w+)\}', lambda m: self.environment_variables.get(m.group(1), m.group(0)), command)
 
-    # def replace_variables(self, command: str) -> str:
-    #     def replacer(match):
-    #         key = match.group(1)
-    #         value = self.environment_variables.get(key, match.group(0))
-    #         if isinstance(value, list):
-    #             # Convert list to safe, space-separated string
-    #             return " ".join(shlex.quote(str(v)) for v in value)
-    #         return shlex.quote(str(value)) if isinstance(value, str) else str(value)
-    #     replaced_command = re.sub(r'\$\{(\w+)\}', replacer, command)
-    #     return replaced_command
-
     def replace_variables(self, command: str) -> str:
+        """Replace placeholders like ${VAR} with environment values.
+        - If value is a list: safely join into space-separated arguments (quoted).
+        - Otherwise: use the old behavior (direct substitution).
+        """
         def replacer(match):
             key = match.group(1)
             value = self.environment_variables.get(key, match.group(0))
+            # ✅ Special handling for lists
             if isinstance(value, list):
-                # ✅ Only modify behavior for lists — safely join them
                 return " ".join(shlex.quote(str(v)) for v in value)
-            # ✅ For strings, keep old behavior (no quoting)
-            return value if isinstance(value, str) else str(value)
-
-        replaced_command = re.sub(r'\$\{(\w+)\}', replacer, command)
-        return replaced_command
-
+            # ✅ Default: keep original behavior for strings, numbers, None
+            return self.environment_variables.get(key, match.group(0))
+        return re.sub(r'\$\{(\w+)\}', replacer, command)
+        
 
     def execute_command(self, command: str):
         """Run the command in the terminal, display output in real-time, and log the captured output."""

{scientiflow_cli-0.4.1.dist-info → scientiflow_cli-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scientiflow-cli
-Version: 0.4.1
+Version: 0.4.2
 Summary: CLI tool for scientiflow. This application runs on the client side, decodes pipelines, and executes them in the configured order!
 License: Proprietary
 Author: ScientiFlow

{scientiflow_cli-0.4.1.dist-info → scientiflow_cli-0.4.2.dist-info}/RECORD

@@ -8,7 +8,7 @@ scientiflow_cli/config.py,sha256=_ThqpT5MpbE3fYh7WfmMQj6WLoEN5NNVkYMRvxv4ANc,345
 scientiflow_cli/main.py,sha256=TwCRK381_TYrJ5LAXlsSJdJVe8LhfD2SWGBtGp6hRFk,5278
 scientiflow_cli/pipeline/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scientiflow_cli/pipeline/container_manager.py,sha256=KAnE5AvsSg4cewLc_v4gWCqhKGoc7ycHOtl_HYxUK7E,8444
-scientiflow_cli/pipeline/decode_and_execute.py,sha256=4jGwv1g2esQ0u0J36Emf0TAKisQ7ANjGiDHZfD-BYSs,16737
+scientiflow_cli/pipeline/decode_and_execute.py,sha256=UxvEU5g--OMd_J3dt8PIcGeF82uDL2uanY54ZVbRk-M,16398
 scientiflow_cli/pipeline/get_jobs.py,sha256=69jOIVwXd8j2lAYy28r2QcsjFT4yRpXNOqsfopiZhFs,1498
 scientiflow_cli/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scientiflow_cli/services/auth_service.py,sha256=lknARfVTjRCH-4yWVPKiS330NIVHxFw3HlQdN2Lw3Og,3343
@@ -23,8 +23,8 @@ scientiflow_cli/utils/file_manager.py,sha256=J6FBaZ0xz6OH4vcArOGj5KqKSZ2AD78HNei
 scientiflow_cli/utils/logger.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 scientiflow_cli/utils/mock.py,sha256=UZ9cN2Qx3EAXcxnLQY5z4DQWy4jflnWFnfNTsuvnFH8,11237
 scientiflow_cli/utils/singularity.py,sha256=MPBMpL_9ik9mKApht9LKf1zlyMjNk8GGfKFhbrZHErs,4747
-scientiflow_cli-0.4.1.dist-info/LICENSE.md,sha256=nb6GGGYuS_KXe33mSNwcEW-QzvwM475NQ4cNE7KBb34,425
-scientiflow_cli-0.4.1.dist-info/METADATA,sha256=uyLky9fOE6TjEWNxhpw-YfgCAba4IfTchxKXHuwJG-w,2491
-scientiflow_cli-0.4.1.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-scientiflow_cli-0.4.1.dist-info/entry_points.txt,sha256=0lq2mjcG5hGfODrQodeMSAy9RfE2EX1MZSHRpfSncxc,61
-scientiflow_cli-0.4.1.dist-info/RECORD,,
+scientiflow_cli-0.4.2.dist-info/LICENSE.md,sha256=nb6GGGYuS_KXe33mSNwcEW-QzvwM475NQ4cNE7KBb34,425
+scientiflow_cli-0.4.2.dist-info/METADATA,sha256=aPNmj6g_5enMVn2qHCkItfBIK-cmkKzW9x9TkndHOF4,2491
+scientiflow_cli-0.4.2.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+scientiflow_cli-0.4.2.dist-info/entry_points.txt,sha256=0lq2mjcG5hGfODrQodeMSAy9RfE2EX1MZSHRpfSncxc,61
+scientiflow_cli-0.4.2.dist-info/RECORD,,