thestage 0.6.6__tar.gz → 0.6.7__tar.gz

{thestage-0.6.6 → thestage-0.6.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thestage
-Version: 0.6.6
+Version: 0.6.7
 Summary: 
 License-File: LICENSE.txt
 Author: TheStage AI team
@@ -21,6 +21,7 @@ Requires-Dist: pydantic (>=2.4.2,<3.0.0)
 Requires-Dist: python-dotenv (>=1.0.0,<2.0.0)
 Requires-Dist: python-gettext-translations (>=1.1.0,<2.0.0)
 Requires-Dist: requests (>=2.31.0,<3.0.0)
+Requires-Dist: rich (>=14.2.0,<15.0.0)
 Requires-Dist: tabulate (>=0.9.0,<0.10.0)
 Requires-Dist: typer[all] (>=0.15.2,<0.16.0)
 Description-Content-Type: text/markdown

{thestage-0.6.6 → thestage-0.6.7}/pyproject.toml

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "thestage"
 
-version = "0.6.6"
+version = "0.6.7"
 
 description = ""
 authors = ["TheStage AI team <hello@thestage.ai>"]
@@ -34,6 +34,7 @@ paramiko = "^3.5.1"
 aioconsole = "^0.8.0"
 httpx = "^0.27.2"
 boto3 = "^1.35.80"
+rich = "^14.2.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.4.3"

{thestage-0.6.6 → thestage-0.6.7}/thestage/__init__.py

@@ -1,3 +1,3 @@
 from . import *
 __app_name__ = "thestage"
-__version__ = "0.6.6"
+__version__ = "0.6.7"

{thestage-0.6.6 → thestage-0.6.7}/thestage/controllers/container_controller.py

@@ -2,9 +2,12 @@
 import re
 from pathlib import Path
 from typing import Optional, List
+from rich import print
 
 from thestage.cli_command import CliCommand
 from thestage.cli_command_helper import get_command_metadata, check_command_permission
+from thestage.color_scheme.color_scheme import ColorScheme
+from thestage.services.clients.thestage_api.api_client import TheStageApiClient
 from thestage.services.clients.thestage_api.dtos.enums.container_pending_action import DockerContainerAction
 from thestage.services.clients.thestage_api.dtos.container_response import DockerContainerDto
 from thestage.i18n.translation import __
@@ -215,7 +218,7 @@ def container_connect(
 @app.command(name="upload", no_args_is_help=True, help=__("Upload file to container"), **get_command_metadata(CliCommand.CONTAINER_UPLOAD))
 def upload_file(
         source_path: str = typer.Argument(help=__("Source file path"),),
-        destination: Optional[str] = typer.Argument(help=__("Destination directory path in container. Format: container_name:/path/to/file"),),
+        destination: Optional[str] = typer.Argument(help=__("Destination directory path in container. Format: container_id_or_name:/path/to/file"),),
         username: Optional[str] = typer.Option(
             None,
             '--username',
@@ -228,50 +231,22 @@ def upload_file(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
-    container_args = re.match(r"^([\w\W]+?):([\w\W]+)$", destination)
-
-    if container_args is None:
-        typer.echo(__('Container name and source file path are required as the second argument'))
-        typer.echo(__('Example: container_uid:/path/to/file'))
-        raise typer.Exit(1)
-    container_slug = container_args.groups()[0]
-    destination_path = container_args.groups()[1].rstrip("/")
-
-    if not container_slug:
-        typer.echo(__('Container name is required'))
-        raise typer.Exit(1)
-
     service_factory = validate_config_and_get_service_factory()
     container_service: ContainerService = service_factory.get_container_service()
 
-    container: Optional[DockerContainerDto] = container_service.get_container(
-        container_slug=container_slug,
+    container_service.put_file_to_container(
+        source_path=source_path,
+        destination=destination,
+        username_param=username,
     )
 
-    if container:
-        container_service.check_if_container_running(
-            container=container
-        )
-
-        typer.echo(f"Uploading file(s) to container '{container_slug}'")
-
-        container_service.put_file_to_container(
-            container=container,
-            src_path=source_path,
-            destination_path=destination_path,
-            username_param=username,
-            copy_only_folder_contents=source_path.endswith("/")
-        )
-    else:
-        typer.echo(__("Container not found: %container_item%", {'container_item': container_slug}))
-
     app_logger.info(f'End send files to container')
     raise typer.Exit(0)
 
 
 @app.command(name="download", no_args_is_help=True, help=__("Download file from container"), **get_command_metadata(CliCommand.CONTAINER_DOWNLOAD))
 def download_file(
-        source_path: str = typer.Argument(help=__("Source file path in container. Format: container_name:/path/to/file"),),
+        source: str = typer.Argument(help=__("Source file path in container. Format: container_name:/path/to/file"),),
         destination_path: str = typer.Argument(help=__("Destination directory path on local machine"),),
         username: Optional[str] = typer.Option(
             None,
@@ -285,43 +260,15 @@ def download_file(
     app_logger.info(f'Running {command_name} from {get_current_directory()}')
     check_command_permission(command_name)
 
-    container_args = re.match(r"^([\w\W]+?):([\w\W]+)$", source_path)
-
-    if container_args is None:
-        typer.echo(__('Container name and source directory path are required as the first argument'))
-        typer.echo(__('Example: container-uid:/path/to/file'))
-        raise typer.Exit(1)
-    container_slug = container_args.groups()[0]
-    source_path = container_args.groups()[1]
-
-    if not container_slug:
-        typer.echo(__('Container name is required'))
-        raise typer.Exit(1)
-
     service_factory = validate_config_and_get_service_factory()
     container_service: ContainerService = service_factory.get_container_service()
 
-    container: Optional[DockerContainerDto] = container_service.get_container(
-        container_slug=container_slug,
+    container_service.get_file_from_container(
+        source=source,
+        destination_path=destination_path.rstrip("/"),
+        username_param=username,
     )
 
-    if container:
-        container_service.check_if_container_running(
-            container=container
-        )
-
-        typer.echo(f"Downloading files from container: '{container_slug}'")
-
-        container_service.get_file_from_container(
-            container=container,
-            src_path=source_path,
-            destination_path=destination_path.rstrip("/"),
-            username_param=username,
-            copy_only_folder_contents=source_path.endswith("/"),
-        )
-    else:
-        typer.echo(f"Container not found: {container_slug}")
-
     app_logger.info(f'End download files from container')
     raise typer.Exit(0)
 

{thestage-0.6.6 → thestage-0.6.7}/thestage/controllers/instance_controller.py

@@ -66,14 +66,14 @@ def rented_list(
 def instance_connect(
         public_id: Optional[str] = typer.Option(
             None,
-            '--id',
+            '--rented-instance-id',
             '-rid',
             help="Rented instance ID",
             is_eager=False,
         ),
         slug: Optional[str] = typer.Option(
             None,
-            '--name',
+            '--rented-instance-name',
             '-rn',
             help="Rented instance name",
             is_eager=False,
@@ -156,14 +156,14 @@ def self_hosted_list(
 def self_hosted_connect(
         public_id: Optional[str] = typer.Option(
             None,
-            '--id',
+            '--self-hosted-instance-id',
             '-sid',
             help="Self-hosted instance ID",
             is_eager=False,
         ),
         slug: Optional[str] = typer.Option(
             None,
-            '--name',
+            '--self-hosted-instance-name',
             '-sn',
             help="Self-hosted instance name",
             is_eager=False,

{thestage-0.6.6 → thestage-0.6.7}/thestage/controllers/project_controller.py

@@ -63,7 +63,8 @@ def clone(
         raise typer.Exit(1)
 
     if not working_directory:
-        working_directory = get_current_directory().joinpath(project_slug)
+        project_dir_name = project_public_id if project_slug is None else project_slug
+        working_directory = get_current_directory().joinpath(project_dir_name)
 
     service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
     project_service = service_factory.get_project_service()
@@ -842,7 +843,7 @@ def inference_simulator_logs(
         ),
         slug: Optional[str] = typer.Option(
             None,
-            '--name',
+            '--inference-simulator-name',
             '-isn',
             help="Inference simulator name",
             is_eager=False,
@@ -952,17 +953,14 @@ def deploy_inference_simulator_model_to_instance(
     check_command_permission(command_name)
 
     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."))
-
-    new_inference_simulator_slug = f"{model_slug}-{int(time.time())}"
+        raise typer.BadParameter("Invalid name format. Name 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_instance(
+    inference_simulator_public_id = project_service.project_deploy_inference_simulator_model_to_instance(
         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,
@@ -973,7 +971,7 @@ def deploy_inference_simulator_model_to_instance(
         logging_service: LoggingService = service_factory.get_logging_service()
 
         logging_service.stream_inference_simulator_logs_with_controls(
-            slug=new_inference_simulator_slug
+            public_id=inference_simulator_public_id
         )
     raise typer.Exit(0)
 
@@ -982,14 +980,14 @@ def deploy_inference_simulator_model_to_instance(
 def deploy_inference_simulator_model_to_sagemaker(
         model_public_id: Optional[str] = typer.Option(
             None,
-            '--id',
+            '--model-id',
             '-mid',
             help="Inference simulator model ID",
             is_eager=False,
         ),
         model_slug: Optional[str] = typer.Option(
             None,
-            '--name',
+            '--model-name',
             '-mn',
             help="Inference simulator model name",
             is_eager=False,

{thestage-0.6.6 → thestage-0.6.7}/thestage/entities/project_inference_simulator_model.py

@@ -11,7 +11,7 @@ class ProjectInferenceSimulatorModelEntity(BaseModel):
     )
 
     public_id: Optional[str] = Field(None, alias='ID')
-    slug: Optional[str] = Field(None, alias='UNIQUE_ID')
+    slug: Optional[str] = Field(None, alias='NAME')
     status: Optional[str] = Field(None, alias='STATUS')
     commit_hash: Optional[str] = Field(None, alias='COMMIT_HASH')
     environment_metadata: Optional[Dict[str, Any]] = Field(None, alias='ENVIRONMENT_METADATA')

{thestage-0.6.6 → thestage-0.6.7}/thestage/helpers/error_handler.py

@@ -106,8 +106,8 @@ def error_handler() -> Callable:
                     raise e100
                 else:
                     typer.echo(__('Undefined error occurred'))
-                    typer.echo(e100.__class__.__name__)
-                    print(traceback.format_exc())
+                    # typer.echo(e100.__class__.__name__)
+                    # print(traceback.format_exc())
                     # TODO send all exceptions to backend?
                     app_logger.error(f'{traceback.format_exc()}')
                     raise typer.Exit(1)

{thestage-0.6.6 → thestage-0.6.7}/thestage/main.py

@@ -19,7 +19,7 @@ def main():
             config_provider.update_allowed_commands_and_is_token_valid(validate_token_response=token_info)
         except Exception as e:
             app_logger.error(f'{traceback.format_exc()}')
-            print('Unexpected error occurred')  # TODO inquire what we want here if backend is offline
+            print('Error connecting to TheStage servers')  # TODO inquire what we want here if backend is offline
             print(f'Application logs path: {str(get_log_path_from_os())}')
             return
 

{thestage-0.6.6 → thestage-0.6.7}/thestage/services/clients/git/git_client.py

@@ -196,7 +196,7 @@ class GitLocalClient:
     ) -> Optional[str]:
         repo = self.__get_repo(path=path)
         if repo.head.is_detached:
-            line_color = ColorScheme.GIT_HEADLESS
+            line_color = ColorScheme.GIT_HEADLESS.value
             print(f'[{line_color}]Committing in detached head state at {repo.head.commit.hexsha}[/{line_color}]')
         commit_name = name if name else f"Auto commit {str(datetime.datetime.now().date())}"
         commit = repo.git.commit('--allow-empty', '-m', commit_name, )

{thestage-0.6.6 → thestage-0.6.7}/thestage/services/clients/thestage_api/api_client.py

@@ -667,7 +667,6 @@ class TheStageApiClient(TheStageApiClientCore):
             self,
             model_public_id: str,
             model_slug: str,
-            new_inference_simulator_slug: str,
             rented_instance_public_id: Optional[str] = None,
             rented_instance_slug: Optional[str] = None,
             self_hosted_instance_public_id: Optional[str] = None,
@@ -675,10 +674,9 @@ class TheStageApiClient(TheStageApiClientCore):
 
     ) -> Optional[DeployInferenceModelToInstanceResponse]:
         request = DeployInferenceModelToInstanceRequest(
-            inferenceSimulatorSlug=new_inference_simulator_slug,
             modelPublicId=model_public_id,
             modelSlug=model_slug,
-            instancePublicId=rented_instance_public_id,
+            instanceRentedPublicId=rented_instance_public_id,
             instanceRentedSlug=rented_instance_slug,
             selfhostedInstancePublicId=self_hosted_instance_public_id,
             selfhostedInstanceSlug=self_hosted_instance_slug
@@ -735,7 +733,7 @@ class TheStageApiClient(TheStageApiClientCore):
         return result
 
 
-    def resolve_connect_options(
+    def resolve_user_input(
             self,
             entity_identifier: str
     ) -> Optional[ConnectResolveOptionsResponse]:
@@ -745,7 +743,7 @@ class TheStageApiClient(TheStageApiClientCore):
 
         response = self._request(
             method='POST',
-            url='/user-api/v1/connect/resolve-options',
+            url='/user-api/v1/resolve-user-input',
             data=data,
             token=self.__config_provider.get_config().main.thestage_auth_token,
         )

{thestage-0.6.6 → thestage-0.6.7}/thestage/services/clients/thestage_api/dtos/base_controller/connect_resolve_response.py

@@ -11,6 +11,7 @@ class EntityMatchData(BaseModel):
     publicId: str = Field(alias='publicId')
     frontendStatus: FrontendStatusDto = Field(alias='frontendStatus')
     canConnect: bool = Field(alias='canConnect')
+    canDownloadUploadOnContainer: bool = Field(alias='canDownloadUploadOnContainer')
     matchedField: Optional[str] = Field(None, alias='matchedField')
 
 

{thestage-0.6.6 → thestage-0.6.7}/thestage/services/clients/thestage_api/dtos/inference_controller/deploy_inference_model_to_instance_request.py

@@ -16,5 +16,3 @@ class DeployInferenceModelToInstanceRequest(BaseModel):
 
     selfhostedInstancePublicId: Optional[str] = Field(None, alias='selfhostedInstancePublicId')
     selfhostedInstanceSlug: Optional[str] = Field(None, alias='selfhostedInstanceSlug')
-
-    inferenceSimulatorSlug: Optional[str] = Field(None, alias='inferenceSimulatorSlug')

{thestage-0.6.6 → thestage-0.6.7}/thestage/services/clients/thestage_api/dtos/inference_controller/deploy_inference_model_to_instance_response.py

@@ -9,4 +9,6 @@ from thestage.services.project.dto.inference_simulator_model_dto import Inferenc
 class DeployInferenceModelToInstanceResponse(TheStageBaseResponse):
     model_config = ConfigDict(use_enum_values=True)
 
+    inferenceSimulatorPublicId: Optional[str] = Field(None, alias='inferenceSimulatorPublicId')
+
 

{thestage-0.6.6 → thestage-0.6.7}/thestage/services/clients/thestage_api/dtos/inference_controller/get_inference_simulator_request.py

@@ -8,5 +8,5 @@ from thestage.services.clients.thestage_api.dtos.entity_filter_request import En
 class GetInferenceSimulatorRequest(BaseModel):
     model_config = ConfigDict(use_enum_values=True)
 
-    public_id: Optional[str] = Field(None, alias='publicId')
+    publicId: Optional[str] = Field(None, alias='publicId')
     slug: Optional[str] = Field(None, alias='slug')

{thestage-0.6.6 → thestage-0.6.7}/thestage/services/clients/thestage_api/dtos/project_controller/project_run_task_response.py

@@ -1,3 +1,5 @@
+from typing import Optional, List
+
 from pydantic import Field, ConfigDict
 
 from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse
@@ -8,3 +10,4 @@ class ProjectRunTaskResponse(TheStageBaseResponse):
     model_config = ConfigDict(use_enum_values=True)
 
     task: TaskDto = Field(None, alias='task')
+    tasksInQueue: Optional[List[TaskDto]] = Field(None, alias='tasksInQueue')

{thestage-0.6.6 → thestage-0.6.7}/thestage/services/connect/connect_service.py

@@ -45,7 +45,7 @@ class ConnectService(AbstractService):
             username: Optional[str],
             private_key_path: Optional[str],
     ):
-        resolved_options = self.__thestage_api_client.resolve_connect_options(entity_identifier=input_entity_identifier)
+        resolved_options = self.__thestage_api_client.resolve_user_input(entity_identifier=input_entity_identifier)
         entities_available_for_connect_count = 0
         task_presence = False
         container_presence = False
@@ -56,7 +56,7 @@ class ConnectService(AbstractService):
         if resolved_options.taskMatchData:
             for task_item in resolved_options.taskMatchData:
                 message = f"Found a task with with matching {task_item.matchedField} in status: '{task_item.frontendStatus.status_translation}' (ID: {task_item.publicId})"
-                line_color = ColorScheme.SUCCESS if task_item.canConnect else 'default'
+                line_color = ColorScheme.SUCCESS.value if task_item.canConnect else 'default'
                 print(f"[{line_color}]{message}[{line_color}]")
                 if task_item.canConnect:
                     task_presence = True
@@ -66,7 +66,7 @@ class ConnectService(AbstractService):
         if resolved_options.dockerContainerMatchData:
             for container_item in resolved_options.dockerContainerMatchData:
                 message = f"Found a container with matching {container_item.matchedField} in status: '{container_item.frontendStatus.status_translation}' (ID: {container_item.publicId})"
-                line_color = ColorScheme.SUCCESS if container_item.canConnect else 'default'
+                line_color = ColorScheme.SUCCESS.value if container_item.canConnect else 'default'
                 print(f"[{line_color}]{message}[{line_color}]")
                 if container_item.canConnect:
                     container_presence = True
@@ -76,7 +76,7 @@ class ConnectService(AbstractService):
         if resolved_options.instanceRentedMatchData:
             for instance_rented_item in resolved_options.instanceRentedMatchData:
                 message = f"Found a rented instance with matching {instance_rented_item.matchedField} in status: '{instance_rented_item.frontendStatus.status_translation}'  (ID: {instance_rented_item.publicId})"
-                line_color = ColorScheme.SUCCESS if instance_rented_item.canConnect else 'default'
+                line_color = ColorScheme.SUCCESS.value if instance_rented_item.canConnect else 'default'
                 print(f"[{line_color}]{message}[{line_color}]")
 
                 if instance_rented_item.canConnect:
@@ -87,7 +87,7 @@ class ConnectService(AbstractService):
         if resolved_options.selfhostedInstanceMatchData:
             for selfhosted_item in resolved_options.selfhostedInstanceMatchData:
                 message = f"Found a self-hosted instance with matching {selfhosted_item.matchedField} in status: '{selfhosted_item.frontendStatus.status_translation}' (ID: {selfhosted_item.publicId})"
-                line_color = ColorScheme.SUCCESS if selfhosted_item.canConnect else 'default'
+                line_color = ColorScheme.SUCCESS.value if selfhosted_item.canConnect else 'default'
                 print(f"[{line_color}]{message}[{line_color}]")
 
                 if selfhosted_item.canConnect:
@@ -153,7 +153,7 @@ class ConnectService(AbstractService):
 
             # if no instances found - exit 1
             if instance_rented is None:
-                typer.echo(f"No rented instance found with matching unique ID '{instance_slug}'")
+                typer.echo(f"No rented instance found with matching identifier")
                 raise typer.Exit(1)
 
         note_to_send: Optional[str] = None

{thestage-0.6.6 → thestage-0.6.7}/thestage/services/container/container_service.py

@@ -1,7 +1,11 @@
+import re
 from pathlib import Path
 from typing import List, Tuple, Optional, Dict
+from rich import print
 
 import typer
+
+from thestage.color_scheme.color_scheme import ColorScheme
 from thestage.entities.container import DockerContainerEntity
 from thestage.services.clients.thestage_api.dtos.container_param_request import DockerContainerActionRequestDto
 from thestage.services.clients.thestage_api.dtos.enums.container_pending_action import DockerContainerAction
@@ -150,7 +154,7 @@ class ContainerService(AbstractService):
             if private_key_path:
                 typer.echo(f'Using configured private key for {ip_address}: {private_key_path}')
             else:
-                typer.echo(f'Using SSH agent to connect to {ip_address}')
+                typer.echo(f'Using SSH agent to connect to {ip_address} as {username}')
         else:
             self.__config_provider.update_remote_server_config_entry(ip_address, Path(private_key_path))
             typer.echo(f'Updated private key path for {ip_address}: {private_key_path}')
@@ -267,22 +271,49 @@ class ContainerService(AbstractService):
     @error_handler()
     def put_file_to_container(
             self,
-            container: DockerContainerDto,
-            src_path: str,
-            copy_only_folder_contents: bool,
-            destination_path: Optional[str] = None,
-            username_param: Optional[str] = None,
+            source_path: str,
+            destination: str,
+            username_param: Optional[str],
     ):
-        if not self.__file_system_service.check_if_path_exist(file=src_path):
-            typer.echo(__("File not found at specified path"))
+        container_args = re.match(r"^([\w\W]+?):([\w\W]+)$", destination)
+        if container_args is None:
+            typer.echo(__('Container name and source file path are required as the second argument'))
+            typer.echo(__('Example: container_name:/path/to/file'))
             raise typer.Exit(1)
+        container_identifier = container_args.groups()[0]
+        destination_path = container_args.groups()[1].rstrip("/")
 
-        username, ip_address, private_key_path = self.get_server_auth(
-            container=container,
-            username_param=username_param,
-            private_key_path_override=None
+        if not container_identifier:
+            typer.echo('Container identifier (container_id_or_name) is required')
+            raise typer.Exit(1)
+
+        resolved_options = self.__thestage_api_client.resolve_user_input(entity_identifier=container_identifier)
+        container_public_id = None
+        valid_container_count = 0
+        for container_item in resolved_options.dockerContainerMatchData:
+            message = f"Found a container with matching {container_item.matchedField} in status: '{container_item.frontendStatus.status_translation}' (ID: {container_item.publicId})"
+            line_color = ColorScheme.SUCCESS.value if container_item.canDownloadUploadOnContainer else 'default'
+            print(f"[{line_color}]{message}[{line_color}]")
+            if container_item.canDownloadUploadOnContainer:
+                valid_container_count += 1
+                container_public_id = container_item.publicId
+
+        if valid_container_count != 1:
+            typer.echo(f"Failed to resolve the container by provided identifier, as total of {valid_container_count} containers are valid options")
+            raise typer.Exit(1)
+
+        container: Optional[DockerContainerDto] = self.__thestage_api_client.get_container(
+            container_public_id=container_public_id,
         )
 
+        if not container:
+            typer.echo(f"Unexpected error: container '{container_public_id}' not found")
+            raise typer.Exit(1)
+
+        if not self.__file_system_service.check_if_path_exist(file=source_path):
+            typer.echo(__("File not found at specified path"))
+            raise typer.Exit(1)
+
         if not container.mappings or not container.mappings.directory_mappings:
             typer.echo(__("Mapping folders not found"))
             raise typer.Exit(1)
@@ -296,10 +327,18 @@ class ContainerService(AbstractService):
             typer.echo(__("Cannot find matching container volume mapping for specified file path"))
             raise typer.Exit(1)
 
+        username, ip_address, private_key_path = self.get_server_auth(
+            container=container,
+            username_param=username_param,
+            private_key_path_override=None
+        )
+
+        copy_only_folder_contents = source_path.endswith("/")
+
         self.__remote_server_service.upload_data_to_container(
             ip_address=ip_address,
             username=username,
-            src_path=src_path,
+            src_path=source_path,
             dest_path=destination_path,
             instance_path=instance_path,
             container_path=container_path,
@@ -310,31 +349,67 @@ class ContainerService(AbstractService):
     @error_handler()
     def get_file_from_container(
             self,
-            container: DockerContainerDto,
-            src_path: str,
-            copy_only_folder_contents: bool,
-            destination_path: Optional[str] = None,
+            source: str,
+            destination_path: str,
             username_param: Optional[str] = None,
     ):
-        username, ip_address, private_key_path = self.get_server_auth(
-            container=container,
-            username_param=username_param,
-            private_key_path_override=None,
+        container_args = re.match(r"^([\w\W]+?):([\w\W]+)$", source)
+
+        if container_args is None:
+            typer.echo(__('Container name and source directory path are required as the first argument'))
+            typer.echo(__('Example: container_name:/path/to/file'))
+            raise typer.Exit(1)
+        container_identifier = container_args.groups()[0]
+        source_path = container_args.groups()[1]
+
+        if not container_identifier:
+            typer.echo('Container identifier (container_id_or_name) is required')
+            raise typer.Exit(1)
+
+        resolved_options = self.__thestage_api_client.resolve_user_input(entity_identifier=container_identifier)
+        container_public_id = None
+        valid_container_count = 0
+        for container_item in resolved_options.dockerContainerMatchData:
+            message = f"Found a container with matching {container_item.matchedField} in status: '{container_item.frontendStatus.status_translation}' (ID: {container_item.publicId})"
+            line_color = ColorScheme.SUCCESS.value if container_item.canDownloadUploadOnContainer else 'default'
+            print(f"[{line_color}]{message}[{line_color}]")
+            if container_item.canDownloadUploadOnContainer:
+                valid_container_count += 1
+                container_public_id = container_item.publicId
+
+        if valid_container_count != 1:
+            typer.echo(f"Failed to resolve the container by provided identifier, as total of {valid_container_count} containers are valid options")
+            raise typer.Exit(1)
+
+        container: Optional[DockerContainerDto] = self.__thestage_api_client.get_container(
+            container_public_id=container_public_id,
         )
 
+        if not container:
+            typer.echo(f"Unexpected error: container '{container_public_id}' not found")
+            raise typer.Exit(1)
+
         if not container.mappings or not container.mappings.directory_mappings:
             typer.echo(__("Mapping folders not found"))
             raise typer.Exit(1)
 
         instance_path, container_path = self._get_new_path_from_mapping(
             directory_mapping=container.mappings.directory_mappings,
-            destination_path=src_path,
+            destination_path=source_path,
         )
 
         if not instance_path and not container_path:
             typer.echo(__("Cannot find matching container volume mapping for specified file path"))
             raise typer.Exit(1)
 
+        username, ip_address, private_key_path = self.get_server_auth(
+            container=container,
+            username_param=username_param,
+            private_key_path_override=None,
+        )
+
+        copy_only_folder_contents=source_path.endswith("/")
+
         self.__remote_server_service.download_data_from_container(
             ip_address=ip_address,
             username=username,