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

cli/commands/material.py

@@ -7,7 +7,9 @@ from typing import Optional, Any, Tuple
 
 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
+from cli.utils.parsers import parse_value_safe, parse_json_dict_or_exit
+from cli.utils.constants import SEARCH_METHOD_CHOICE_RENDERER
 
 
 @click.group()
@@ -18,6 +20,7 @@ def material():
 
 @material.command("info")
 @click.argument("path")
+@handle_unity_errors
 def info(path: str):
     """Get information about a material.
 
@@ -27,15 +30,11 @@ def info(path: str):
     """
     config = get_config()
 
-    try:
-        result = run_command("manage_material", {
-            "action": "get_material_info",
-            "materialPath": path,
-        }, config)
-        click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_material", {
+        "action": "get_material_info",
+        "materialPath": path,
+    }, config)
+    click.echo(format_output(result, config.format))
 
 
 @material.command("create")
@@ -50,6 +49,7 @@ def info(path: str):
     default=None,
     help='Initial properties as JSON.'
 )
+@handle_unity_errors
 def create(path: str, shader: str, properties: Optional[str]):
     """Create a new material.
 
@@ -68,20 +68,12 @@ def create(path: str, shader: str, properties: Optional[str]):
     }
 
     if properties:
-        try:
-            params["properties"] = json.loads(properties)
-        except json.JSONDecodeError as e:
-            print_error(f"Invalid JSON for properties: {e}")
-            sys.exit(1)
-
-    try:
-        result = run_command("manage_material", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Created material: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+        params["properties"] = parse_json_dict_or_exit(properties, "properties")
+
+    result = run_command("manage_material", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Created material: {path}")
 
 
 @material.command("set-color")
@@ -95,6 +87,7 @@ def create(path: str, shader: str, properties: Optional[str]):
     default="_Color",
     help="Color property name (default: _Color)."
 )
+@handle_unity_errors
 def set_color(path: str, r: float, g: float, b: float, a: float, property: str):
     """Set a material's color.
 
@@ -113,20 +106,17 @@ def set_color(path: str, r: float, g: float, b: float, a: float, property: str):
         "color": [r, g, b, a],
     }
 
-    try:
-        result = run_command("manage_material", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Set color on: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_material", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Set color on: {path}")
 
 
 @material.command("set-property")
 @click.argument("path")
 @click.argument("property_name")
 @click.argument("value")
+@handle_unity_errors
 def set_property(path: str, property_name: str, value: str):
     """Set a shader property on a material.
 
@@ -139,14 +129,7 @@ def set_property(path: str, property_name: str, value: str):
     config = get_config()
 
     # Try to parse value as JSON for complex types
-    try:
-        parsed_value = json.loads(value)
-    except json.JSONDecodeError:
-        # Try to parse as number
-        try:
-            parsed_value = float(value)
-        except ValueError:
-            parsed_value = value
+    parsed_value = parse_value_safe(value)
 
     params: dict[str, Any] = {
         "action": "set_material_shader_property",
@@ -155,14 +138,10 @@ def set_property(path: str, property_name: str, value: str):
         "value": parsed_value,
     }
 
-    try:
-        result = run_command("manage_material", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Set {property_name} on: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_material", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Set {property_name} on: {path}")
 
 
 @material.command("assign")
@@ -170,8 +149,7 @@ def set_property(path: str, property_name: str, value: str):
 @click.argument("target")
 @click.option(
     "--search-method",
-    type=click.Choice(["by_name", "by_path", "by_tag",
-                      "by_layer", "by_component"]),
+    type=SEARCH_METHOD_CHOICE_RENDERER,
     default=None,
     help="How to find the target GameObject."
 )
@@ -187,6 +165,7 @@ def set_property(path: str, property_name: str, value: str):
     default="shared",
     help="Assignment mode."
 )
+@handle_unity_errors
 def assign(material_path: str, target: str, search_method: Optional[str], slot: int, mode: str):
     """Assign a material to a GameObject's renderer.
 
