torizon-templates-utils 0.0.10__tar.gz → 1.0.0__tar.gz

{torizon_templates_utils-0.0.10 → torizon_templates_utils-1.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: torizon_templates_utils
-Version: 0.0.10
+Version: 1.0.0
 Summary: Package with utilities for Torizon Templates scripts
 Author-email: Matheus Castello <matheus.castello@toradex.com>
 Project-URL: Homepage, https://github.com/torizon/vscode-torizon-templates

{torizon_templates_utils-0.0.10 → torizon_templates_utils-1.0.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "torizon_templates_utils"
-version = "0.0.10"
+version = "1.0.0"
 authors = [
   { name="Matheus Castello", email="matheus.castello@toradex.com" },
 ]

{torizon_templates_utils-0.0.10 → torizon_templates_utils-1.0.0}/torizon_templates_utils/network.py

@@ -33,3 +33,12 @@ def get_host_ip():
 
         result = subprocess.run(command, capture_output=True, text=True)
         return result.stdout.split()[0]
+
+
+def is_in_docker_container():
+    return os.path.exists("/.dockerenv")
+
+
+def is_in_gitlab_ci_container():
+    return "GITLAB_CI" in os.environ and is_in_docker_container()
+

{torizon_templates_utils-0.0.10 → torizon_templates_utils-1.0.0}/torizon_templates_utils/tasks.py

@@ -8,10 +8,17 @@ import mimetypes
 import subprocess
 from pathlib import Path
 from typing import List, Dict, Type, TypeVar, Union, Tuple, Optional, Literal
+from torizon_templates_utils.network import is_in_docker_container
 from torizon_templates_utils.colors import print, Color
 
 T = TypeVar('T')
 
+REPLACE_WHITELIST = [
+    "torizon_",
+    "docker_",
+    "inputBox-"
+]
+
 def replace_tasks_input():
     for file in Path('.').rglob('*.json'):
         print(file, flush=True)
@@ -22,9 +29,9 @@ def replace_tasks_input():
                 with open(file, 'r') as f:
                     content = f.read()
 
-                content = content.replace("input:dockerLogin", "command:docker_login")
-                content = content.replace("input:dockerImageRegistry", "command:docker_registry")
-                content = content.replace("input:dockerPsswd", "command:docker_password")
+                content = content.replace("input:dockerLogin", "command:docker_login.__change__")
+                content = content.replace("input:dockerImageRegistry", "command:inputBox-docker_registry.__change__")
+                content = content.replace("input:dockerPsswd", "command:docker_password.__change__")
 
                 with open(file, 'w') as f:
                     f.write(content)
@@ -397,17 +404,55 @@ def get_tasks_json(file_path: str) -> TaskConfiguration:
 
 
 def get_settings_json(
-        file_path: str,
-        custom_file: str | None = None
+    file_path: str,
+    custom_file: str | None = None
 ) -> TorizonSettings:
     _file = custom_file if custom_file else "settings.json"
+    local_settings_path = Path(file_path) / ".vscode" / _file
+
+    try:
+        with open(local_settings_path, 'r') as file:
+            local_settings = json.load(file)
+    except FileNotFoundError:
+        print(f"No local settings file found at {local_settings_path}")
+        local_settings = {}
+    except json.JSONDecodeError as e:
+        raise ValueError(f"Invalid JSON in settings file: {e}")
+
+    workspace_settings = {}
+    parent_dir = Path(file_path).parent
+    # First check for .code-workspace files directly inside the parent
+    for child in parent_dir.glob("*.code-workspace"):
+        try:
+            with open(child, "r") as ws_file:
+                data = json.load(ws_file)
+                if "settings" in data:
+                    print(f"Merging settings from: {child}")
+                    workspace_settings = data["settings"]
+                    break
+        except Exception as e:
+            print(f"Error reading {child}: {e}")
+
+    # If not found, scan folders in parent_dir
+    if not workspace_settings:
+        for sub in parent_dir.iterdir():
+            if sub.is_dir():
+                for child in sub.glob("*.code-workspace"):
+                    try:
+                        with open(child, "r") as ws_file:
+                            data = json.load(ws_file)
+                            if "settings" in data:
+                                print(f"Merging settings from: {child}")
+                                workspace_settings = data["settings"]
+                                break
+                    except Exception as e:
+                        print(f"Error reading {child}: {e}")
+                if workspace_settings:
+                    break
 
-    with open(f"{file_path}/.vscode/{_file}", 'r') as file:
-        _tor_settings = _cast_from_json(json.load(file), TorizonSettings)
-
-
-
-        return _tor_settings
+    # Merge with local settings taking precedence
+    combined = {**workspace_settings, **local_settings}
+    return _cast_from_json(combined, TorizonSettings)
 
 
 class TaskRunner:
@@ -437,8 +482,8 @@ class TaskRunner:
             self.__can_receive_interactive_input = True
 
         # environment configs
-        if "DOCKER_PSSWD" in os.environ:
-            os.environ["config:docker_password"] = os.environ["DOCKER_PSSWD"]
+        if "DOCKER_PASSWORD" in os.environ:
+            os.environ["config:docker_password"] = os.environ["DOCKER_PASSWORD"]
 
         if "GITLAB_CI" in os.environ:
             self.__gitlab_ci = True
@@ -531,7 +576,42 @@ class TaskRunner:
 
         for value in env:
             if "${command:torizon_" in value:
+                # here is not needed to clean the torizon_<prop>.<project_name>
+                # because this will be handled on the cmd args check
                 value = value.replace("${command:torizon_", "${config:torizon_")
+
+            ret.append(value)
+
+        return ret
+
+
+    def __check_input_boxes(self, env: List[str]) -> List[str]:
+        ret: List[str] = []
+
+        for value in env:
+            value = value.replace("${command:inputBox-", "${config:")
+            ret.append(value)
+
+        return ret
+
+
+    def __check_cmd_args(self, env: List[str]) -> List[str]:
+        ret: List[str] = []
+
+        for value in env:
+            for whitelisted_start in REPLACE_WHITELIST:
+                if value.startswith("${command:" + whitelisted_start) or value.startswith("${config:" + whitelisted_start):
+
+                    if "." in value:
+                        value_p1, value_p2 = value.split(".", 1)
+                        ret_p2 = value_p2.split("}", 1)
+
+                        if len(ret_p2) > 1:
+                            value = f"{value_p1}}}{ret_p2[1]}"
+                        else:
+                            value = f"{value_p1}}}"
+                    break
+
             ret.append(value)
 
         return ret
@@ -788,7 +868,9 @@ class TaskRunner:
 
             if _env_value:
                 expvalue = [_env_value]
+                expvalue = self.__check_cmd_args(expvalue)
                 expvalue = self.__check_workspace_folder(expvalue)
+                expvalue = self.__check_input_boxes(expvalue)
                 expvalue = self.__check_torizon_inputs(expvalue)
                 expvalue = self.__check_docker_inputs(expvalue)
                 expvalue = self.__check_tcb_inputs(expvalue)
@@ -806,7 +888,7 @@ class TaskRunner:
 
 
     def __replace_docker_host(self, arg: str) -> str:
-        if "DOCKER_HOST" in arg:
+        if "DOCKER_HOST" in arg and is_in_docker_container():
             arg = arg.replace("DOCKER_HOST=", "DOCKER_HOST=tcp://docker:2375")
 
         return arg
@@ -849,7 +931,9 @@ class TaskRunner:
         _cmd = _task.command
 
         # the cmd itself can use the mechanism to replace stuff
+        _cmd = self.__check_cmd_args([_cmd])[0]
         _cmd = self.__check_workspace_folder([_cmd])[0]
+        _cmd = self.__check_input_boxes([_cmd])[0]
         _cmd = self.__check_torizon_inputs([_cmd])[0]
         _cmd = self.__check_docker_inputs([_cmd])[0]
         _cmd = self.__check_tcb_inputs([_cmd])[0]
@@ -877,7 +961,9 @@ class TaskRunner:
         # FIXME:    The scape args was in the powershell implementation
         #           but when used on Python it generates weird behavior
         # _args = self.__scape_args(_args)
+        _args = self.__check_cmd_args(_args)
         _args = self.__check_workspace_folder(_args)
+        _args = self.__check_input_boxes(_args)
         _args = self.__check_torizon_inputs(_args)
         _args = self.__check_docker_inputs(_args)
         _args = self.__check_tcb_inputs(_args)
@@ -885,9 +971,12 @@ class TaskRunner:
         _args = self.__check_vscode_env(_args)
         _args = self.__check_config(_args)
         _args = self.__check_workspace_folder(_args)
+
+        if _shell:
+            _args = self.__check_long_args(_args)
+
         # FIXME:    These was in the powershell implementation
         #           but when used on Python it generates weird behavior
-        # _args = self.__check_long_args(_args)
         # _args = self.__quoting_special_chars(_args)
 
         # if in gitlab ci env we need to replace the DOCKER_HOST

{torizon_templates_utils-0.0.10 → torizon_templates_utils-1.0.0}/torizon_templates_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: torizon_templates_utils
-Version: 0.0.10
+Version: 1.0.0
 Summary: Package with utilities for Torizon Templates scripts
 Author-email: Matheus Castello <matheus.castello@toradex.com>
 Project-URL: Homepage, https://github.com/torizon/vscode-torizon-templates