mcpforunityserver 9.3.0b20260128055651__py3-none-any.whl → 9.3.0b20260129121506__py3-none-any.whl

cli/commands/ui.py

@@ -6,7 +6,7 @@ from typing import Optional, Any
 
 from cli.utils.config import get_config
 from cli.utils.output import format_output, print_error, print_success
-from cli.utils.connection import run_command, UnityConnectionError
+from cli.utils.connection import run_command, handle_unity_errors
 
 
 @click.group()
@@ -24,6 +24,7 @@ def ui():
     default="ScreenSpaceOverlay",
     help="Canvas render mode."
 )
+@handle_unity_errors
 def create_canvas(name: str, render_mode: str):
     """Create a new Canvas.
 
@@ -34,41 +35,44 @@ def create_canvas(name: str, render_mode: str):
     """
     config = get_config()
 
-    try:
-        # Step 1: Create empty GameObject
-        result = run_command("manage_gameobject", {
-            "action": "create",
-            "name": name,
-        }, config)
+    # Step 1: Create empty GameObject
+    result = run_command("manage_gameobject", {
+        "action": "create",
+        "name": name,
+    }, config)
 
-        if not (result.get("success") or result.get("data") or result.get("result")):
-            click.echo(format_output(result, config.format))
-            return
-
-        # Step 2: Add Canvas components
-        for component in ["Canvas", "CanvasScaler", "GraphicRaycaster"]:
-            run_command("manage_components", {
-                "action": "add",
-                "target": name,
-                "componentType": component,
-            }, config)
-
-        # Step 3: Set render mode
-        render_mode_value = {"ScreenSpaceOverlay": 0,
-                             "ScreenSpaceCamera": 1, "WorldSpace": 2}.get(render_mode, 0)
-        run_command("manage_components", {
-            "action": "set_property",
+    if not (result.get("success") or result.get("data") or result.get("result")):
+        click.echo(format_output(result, config.format))
+        return
+
+    # Step 2: Add Canvas components
+    failed_components = []
+    for component in ["Canvas", "CanvasScaler", "GraphicRaycaster"]:
+        comp_result = run_command("manage_components", {
+            "action": "add",
             "target": name,
-            "componentType": "Canvas",
-            "property": "renderMode",
-            "value": render_mode_value,
+            "componentType": component,
         }, config)
+        if not (comp_result.get("success") or comp_result.get("data")):
+            failed_components.append((component, comp_result.get("error", "Unknown error")))
 
-        click.echo(format_output(result, config.format))
-        print_success(f"Created Canvas: {name}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    if failed_components:
+        error_details = "; ".join([f"{c}: {e}" for c, e in failed_components])
+        print_error(f"Failed to add components: {error_details}")
+
+    # Step 3: Set render mode
+    render_mode_value = {"ScreenSpaceOverlay": 0,
+                         "ScreenSpaceCamera": 1, "WorldSpace": 2}.get(render_mode, 0)
+    run_command("manage_components", {
+        "action": "set_property",
+        "target": name,
+        "componentType": "Canvas",
+        "property": "renderMode",
+        "value": render_mode_value,
+    }, config)
+
+    click.echo(format_output(result, config.format))
+    print_success(f"Created Canvas: {name}")
 
 
 @ui.command("create-text")
@@ -90,6 +94,7 @@ def create_canvas(name: str, render_mode: str):
     default=(0, 0),
     help="Anchored position X Y."
 )
+@handle_unity_errors
 def create_text(name: str, parent: str, text: str, position: tuple):
     """Create a UI Text element (TextMeshPro).
 
@@ -99,40 +104,36 @@ def create_text(name: str, parent: str, text: str, position: tuple):
     """
     config = get_config()
 
-    try:
-        # Step 1: Create empty GameObject with parent
-        result = run_command("manage_gameobject", {
-            "action": "create",
-            "name": name,
-            "parent": parent,
-            "position": list(position),
-        }, config)
+    # Step 1: Create empty GameObject with parent
+    result = run_command("manage_gameobject", {
+        "action": "create",
+        "name": name,
+        "parent": parent,
+        "position": list(position),
+    }, config)
 
-        if not (result.get("success") or result.get("data") or result.get("result")):
-            click.echo(format_output(result, config.format))
-            return
+    if not (result.get("success") or result.get("data") or result.get("result")):
+        click.echo(format_output(result, config.format))
+        return
 
-        # Step 2: Add RectTransform and TextMeshProUGUI
-        run_command("manage_components", {
-            "action": "add",
-            "target": name,
-            "componentType": "TextMeshProUGUI",
-        }, config)
+    # Step 2: Add RectTransform and TextMeshProUGUI
+    run_command("manage_components", {
+        "action": "add",
+        "target": name,
+        "componentType": "TextMeshProUGUI",
+    }, config)
 
-        # Step 3: Set text content
-        run_command("manage_components", {
-            "action": "set_property",
-            "target": name,
-            "componentType": "TextMeshProUGUI",
-            "property": "text",
-            "value": text,
-        }, config)
+    # Step 3: Set text content
+    run_command("manage_components", {
+        "action": "set_property",
+        "target": name,
+        "componentType": "TextMeshProUGUI",
+        "property": "text",
+        "value": text,
+    }, config)
 
-        click.echo(format_output(result, config.format))
-        print_success(f"Created Text: {name}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    click.echo(format_output(result, config.format))
+    print_success(f"Created Text: {name}")
 
 
 @ui.command("create-button")
@@ -147,6 +148,7 @@ def create_text(name: str, parent: str, text: str, position: tuple):
     default="Button",
     help="Button label text."
 )
+@handle_unity_errors
 def create_button(name: str, parent: str, text: str):  # text current placeholder
     """Create a UI Button.
 
@@ -156,53 +158,49 @@ def create_button(name: str, parent: str, text: str):  # text current placeholde
     """
     config = get_config()
 
-    try:
-        # Step 1: Create empty GameObject with parent
-        result = run_command("manage_gameobject", {
-            "action": "create",
-            "name": name,
-            "parent": parent,
-        }, config)
+    # Step 1: Create empty GameObject with parent
+    result = run_command("manage_gameobject", {
+        "action": "create",
+        "name": name,
+        "parent": parent,
+    }, config)
 
-        if not (result.get("success") or result.get("data") or result.get("result")):
-            click.echo(format_output(result, config.format))
-            return
-
-        # Step 2: Add Button and Image components
-        for component in ["Image", "Button"]:
-            run_command("manage_components", {
-                "action": "add",
-                "target": name,
-                "componentType": component,
-            }, config)
-
-        # Step 3: Create child label GameObject
-        label_name = f"{name}_Label"
-        label_result = run_command("manage_gameobject", {
-            "action": "create",
-            "name": label_name,
-            "parent": name,
-        }, config)
+    if not (result.get("success") or result.get("data") or result.get("result")):
+        click.echo(format_output(result, config.format))
+        return
 
-        # Step 4: Add TextMeshProUGUI to label and set text
+    # Step 2: Add Button and Image components
+    for component in ["Image", "Button"]:
         run_command("manage_components", {
             "action": "add",
-            "target": label_name,
-            "componentType": "TextMeshProUGUI",
-        }, config)
-        run_command("manage_components", {
-            "action": "set_property",
-            "target": label_name,
-            "componentType": "TextMeshProUGUI",
-            "property": "text",
-            "value": text,
+            "target": name,
+            "componentType": component,
         }, config)
 
-        click.echo(format_output(result, config.format))
-        print_success(f"Created Button: {name} (with label '{text}')")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    # Step 3: Create child label GameObject
+    label_name = f"{name}_Label"
+    run_command("manage_gameobject", {
+        "action": "create",
+        "name": label_name,
+        "parent": name,
+    }, config)
+
+    # Step 4: Add TextMeshProUGUI to label and set text
+    run_command("manage_components", {
+        "action": "add",
+        "target": label_name,
+        "componentType": "TextMeshProUGUI",
+    }, config)
+    run_command("manage_components", {
+        "action": "set_property",
+        "target": label_name,
+        "componentType": "TextMeshProUGUI",
+        "property": "text",
+        "value": text,
+    }, config)
+
+    click.echo(format_output(result, config.format))
+    print_success(f"Created Button: {name} (with label '{text}')")
 
 
 @ui.command("create-image")
@@ -217,6 +215,7 @@ def create_button(name: str, parent: str, text: str):  # text current placeholde
     default=None,
     help="Sprite asset path."
 )
+@handle_unity_errors
 def create_image(name: str, parent: str, sprite: Optional[str]):
     """Create a UI Image.
 
@@ -227,37 +226,33 @@ def create_image(name: str, parent: str, sprite: Optional[str]):
     """
     config = get_config()
 
-    try:
-        # Step 1: Create empty GameObject with parent
-        result = run_command("manage_gameobject", {
-            "action": "create",
-            "name": name,
-            "parent": parent,
-        }, config)
+    # Step 1: Create empty GameObject with parent
+    result = run_command("manage_gameobject", {
+        "action": "create",
+        "name": name,
+        "parent": parent,
+    }, config)
+
+    if not (result.get("success") or result.get("data") or result.get("result")):
+        click.echo(format_output(result, config.format))
+        return
 
-        if not (result.get("success") or result.get("data") or result.get("result")):
-            click.echo(format_output(result, config.format))
-            return
+    # Step 2: Add Image component
+    run_command("manage_components", {
+        "action": "add",
+        "target": name,
+        "componentType": "Image",
+    }, config)
 
-        # Step 2: Add Image component
+    # Step 3: Set sprite if provided
+    if sprite:
         run_command("manage_components", {
-            "action": "add",
+            "action": "set_property",
             "target": name,
             "componentType": "Image",
+            "property": "sprite",
+            "value": sprite,
         }, config)
 
-        # Step 3: Set sprite if provided
-        if sprite:
-            run_command("manage_components", {
-                "action": "set_property",
-                "target": name,
-                "componentType": "Image",
-                "property": "sprite",
-                "value": sprite,
-            }, config)
-
-        click.echo(format_output(result, config.format))
-        print_success(f"Created Image: {name}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    click.echo(format_output(result, config.format))
+    print_success(f"Created Image: {name}")