nextmv 1.2.3.dev3__tar.gz → 1.2.3.dev4__tar.gz

{nextmv-1.2.3.dev3 → nextmv-1.2.3.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 1.2.3.dev3
+Version: 1.2.3.dev4
 Summary: The all-purpose Python SDK for Nextmv
 Project-URL: Homepage, https://www.nextmv.io
 Project-URL: Documentation, https://nextmv-py.docs.nextmv.io/en/latest/nextmv/

nextmv-1.2.3.dev4/nextmv/__about__.py

@@ -0,0 +1 @@
+__version__ = "v1.2.3.dev4"

{nextmv-1.2.3.dev3 → nextmv-1.2.3.dev4}/nextmv/cli/mcp/tools/_helpers.py

@@ -73,6 +73,24 @@ def _get_local_app(app_dir: str, app_id: str | None = None) -> local.Application
     return app
 
 
+def _build_run_configuration(content_format: str | None):
+    """Build a RunConfiguration for the given content format string, or None."""
+
+    if content_format is None:
+        return None
+
+    from nextmv.input import InputFormat
+    from nextmv.run import Format, FormatInput, RunConfiguration
+
+    config = RunConfiguration()
+    config.format = Format(
+        format_input=FormatInput(
+            input_type=InputFormat(content_format),
+        ),
+    )
+    return config
+
+
 def _save_to_file(data: Any, prefix: str) -> str:
     """Serialize data to a temp JSON file and return a message with the path.
 

{nextmv-1.2.3.dev3 → nextmv-1.2.3.dev4}/nextmv/cli/mcp/tools/local.py

@@ -55,7 +55,9 @@ def _local_run_logs_impl(
 
 def local_run(
     app_dir: str,
-    input: dict[str, Any],
+    input: dict[str, Any] | None = None,
+    input_dir_path: str | None = None,
+    content_format: str | None = None,
     run_options: dict[str, str] | None = None,
 ) -> str:
     """Run a local Nextmv application and wait for the result.
@@ -65,16 +67,32 @@ def local_run(
     ``{app_dir}/.nextmv/runs/{run_id}/``. Use file-reading tools to
     inspect the result file.
 
+    For JSON apps, provide ``input`` as a JSON object. For multi-file
+    or CSV archive apps, provide ``input_dir_path`` pointing to a
+    directory of input files and set ``content_format`` accordingly
+    (e.g. ``"multi-file"`` or ``"csv-archive"``).
+
     Args:
         app_dir: Absolute path to the local application directory
             containing an app.yaml manifest.
-        input: The input data (JSON object) for the optimization run.
+        input: The input data (JSON object) for the run. Used for
+            JSON apps. Ignored when ``input_dir_path`` is provided.
+        input_dir_path: Path to a directory containing input files.
+            Use for multi-file or CSV archive apps. When provided,
+            ``content_format`` must also be set.
+        content_format: Content format of the input. Required when
+            ``input_dir_path`` is set. Allowed values:
+            ``"multi-file"``, ``"csv-archive"``, ``"json"``.
         run_options: Optional solver options passed to the application,
             e.g. ``{"solve.duration": "10s"}``.
     """
 
     app = _helpers._get_local_app(app_dir=app_dir)
-    run_id = app.new_run(input=input, options=run_options)
+    config = _helpers._build_run_configuration(content_format)
+    if input_dir_path is not None:
+        run_id = app.new_run(input_dir_path=input_dir_path, options=run_options, configuration=config)
+    else:
+        run_id = app.new_run(input=input, options=run_options, configuration=config)
     app.run_result_with_polling(
         run_id=run_id,
         polling_options=default_polling_options(),
@@ -89,7 +107,9 @@ def local_run(
 
 def local_run_submit(
     app_dir: str,
-    input: dict[str, Any],
+    input: dict[str, Any] | None = None,
+    input_dir_path: str | None = None,
+    content_format: str | None = None,
     run_options: dict[str, str] | None = None,
 ) -> str:
     """Submit a local run without waiting for completion.
@@ -98,16 +118,31 @@ def local_run_submit(
     ID immediately. Use ``local_run_poll_result`` or
     ``local_run_status`` to check on the run later.
 
+    For JSON apps, provide ``input`` as a JSON object. For multi-file
+    or CSV archive apps, provide ``input_dir_path`` pointing to a
+    directory of input files and set ``content_format`` accordingly
+    (e.g. ``"multi-file"`` or ``"csv-archive"``).
+
     Args:
         app_dir: Absolute path to the local application directory
             containing an app.yaml manifest.
-        input: The input data (JSON object) for the run.
+        input: The input data (JSON object) for the run. Used for
+            JSON apps. Ignored when ``input_dir_path`` is provided.
+        input_dir_path: Path to a directory containing input files.
+            Use for multi-file or CSV archive apps. When provided,
+            ``content_format`` must also be set.
+        content_format: Content format of the input. Required when
+            ``input_dir_path`` is set. Allowed values:
+            ``"multi-file"``, ``"csv-archive"``, ``"json"``.
         run_options: Optional solver options passed to the application,
             e.g. ``{"solve.duration": "10s"}``.
     """
 
     app = _helpers._get_local_app(app_dir=app_dir)
-    return app.new_run(input=input, options=run_options)
+    config = _helpers._build_run_configuration(content_format)
+    if input_dir_path is not None:
+        return app.new_run(input_dir_path=input_dir_path, options=run_options, configuration=config)
+    return app.new_run(input=input, options=run_options, configuration=config)
 
 
 def local_run_status(

{nextmv-1.2.3.dev3 → nextmv-1.2.3.dev4}/nextmv/cli/mcp/tools/run.py

@@ -45,7 +45,9 @@ def register(mcp: FastMCP) -> None:
     @mcp.tool()
     def cloud_run(
         app_id: str,
-        input: dict[str, Any],
+        input: dict[str, Any] | None = None,
+        input_dir_path: str | None = None,
+        content_format: str | None = None,
         instance_id: str | None = None,
         run_options: dict[str, str] | None = None,
         managed_input_id: str | None = None,
@@ -57,10 +59,22 @@ def register(mcp: FastMCP) -> None:
         statistics) to a local temp file. Use file-reading tools to
         inspect the contents.
 
+        For JSON apps, provide ``input`` as a JSON object. For
+        multi-file or CSV archive apps, provide ``input_dir_path``
+        pointing to a local directory of input files and set
+        ``content_format`` accordingly (e.g. ``"multi-file"``).
+
         Args:
             app_id: The application ID.
-            input: The input data (JSON object) for the optimization
-                run. Ignored when ``managed_input_id`` is provided.
+            input: The input data (JSON object) for the run. Used for
+                JSON apps. Ignored when ``input_dir_path`` or
+                ``managed_input_id`` is provided.
+            input_dir_path: Path to a local directory containing input
+                files. Use for multi-file or CSV archive apps. When
+                provided, ``content_format`` must also be set.
+            content_format: Content format of the input. Required when
+                ``input_dir_path`` is set. Allowed values:
+                ``"multi-file"``, ``"csv-archive"``, ``"json"``.
             instance_id: Instance to run against. Uses the application's
                 default instance if omitted.
             run_options: Solver options passed to the application, e.g.
@@ -70,8 +84,11 @@ def register(mcp: FastMCP) -> None:
         """
 
         app = _helpers._get_app(app_id)
+        config = _helpers._build_run_configuration(content_format)
         result = app.new_run_with_result(
             input=input,
+            input_dir_path=input_dir_path,
+            configuration=config,
             instance_id=instance_id,
             run_options=run_options or {},
             polling_options=default_polling_options(),
@@ -82,7 +99,9 @@ def register(mcp: FastMCP) -> None:
     @mcp.tool()
     def cloud_run_submit(
         app_id: str,
-        input: dict[str, Any],
+        input: dict[str, Any] | None = None,
+        input_dir_path: str | None = None,
+        content_format: str | None = None,
         instance_id: str | None = None,
         run_options: dict[str, str] | None = None,
         managed_input_id: str | None = None,
@@ -92,10 +111,22 @@ def register(mcp: FastMCP) -> None:
         Returns the run ID immediately. Use ``cloud_run_status`` or
         ``cloud_run_result`` to check on the run later.
 
+        For JSON apps, provide ``input`` as a JSON object. For
+        multi-file or CSV archive apps, provide ``input_dir_path``
+        pointing to a local directory of input files and set
+        ``content_format`` accordingly (e.g. ``"multi-file"``).
+
         Args:
             app_id: The application ID.
-            input: The input data (JSON object) for the run. Ignored
-                when ``managed_input_id`` is provided.
+            input: The input data (JSON object) for the run. Used for
+                JSON apps. Ignored when ``input_dir_path`` or
+                ``managed_input_id`` is provided.
+            input_dir_path: Path to a local directory containing input
+                files. Use for multi-file or CSV archive apps. When
+                provided, ``content_format`` must also be set.
+            content_format: Content format of the input. Required when
+                ``input_dir_path`` is set. Allowed values:
+                ``"multi-file"``, ``"csv-archive"``, ``"json"``.
             instance_id: Instance to run against. Uses the application's
                 default instance if omitted.
             run_options: Solver options passed to the application, e.g.
@@ -105,13 +136,15 @@ def register(mcp: FastMCP) -> None:
         """
 
         app = _helpers._get_app(app_id)
-        run_id = app.new_run(
+        config = _helpers._build_run_configuration(content_format)
+        return app.new_run(
             input=input,
+            input_dir_path=input_dir_path,
+            configuration=config,
             instance_id=instance_id,
             options=run_options or {},
             managed_input_id=managed_input_id,
         )
-        return run_id
 
     @mcp.tool()
     def cloud_run_status(app_id: str, run_id: str) -> dict[str, Any]:

{nextmv-1.2.3.dev3 → nextmv-1.2.3.dev4}/tests/cli/test_mcp.py

@@ -931,3 +931,115 @@ class TestBugFixes(unittest.TestCase):
         run_numbers = [r["run_number"] for r in runs]
         self.assertEqual(run_numbers, ["1", "2"])
 
+
+class TestMultiFileRunSupport(unittest.TestCase):
+    """Tests for multi-file run support in local and cloud run tools."""
+
+    def test_build_run_configuration_none(self):
+        """_build_run_configuration returns None when content_format is None."""
+        from nextmv.cli.mcp.tools._helpers import _build_run_configuration
+
+        self.assertIsNone(_build_run_configuration(None))
+
+    def test_build_run_configuration_multi_file(self):
+        """_build_run_configuration builds a RunConfiguration for 'multi-file'."""
+        from nextmv.cli.mcp.tools._helpers import _build_run_configuration
+        from nextmv.input import InputFormat
+
+        config = _build_run_configuration("multi-file")
+        self.assertIsNotNone(config)
+        self.assertEqual(
+            config.format.format_input.input_type,
+            InputFormat.MULTI_FILE,
+        )
+
+    @patch("nextmv.cli.mcp.tools._helpers._get_local_app")
+    def test_local_run_submit_json_input(self, mock_get_local_app):
+        """local_run_submit passes input dict to new_run for JSON apps."""
+        from nextmv.cli.mcp.server import create_server
+
+        mock_app = MagicMock()
+        mock_app.new_run.return_value = "run-123"
+        mock_get_local_app.return_value = mock_app
+
+        server = create_server()
+        tool = server._tool_manager._tools["local_run_submit"]
+        asyncio.run(tool.run({
+            "app_dir": "/some/app",
+            "input": {"stops": []},
+        }))
+        mock_app.new_run.assert_called_once()
+        call_kwargs = mock_app.new_run.call_args[1]
+        self.assertEqual(call_kwargs["input"], {"stops": []})
+        self.assertIsNone(call_kwargs.get("input_dir_path"))
+        self.assertIsNone(call_kwargs.get("configuration"))
+
+    @patch("nextmv.cli.mcp.tools._helpers._get_local_app")
+    def test_local_run_submit_multifile_input(self, mock_get_local_app):
+        """local_run_submit passes input_dir_path + configuration for multi-file apps."""
+        from nextmv.cli.mcp.server import create_server
+        from nextmv.input import InputFormat
+
+        mock_app = MagicMock()
+        mock_app.new_run.return_value = "run-456"
+        mock_get_local_app.return_value = mock_app
+
+        server = create_server()
+        tool = server._tool_manager._tools["local_run_submit"]
+        asyncio.run(tool.run({
+            "app_dir": "/some/app",
+            "input_dir_path": "/some/input-dir",
+            "content_format": "multi-file",
+        }))
+        mock_app.new_run.assert_called_once()
+        call_kwargs = mock_app.new_run.call_args[1]
+        self.assertEqual(call_kwargs["input_dir_path"], "/some/input-dir")
+        config = call_kwargs.get("configuration")
+        self.assertIsNotNone(config)
+        self.assertEqual(config.format.format_input.input_type, InputFormat.MULTI_FILE)
+
+    @patch("nextmv.cli.mcp.tools._helpers._get_app")
+    def test_cloud_run_submit_json_input(self, mock_get_app):
+        """cloud_run_submit passes input dict to new_run for JSON apps."""
+        from nextmv.cli.mcp.server import create_server
+
+        mock_app = MagicMock()
+        mock_app.new_run.return_value = "run-789"
+        mock_get_app.return_value = mock_app
+
+        server = create_server()
+        tool = server._tool_manager._tools["cloud_run_submit"]
+        asyncio.run(tool.run({
+            "app_id": "my-app",
+            "input": {"stops": []},
+        }))
+        mock_app.new_run.assert_called_once()
+        call_kwargs = mock_app.new_run.call_args[1]
+        self.assertEqual(call_kwargs["input"], {"stops": []})
+        self.assertIsNone(call_kwargs.get("input_dir_path"))
+        self.assertIsNone(call_kwargs.get("configuration"))
+
+    @patch("nextmv.cli.mcp.tools._helpers._get_app")
+    def test_cloud_run_submit_multifile_input(self, mock_get_app):
+        """cloud_run_submit passes input_dir_path + configuration for multi-file apps."""
+        from nextmv.cli.mcp.server import create_server
+        from nextmv.input import InputFormat
+
+        mock_app = MagicMock()
+        mock_app.new_run.return_value = "run-mf-1"
+        mock_get_app.return_value = mock_app
+
+        server = create_server()
+        tool = server._tool_manager._tools["cloud_run_submit"]
+        asyncio.run(tool.run({
+            "app_id": "my-app",
+            "input_dir_path": "/some/input-dir",
+            "content_format": "multi-file",
+        }))
+        mock_app.new_run.assert_called_once()
+        call_kwargs = mock_app.new_run.call_args[1]
+        self.assertEqual(call_kwargs["input_dir_path"], "/some/input-dir")
+        config = call_kwargs.get("configuration")
+        self.assertIsNotNone(config)
+        self.assertEqual(config.format.format_input.input_type, InputFormat.MULTI_FILE)
+

nextmv-1.2.3.dev3/nextmv/__about__.py

@@ -1 +0,0 @@
-__version__ = "v1.2.3.dev3"