nextmv 1.3.1.dev4__tar.gz → 1.4.0.dev0__tar.gz

{nextmv-1.3.1.dev4 → nextmv-1.4.0.dev0}/.gitignore

@@ -161,10 +161,5 @@ cython_debug/
 # VSCode
 .vscode/
 
-# Agents
-.claude
-
 # Documentation stuff
 site/
-
-scratch

{nextmv-1.3.1.dev4 → nextmv-1.4.0.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nextmv
-Version: 1.3.1.dev4
+Version: 1.4.0.dev0
 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/
@@ -227,8 +227,6 @@ Requires-Dist: questionary>=2.1.1
 Requires-Dist: requests>=2.31.0
 Requires-Dist: typer>=0.20.1
 Requires-Dist: urllib3>=2.1.0
-Provides-Extra: mcp
-Requires-Dist: mcp[cli]>=1.0; extra == 'mcp'
 Provides-Extra: notebook
 Requires-Dist: mlflow>=3.9.0; extra == 'notebook'
 Description-Content-Type: text/markdown

nextmv-1.4.0.dev0/nextmv/__about__.py

@@ -0,0 +1 @@
+__version__ = "v1.4.0.dev0"

{nextmv-1.3.1.dev4 → nextmv-1.4.0.dev0}/nextmv/cli/cloud/input_set/create.py

@@ -146,13 +146,14 @@ def create(
     if input_set_id is None:
         input_set_id = safe_id("input-set")
 
-    managed_inputs = []
+    managed_input_list = []
     if managed_inputs is not None:
         for d in json.loads(managed_inputs):
             i = ManagedInput.from_dict(d)
             if i is None:
                 error(f"[magenta]{d}[/magenta] is not a valid [yellow]ManagedInput[/yellow]")
-            managed_inputs.append(i)
+
+            managed_input_list.append(i)
 
     input_set = cloud_app.new_input_set(
         input_set_id,
@@ -163,6 +164,6 @@ def create(
         start_time=start_time,
         end_time=end_time,
         maximum_runs=maximum_runs,
-        inputs=managed_inputs,
+        inputs=managed_input_list or None,
     )
     print_json(input_set.to_dict())

{nextmv-1.3.1.dev4 → nextmv-1.4.0.dev0}/nextmv/cli/init.py

@@ -73,113 +73,99 @@ def init() -> None:
         raise typer.Exit()
     rule()
 
-    is_template = _template_question()
+    manifest_type = _manifest_type_question()
     rule()
 
-    manifest_type = _manifest_type_question(is_template)
+    template = _template_question(manifest_type)
     rule()
 
-    content_format = _content_format_question(is_template)
+    content_format = _content_format_question()
     rule()
 
-    dirpath = _path_question(is_template)
+    dirpath = _path_question(template)
 
-    local_app = _handle_files_initialization(is_template, dirpath, manifest_type, content_format)
+    local_app = _handle_files_initialization(template, dirpath, manifest_type, content_format)
     rule()
 
-    commands = []
-    try:
-        local_run_id, cmds1 = _handle_local_run_create(local_app, is_template)
-        commands.extend(cmds1)
+    if manifest_type == ManifestType.PYTHON and template == "demand-alloc":
+        message(
+            msg="This template is a complex, real-world example of a demand-forecast allocation workflow. "
+            "Please navigate to the directory and read the [magenta]README.md[/magenta] files for more information.",
+            emoji=":sparkles:",
+        )
         rule()
+        message(
+            msg="Congratulations! You've completed the Nextmv CLI tutorial.",
+            emoji=":rocket:",
+        )
 
-        cmd2 = _handle_local_run_get(local_run_id)
-        commands.append(cmd2)
-        rule()
+    else:
+        commands = []
+        try:
+            local_run_id, cmds1 = _handle_local_run_create(local_app, template)
+            commands.extend(cmds1)
+            rule()
 
-        cmd3 = _handle_configuration()
-        commands.append(cmd3)
-        rule()
+            cmd2 = _handle_local_run_get(local_run_id)
+            commands.append(cmd2)
+            rule()
 
-        cloud_app, cmds4 = _handle_app_sync()
-        commands.extend(cmds4)
-        rule()
+            cmd3 = _handle_configuration()
+            commands.append(cmd3)
+            rule()
 
-        cmd5 = _handle_app_push(cloud_app)
-        commands.append(cmd5)
-        rule()
+            cloud_app, cmds4 = _handle_app_sync()
+            commands.extend(cmds4)
+            rule()
 
-        cloud_run_id, cmd6 = _handle_cloud_run_create(cloud_app, local_app, is_template)
-        commands.append(cmd6)
-        rule()
+            cmd5 = _handle_app_push(cloud_app)
+            commands.append(cmd5)
+            rule()
 
-        cmd7 = _handle_cloud_run_get(cloud_app, cloud_run_id)
-        commands.append(cmd7)
-        rule()
+            cloud_run_id, cmd6 = _handle_cloud_run_create(cloud_app, local_app, template)
+            commands.append(cmd6)
+            rule()
+
+            cmd7 = _handle_cloud_run_get(cloud_app, cloud_run_id)
+            commands.append(cmd7)
+            rule()
 
-        message(
-            msg="Congratulations! You've completed the Nextmv CLI tutorial. "
-            "This is a summary of the commands that were executed during the tutorial:",
-            emoji=":rocket:",
-        )
-    except Exception:
-        rule()
-        message(msg="The tutorial was not completed! You can run [code]nextmv init[/code] any time.", emoji=":rabbit:")
-        if len(commands) > 0:
             message(
-                msg="Here are the commands that were run so far:",
+                msg="Congratulations! You've completed the Nextmv CLI tutorial. "
+                "This is a summary of the commands that were executed during the tutorial:",
                 emoji=":rocket:",
             )
+        except Exception:
+            rule()
+            message(
+                msg="The tutorial was not completed! You can run [code]nextmv init[/code] any time.", emoji=":rabbit:"
+            )
+            if len(commands) > 0:
+                message(
+                    msg="Here are the commands that were run so far:",
+                    emoji=":rocket:",
+                )
 
-    for cmd in commands:
-        if cmd is not None:
-            message(msg=f"- {cmd.explanation}: [code]{cmd.cmd}[/code]", indents=1)
+        for cmd in commands:
+            if cmd is not None:
+                message(msg=f"- {cmd.explanation}: [code]{cmd.cmd}[/code]", indents=1)
 
     print("", file=sys.stderr)
     message(msg="[yellow]Happy optimizing![/yellow]", emoji=":sparkles:")
 
 
-def _template_question() -> bool:
-    """
-    Ask the user if they want to start with a template or an existing model.
-
-    Returns
-    -------
-    bool
-        True if the user wants to start with a template, False if they want to
-        start with an existing model.
-    """
-
-    init_type = choice(
-        msg="Are you working with an existing model or do you want to start with a template?",
-        choices=["Template", "Existing model"],
-        default="Template",
-    )
-
-    return init_type == "Template"
-
-
-def _manifest_type_question(is_template: bool) -> ManifestType:
+def _manifest_type_question() -> ManifestType:
     """
     Ask the user which language they want to use for their manifest.
 
-    Parameters
-    ----------
-    is_template : bool
-        Whether the user is starting with a template or an existing model.
-
     Returns
     -------
     ManifestType
         The type of manifest to initialize, based on the user's choice.
     """
 
-    msg = "Which type (language) is your existing model written in?"
-    if is_template:
-        msg = "Which type (language) do you want to use for your Nextmv application template?"
-
     manifest_type = choice(
-        msg=msg,
+        msg="Which type (language) do you want to work with?",
         choices=[member.value for member in ManifestType],
         default=ManifestType.PYTHON.value,
     )
@@ -191,7 +177,57 @@ def _manifest_type_question(is_template: bool) -> ManifestType:
     return manifest_type
 
 
-def _content_format_question(is_template: bool) -> ContentFormat:
+def _template_question(manifest_type: ManifestType) -> str:
+    """
+    Ask the user how they want to start working with Nextmv.
+
+    Returns
+    -------
+    str
+        The user's choice for how to start working with Nextmv. If the user
+        chooses to start with an example template, the value will be the name
+        of the example. If they choose to start with an existing model, the
+        value will be "existing".
+    """
+
+    hello_world = questionary.Choice(
+        title="Example - hello world",
+        description="A simple, beginner-friendly example to get you started with the basics of Nextmv.",
+        value="hello-world",
+    )
+    existing_model = questionary.Choice(
+        title="Existing model",
+        description="I already have a model and want to make it work with Nextmv.",
+        value="existing",
+    )
+    if manifest_type == ManifestType.PYTHON:
+        choices = [
+            hello_world,
+            questionary.Choice(
+                title="Example - class-room assignment",
+                description="A more complete, real-world example to see Nextmv in action.",
+                value="class-assign",
+            ),
+            questionary.Choice(
+                title="Example - demand allocation workflow",
+                description="A complex example showcasing a decision workflow with multiple steps and a sub-app.",
+                value="demand-alloc",
+            ),
+            existing_model,
+        ]
+    else:
+        choices = [hello_world, existing_model]
+
+    init_type = choice(
+        msg="How do you want to start working with Nextmv?",
+        choices=choices,
+        default=hello_world.value,
+    )
+
+    return init_type
+
+
+def _content_format_question() -> ContentFormat:
     """
     Ask the user which content format they want to use for their manifest.
 
@@ -212,12 +248,8 @@ def _content_format_question(is_template: bool) -> ContentFormat:
             description=member.description,
         )
 
-    msg = "How does your existing model handle I/O (input/output) data?"
-    if is_template:
-        msg = "Which type of I/O (input/output) content format do you prefer for your app?"
-
     content_format = choice(
-        msg=msg,
+        msg="Which type of I/O (input/output) content format do you prefer for your app?",
         choices=choices,
         default=ContentFormat.JSON.value,
     )
@@ -226,15 +258,15 @@ def _content_format_question(is_template: bool) -> ContentFormat:
     return content_format
 
 
-def _path_question(is_template: bool) -> str:
+def _path_question(template: str) -> str:
     """
     Ask the user for the path to their existing model or where they want to
     initialize their template.
 
     Parameters
     ----------
-    is_template : bool
-        Whether the user is starting with a template or an existing model.
+    template : str
+        The name of the template or "existing" if the user is working with an existing model.
 
     Returns
     -------
@@ -244,7 +276,7 @@ def _path_question(is_template: bool) -> str:
     """
 
     msg = "What is the path to your existing model?"
-    if is_template:
+    if template != "existing":
         msg = "Where would you like to initialize your Nextmv application template?"
 
     dirpath = directory_path(
@@ -257,7 +289,7 @@ def _path_question(is_template: bool) -> str:
 
 
 def _handle_files_initialization(
-    is_template: bool,
+    template: str,
     dirpath: str,
     manifest_type: ManifestType,
     content_format: ContentFormat,
@@ -271,10 +303,8 @@ def _handle_files_initialization(
 
     Parameters
     ----------
-    is_template : bool
-        If True, a full application template is scaffolded under `dirpath`. If
-        False, only the manifest (`app.yaml`) is initialized in the existing
-        model directory.
+    template : str
+        The name of the template or "existing" if the user is working with an existing model.
     dirpath : str
         Path to the directory where the application or manifest will be
         initialized.
@@ -291,14 +321,15 @@ def _handle_files_initialization(
         local registry.
     """
 
-    if is_template:
-        template = f"{manifest_type.value}_{content_format.value}_template"
-        resolved_template = _get_valid_path(template, os.stat)
+    if template != "existing":
+        template_dst = f"{manifest_type.value}_{content_format.value}_{template}"
+        resolved_template = _get_valid_path(template_dst, os.stat)
         local_app = local.Application.initialize(
             src=resolved_template,
             description="Sample Nextmv application initialized with the CLI.",
             manifest_type=manifest_type,
             content_format=content_format,
+            example=template,
             destination=dirpath,
             should_register=False,
         )
@@ -318,7 +349,7 @@ def _handle_files_initialization(
     return local_app
 
 
-def _handle_local_run_create(local_app: local.Application, is_template: bool) -> tuple[str, list[ExecutedCommand]]:
+def _handle_local_run_create(local_app: local.Application, template: str) -> tuple[str, list[ExecutedCommand]]:
     """
     Prompt the user to start a local run for the initialized application.
 
@@ -330,8 +361,8 @@ def _handle_local_run_create(local_app: local.Application, is_template: bool) ->
     ----------
     local_app : Application
         The registered local application for which the run will be started.
-    is_template : bool
-        Indicates whether the application was initialized from a template.
+    template : str
+        The name of the template or "existing" if the user is working with an existing model.
 
     Returns
     -------
@@ -376,11 +407,25 @@ def _handle_local_run_create(local_app: local.Application, is_template: bool) ->
             cmd = ExecutedCommand(cmd=cmd_str, explanation="Compile/build the application")
             commands.append(cmd)
 
+    # If the application is Python, we ask if the user wants to install
+    # dependencies with pip.
+    if man_type == ManifestType.PYTHON and template != "hello-world":
+        cmd_str = Prompt.ask(
+            prompt=f"This application is of type [magenta]{man_type.value}[/magenta]. "
+            "Please type the command needed to install deps (e.g. [code]pip install -r requirements.txt[/code]). "
+            "Leave blank to omit",
+            default="",
+        )
+        if cmd_str:
+            result = _cli_call(cmd_str.split())
+            cmd = ExecutedCommand(cmd=cmd_str, explanation="Install dependencies for the Python application")
+            commands.append(cmd)
+
     # Select the input path to run the local app.
     default = "."
-    if is_template and local_app.content_format == ContentFormat.JSON:
+    if template != "existing" and local_app.content_format == ContentFormat.JSON:
         default = "input.json"
-    elif is_template and local_app.content_format == ContentFormat.MULTI_FILE:
+    elif template != "existing" and local_app.content_format == ContentFormat.MULTI_FILE:
         default = "inputs/"
 
     dirpath = directory_path(
@@ -457,14 +502,7 @@ def _handle_local_run_get(run_id: str) -> ExecutedCommand:
         raise typer.Exit()
 
     # Actually execute the command to get the local run results.
-    command = [
-        "nextmv",
-        "local",
-        "run",
-        "get",
-        "--run-id",
-        run_id,
-    ]
+    command = ["nextmv", "local", "run", "get", "--run-id", run_id, "--wait"]
     str_cmd = " ".join(command)
     in_progress(f"Getting local run results with command: [code]{str_cmd}[/code]")
     result = _cli_call(command)
@@ -851,16 +889,7 @@ def _handle_cloud_run_get(cloud_app: cloud.Application, run_id: str) -> Executed
         raise typer.Exit()
 
     # Actually execute the command to get the Cloud run results.
-    command = [
-        "nextmv",
-        "cloud",
-        "run",
-        "get",
-        "--app-id",
-        cloud_app.id,
-        "--run-id",
-        run_id,
-    ]
+    command = ["nextmv", "cloud", "run", "get", "--app-id", cloud_app.id, "--run-id", run_id, "--wait"]
     str_cmd = " ".join(command)
     in_progress(f"Getting [italic]remote[/italic] run results with command: [code]{str_cmd}[/code]")
     result = _cli_call(command)

{nextmv-1.3.1.dev4 → nextmv-1.4.0.dev0}/nextmv/cli/main.py

@@ -55,14 +55,6 @@ app.add_typer(local_app, name="local")
 app.add_typer(manifest_app, name="manifest")
 app.add_typer(version_app)
 
-# Register the MCP subcommand only if the mcp extra is installed.
-try:
-    from nextmv.cli.mcp import app as mcp_app
-
-    app.add_typer(mcp_app, name="mcp", rich_help_panel="Preview")
-except ImportError:
-    pass
-
 
 @app.callback()
 def callback(
@@ -87,7 +79,7 @@ def callback(
         return
 
     # Skip checks for certain commands.
-    ignored_commands = {"configuration", "mcp", "local", "init", "manifest", "version"}
+    ignored_commands = {"configuration", "local", "init", "manifest", "version"}
     if ctx.invoked_subcommand in ignored_commands:
         return
 

{nextmv-1.3.1.dev4 → nextmv-1.4.0.dev0}/nextmv/cloud/application/_batch_scenario.py

@@ -262,7 +262,6 @@ class ApplicationBatchMixin:
         option_sets: dict[str, dict[str, str]] | None = None,
         runs: list[BatchExperimentRun | dict[str, Any]] | None = None,
         type: str | None = "batch",
-        content_type: str | None = None,
     ) -> str:
         """
         Create a new batch experiment.
@@ -287,10 +286,6 @@ class ApplicationBatchMixin:
             Type of the batch experiment. This is used to determine the
             experiment type. The default value is "batch". If you want to
             create a scenario test, set this to "scenario".
-        content_type: Optional[str]
-            Content type for the app's input/output format. Set to
-            "multi-file" for multi-file apps. If not provided, defaults
-            to the app's configured content type.
 
         Returns
         -------
@@ -328,8 +323,6 @@ class ApplicationBatchMixin:
             payload["runs"] = payload_runs
         if type is not None:
             payload["type"] = type
-        if content_type is not None:
-            payload["content_type"] = content_type
 
         response = self.client.request(
             method="POST",
@@ -411,7 +404,6 @@ class ApplicationBatchMixin:
         name: str | None = None,
         description: str | None = None,
         repetitions: int | None = 0,
-        content_type: str | None = None,
     ) -> str:
         """
         Create a new scenario test. The test is based on `scenarios` and you
@@ -456,10 +448,6 @@ class ApplicationBatchMixin:
             repetition means that the test will be repeated once, i.e.: it
             will be executed twice. 2 repetitions equals 3 executions, so on,
             and so forth.
-        content_type: Optional[str]
-            Content type for the app's input/output format. Set to
-            "multi-file" for multi-file apps. If not provided, defaults
-            to the app's configured content type.
 
         Returns
         -------
@@ -536,7 +524,6 @@ class ApplicationBatchMixin:
             type="scenario",
             option_sets=opt_sets,
             runs=runs,
-            content_type=content_type,
         )
 
     def new_scenario_test_with_result(
@@ -546,7 +533,6 @@ class ApplicationBatchMixin:
         name: str | None = None,
         description: str | None = None,
         repetitions: int | None = 0,
-        content_type: str | None = None,
         polling_options: PollingOptions = DEFAULT_POLLING_OPTIONS,
     ) -> BatchExperiment:
         """
@@ -598,7 +584,6 @@ class ApplicationBatchMixin:
             name=name,
             description=description,
             repetitions=repetitions,
-            content_type=content_type,
         )
 
         return self.scenario_test_with_polling(

{nextmv-1.3.1.dev4 → nextmv-1.4.0.dev0}/nextmv/cloud/application/_run.py

@@ -18,6 +18,7 @@ from nextmv._serialization import deflated_serialize_json
 from nextmv.base_model import BaseModel
 from nextmv.cloud.assets import RunAsset
 from nextmv.cloud.client import get_size
+from nextmv.cloud.input_set import ManagedInput
 from nextmv.cloud.url import DownloadURL
 from nextmv.input import Input, InputFormat
 from nextmv.logger import log
@@ -256,7 +257,7 @@ class ApplicationRunMixin:
 
     def new_run(  # noqa: C901 # Refactor this function at some point.
         self: "Application",
-        input: Input | dict[str, Any] | BaseModel | str = None,
+        input: Input | dict[str, Any] | ManagedInput | BaseModel | str = None,
         instance_id: str | None = None,
         name: str | None = None,
         description: str | None = None,
@@ -275,9 +276,9 @@ class ApplicationRunMixin:
 
         Parameters
         ----------
-        input: Union[Input, dict[str, Any], BaseModel, str]
+        input: Union[Input, dict[str, Any], ManagedInput, BaseModel, str]
             Input to use for the run. This can be a `nextmv.Input` object,
-            `dict`, `BaseModel` or `str`.
+            `dict`, `ManagedInput`, `BaseModel` or `str`.
 
             If `nextmv.Input` is used, and the `input_format` is either
             `nextmv.InputFormat.JSON` or `nextmv.InputFormat.TEXT`, then the
@@ -380,14 +381,22 @@ class ApplicationRunMixin:
 
         input_data = self.__extract_input_data(input)
 
+        managed_input_used, managed_input = self.__prepare_managed_input(
+            managed_input=input,
+            managed_input_id=managed_input_id,
+        )
+        if managed_input_used:
+            input = managed_input
+            if input_dir_path is not None and input_dir_path != "":
+                raise ValueError("Cannot specify both a managed input and an input directory path.")
+
         input_size = 0
         if input_data is not None:
             input_size = get_size(input_data)
 
-        managed_input_id_used = managed_input_id is not None and managed_input_id != ""
         upload_id_used = upload_id is not None and upload_id != ""
         if self.__upload_url_required(
-            uploaded_input_used=upload_id_used or managed_input_id_used,
+            uploaded_input_used=upload_id_used or managed_input_used,
             input_size=input_size,
             tar_file=tar_file,
             input=input,
@@ -409,8 +418,8 @@ class ApplicationRunMixin:
         # use `upload_id` if no managed input is defined but `upload_id` is or
         # the input used necessitated the input be uploaded, and use `input`
         # for all remaining cases.
-        if managed_input_id_used:
-            payload["input_id"] = managed_input_id
+        if managed_input_used:
+            payload["input_id"] = managed_input.id
         elif upload_id_used:
             payload["upload_id"] = upload_id
         else:
@@ -453,7 +462,7 @@ class ApplicationRunMixin:
 
     def new_run_with_result(
         self: "Application",
-        input: Input | dict[str, Any] | BaseModel | str = None,
+        input: Input | dict[str, Any] | ManagedInput | BaseModel | str = None,
         instance_id: str | None = None,
         name: str | None = None,
         description: str | None = None,
@@ -476,9 +485,9 @@ class ApplicationRunMixin:
 
         Parameters
         ----------
-        input: Union[Input, dict[str, Any], BaseModel, str]
+        input: Union[Input, dict[str, Any], ManagedInput, BaseModel, str]
             Input to use for the run. This can be a `nextmv.Input` object,
-            `dict`, `BaseModel` or `str`.
+            `dict`, `ManagedInput`, `BaseModel` or `str`.
 
             If `nextmv.Input` is used, and the `input_format` is either
             `nextmv.InputFormat.JSON` or `nextmv.InputFormat.TEXT`, then the
@@ -561,7 +570,8 @@ class ApplicationRunMixin:
             required if the output is non-JSON. If the directory does not exist, it
             will be created. Uses the current directory by default.
         managed_input_id : Optional[str],
-            The ID of an existing managed input (`nextmv.cloud.ManagedInput`) to use as the run's input.
+            The ID of an existing managed input (`nextmv.cloud.ManagedInput`) to use as
+            the run's input.
 
         Returns
         ----------
@@ -1393,6 +1403,18 @@ class ApplicationRunMixin:
 
         return input_data
 
+    def __prepare_managed_input(
+        self: "Application",
+        managed_input_id: str | None,
+        managed_input: ManagedInput | None,
+    ) -> tuple[bool, ManagedInput | None]:
+        if managed_input is not None and isinstance(managed_input, ManagedInput):
+            return True, managed_input
+        elif managed_input_id is not None and managed_input_id != "":
+            return True, self.managed_input(managed_input_id=managed_input_id)
+        else:
+            return False, None
+
     def __extract_options_dict(
         self: "Application",
         options: Options | dict[str, str] | None = None,
@@ -1420,7 +1442,7 @@ class ApplicationRunMixin:
 
     def __extract_run_config(
         self: "Application",
-        input: Input | dict[str, Any] | BaseModel | str = None,
+        input: Input | dict[str, Any] | ManagedInput | BaseModel | str = None,
         configuration: RunConfiguration | dict[str, Any] | None = None,
         dir_path: str | None = None,
     ) -> dict[str, Any]:
@@ -1436,6 +1458,8 @@ class ApplicationRunMixin:
             return configuration_dict
 
         configuration = RunConfiguration()
+        if isinstance(input, ManagedInput):
+            configuration.format = input.format
         configuration.resolve(input=input, dir_path=dir_path)
         configuration_dict = configuration.to_dict()