@@ -209,14 +188,10 @@ def assign(material_path: str, target: str, search_method: Optional[str], slot:
     if search_method:
         params["searchMethod"] = search_method
 
-    try:
-        result = run_command("manage_material", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Assigned material to: {target}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_material", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Assigned material to: {target}")
 
 
 @material.command("set-renderer-color")
@@ -227,8 +202,7 @@ def assign(material_path: str, target: str, search_method: Optional[str], slot:
 @click.argument("a", type=float, default=1.0)
 @click.option(
     "--search-method",
-    type=click.Choice(["by_name", "by_path", "by_tag",
-                      "by_layer", "by_component"]),
+    type=SEARCH_METHOD_CHOICE_RENDERER,
     default=None,
     help="How to find the target GameObject."
 )
@@ -238,6 +212,7 @@ def assign(material_path: str, target: str, search_method: Optional[str], slot:
     default="property_block",
     help="Modification mode."
 )
+@handle_unity_errors
 def set_renderer_color(target: str, r: float, g: float, b: float, a: float, search_method: Optional[str], mode: str):
     """Set a renderer's material color directly.
 
@@ -258,11 +233,7 @@ def set_renderer_color(target: str, r: float, g: float, b: float, a: float, sear
     if search_method:
         params["searchMethod"] = search_method
 
-    try:
-        result = run_command("manage_material", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Set renderer color on: {target}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_material", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Set renderer color on: {target}")

cli/commands/prefab.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()
@@ -17,6 +17,7 @@ def prefab():
 
 @prefab.command("open")
 @click.argument("path")
+@handle_unity_errors
 def open_stage(path: str):
     """Open a prefab in the prefab stage for editing.
 
@@ -31,14 +32,10 @@ def open_stage(path: str):
         "prefabPath": path,
     }
 
-    try:
-        result = run_command("manage_prefabs", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Opened prefab: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_prefabs", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Opened prefab: {path}")
 
 
 @prefab.command("close")
@@ -47,6 +44,7 @@ def open_stage(path: str):
     is_flag=True,
     help="Save the prefab before closing."
 )
+@handle_unity_errors
 def close_stage(save: bool):
     """Close the current prefab stage.
 
@@ -63,14 +61,10 @@ def close_stage(save: bool):
     if save:
         params["saveBeforeClose"] = True
 
-    try:
-        result = run_command("manage_prefabs", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success("Closed prefab stage")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_prefabs", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success("Closed prefab stage")
 
 
 @prefab.command("save")
@@ -79,6 +73,7 @@ def close_stage(save: bool):
     is_flag=True,
     help="Force save even if no changes detected. Useful for automated workflows."
 )
+@handle_unity_errors
 def save_stage(force: bool):
     """Save the currently open prefab stage.
 
@@ -95,14 +90,10 @@ def save_stage(force: bool):
     if force:
         params["force"] = True
 
-    try:
-        result = run_command("manage_prefabs", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success("Saved prefab")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_prefabs", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success("Saved prefab")
 
 
 @prefab.command("info")
@@ -112,6 +103,7 @@ def save_stage(force: bool):
     is_flag=True,
     help="Show compact output (key values only)."
 )
