thestage 0.6.4__py3-none-any.whl → 0.6.6__py3-none-any.whl

thestage/controllers/project_controller.py

@@ -32,8 +32,19 @@ app.add_typer(config_app, name="config", rich_help_panel=get_command_group_help_
 
 @app.command(name='clone', no_args_is_help=True, help=__("Clone project repository to empty directory"), **get_command_metadata(CliCommand.PROJECT_CLONE))
 def clone(
-        project_uid: str = typer.Argument(
-            help=__("Project unique ID"),
+        project_public_id: Optional[str] = typer.Option(
+            None,
+            "--project-id",
+            "-pid",
+            help=__("Project ID. ID or name is required"),
+            is_eager=False,
+        ),
+        project_slug: Optional[str] = typer.Option(
+            None,
+            "--project-name",
+            "-pn",
+            help=__("Project name. ID or name is required."),
+            is_eager=False,
         ),
         working_directory: Optional[str] = typer.Option(
             None,
@@ -47,14 +58,19 @@ def clone(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    if sum(v is not None for v in [project_public_id, project_slug]) != 1:
+        typer.echo("Please provide a single identifier for the project - name or ID.")
+        raise typer.Exit(1)
+
     if not working_directory:
-        working_directory = get_current_directory().joinpath(project_uid)
+        working_directory = get_current_directory().joinpath(project_slug)
 
     service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
     project_service = service_factory.get_project_service()
 
     project_service.clone_project(
-        project_slug=project_uid,
+        project_slug=project_slug,
+        project_public_id=project_public_id,
     )
 
     raise typer.Exit(0)
@@ -62,8 +78,19 @@ def clone(
 
 @app.command(name='init', no_args_is_help=True, help=__("Initialize project repository with existing files"), **get_command_metadata(CliCommand.PROJECT_INIT))
 def init(
-        project_uid: Optional[str] = typer.Argument(
-            help=__("Project unique ID"),
+        project_public_id: Optional[str] = typer.Option(
+            None,
+            "--project-id",
+            "-pid",
+            help=__("Project ID. ID or name is required"),
+            is_eager=False,
+        ),
+        project_slug: Optional[str] = typer.Option(
+            None,
+            "--project-name",
+            "-pn",
+            help=__("Project name. ID or name is required."),
+            is_eager=False,
         ),
         working_directory: Optional[str] = typer.Option(
             None,
@@ -77,6 +104,10 @@ def init(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    if sum(v is not None for v in [project_public_id, project_slug]) != 1:
+        typer.echo("Please provide a single identifier for the project - name or ID.")
+        raise typer.Exit(1)
+
     service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
     project_service = service_factory.get_project_service()
     project_config = service_factory.get_config_provider().read_project_config()
@@ -86,7 +117,8 @@ def init(
         raise typer.Exit(1)
 
     project_service.init_project(
-        project_slug=project_uid,
+        project_slug=project_slug,
+        project_public_id=project_public_id,
     )
 
     raise typer.Exit(0)
@@ -104,11 +136,18 @@ def run(
             help=__("Commit hash to use. By default, the current HEAD commit is used."),
             is_eager=False,
         ),
-        docker_container_slug: Optional[str] = typer.Option(
+        docker_container_public_id: Optional[str] = typer.Option(
             None,
-            '--container-uid',
+            '--container-id',
             '-cid',
-            help=__("Docker container unique ID"),
+            help=__("Docker container ID"),
+            is_eager=False,
+        ),
+        docker_container_slug: Optional[str] = typer.Option(
+            None,
+            '--container-name',
+            '-cn',
+            help=__("Docker container name"),
             is_eager=False,
         ),
         working_directory: Optional[str] = typer.Option(
@@ -152,6 +191,10 @@ def run(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    if sum(v is not None for v in [docker_container_public_id, docker_container_slug]) != 1:
+        typer.echo("Please provide a single identifier for the container - name or ID.")
+        raise typer.Exit(1)
+
     if not command:
         typer.echo(__('Command is required'))
         raise typer.Exit(1)
@@ -162,6 +205,7 @@ def run(
     task: Optional[TaskDto] = project_service.project_run_task(
         run_command=" ".join(command),
         commit_hash=commit_hash,
+        docker_container_public_id=docker_container_public_id,
         docker_container_slug=docker_container_slug,
         task_title=task_title,
         files_to_add=files_to_add,
@@ -170,14 +214,14 @@ def run(
 
     if enable_log_stream:
         logging_service: LoggingService = service_factory.get_logging_service()
-        logging_service.stream_task_logs_with_controls(task_id=task.id)
+        logging_service.stream_task_logs_with_controls(task_public_id=task.public_id)
 
     raise typer.Exit(0)
 
 
 @task_app.command(name='cancel', no_args_is_help=True, help=__("Cancel a task by ID"), **get_command_metadata(CliCommand.PROJECT_TASK_CANCEL))
 def cancel_task(
-        task_id: Annotated[int, typer.Argument(
+        task_id: Annotated[str, typer.Argument(
             help=__("Task ID (required)"),
         )],
 ):
@@ -186,14 +230,14 @@ def cancel_task(
     check_command_permission(command_name)
 
     if not task_id:
-        typer.echo(__('Task ID is required'))
+        typer.echo('Task ID is required')
         raise typer.Exit(1)
 
     service_factory = validate_config_and_get_service_factory()
     project_service = service_factory.get_project_service()
 
     project_service.cancel_task(
-        task_id=task_id
+        task_public_id=task_id
     )
 
     raise typer.Exit(0)
@@ -201,7 +245,20 @@ def cancel_task(
 
 @task_app.command("ls", help=__("List tasks"), **get_command_metadata(CliCommand.PROJECT_TASK_LS))
 def list_runs(
-        project_uid: Annotated[str, typer.Argument(help=__("Project unique ID. By default, project info is taken from the current directory"), metavar="OPTIONAL")] = None,
+        project_public_id: Optional[str] = typer.Option(
+            None,
+            '--project-id',
+            '-pid',
+            help=__("Project ID. By default, project info is taken from the current directory"),
+            is_eager=False,
+        ),
+        project_slug: Optional[str] = typer.Option(
+            None,
+            '--project-name',
+            '-pn',
+            help=__("Project name. By default, project info is taken from the current directory"),
+            is_eager=False,
+        ),
         row: int = typer.Option(
             5,
             '--row',
@@ -221,10 +278,14 @@ def list_runs(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    if sum(v is not None for v in [project_public_id, project_slug]) > 1:
+        typer.echo("Please provide a single identifier for project - ID or name.")
+        raise typer.Exit(1)
+
     service_factory = validate_config_and_get_service_factory()
     project_service: ProjectService = service_factory.get_project_service()
 
-    project_service.print_task_list(project_uid, row, page)
+    project_service.print_task_list(project_public_id=project_public_id, project_slug=project_slug, row=row, page=page)
 
     typer.echo(__("Tasks listing complete"))
     raise typer.Exit(0)
@@ -232,7 +293,7 @@ def list_runs(
 
 @task_app.command(name="logs", no_args_is_help=True, help=__("Stream real-time task logs or view last logs for a task"), **get_command_metadata(CliCommand.PROJECT_TASK_LOGS))
 def task_logs(
-        task_id: Optional[int] = typer.Argument(help=__("Task ID"),),
+        task_id: Optional[str] = typer.Argument(help=__("Task ID"),),
         logs_number: Optional[int] = typer.Option(
             None,
             '--number',
@@ -253,9 +314,9 @@ def task_logs(
     logging_service: LoggingService = service_factory.get_logging_service()
 
     if logs_number is None:
-        logging_service.stream_task_logs_with_controls(task_id=task_id)
+        logging_service.stream_task_logs_with_controls(task_public_id=task_id)
     else:
-        logging_service.print_last_task_logs(task_id=task_id, logs_number=logs_number)
+        logging_service.print_last_task_logs(task_public_id=task_id, logs_number=logs_number)
 
     app_logger.info(f'Task logs - end')
     raise typer.Exit(0)
@@ -263,8 +324,19 @@ def task_logs(
 
 @app.command(name='checkout', no_args_is_help=True, help=__("Checkout project repository to a specific reference"), **get_command_metadata(CliCommand.PROJECT_CHECKOUT))
 def checkout_project(
-        reference: Optional[str] = typer.Argument(
-            help=__("Task ID or branch name to checkout. '/' will try to identify the main branch."),
+        task_public_id: Optional[str] = typer.Option(
+            None,
+            "--task-id",
+            "-tid",
+            help="Task ID to checkout",
+            is_eager=False,
+        ),
+        branch_name: Optional[str] = typer.Option(
+            None,
+            "--branch",
+            "-b",
+            help="Branch name to checkout. Use '/' value to checkout to the main branch.",
+            is_eager=False,
         ),
         working_directory: Optional[str] = typer.Option(
             None,
@@ -278,22 +350,20 @@ def checkout_project(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    if sum(v is not None for v in [branch_name, task_public_id]) != 1:
+        typer.echo("Please provide a single identifier for checkout - task ID or branch name.")
+        raise typer.Exit(1)
+
     service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
     project_service = service_factory.get_project_service()
 
-    task_id: Optional[int] = None
-    branch_name: Optional[str] = None
-
-    if reference == "/":
-        pass
-    elif reference.isdigit():
-        task_id = int(reference)
-    else:
-        branch_name = reference
+    final_branch_name = branch_name
+    if branch_name == "/":
+        final_branch_name = None
 
     project_service.checkout_project(
-        task_id=task_id,
-        branch_name=branch_name,
+        task_public_id=task_public_id,
+        branch_name=final_branch_name,
     )
 
     raise typer.Exit(0)
@@ -345,9 +415,20 @@ def reset_project(
 
 @config_app.command(name='set-default-container', no_args_is_help=True, help=__("Set default docker container for a project installation"), **get_command_metadata(CliCommand.PROJECT_CONFIG_SET_DEFAULT_CONTAINER))
 def set_default_container(
-        container_uid: Annotated[Optional[str], typer.Argument(
-            help=__("Unique ID of the container to use by default for running tasks"),
-        )] = None,
+        docker_container_public_id: Optional[str] = typer.Option(
+            None,
+            '--container-id',
+            '-cid',
+            help=__("Docker container ID"),
+            is_eager=False,
+        ),
+        docker_container_slug: Optional[str] = typer.Option(
+            None,
+            '--container-name',
+            '-cn',
+            help=__("Docker container name"),
+            is_eager=False,
+        ),
         unset_default_container: Optional[bool] = typer.Option(
             False,
             "--unset",
@@ -367,20 +448,26 @@ def set_default_container(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    container_args_count = sum(v is not None for v in [docker_container_public_id, docker_container_slug])
+    if container_args_count > 1:
+        typer.echo("Please provide a single identifier for the container - name or ID.")
+        raise typer.Exit(1)
+
     service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
 
-    if unset_default_container and container_uid:
-        typer.echo("Container unique ID is provided along with unset flag. Please pick one.")
+    if unset_default_container and container_args_count > 0:
+        typer.echo("Container identifier is provided along with unset flag. Please pick one.")
         raise typer.Exit(1)
 
-    if not unset_default_container and not container_uid:
-        typer.echo("Provide container unique ID or use '--unset' flag")
+    if not unset_default_container and container_args_count != 1:
+        typer.echo("Provide container identifier or use '--unset' flag")
         raise typer.Exit(1)
 
     project_service = service_factory.get_project_service()
 
     project_service.set_default_container(
-        container_uid=container_uid,
+        container_public_id=docker_container_public_id,
+        container_slug=docker_container_slug,
     )
 
     raise typer.Exit(0)
@@ -410,18 +497,32 @@ def get_project_config(
 
 @inference_simulators_app.command(name='run', no_args_is_help=True, help="Run an inference simulator within the project", **get_command_metadata(CliCommand.PROJECT_INFERENCE_SIMULATOR_RUN))
 def run_inference_simulator(
-        rented_instance_unique_id: Optional[str] = typer.Option(
+        rented_instance_public_id: Optional[str] = typer.Option(
+            None,
+            '--rented-instance-id',
+            '-rid',
+            help=__("The rented instance ID on which the inference simulator will run"),
+            is_eager=False,
+        ),
+        rented_instance_slug: Optional[str] = typer.Option(
+            None,
+            '--rented-instance-name',
+            '-rn',
+            help=__("The rented instance name on which the inference simulator will run"),
+            is_eager=False,
+        ),
+        self_hosted_instance_public_id: Optional[str] = typer.Option(
             None,
-            '--rented-instance-unique-id',
-            '-ruid',
-            help=__("The rented instance unique ID on which the inference simulator will run"),
+            '--self-hosted-instance-id',
+            '-sid',
+            help=__("The self-hosted instance ID on which the inference simulator will run"),
             is_eager=False,
         ),
-        self_hosted_instance_unique_id: Optional[str] = typer.Option(
+        self_hosted_instance_slug: Optional[str] = typer.Option(
             None,
-            '--self-hosted-instance-unique-id',
-            '-suid',
-            help=__("The self-hosted instance unique ID on which the inference simulator will run"),
+            '--self-hosted-instance-name',
+            '-sn',
+            help=__("The self-hosted instance name on which the inference simulator will run"),
             is_eager=False,
         ),
         commit_hash: Optional[str] = typer.Option(
@@ -508,8 +609,10 @@ def run_inference_simulator(
 
     inference_simulator = project_service.project_run_inference_simulator(
         commit_hash=commit_hash,
-        rented_instance_unique_id=rented_instance_unique_id,
-        self_hosted_instance_unique_id=self_hosted_instance_unique_id,
+        rented_instance_public_id=rented_instance_public_id,
+        rented_instance_slug=rented_instance_slug,
+        self_hosted_instance_public_id=self_hosted_instance_public_id,
+        self_hosted_instance_slug=self_hosted_instance_slug,
         inference_dir=inference_dir,
         is_skip_installation=is_skip_installation,
         files_to_add=files_to_add,
@@ -520,14 +623,27 @@ def run_inference_simulator(
         logging_service: LoggingService = service_factory.get_logging_service()
 
         logging_service.stream_inference_simulator_logs_with_controls(
-            slug=inference_simulator.slug
+            public_id=inference_simulator.public_id
         )
     raise typer.Exit(0)
 
 
 @inference_simulators_app.command(name='save-metadata', no_args_is_help=True, help="Get and save inference simulator metadata", **get_command_metadata(CliCommand.PROJECT_INFERENCE_SIMULATOR_SAVE_METADATA))
 def get_and_save_inference_simulator_metadata(
-        unique_id: Optional[str] = typer.Argument(help=__("Inference simulator unique ID"),),
+        inference_simulator_public_id: Optional[str] = typer.Option(
+            None,
+            '--inference-simulator-id',
+            '-isid',
+            help=__("Inference simulator ID"),
+            is_eager=False,
+        ),
+        inference_simulator_slug: Optional[str] = typer.Option(
+            None,
+            '--inference-simulator-name',
+            '-isn',
+            help=__("Inference simulator ID"),
+            is_eager=False,
+        ),
         file_path: Optional[str] = typer.Option(
             None,
             "--file-path",
@@ -541,12 +657,17 @@ def get_and_save_inference_simulator_metadata(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    if sum(v is not None for v in [inference_simulator_public_id, inference_simulator_slug]) != 1:
+        typer.echo("Please provide a single identifier for inference simulator - ID or name.")
+        raise typer.Exit(1)
+
     service_factory = validate_config_and_get_service_factory()
     project_service = service_factory.get_project_service()
 
     project_service.project_get_and_save_inference_simulator_metadata(
         file_path=file_path,
-        slug=unique_id,
+        inference_simulator_public_id=inference_simulator_public_id,
+        inference_simulator_slug=inference_simulator_slug,
     )
 
     raise typer.Exit(0)
@@ -554,17 +675,35 @@ def get_and_save_inference_simulator_metadata(
 
 @inference_simulators_app.command(name='push', no_args_is_help=True, help="Push an inference simulator within the project to model registry", **get_command_metadata(CliCommand.PROJECT_INFERENCE_SIMULATOR_PUSH))
 def push_inference_simulator(
-        unique_id: Optional[str] = typer.Argument(help=__("Inference simulator unique ID"),),
+        inference_simulator_public_id: Optional[str] = typer.Option(
+            None,
+            '--inference-simulator-id',
+            '-isid',
+            help=__("Inference simulator ID"),
+            is_eager=False,
+        ),
+        inference_simulator_slug: Optional[str] = typer.Option(
+            None,
+            '--inference-simulator-name',
+            '-isn',
+            help=__("Inference simulator name"),
+            is_eager=False,
+        ),
 ):
     command_name = CliCommand.PROJECT_INFERENCE_SIMULATOR_PUSH
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    if sum(v is not None for v in [inference_simulator_public_id, inference_simulator_slug]) != 1:
+        typer.echo("Please provide a single identifier for inference simulator - ID or name.")
+        raise typer.Exit(1)
+
     service_factory = validate_config_and_get_service_factory()
     project_service = service_factory.get_project_service()
 
     project_service.project_push_inference_simulator(
-        slug=unique_id,
+        public_id=inference_simulator_public_id,
+        slug=inference_simulator_slug,
     )
 
     raise typer.Exit(0)
@@ -572,7 +711,20 @@ def push_inference_simulator(
 
 @inference_simulators_app.command("ls", help=__("List inference simulators"), **get_command_metadata(CliCommand.PROJECT_INFERENCE_SIMULATOR_LS))
 def list_inference_simulators(
-        project_uid: Annotated[str, typer.Argument(help=__("Project unique ID. By default, project info is taken from the current directory"), metavar="OPTIONAL")] = None,
+        project_public_id: Optional[str] = typer.Option(
+            None,
+            '--project-id',
+            '-pid',
+            help=__("Project ID. By default, project info is taken from the current directory"),
+            is_eager=False,
+        ),
+        project_slug: Optional[str] = typer.Option(
+            None,
+            '--project-name',
+            '-pn',
+            help=__("Project name. By default, project info is taken from the current directory"),
+            is_eager=False,
+        ),
         row: int = typer.Option(
             5,
             '--row',
@@ -599,10 +751,20 @@ def list_inference_simulators(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    if sum(v is not None for v in [project_public_id, project_slug]) > 1:
+        typer.echo("Please provide a single identifier for project - ID or name.")
+        raise typer.Exit(1)
+
     service_factory = validate_config_and_get_service_factory()
     project_service: ProjectService = service_factory.get_project_service()
 
-    project_service.print_inference_simulator_list(project_uid, statuses, row, page)
+    project_service.print_inference_simulator_list(
+        project_public_id=project_public_id,
+        project_slug=project_slug,
+        statuses=statuses,
+        row=row,
+        page=page
+    )
 
     typer.echo(__("Inference simulators listing complete"))
     raise typer.Exit(0)
@@ -610,7 +772,20 @@ def list_inference_simulators(
 
 @inference_simulator_model_app.command("ls", help=__("List inference simulator models"), **get_command_metadata(CliCommand.PROJECT_MODEL_LS))
 def list_inference_simulator_models(
-        project_uid: Annotated[str, typer.Argument(help=__("Project unique ID. By default, project info is taken from the current directory"), metavar="OPTIONAL")] = None,
+        project_public_id: Optional[str] = typer.Option(
+            None,
+            '--project-id',
+            '-pid',
+            help=__("Project ID. By default, project info is taken from the current directory"),
+            is_eager=False,
+        ),
+        project_slug: Optional[str] = typer.Option(
+            None,
+            '--project-name',
+            '-pn',
+            help=__("Project name. By default, project info is taken from the current directory"),
+            is_eager=False,
+        ),
         row: int = typer.Option(
             5,
             '--row',
@@ -637,10 +812,20 @@ def list_inference_simulator_models(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
+    if sum(v is not None for v in [project_public_id, project_slug]) > 1:
+        typer.echo("Please provide a single identifier for project - ID or name.")
+        raise typer.Exit(1)
+
     service_factory = validate_config_and_get_service_factory()
     project_service: ProjectService = service_factory.get_project_service()
 
-    project_service.print_inference_simulator_model_list(project_uid, statuses, row, page)
+    project_service.print_inference_simulator_model_list(
+        project_public_id=project_public_id,
+        project_slug=project_slug,
+        statuses=statuses,
+        row=row,
+        page=page
+    )
 
     typer.echo(__("Inference simulator models listing complete"))
     raise typer.Exit(0)
@@ -648,7 +833,20 @@ def list_inference_simulator_models(
 
 @inference_simulators_app.command(name="logs", no_args_is_help=True, help=__("Stream real-time task logs or view last logs for an inference simulator"), **get_command_metadata(CliCommand.PROJECT_INFERENCE_SIMULATOR_LOGS))
 def inference_simulator_logs(
-        unique_id: Optional[str] = typer.Argument(help=__("Inference simulator unique ID"),),
+        public_id: Optional[str] = typer.Option(
+            None,
+            '--inference-simulator-id',
+            '-isid',
+            help="Inference simulator ID",
+            is_eager=False,
+        ),
+        slug: Optional[str] = typer.Option(
+            None,
+            '--name',
+            '-isn',
+            help="Inference simulator name",
+            is_eager=False,
+        ),
         logs_number: Optional[int] = typer.Option(
             None,
             '--number',
@@ -661,8 +859,8 @@ def inference_simulator_logs(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
-    if not unique_id:
-        typer.echo(__('Inference simulator UID is required'))
+    if sum(v is not None for v in [public_id, slug]) != 1:
+        typer.echo("Please provide a single identifier for inference simulator - ID or name.")
         raise typer.Exit(1)
 
     service_factory = validate_config_and_get_service_factory()
@@ -670,18 +868,20 @@ def inference_simulator_logs(
 
     if logs_number is None:
         logging_service.stream_inference_simulator_logs_with_controls(
-            slug=unique_id
+            public_id=public_id,
+            slug=slug,
         )
     else:
         get_inference_simulator_response: Optional[GetInferenceSimulatorResponse] = service_factory.get_thestage_api_client().get_inference_simulator(
-            slug=unique_id,
+            public_id=public_id,
+            slug=slug,
         )
         if not get_inference_simulator_response:
-            typer.echo(__("Inference simulator with UID %uid% not found", {"uid": unique_id}))
+            typer.echo("Inference simulator with not found")
             raise typer.Exit(1)
         else:
-            inference_simulator_id = get_inference_simulator_response.inferenceSimulator.id
-            logging_service.print_last_inference_simulator_logs(inference_simulator_id=inference_simulator_id, logs_number=logs_number)
+            inference_simulator_public_id = get_inference_simulator_response.inferenceSimulator.public_id
+            logging_service.print_last_inference_simulator_logs(inference_simulator_public_id=inference_simulator_public_id, logs_number=logs_number)
 
     app_logger.info(f'Inference simulator logs - end')
     raise typer.Exit(0)
@@ -689,19 +889,46 @@ def inference_simulator_logs(
 
 @inference_simulator_model_app.command("deploy-instance", no_args_is_help=True, help=__("Deploy an inference simulator model to an instance"), **get_command_metadata(CliCommand.PROJECT_MODEL_DEPLOY_INSTANCE))
 def deploy_inference_simulator_model_to_instance(
-        unique_id: Optional[str] = typer.Argument(help=__("Inference simulator model unique ID"), ),
-        rented_instance_unique_id: Optional[str] = typer.Option(
+        model_public_id: Optional[str] = typer.Option(
+            None,
+            '--model-id',
+            '-mid',
+            help="The inference simulator model ID",
+            is_eager=False,
+        ),
+        model_slug: Optional[str] = typer.Option(
+            None,
+            '--model-name',
+            '-mn',
+            help="The inference simulator model name",
+            is_eager=False,
+        ),
+        rented_instance_public_id: Optional[str] = typer.Option(
             None,
-            '--rented-instance-unique-id',
-            '-ruid',
-            help=__("The rented instance unique ID on which the inference simulator model will be deployed"),
+            '--rented-instance-id',
+            '-rid',
+            help=__("The rented instance ID on which the inference simulator will run"),
             is_eager=False,
         ),
-        self_hosted_instance_unique_id: Optional[str] = typer.Option(
+        rented_instance_slug: Optional[str] = typer.Option(
             None,
-            '--self-hosted-instance-unique-id',
-            '-suid',
-            help=__("The self-hosted instance unique ID on which the inference simulator model will be deployed"),
+            '--rented-instance-name',
+            '-rn',
+            help=__("The rented instance name on which the inference simulator will run"),
+            is_eager=False,
+        ),
+        self_hosted_instance_public_id: Optional[str] = typer.Option(
+            None,
+            '--self-hosted-instance-id',
+            '-sid',
+            help=__("The self-hosted instance ID on which the inference simulator will run"),
+            is_eager=False,
+        ),
+        self_hosted_instance_slug: Optional[str] = typer.Option(
+            None,
+            '--self-hosted-instance-name',
+            '-sn',
+            help=__("The self-hosted instance name on which the inference simulator will run"),
             is_eager=False,
         ),
         working_directory: Optional[str] = typer.Option(
@@ -724,33 +951,49 @@ def deploy_inference_simulator_model_to_instance(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
-    if unique_id and not re.match(r"^[a-zA-Z0-9-]+$", unique_id):
+    if model_slug and not re.match(r"^[a-zA-Z0-9-]+$", model_slug):
         raise typer.BadParameter(__("Invalid UID format. The UID can only contain letters, numbers, and hyphens."))
 
-    unique_id_with_timestamp = f"{unique_id}-{int(time.time())}"
+    new_inference_simulator_slug = f"{model_slug}-{int(time.time())}"
 
     service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
     project_service = service_factory.get_project_service()
 
     project_service.project_deploy_inference_simulator_model_to_instance(
-        unique_id=unique_id,
-        unique_id_with_timestamp=unique_id_with_timestamp,
-        rented_instance_unique_id=rented_instance_unique_id,
-        self_hosted_instance_unique_id=self_hosted_instance_unique_id,
+        model_public_id=model_public_id,
+        model_slug=model_slug,
+        new_inference_simulator_slug=new_inference_simulator_slug,
+        rented_instance_public_id=rented_instance_public_id,
+        rented_instance_slug=rented_instance_slug,
+        self_hosted_instance_public_id=self_hosted_instance_public_id,
+        self_hosted_instance_slug=self_hosted_instance_slug,
     )
 
     if enable_log_stream:
         logging_service: LoggingService = service_factory.get_logging_service()
 
         logging_service.stream_inference_simulator_logs_with_controls(
-            slug=unique_id_with_timestamp
+            slug=new_inference_simulator_slug
         )
     raise typer.Exit(0)
 
 
 @inference_simulator_model_app.command("deploy-sagemaker", no_args_is_help=True, help=__("Deploy an inference simulator model to SageMaker"), **get_command_metadata(CliCommand.PROJECT_MODEL_DEPLOY_SAGEMAKER))
 def deploy_inference_simulator_model_to_sagemaker(
-        unique_id: Optional[str] = typer.Argument(help=__("Inference simulator model unique ID"), ),
+        model_public_id: Optional[str] = typer.Option(
+            None,
+            '--id',
+            '-mid',
+            help="Inference simulator model ID",
+            is_eager=False,
+        ),
+        model_slug: Optional[str] = typer.Option(
+            None,
+            '--name',
+            '-mn',
+            help="Inference simulator model name",
+            is_eager=False,
+        ),
         arn: Optional[str] = typer.Option(
             None,
             '--amazon-resource-name',
@@ -795,14 +1038,19 @@ def deploy_inference_simulator_model_to_sagemaker(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
-    if unique_id and not re.match(r"^[a-zA-Z0-9-]+$", unique_id):
+    if sum(v is not None for v in [model_public_id, model_slug]) != 1:
+        typer.echo("Please provide a single identifier for inference simulator model - ID or name.")
+        raise typer.Exit(1)
+
+    if model_slug and not re.match(r"^[a-zA-Z0-9-]+$", model_slug):
         raise typer.BadParameter(__("Invalid UID format. The UID can only contain letters, numbers, and hyphens."))
 
     service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
     project_service = service_factory.get_project_service()
 
     project_service.project_deploy_inference_simulator_model_to_sagemaker(
-        unique_id=unique_id,
+        model_public_id=model_public_id,
+        model_slug=model_slug,
         arn=arn,
         instance_type=instance_type,
         initial_variant_weight=initial_variant_weight,