torizon-templates-utils 0.0.9__tar.gz → 0.0.11__tar.gz

{torizon_templates_utils-0.0.9 → torizon_templates_utils-0.0.11}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: torizon_templates_utils
-Version: 0.0.9
+Version: 0.0.11
 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
@@ -8,13 +8,13 @@ Project-URL: Issues, https://github.com/torizon/vscode-torizon-templates/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: torizon-io-api
 Requires-Dist: requests
 Requires-Dist: pyyaml
 Requires-Dist: debugpy
+Requires-Dist: pkginfo>=1.12
 
 # Torizon Templates Utils
 

{torizon_templates_utils-0.0.9 → torizon_templates_utils-0.0.11}/pyproject.toml

@@ -1,16 +1,16 @@
 [build-system]
-requires = ["setuptools>=61.0"]
+requires = ["setuptools>=70.0", "pkginfo>=1.12"]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "torizon_templates_utils"
-version = "0.0.9"
+version = "0.0.11"
 authors = [
   { name="Matheus Castello", email="matheus.castello@toradex.com" },
 ]
 description = "Package with utilities for Torizon Templates scripts"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.10"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: MIT License",
@@ -20,9 +20,13 @@ dependencies = [
     "torizon-io-api",
     "requests",
     "pyyaml",
-    "debugpy"
+    "debugpy",
+    "pkginfo>=1.12"
 ]
 
+[tool.setuptools]
+license-files = []
+
 [project.urls]
 Homepage = "https://github.com/torizon/vscode-torizon-templates"
 Issues = "https://github.com/torizon/vscode-torizon-templates/issues"

{torizon_templates_utils-0.0.9 → torizon_templates_utils-0.0.11}/torizon_templates_utils/network.py

@@ -6,14 +6,14 @@ import subprocess
 
 def get_host_ip():
     if 'WSL_DISTRO_NAME' in os.environ and os.environ['WSL_DISTRO_NAME'] != '':
-        command = ["/mnt/c/Windows/System32/Wbem/WMIC.exe", "NICCONFIG", "WHERE", "IPEnabled=true", "GET", "IPAddress"]
+        command = ["/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe", "-c", '(Get-NetIPAddress -AddressFamily IPv4 -InterfaceAlias (Get-NetRoute -DestinationPrefix "0.0.0.0/0").InterfaceAlias).IPAddress']
 
         # if inside a container we need to run the command in the host
         if "APOLLOX_CONTAINER" in os.environ:
             command = [
                 "sudo", "nsenter", "-t", "1", "-m", "-u", "-n", "-i",
                 "--",
-                "/mnt/c/Windows/System32/Wbem/WMIC.exe", "NICCONFIG", "WHERE", "IPEnabled=true", "GET", "IPAddress"
+                "/mnt/c/Windows/System32/WindowsPowerShell/v1.0/powershell.exe", "-c", '(Get-NetIPAddress -AddressFamily IPv4 -InterfaceAlias (Get-NetRoute -DestinationPrefix "0.0.0.0/0").InterfaceAlias).IPAddress'
             ]
 
         result = subprocess.run(command, capture_output=True, text=True)
@@ -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.9 → torizon_templates_utils-0.0.11}/torizon_templates_utils/tasks.py

@@ -8,13 +8,14 @@ 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')
 
 def replace_tasks_input():
     for file in Path('.').rglob('*.json'):
-        print(file)
+        print(file, flush=True)
         mime_type, _ = mimetypes.guess_type(file)
 
         if mime_type is None or mime_type.startswith("application/octet-stream"):
@@ -397,17 +398,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:
@@ -428,12 +467,12 @@ class TaskRunner:
         self.__settings = settings
         self.__debug = debug
         self.__gitlab_ci = False
-        self.__override_env = False
+        self.__tasks_override_env = False
         self.__cli_inputs: Dict[str, str] = {}
         self.__can_receive_interactive_input = False
 
         # check if we have stdin
