torizon-templates-utils 0.0.10__py3-none-any.whl → 0.0.11__py3-none-any.whl

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/tasks.py

@@ -8,6 +8,7 @@ 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')
@@ -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:
@@ -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

{torizon_templates_utils-0.0.10.dist-info → torizon_templates_utils-0.0.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: torizon_templates_utils
-Version: 0.0.10
+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

{torizon_templates_utils-0.0.10.dist-info → torizon_templates_utils-0.0.11.dist-info}/RECORD

@@ -4,9 +4,9 @@ torizon_templates_utils/args.py,sha256=nN1b9Ts2lEYbpAGzaMWpAcmcYIrTUFJHehM_UqvnC
 torizon_templates_utils/colors.py,sha256=Y1FZ0HtKvXfLGYTDclsXubtZCQ-epuch5Dgk1DJdjps,1143
 torizon_templates_utils/debug.py,sha256=OfdKSdN1kypuJnV_WcPa9bvonjyDvXvA3QTmc1iKyjw,556
 torizon_templates_utils/errors.py,sha256=Wkk0AeCx0KQW-Qlu_5A6GYaGUkaJU79Mok8lZuZKHjM,1425
-torizon_templates_utils/network.py,sha256=NpBeJlvpCY0Gvdc8ZzCKfmAk6zGYD_gLx-rTzZn9ZsU,1528
-torizon_templates_utils/tasks.py,sha256=9G0SiSO4VEA5XccozNSjYwDsc2RZoAPO_iSwjsE5JDk,32808
-torizon_templates_utils-0.0.10.dist-info/METADATA,sha256=aQMMGaOpa5FYhna733e39T0dbzvgpSUe-n2S5_PhZx0,977
-torizon_templates_utils-0.0.10.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
-torizon_templates_utils-0.0.10.dist-info/top_level.txt,sha256=qlOkS1ASF5C-kSfpbiWbVHJFgmQ0RN6iunmLArNt6zc,24
-torizon_templates_utils-0.0.10.dist-info/RECORD,,
+torizon_templates_utils/network.py,sha256=SFZivQumv-pVL0vglYCW3JS6WWCUG8asoMdgljeJZ24,1703
+torizon_templates_utils/tasks.py,sha256=lDRIF9EXA-cjzLqWYmcf717M4pu6LkJYY5fYbuSu80Y,34597
+torizon_templates_utils-0.0.11.dist-info/METADATA,sha256=PmYKN9vm5QHKexPGflu7Jm8fVnZLpK1iKEd-4a8e_Vw,977
+torizon_templates_utils-0.0.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+torizon_templates_utils-0.0.11.dist-info/top_level.txt,sha256=qlOkS1ASF5C-kSfpbiWbVHJFgmQ0RN6iunmLArNt6zc,24
+torizon_templates_utils-0.0.11.dist-info/RECORD,,

{torizon_templates_utils-0.0.10.dist-info → torizon_templates_utils-0.0.11.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (78.0.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any