unity-devkit 0.1.16__py3-none-any.whl → 0.1.17__py3-none-any.whl

unity_devkit/dispatch_workflow_generator.py

@@ -1,4 +1,5 @@
 import json
+from collections import Counter
 from pathlib import Path
 from typing import Annotated
 
@@ -13,6 +14,7 @@ app = typer.Typer(add_completion=False, pretty_exceptions_show_locals=False)
 
 DUMP_EXECUTE_METHOD = "Outernet.PlayerBuild.DumpEnvironment"
 DISPATCH_INPUT_CAP = 25
+RESERVED_INPUT_IDS = frozenset({"environment-preset", "development"})
 NUMERIC_FIELD_TYPES = {
     "Byte",
     "SByte",
@@ -124,19 +126,26 @@ def extract_environment_dump(log_path: Path) -> EnvironmentDump:
 
 def render_dispatch_workflow(dump: EnvironmentDump, *, project: str, output: str, build_workflow: str) -> str:
     enums_by_name = {environment_enum.name: environment_enum for environment_enum in dump.enums}
-    input_blocks: list[tuple[str, str, list[str], str | None]] = [
+    emitted_fields = [field for field in dump.fields if field.path != dump.mode_field]
+    leaf_counts = Counter(field.path.rsplit(".", 1)[-1] for field in emitted_fields)
+    input_ids: dict[str, str] = {}
+    for field in emitted_fields:
+        leaf = field.path.rsplit(".", 1)[-1]
+        input_ids[field.path] = (
+            leaf if leaf_counts[leaf] == 1 and leaf not in RESERVED_INPUT_IDS else field.path.replace(".", "-")
+        )
+    default_preset = next(iter(dump.presets), "")
+    input_blocks: list[tuple[str, str | None, list[str], str | None]] = [
         (
             "environment-preset",
-            "Environment preset (Presets key) — empty leaves the workspace untouched",
+            "Preset to apply — blank leaves the workspace untouched; leave fields empty to keep the preset's values",
             ["type: choice", "options:", *indent_lines([*(f'- "{preset}"' for preset in ("", *dump.presets))], 2)],
-            'default: ""',
+            f'default: "{default_preset}"',
         ),
-        ("development", "Development build column", ["type: boolean"], "default: false"),
+        ("development", "Development build (debug symbols)", ["type: boolean"], "default: false"),
     ]
-    for field in dump.fields:
-        if field.path == dump.mode_field:
-            continue
-        input_blocks.append(field_input_block(field, enums_by_name))
+    for field in emitted_fields:
+        input_blocks.append(field_input_block(field, input_ids[field.path], enums_by_name))
 
     input_count = len(input_blocks)
     if input_count > DISPATCH_INPUT_CAP:
@@ -145,7 +154,7 @@ def render_dispatch_workflow(dump: EnvironmentDump, *, project: str, output: str
             "Shrink the env class or move configuration out of it."
         )
 
-    transport_lines = [field_transport_line(field) for field in dump.fields if field.path != dump.mode_field]
+    transport_lines = [field_transport_line(field, input_ids[field.path]) for field in emitted_fields]
     header = (
         f"# Generated by '{regen_command(project, output, build_workflow)}' from the environment class "
         f"{dump.class_name} —"
@@ -182,32 +191,23 @@ def regen_command(project: str, output: str, build_workflow: str) -> str:
 
 
 def field_input_block(
-    field: EnvironmentFieldDump, enums_by_name: dict[str, EnvironmentEnum]
-) -> tuple[str, str, list[str], str | None]:
-    input_id = field.path.replace(".", "-")
+    field: EnvironmentFieldDump, input_id: str, enums_by_name: dict[str, EnvironmentEnum]
+) -> tuple[str, str | None, list[str], str | None]:
     if field.field_type == "Boolean":
-        return (
-            input_id,
-            f"environment field {field.path} (bool) — checked overrides the preset value",
-            ["type: boolean"],
-            "default: false",
-        )
+        return (input_id, None, ["type: boolean"], "default: false")
 
     if field.field_type in enums_by_name:
         environment_enum = enums_by_name[field.field_type]
         if environment_enum.flags:
             return (
                 input_id,
-                (
-                    f"environment field {field.path} (flags: {', '.join(environment_enum.values)}) — "
-                    "comma-separated names, empty keeps the preset value"
-                ),
+                f"comma-separated: {', '.join(environment_enum.values)}",
                 ["type: string"],
                 'default: ""',
             )
         return (
             input_id,
-            f"environment field {field.path} ({environment_enum.name}) — empty keeps the preset value",
+            None,
             [
                 "type: choice",
                 "options:",
@@ -217,20 +217,10 @@ def field_input_block(
         )
 
     if field.field_type == "String":
-        return (
-            input_id,
-            f"environment field {field.path} (string) — empty keeps the preset value",
-            ["type: string"],
-            'default: ""',
-        )
+        return (input_id, None, ["type: string"], 'default: ""')
 
     if field.field_type in NUMERIC_FIELD_TYPES:
-        return (
-            input_id,
-            f"environment field {field.path} ({field.field_type}) — empty keeps the preset value",
-            ["type: number"],
-            None,
-        )
+        return (input_id, None, ["type: number"], None)
 
     raise SystemExit(
         f"Environment field '{field.path}' has type '{field.field_type}' — no dispatch input type maps to it "
@@ -238,8 +228,7 @@ def field_input_block(
     )
 
 
-def field_transport_line(field: EnvironmentFieldDump) -> str:
-    input_id = field.path.replace(".", "-")
+def field_transport_line(field: EnvironmentFieldDump, input_id: str) -> str:
     guard = "" if field.field_type == "Boolean" else " != ''"
     return (
         "${{ inputs['"
@@ -254,9 +243,12 @@ def field_transport_line(field: EnvironmentFieldDump) -> str:
     )
 
 
-def build_input_block(input_block: tuple[str, str, list[str], str | None]) -> list[str]:
+def build_input_block(input_block: tuple[str, str | None, list[str], str | None]) -> list[str]:
     input_id, description, type_lines, default_line = input_block
-    lines = [f"{input_id}:", f'  description: "{description}"', *[f"  {line}" for line in type_lines]]
+    lines = [f"{input_id}:"]
+    if description is not None:
+        lines.append(f'  description: "{description}"')
+    lines.extend(f"  {line}" for line in type_lines)
     if default_line is not None:
         lines.append(f"  {default_line}")
     return lines

{unity_devkit-0.1.16.dist-info → unity_devkit-0.1.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: unity-devkit
-Version: 0.1.16
+Version: 0.1.17
 Summary: Unity build, license, and CI tooling
 Requires-Python: >=3.13
 Requires-Dist: bashrun>=0.1.0

{unity_devkit-0.1.16.dist-info → unity_devkit-0.1.17.dist-info}/RECORD

@@ -2,7 +2,7 @@ unity_devkit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unity_devkit/build_unity.py,sha256=iROcoytNTlDnS2NeGxzARvOyNW08tee2PEBuKV54vFA,1536
 unity_devkit/ci_build_unity.py,sha256=XqYX--hUpvwYss7QCL1CNT8Jabiuz-DuEVrqqvK6PTE,3926
 unity_devkit/compile_check_unity.py,sha256=dLo2-c7y28SN88-oDsxQQPGLq3oV-MfFWABw3KB97IQ,1227
-unity_devkit/dispatch_workflow_generator.py,sha256=o0hri8uqUSENenE7WYwueXCiECAJAXSG4s4ECqml-Mw,9286
+unity_devkit/dispatch_workflow_generator.py,sha256=lPxCJjU16P-hLX_5z3wJKJ3lpDJ3lR8VnI7iR-1iy5Q,9286
 unity_devkit/install.py,sha256=tUzqhobqAL0fI47w4vAMgP3IB69836cuK0iKsoO7btA,5945
 unity_devkit/license.py,sha256=iiMdos8kMk4p5uYYroIWUzxvusXtcMRdPkIDXsYTC9c,1484
 unity_devkit/license_restore.py,sha256=Tbt2Kt1axszqj4H6K5Fx9_nqRL-dpL5XTVnxnmP4PZw,1077
@@ -12,7 +12,7 @@ unity_devkit/player_build.py,sha256=a3AgpqHk64WfN3TwUMzhF_NuhOOghcbfHhetdhfha8U,
 unity_devkit/projects.py,sha256=CBiIhnZUeGOSVznmlTCJ_Ey4P3FraBKSfZsvnVU0pXs,1971
 unity_devkit/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unity_devkit/test_unity.py,sha256=ayjoleM4Rnj0vbfVxiL52CofBukf12CBwRSrUvirqEA,1056
-unity_devkit-0.1.16.dist-info/METADATA,sha256=seG2ICc6iog2GWsv4ReCiJ66sy1p3u_5BJvcyhrXVos,290
-unity_devkit-0.1.16.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-unity_devkit-0.1.16.dist-info/entry_points.txt,sha256=wdkAD7hjUPC4tDwe1ulAo5a0vWPXPO5sSGX1iN6VvJc,588
-unity_devkit-0.1.16.dist-info/RECORD,,
+unity_devkit-0.1.17.dist-info/METADATA,sha256=OnYKknCqRZY-PRT8v5T48AacX4-lqPcfH_Yw6K1BVrE,290
+unity_devkit-0.1.17.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+unity_devkit-0.1.17.dist-info/entry_points.txt,sha256=wdkAD7hjUPC4tDwe1ulAo5a0vWPXPO5sSGX1iN6VvJc,588
+unity_devkit-0.1.17.dist-info/RECORD,,