-        if os.isatty(0) and ("TASKS_DISABLE_INTERACTIVE_INPUT" not in os.environ):
+        if os.isatty(0) and (("TASKS_DISABLE_INTERACTIVE_INPUT" not in os.environ) or (os.environ["TASKS_DISABLE_INTERACTIVE_INPUT"] != "True")):
             self.__can_receive_interactive_input = True
 
         # environment configs
@@ -443,10 +482,10 @@ class TaskRunner:
         if "GITLAB_CI" in os.environ:
             self.__gitlab_ci = True
 
-        if "TASKS_OVERRIDE_ENV" in os.environ:
-            self.__override_env = True
+        if "TASKS_OVERRIDE_ENV" in os.environ and os.environ["TASKS_OVERRIDE_ENV"] == "True":
+            self.__tasks_override_env = True
 
-        if "TASKS_DEBUG" in os.environ:
+        if "TASKS_DEBUG" in os.environ and os.environ["TASKS_DEBUG"] == "True":
             self.__debug = True
 
         self.__settings_to_env()
@@ -473,10 +512,10 @@ class TaskRunner:
         for task in self.__tasks:
             if no_index:
                 if show_hidden or not task.hide:
-                    print(task.label)
+                    print(task.label, flush=True)
             else:
                 if show_hidden or not task.hide:
-                    print(f"{i}. \t{task.label}")
+                    print(f"{i}. \t{task.label}", flush=True)
 
             i += 1
 
@@ -503,7 +542,7 @@ class TaskRunner:
 
         if task is not None:
             task_txt = json.dumps(task.to_dict(), indent=4)
-            print(task_txt)
+            print(task_txt, flush=True)
         else:
             raise ReferenceError(f"Task with index [{label}] not found")
 