+@handle_unity_errors
 def info(path: str, compact: bool):
     """Get information about a prefab asset.
 
@@ -127,26 +119,22 @@ def info(path: str, compact: bool):
         "prefabPath": path,
     }
 
-    try:
-        result = run_command("manage_prefabs", params, config)
-        # Get the actual response data from the wrapped result structure
-        response_data = result.get("result", result)
-        if compact and response_data.get("success") and response_data.get("data"):
-            data = response_data["data"]
-            click.echo(f"Prefab: {data.get('assetPath', path)}")
-            click.echo(f"  Type: {data.get('prefabType', 'Unknown')}")
-            click.echo(f"  Root: {data.get('rootObjectName', 'N/A')}")
-            click.echo(f"  GUID: {data.get('guid', 'N/A')}")
-            click.echo(
-                f"  Components: {len(data.get('rootComponentTypes', []))}")
-            click.echo(f"  Children: {data.get('childCount', 0)}")
-            if data.get('isVariant'):
-                click.echo(f"  Variant of: {data.get('parentPrefab', 'N/A')}")
-        else:
-            click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_prefabs", params, config)
+    # Get the actual response data from the wrapped result structure
+    response_data = result.get("result", result)
+    if compact and response_data.get("success") and response_data.get("data"):
+        data = response_data["data"]
+        click.echo(f"Prefab: {data.get('assetPath', path)}")
+        click.echo(f"  Type: {data.get('prefabType', 'Unknown')}")
+        click.echo(f"  Root: {data.get('rootObjectName', 'N/A')}")
+        click.echo(f"  GUID: {data.get('guid', 'N/A')}")
+        click.echo(
+            f"  Components: {len(data.get('rootComponentTypes', []))}")
+        click.echo(f"  Children: {data.get('childCount', 0)}")
+        if data.get('isVariant'):
+            click.echo(f"  Variant of: {data.get('parentPrefab', 'N/A')}")
+    else:
+        click.echo(format_output(result, config.format))
 
 
 @prefab.command("hierarchy")
@@ -161,6 +149,7 @@ def info(path: str, compact: bool):
     is_flag=True,
     help="Show prefab nesting information."
 )
+@handle_unity_errors
 def hierarchy(path: str, compact: bool, show_prefab_info: bool):
     """Get the hierarchical structure of a prefab.
 
@@ -177,41 +166,37 @@ def hierarchy(path: str, compact: bool, show_prefab_info: bool):
         "prefabPath": path,
     }
 
-    try:
-        result = run_command("manage_prefabs", params, config)
-        # Get the actual response data from the wrapped result structure
-        response_data = result.get("result", result)
-        if compact and response_data.get("success") and response_data.get("data"):
+    result = run_command("manage_prefabs", params, config)
+    # Get the actual response data from the wrapped result structure
+    response_data = result.get("result", result)
+    if compact and response_data.get("success") and response_data.get("data"):
+        data = response_data["data"]
+        items = data.get("items", [])
+        for item in items:
+            indent = "  " * item.get("path", "").count("/")
+            prefab_info = ""
+            if show_prefab_info and item.get("prefab", {}).get("isNestedRoot"):
+                prefab_info = f" [nested: {item['prefab']['assetPath']}]"
+            click.echo(f"{indent}{item.get('name')}{prefab_info}")
+        click.echo(f"\nTotal: {data.get('total', 0)} objects")
+    elif show_prefab_info:
+        # Show prefab info in readable format
+        if response_data.get("success") and response_data.get("data"):
             data = response_data["data"]
             items = data.get("items", [])
             for item in items:
-                indent = "  " * item.get("path", "").count("/")
+                prefab = item.get("prefab", {})
                 prefab_info = ""
-                if show_prefab_info and item.get("prefab", {}).get("isNestedRoot"):
-                    prefab_info = f" [nested: {item['prefab']['assetPath']}]"
-                click.echo(f"{indent}{item.get('name')}{prefab_info}")
+                if prefab.get("isRoot"):
+                    prefab_info = " [root]"
+                elif prefab.get("isNestedRoot"):
+                    prefab_info = f" [nested: {prefab.get('nestingDepth', 0)}]"
+                click.echo(f"{item.get('path')}{prefab_info}")
             click.echo(f"\nTotal: {data.get('total', 0)} objects")
-        elif show_prefab_info:
-            # Show prefab info in readable format
-            if response_data.get("success") and response_data.get("data"):
-                data = response_data["data"]
-                items = data.get("items", [])
-                for item in items:
-                    prefab = item.get("prefab", {})
-                    prefab_info = ""
-                    if prefab.get("isRoot"):
-                        prefab_info = " [root]"
-                    elif prefab.get("isNestedRoot"):
-                        prefab_info = f" [nested: {prefab.get('nestingDepth', 0)}]"
-                    click.echo(f"{item.get('path')}{prefab_info}")
-                click.echo(f"\nTotal: {data.get('total', 0)} objects")
-            else:
-                click.echo(format_output(result, config.format))
         else:
             click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    else:
+        click.echo(format_output(result, config.format))
 
 
 @prefab.command("create")
@@ -232,6 +217,7 @@ def hierarchy(path: str, compact: bool, show_prefab_info: bool):
     is_flag=True,
     help="Unlink from existing prefab before creating new one."
 )
