scientiflow-cli 0.4.1__tar.gz → 0.4.3__tar.gz

{scientiflow_cli-0.4.1 → scientiflow_cli-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: scientiflow-cli
-Version: 0.4.1
+Version: 0.4.3
 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 → scientiflow_cli-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "scientiflow-cli"
-version = "0.4.1"
+version = "0.4.3"
 description = "CLI tool for scientiflow. This application runs on the client side, decodes pipelines, and executes them in the configured order!"
 authors = ["ScientiFlow <scientiflow@gmail.com>"]
 license = "Proprietary"

{scientiflow_cli-0.4.1 → scientiflow_cli-0.4.3}/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."""