@@ -558,7 +597,7 @@ class TaskRunner:
                     _p_ret = subprocess.run(
                         [
                             "xonsh",
-                            "./conf/torizon-io.xsh",
+                            "./.conf/torizon-io.xsh",
                             "package", "latest", "version",
                             os.environ["config:tcb_packageName"]
                         ],
@@ -585,7 +624,7 @@ class TaskRunner:
                         raise ValueError(f"Package version should be in one of the following formats: <int>, <string-int>, <major.minor.patch>, or <string-major.minor.patch>. Depending on format, int or patch value will be incremented")
 
                     if self.__debug:
-                        print(f"Next package version: {_next}")
+                        print(f"Next package version: {_next}", flush=True)
 
                     value = value.replace(f"${{command:tcb.getNextPackageVersion}}", f"{_next}")
 
@@ -797,8 +836,8 @@ class TaskRunner:
                 exp_value_str = " ".join(expvalue)
 
                 if self.__debug:
-                    print(f"Env: {env}={_env_value}", color=Color.YELLOW)
-                    print(f"Parsed Env: {env}={exp_value_str}", color=Color.YELLOW)
+                    print(f"Env: {env}={_env_value}", color=Color.YELLOW, flush=True)
+                    print(f"Parsed Env: {env}={exp_value_str}", color=Color.YELLOW, flush=True)
 
                 return exp_value_str
 
@@ -806,7 +845,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
@@ -835,6 +874,16 @@ class TaskRunner:
         if _task is None:
             raise ReferenceError(f"Task with label [{label}] not found")
 
+        _depends = []
+        if _task.dependsOn is not None:
+            _depends = _task.dependsOn
+
+        # first we need to run the dependencies
+        for dep in _depends:
+            self.run_task(dep)
+
+        print(f"> Executing task: {label} <", color=Color.GREEN, flush=True)
+
         # prepare the command
         _cmd = _task.command
 
@@ -858,16 +907,6 @@ class TaskRunner:
             _env = _task.options.env
             _cwd = _task.options.cwd
 
-        _depends = []
-        if _task.dependsOn is not None:
-            _depends = _task.dependsOn
-
-        # first we need to run the dependencies
-        for dep in _depends:
-            self.run_task(dep)
-
-        print(f"> Executing task: {label} <", color=Color.GREEN)
-
         _is_background = ""
         if _task.isBackground:
             _is_background = " &"
@@ -894,18 +933,15 @@ class TaskRunner:
         if self.__gitlab_ci:
             _cmd = self.__replace_docker_host(_cmd)
 
-        # inject env
+        task_env = os.environ.copy()
+        # If TASKS_OVERRIDE_ENV is true, override the env vars with the
+        # env var values present on the task. If false, set just the env vars
+        # present on the task that doesn't already exist on the env var
         if _env is not None:
-            for env, value in _env.items():
-                if self.__override_env:
-                    if env not in os.environ:
-                        __env = self.__parse_envs(env, _task)
-                        if __env:
-                            os.environ[env] = __env
-                else:
-                    __env = self.__parse_envs(env, _task)
-                    if __env:
-                        os.environ[env] = __env
+            for env, _ in _env.items():
+                if self.__tasks_override_env == True or env not in os.environ:
+                    __parsed_env_value = self.__parse_envs(env, _task)
+                    task_env[env] = __parsed_env_value
 
         # we need to change the cwd if it's set
         if _cwd is not None:
@@ -919,10 +955,10 @@ class TaskRunner:
         _cmd_join = f"{_cmd} {' '.join(_args)}{_is_background}"
 
         if self.__debug:
-            print(f"Command: {_task.command}", color=Color.YELLOW)
-            print(f"Args: {_task.args}", color=Color.YELLOW)
-            print(f"Parsed Args: {_args}", color=Color.YELLOW)
-            print(f"Parsed Command: {_cmd_join}", color=Color.YELLOW)
+            print(f"Command: {_task.command}", color=Color.YELLOW, flush=True)
+            print(f"Args: {_task.args}", color=Color.YELLOW, flush=True)
+            print(f"Parsed Args: {_args}", color=Color.YELLOW, flush=True)
+            print(f"Parsed Command: {_cmd_join}", color=Color.YELLOW, flush=True)
 
         # use bash to execute the VSCode tasks commands and scripts, as they
         # are written and tested in bash. Valid just for commands of shell
@@ -931,7 +967,7 @@ class TaskRunner:
             [_cmd, *_args] if not _shell else _cmd_join,
             stdout=None,
             stderr=None,
-            env=os.environ,
+            env=task_env,
             shell=_shell,
             executable="/bin/bash" if _shell else None
         )
@@ -940,5 +976,5 @@ class TaskRunner:
         os.chdir(_last_cwd)
 
         if _ret.returncode != 0:
-            print(f"> TASK [{label}] exited with error code [{_ret.returncode}] <", color=Color.RED)
+            print(f"> TASK [{label}] exited with error code [{_ret.returncode}] <", color=Color.RED, flush=True)
             raise RuntimeError(f"Error running task: {label}")

{torizon_templates_utils-0.0.9 → torizon_templates_utils-0.0.11}/torizon_templates_utils.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: torizon_templates_utils
-Version: 0.0.9
+Version: 0.0.11
 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
@@ -8,13 +8,13 @@ Project-URL: Issues, https://github.com/torizon/vscode-torizon-templates/issues
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: POSIX :: Linux
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-License-File: LICENSE
 Requires-Dist: torizon-io-api
 Requires-Dist: requests
 Requires-Dist: pyyaml
 Requires-Dist: debugpy
+Requires-Dist: pkginfo>=1.12
 
 # Torizon Templates Utils
 

{torizon_templates_utils-0.0.9 → torizon_templates_utils-0.0.11}/torizon_templates_utils.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-LICENSE
 README.md
 pyproject.toml
 torizon_templates_utils/__init__.py

{torizon_templates_utils-0.0.9 → torizon_templates_utils-0.0.11}/torizon_templates_utils.egg-info/requires.txt

@@ -2,3 +2,4 @@ torizon-io-api
 requests
 pyyaml
 debugpy
+pkginfo>=1.12

torizon_templates_utils-0.0.9/LICENSE

@@ -1,23 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) Toradex AG 2024
-
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.