Release version 0.0.0.dev444

Author: AAriam

pkg/pyproject.toml

@@ -17,7 +17,7 @@ namespaces = true
 # ----------------------------------------- Project Metadata -------------------------------------
 #
 [project]
-version = "0.0.0.dev443"
+version = "0.0.0.dev444"
 name = "ControlMan"
 dependencies = [
     "packaging >= 23.2, < 24",

pkg/src/controlman/_data/schema/main.yaml

@@ -348,19 +348,19 @@ patternProperties:
           tasks_local:
             summary: Path to the local tasks script file.
             $ref: https://jsonschemata.repodynamics.com/path/posix/absolute-from-cwd
-            default: ${{ .root }}$/${{ devcontainer.container.rel_path.tasks_local }}$
+            default: ${{ .root }}$/${{ devcontainer.containers.rel_path.tasks_local }}$
           tasks_global:
             summary: Path to the global tasks script file.
             $ref: https://jsonschemata.repodynamics.com/path/posix/absolute-from-cwd
-            default: ${{ .root }}$/${{ devcontainer.container.rel_path.tasks_global }}$
+            default: ${{ .root }}$/${{ devcontainer.containers.rel_path.tasks_global }}$
           environment:
             summary: Path to the environment directory.
             $ref: https://jsonschemata.repodynamics.com/path/posix/absolute-from-cwd
-            default: ${{ .root }}$/${{ devcontainer.container.rel_path.environment }}$
+            default: ${{ .root }}$/${{ devcontainer.containers.rel_path.environment }}$
           conda_rel:
             summary: Path to the conda directory relative to the environment directory.
             type: string
-            default: ${{ devcontainer.container.rel_path.conda }}$
+            default: ${{ devcontainer.containers.rel_path.conda }}$
           conda:
             summary: Path to the conda environment directory.
             $ref: https://jsonschemata.repodynamics.com/path/posix/absolute-from-cwd
@@ -369,7 +369,7 @@ patternProperties:
           apt_rel:
             summary: Path to the apt file relative to the environment directory.
             type: string
-            default: ${{ devcontainer.container.rel_path.apt }}$
+            default: ${{ devcontainer.containers.rel_path.apt }}$
           apt:
             summary: Path to the apt file.
             $ref: https://jsonschemata.repodynamics.com/path/posix/absolute-from-cwd

pkg/src/controlman/center_manager.py

@@ -115,6 +115,10 @@ def load(self) -> _ps.NestedDict:
                 cache_manager=self._cache_manager,
                 github_token=self._github_token,
             )
+
+        def get_prefix(get, prefix: str):
+            return [get(key) for key in full_data.keys() if key.startswith(prefix)]
+
         self._data_raw = _ps.NestedDict(
             full_data,
             code_context={
@@ -133,6 +137,7 @@ def load(self) -> _ps.NestedDict:
                 "team_members_with_role_types": _helper.team_members_with_role_types,
                 "team_members_without_role_types": _helper.team_members_without_role_types,
                 "team_members_with_role_ids": _helper.team_members_with_role_ids,
+                "get_prefix": get_prefix,
             },
             code_context_call=code_context_call,
             relative_template_keys=const.RELATIVE_TEMPLATE_KEYS,

pkg/src/controlman/datatype.py

@@ -7,7 +7,8 @@ class DynamicFileType(_Enum):
     DEVCONTAINER_DOCKERFILE = ("devcontainer_dockerfile", "Devcontainer Dockerfile")
     DEVCONTAINER_APT = ("devcontainer_apt", "Devcontainer Apt Packages")
     DEVCONTAINER_CONDA = ("devcontainer_conda", "Devcontainer Conda Environment")
-    DEVCONTAINER_TASK = ("devcontainer_task", "Devcontainer Bash Tasks")
+    DEVCONTAINER_TASK_LOCAL = ("devcontainer_task_local", "Devcontainer Bash Tasks (Local)")
+    DEVCONTAINER_TASK_GLOBAL = ("devcontainer_task_global", "Devcontainer Bash Tasks (Global)")
     DEVCONTAINER_FEATURE_METADATA = ("devcontainer_feature_metadata", "Devcontainer Feature Metadata")
     DEVCONTAINER_FEATURE_INSTALL = ("devcontainer_feature_install", "Devcontainer Feature Install Script")
     CUSTOM = ("custom", "Custom")

pkg/src/controlman/file_gen/__init__.py

@@ -47,7 +47,7 @@ def generate(
         ):
             type_dict = data_entry.setdefault(generated_file.type.value[0], {})
             if generated_file.subtype[0] in type_dict:
-                raise RuntimeError(f"Duplicate dynamic file subtype: {generated_file.subtype[0]}")
+                raise RuntimeError(f"Duplicate dynamic file type and subtype: {generated_file.type.value[0]} {generated_file.subtype[0]}")
             type_dict[generated_file.subtype[0]] = generated_file.path
     data["project.file"] = data_entry
     metadata_file = _dtype.DynamicFile(

pkg/src/controlman/file_gen/config.py

@@ -194,7 +194,7 @@ def create_docker_compose():
                 service.setdefault("build", {}).update(
                     {
                         "context": path_to_root_from_compose_file,
-                        "dockerfile": f"{container["path"]}/Dockerfile",
+                        "dockerfile": container["path"]["dockerfile"],
                     }
                 )
                 services[service_name] = {
@@ -290,8 +290,6 @@ def add_lines(content: str):
 
         for container_id, container in devcontainers.items():
             container_before = self._data_before.get(f"devcontainer_{container_id}", {})
-            dir_path = container["path"]
-            dir_path_before = container_before.get("path", dir_path)
             dockerfile = DynamicFile(
                 type=DynamicFileType.DEVCONTAINER_DOCKERFILE,
                 subtype=(container_id, container["container"].get("name", container_id)),
@@ -304,10 +302,11 @@ def add_lines(content: str):
             )
             out.append(dockerfile)
             # devcontainer.json file
-            container_path = f"{dir_path}/devcontainer.json"
+            container_path = f"{container["path"]["root"]}/devcontainer.json"
             container["container"].setdefault("dockerComposeFile", []).append(
                 _os.path.relpath(docker_compose_path, _os.path.dirname(container_path))
             )
+            dir_path_before = container_before.get("path", {}).get("root")
             container_file = DynamicFile(
                 type=DynamicFileType.DEVCONTAINER_METADATA,
                 subtype=(container_id, container.get("name", container_id)),
@@ -317,7 +316,7 @@ def add_lines(content: str):
                     **self._data["default"]["file_setting"]["json"],
                 ),
                 path=container_path,
-                path_before=f"{dir_path_before}/devcontainer.json",
+                path_before=f"{dir_path_before}/devcontainer.json" if dir_path_before else None,
             )
             out.append(container_file)
             # apt.txt file
@@ -371,7 +370,7 @@ def add_lines(content: str):
                         )
             for typ in tasks.keys():
                 task_file = DynamicFile(
-                    type=DynamicFileType.DEVCONTAINER_TASK,
+                    type=DynamicFileType[f"DEVCONTAINER_TASK_{typ.upper()}"],
                     subtype=(container_id, container.get("name", container_id)),
                     content=_unit.create_dynamic_file(
                         file_type="txt",