+@handle_unity_errors
 def create(target: str, path: str, overwrite: bool, include_inactive: bool, unlink_if_instance: bool):
     """Create a prefab from a scene GameObject.
 
@@ -256,11 +242,7 @@ def create(target: str, path: str, overwrite: bool, include_inactive: bool, unli
     if unlink_if_instance:
         params["unlinkIfInstance"] = True
 
-    try:
-        result = run_command("manage_prefabs", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Created prefab: {path}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_prefabs", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Created prefab: {path}")

cli/commands/scene.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()
@@ -44,6 +44,7 @@ def scene():
     type=int,
     help="Pagination cursor."
 )
+@handle_unity_errors
 def hierarchy(
     parent: Optional[str],
     max_depth: Optional[int],
@@ -75,25 +76,17 @@ def hierarchy(
     if include_transform:
         params["includeTransform"] = True
 
-    try:
-        result = run_command("manage_scene", params, config)
-        click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_scene", params, config)
+    click.echo(format_output(result, config.format))
 
 
 @scene.command("active")
+@handle_unity_errors
 def active():
     """Get information about the active scene."""
     config = get_config()
-
-    try:
-        result = run_command("manage_scene", {"action": "get_active"}, config)
-        click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_scene", {"action": "get_active"}, config)
+    click.echo(format_output(result, config.format))
 
 
 @scene.command("load")
@@ -103,6 +96,7 @@ def active():
     is_flag=True,
     help="Load by build index instead of path/name."
 )
+@handle_unity_errors
 def load(scene: str, by_index: bool):
     """Load a scene.
 
@@ -128,14 +122,10 @@ def load(scene: str, by_index: bool):
         else:
             params["name"] = scene
 
-    try:
-        result = run_command("manage_scene", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Loaded scene: {scene}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_scene", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Loaded scene: {scene}")
 
 
 @scene.command("save")
@@ -144,6 +134,7 @@ def load(scene: str, by_index: bool):
     default=None,
     help="Path to save the scene to (for new scenes)."
 )
+@handle_unity_errors
 def save(path: Optional[str]):
     """Save the current scene.
 
@@ -158,14 +149,10 @@ def save(path: Optional[str]):
     if path:
         params["path"] = path
 
-    try:
-        result = run_command("manage_scene", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success("Scene saved")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_scene", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success("Scene saved")
 
 
 @scene.command("create")
@@ -175,6 +162,7 @@ def save(path: Optional[str]):
     default=None,
     help="Path to create the scene at."
 )
+@handle_unity_errors
 def create(name: str, path: Optional[str]):
     """Create a new scene.
 
@@ -192,28 +180,19 @@ def create(name: str, path: Optional[str]):
     if path:
         params["path"] = path
 
-    try:
-        result = run_command("manage_scene", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success(f"Created scene: {name}")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_scene", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success(f"Created scene: {name}")
 
 
 @scene.command("build-settings")
+@handle_unity_errors
 def build_settings():
     """Get scenes in build settings."""
     config = get_config()
-
-    try:
-        result = run_command(
-            "manage_scene", {"action": "get_build_settings"}, config)
-        click.echo(format_output(result, config.format))
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_scene", {"action": "get_build_settings"}, config)
+    click.echo(format_output(result, config.format))
 
 
 @scene.command("screenshot")
@@ -228,6 +207,7 @@ def build_settings():
     type=int,
     help="Supersize multiplier (1-4)."
 )
+@handle_unity_errors
 def screenshot(filename: Optional[str], supersize: int):
     """Capture a screenshot of the scene.
 
@@ -245,11 +225,7 @@ def screenshot(filename: Optional[str], supersize: int):
     if supersize > 1:
         params["superSize"] = supersize
 
-    try:
-        result = run_command("manage_scene", params, config)
-        click.echo(format_output(result, config.format))
-        if result.get("success"):
-            print_success("Screenshot captured")
-    except UnityConnectionError as e:
-        print_error(str(e))
-        sys.exit(1)
+    result = run_command("manage_scene", params, config)
+    click.echo(format_output(result, config.format))
+    if result.get("success"):
+        print_success("Screenshot captured")