thestage 0.6.7__py3-none-any.whl → 0.7.0__py3-none-any.whl

thestage/{services/container → docker_container/business}/container_service.py

@@ -6,37 +6,47 @@ 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
-from thestage.services.clients.thestage_api.dtos.enums.container_status import DockerContainerStatus
-from thestage.entities.enums.shell_type import ShellType
+from thestage.connect.communication.connect_api_client import ConnectApiClient
+from thestage.docker_container.business.mapper.image_mapper import ImageMapper
+from thestage.docker_container.communication.docker_container_api_client import DockerContainerApiClient
+from thestage.docker_container.dto.container_entity import DockerContainerEntity
+from thestage.docker_container.dto.container_action_request import DockerContainerActionRequest
+from thestage.docker_container.dto.docker_container_create_request import DockerContainerCreateRequest, \
+    DockerContainerMappings
+from thestage.docker_container.dto.enum.container_pending_action import DockerContainerAction
+from thestage.docker_container.dto.enum.container_status import DockerContainerStatus
+from thestage.docker_container.dto.image_entity import DockerImageEntity
+from thestage.global_dto.enums.shell_type import ShellType
+from thestage.project.dto.project_config import ProjectConfig
 from thestage.services.clients.thestage_api.dtos.paginated_entity_list import PaginatedEntityList
-from thestage.services.container.mapper.container_mapper import ContainerMapper
+from thestage.docker_container.business.mapper.container_mapper import ContainerMapper
 from thestage.services.filesystem_service import FileSystemService
-from thestage.services.remote_server_service import RemoteServerService
+from thestage.connect.business.remote_server_service import RemoteServerService
 from thestage.i18n.translation import __
 from thestage.services.abstract_service import AbstractService
-from thestage.services.clients.thestage_api.dtos.container_response import DockerContainerDto
+from thestage.docker_container.dto.container_response import DockerContainerDto, DockerImageDto
 from thestage.helpers.error_handler import error_handler
-from thestage.services.clients.thestage_api.api_client import TheStageApiClient
-from thestage.services.config_provider.config_provider import ConfigProvider
+from thestage.config.business.config_provider import ConfigProvider
 
 
 class ContainerService(AbstractService):
 
-    __thestage_api_client: TheStageApiClient = None
+    __docker_container_api_client: DockerContainerApiClient = None
     __config_provider: ConfigProvider = None
+    __connect_api_client: ConnectApiClient = None
 
     def __init__(
             self,
-            thestage_api_client: TheStageApiClient,
+            docker_container_api_client: DockerContainerApiClient,
             config_provider: ConfigProvider,
             remote_server_service: RemoteServerService,
             file_system_service: FileSystemService,
+            connect_api_client: ConnectApiClient,
+
     ):
         self.__config_provider = config_provider
-        self.__thestage_api_client = thestage_api_client
+        self.__connect_api_client = connect_api_client
+        self.__docker_container_api_client = docker_container_api_client
         self.__remote_server_service = remote_server_service
         self.__file_system_service = file_system_service
 
@@ -50,7 +60,7 @@ class ContainerService(AbstractService):
             project_slug: Optional[str],
             statuses: List[str],
     ):
-        container_status_map = self.__thestage_api_client.get_container_business_status_map()
+        container_status_map = self.__docker_container_api_client.get_container_business_status_map()
 
         if not statuses:
             statuses = ({key: container_status_map[key] for key in [
@@ -103,7 +113,7 @@ class ContainerService(AbstractService):
             project_slug: Optional[str] = None,
     ) -> PaginatedEntityList[DockerContainerDto]:
 
-        list = self.__thestage_api_client.get_container_list(
+        list = self.__docker_container_api_client.get_container_list(
             statuses=statuses,
             page=page,
             limit=row,
@@ -113,6 +123,7 @@ class ContainerService(AbstractService):
 
         return list
 
+
     # TODO delete this proxy method
     @error_handler()
     def get_container(
@@ -120,7 +131,7 @@ class ContainerService(AbstractService):
             container_public_id: Optional[str] = None,
             container_slug: Optional[str] = None,
     ) -> Optional[DockerContainerDto]:
-        return self.__thestage_api_client.get_container(
+        return self.__docker_container_api_client.get_container(
             container_public_id=container_public_id,
             container_slug=container_slug,
         )
@@ -287,7 +298,7 @@ class ContainerService(AbstractService):
             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)
+        resolved_options = self.__connect_api_client.resolve_user_input(entity_identifier=container_identifier)
         container_public_id = None
         valid_container_count = 0
         for container_item in resolved_options.dockerContainerMatchData:
@@ -302,7 +313,7 @@ class ContainerService(AbstractService):
             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: Optional[DockerContainerDto] = self.__docker_container_api_client.get_container(
             container_public_id=container_public_id,
         )
 
@@ -366,7 +377,7 @@ class ContainerService(AbstractService):
             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)
+        resolved_options = self.__connect_api_client.resolve_user_input(entity_identifier=container_identifier)
         container_public_id = None
         valid_container_count = 0
         for container_item in resolved_options.dockerContainerMatchData:
@@ -381,7 +392,7 @@ class ContainerService(AbstractService):
             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: Optional[DockerContainerDto] = self.__docker_container_api_client.get_container(
             container_public_id=container_public_id,
         )
 
@@ -441,13 +452,127 @@ class ContainerService(AbstractService):
         if action in [DockerContainerAction.STOP, DockerContainerAction.RESTART]:
             self.check_if_container_running(container=container)
 
-        request_params = DockerContainerActionRequestDto(
+        request_params = DockerContainerActionRequest(
             dockerContainerPublicId=container.public_id,
             action=action,
         )
-        result = self.__thestage_api_client.container_action(
+        result = self.__docker_container_api_client.container_action(
             request_param=request_params,
         )
 
         if result.is_success:
             typer.echo(f'Docker container action scheduled: {action.value}')
+
+    @error_handler()
+    def create_docker_container(
+            self,
+            project_public_id: Optional[str],
+            project_slug: Optional[str],
+            container_slug: str,
+            rented_instance_public_id: Optional[str],
+            rented_instance_slug: Optional[str],
+            self_hosted_instance_public_id: Optional[str],
+            self_hosted_instance_slug: Optional[str],
+            image_name: str,
+            cpu_number: Optional[int],
+            gpu_number: Optional[int],
+            volume_mappings: Optional[Dict[str, str]],
+    ):
+        if not project_public_id and not project_slug:
+            project_config: ProjectConfig = self.__config_provider.read_project_config()
+            if not project_config:
+                typer.echo("Provide the project unique ID or name, or run this command from within an initialized project directory")
+                raise typer.Exit(1)
+            project_public_id = project_config.public_id
+
+        docker_images_paginated = self.get_image_list()
+        if not docker_images_paginated or not docker_images_paginated.entities:
+            typer.echo("No Docker images available")
+            raise typer.Exit(1)
+
+        selected_image = None
+        selection_pool = docker_images_paginated.entities
+
+        if image_name is not None:
+            matches = [img for img in selection_pool if img.image == image_name]
+
+            if len(matches) == 1:
+                selected_image = matches[0]
+            elif len(matches) > 1:
+                typer.echo(f"Multiple tags found for repository '{image_name}':")
+                selection_pool = matches
+            else:
+                typer.echo(f"Image '{image_name}' not found. Select from available images:")
+
+        if selected_image is None:
+            for idx, img in enumerate(selection_pool, start=1):
+                typer.echo(f"{idx}) {img.image}:{img.tag}")
+
+            choice_str = typer.prompt("Choose which image to use")
+
+            try:
+                choice_index = int(choice_str)
+            except ValueError:
+                typer.echo("Error: Invalid input. Enter a number.")
+                raise typer.Exit(1)
+
+            if not (1 <= choice_index <= len(selection_pool)):
+                typer.echo("Error: Choice out of range.")
+                raise typer.Exit(1)
+
+            selected_image = selection_pool[choice_index - 1]
+
+        request_params = DockerContainerCreateRequest(
+            instance_rented_public_id=rented_instance_public_id,
+            instance_rented_slug=rented_instance_slug,
+            selfhosted_instance_public_id=self_hosted_instance_public_id,
+            selfhosted_instance_slug=self_hosted_instance_slug,
+            project_public_id=project_public_id,
+            project_slug=project_slug,
+            container_slug=container_slug,
+            docker_image_id=selected_image.id,
+            assigned_cpus=cpu_number,
+            is_unlimited_cpus=cpu_number is None,
+            assigned_gpus=gpu_number,
+            is_unlimited_gpus=gpu_number is None,
+            mappings=DockerContainerMappings(directory_mappings=volume_mappings)
+        )
+
+        result = self.__docker_container_api_client.create_container(
+            request_params
+        )
+        if result.is_success:
+            typer.echo(f'Docker container creation scheduled.')
+
+    @error_handler()
+    def print_docker_image_list(
+            self,
+            row: int,
+            page: int,
+    ):
+        typer.echo("Listing available Docker images:")
+
+        self.print(
+            func_get_data=self.get_image_list,
+            func_special_params={},
+            mapper=ImageMapper(),
+            headers=list(map(lambda x: x.alias, DockerImageEntity.model_fields.values())),
+            row=row,
+            page=page,
+            max_col_width=[50, 20],
+            show_index="never",
+        )
+
+    @error_handler()
+    def get_image_list(
+            self,
+            row: int = 5,
+            page: int = 1,
+    ) -> PaginatedEntityList[DockerImageDto]:
+
+        list = self.__docker_container_api_client.get_docker_image_list(
+            page=page,
+            limit=row,
+        )
+
+        return list

thestage/{services/container → docker_container/business}/mapper/container_mapper.py

@@ -1,7 +1,7 @@
-from typing import Optional, Tuple
+from typing import Optional
 
-from thestage.services.clients.thestage_api.dtos.container_response import DockerContainerDto
-from thestage.entities.container import DockerContainerEntity
+from thestage.docker_container.dto.container_response import DockerContainerDto
+from thestage.docker_container.dto.container_entity import DockerContainerEntity
 from thestage.services.abstract_mapper import AbstractMapper
 
 

thestage/docker_container/business/mapper/image_mapper.py

@@ -0,0 +1,16 @@
+from typing import Optional
+
+from thestage.docker_container.dto.container_response import DockerImageDto
+from thestage.docker_container.dto.image_entity import DockerImageEntity
+from thestage.services.abstract_mapper import AbstractMapper
+
+
+class ImageMapper(AbstractMapper):
+    def build_entity(self, item: DockerImageDto) -> Optional[DockerImageEntity]:
+        if not item:
+            return None
+
+        return DockerImageEntity(
+            image=item.image or '',
+            tag=item.tag or '',
+        )

thestage/{controllers/container_controller.py → docker_container/communication/docker_command.py}

@@ -1,27 +1,20 @@
-
-import re
 from pathlib import Path
 from typing import Optional, List
-from rich import print
+
+import typer
 
 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 __
-from thestage.services.container.container_service import ContainerService
-from thestage.helpers.logger.app_logger import app_logger
 from thestage.controllers.utils_controller import validate_config_and_get_service_factory, get_current_directory
-
-import typer
-
-from thestage.services.logging.logging_service import LoggingService
+from thestage.docker_container.business.container_service import ContainerService
+from thestage.docker_container.dto.container_response import DockerContainerDto
+from thestage.docker_container.dto.enum.container_pending_action import DockerContainerAction
+from thestage.helpers.logger.app_logger import app_logger
+from thestage.i18n.translation import __
+from thestage.logging.business.logging_service import LoggingService
 
 app = typer.Typer(no_args_is_help=True, help=__("Manage containers"))
 
-
 @app.command(name='ls', help=__("List containers"), **get_command_metadata(CliCommand.CONTAINER_LS))
 def list_containers(
         row: int = typer.Option(
@@ -65,7 +58,7 @@ def list_containers(
     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.")
+        typer.echo("Provide a single identifier for project - ID or name.")
         raise typer.Exit(1)
 
     service_factory = validate_config_and_get_service_factory()
@@ -104,7 +97,7 @@ def container_info(
     check_command_permission(command_name)
 
     if sum(v is not None for v in [container_public_id, container_slug]) != 1:
-        typer.echo("Please provide a single identifier for container - ID or name.")
+        typer.echo("Provide a single identifier for container - ID or name.")
         raise typer.Exit(1)
 
     service_factory = validate_config_and_get_service_factory()
@@ -194,7 +187,7 @@ def container_connect(
     check_command_permission(command_name)
 
     if sum(v is not None for v in [container_public_id, container_slug]) != 1:
-        typer.echo("Please provide a single identifier for container - ID or name.")
+        typer.echo("Provide a single identifier for container - ID or name.")
         raise typer.Exit(1)
 
     if private_ssh_key_path and not Path(private_ssh_key_path).is_file():
@@ -240,7 +233,7 @@ def upload_file(
         username_param=username,
     )
 
-    app_logger.info(f'End send files to container')
+    app_logger.info(f'File upload completed')
     raise typer.Exit(0)
 
 
@@ -269,7 +262,7 @@ def download_file(
         username_param=username,
     )
 
-    app_logger.info(f'End download files from container')
+    app_logger.info(f'File download completed')
     raise typer.Exit(0)
 
 
@@ -295,7 +288,7 @@ def start_container(
     check_command_permission(command_name)
 
     if sum(v is not None for v in [container_public_id, container_slug]) != 1:
-        typer.echo("Please provide a single identifier for container - ID or name.")
+        typer.echo("Provide a single identifier for container - ID or name.")
         raise typer.Exit(1)
 
     service_factory = validate_config_and_get_service_factory()
@@ -307,7 +300,140 @@ def start_container(
         action=DockerContainerAction.START
     )
 
-    app_logger.info(f'End start container')
+    app_logger.info(f'Container is starting')
+    raise typer.Exit(0)
+
+
+@app.command(name="create", no_args_is_help=True, help=__("Create container"), **get_command_metadata(CliCommand.CONTAINER_CREATE))
+def create_container(
+        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,
+        ),
+        working_directory: Optional[str] = typer.Option(
+            None,
+            "--working-directory",
+            "-wd",
+            help=__("Full path to working directory"),
+            show_default=False,
+            is_eager=False,
+        ),
+        container_slug: Optional[str] = typer.Option(
+            None,
+            '--container-name',
+            '-cn',
+            help=__("Container name"),
+            is_eager=False,
+        ),
+        rented_instance_public_id: Optional[str] = typer.Option(
+            None,
+            '--rented-instance-id',
+            '-rid',
+            help=__("Rented instance ID on which container will run"),
+            is_eager=False,
+        ),
+        rented_instance_slug: Optional[str] = typer.Option(
+            None,
+            '--rented-instance-name',
+            '-rn',
+            help=__("Rented instance name on which container will run"),
+            is_eager=False,
+        ),
+        self_hosted_instance_public_id: Optional[str] = typer.Option(
+            None,
+            '--self-hosted-instance-id',
+            '-sid',
+            help=__("Self-hosted instance ID on which container will run"),
+            is_eager=False,
+        ),
+        self_hosted_instance_slug: Optional[str] = typer.Option(
+            None,
+            '--self-hosted-instance-name',
+            '-sn',
+            help=__("Self-hosted instance name on which container will run"),
+            is_eager=False,
+        ),
+        image_name: Optional[str] = typer.Option(
+            None,
+            '--image',
+            '-i',
+            help=__("Docker image name. If not provided, you will be prompted to select from available images"),
+            is_eager=False,
+        ),
+        gpu_number: Optional[int] = typer.Option(
+            None,
+            '--gpu-number',
+            '-gpun',
+            help=__("Number of assigned GPUs for container. No GPU limit by default"),
+            is_eager=False,
+        ),
+        cpu_number: Optional[int] = typer.Option(
+            None,
+            '--cpu-number',
+            '-cpun',
+            help=__("Number of assigned CPUs for container. No CPU limit by default"),
+            is_eager=False,
+        ),
+        volume_mounts: Optional[List[str]] = typer.Option(
+            None,
+            '--volume',
+            '-v',
+            help=__("Volume mounts. Can be used multiple times. Format: /host_dir:/container_dir"),
+            is_eager=False,
+        ),
+):
+    command_name = CliCommand.CONTAINER_CREATE
+    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("Provide a single identifier for project - ID or name.")
+        raise typer.Exit(1)
+
+    if sum(v is not None for v in [rented_instance_public_id, rented_instance_slug, self_hosted_instance_public_id, self_hosted_instance_slug]) != 1:
+        typer.echo("Provide exactly one identifier (ID or Name) for either a rented or self-hosted instance.")
+        raise typer.Exit(1)
+
+    if not container_slug:
+        container_slug = typer.prompt("Enter container name")
+
+    volume_mappings_dict = {}
+    if volume_mounts:
+        for mount in volume_mounts:
+            if ":" not in mount:
+                typer.echo(f"Invalid volume format: {mount}. Expected host:container")
+                raise typer.Exit(1)
+            host_path, container_path = mount.split(":", 1)
+            volume_mappings_dict[host_path] = container_path
+
+    service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
+    container_service: ContainerService = service_factory.get_container_service()
+
+    container_service.create_docker_container(
+        project_public_id=project_public_id,
+        project_slug=project_slug,
+        container_slug=container_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,
+        image_name=image_name,
+        cpu_number=cpu_number,
+        gpu_number=gpu_number,
+        volume_mappings=volume_mappings_dict
+    )
+
+    app_logger.info(f'Container is creating')
     raise typer.Exit(0)
 
 
@@ -333,7 +459,7 @@ def stop_container(
     check_command_permission(command_name)
 
     if sum(v is not None for v in [container_public_id, container_slug]) != 1:
-        typer.echo("Please provide a single identifier for container - ID or name.")
+        typer.echo("Provide a single identifier for container - ID or name.")
         raise typer.Exit(1)
 
     service_factory = validate_config_and_get_service_factory()
@@ -345,10 +471,47 @@ def stop_container(
         action=DockerContainerAction.STOP
     )
 
-    app_logger.info(f'End stop container')
+    app_logger.info(f'Container is stopping')
     raise typer.Exit(0)
 
 
+@app.command(name="delete", no_args_is_help=True, help=__("Delete container"), **get_command_metadata(CliCommand.CONTAINER_DELETE))
+def delete_container(
+        container_public_id: str = typer.Option(
+            None,
+            '--container-id',
+            '-cid',
+            help=__("Container ID"),
+            is_eager=False,
+        ),
+        container_slug: str = typer.Option(
+            None,
+            '--container-name',
+            '-cn',
+            help=__("Container name"),
+            is_eager=False,
+        ),
+):
+    command_name = CliCommand.CONTAINER_DELETE
+    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 [container_public_id, container_slug]) != 1:
+        typer.echo("Provide a single identifier for container - ID or name.")
+        raise typer.Exit(1)
+
+    service_factory = validate_config_and_get_service_factory()
+    container_service: ContainerService = service_factory.get_container_service()
+
+    container_service.request_docker_container_action(
+        container_public_id=container_public_id,
+        container_slug=container_slug,
+        action=DockerContainerAction.DELETE
+    )
+
+    app_logger.info(f'Container is deleting')
+    raise typer.Exit(0)
+
 @app.command(name="restart", no_args_is_help=True, help=__("Restart container"), **get_command_metadata(CliCommand.CONTAINER_RESTART))
 def restart_container(
         container_public_id: str = typer.Option(
@@ -371,7 +534,7 @@ def restart_container(
     check_command_permission(command_name)
 
     if sum(v is not None for v in [container_public_id, container_slug]) != 1:
-        typer.echo("Please provide a single identifier for container - ID or name.")
+        typer.echo("Provide a single identifier for container - ID or name.")
         raise typer.Exit(1)
 
     service_factory = validate_config_and_get_service_factory()
@@ -383,7 +546,7 @@ def restart_container(
         action=DockerContainerAction.RESTART
     )
 
-    app_logger.info(f'End stop container')
+    app_logger.info(f'Container is restarting')
     raise typer.Exit(0)
 
 
@@ -416,7 +579,7 @@ def container_logs(
     check_command_permission(command_name)
 
     if sum(v is not None for v in [container_public_id, container_slug]) != 1:
-        typer.echo("Please provide a single identifier for container - ID or name.")
+        typer.echo("Provide a single identifier for container - ID or name.")
         raise typer.Exit(1)
 
     service_factory = validate_config_and_get_service_factory()
@@ -430,5 +593,5 @@ def container_logs(
     else:
         logging_service.print_last_container_logs(container_public_id=container_public_id, container_slug=container_slug, logs_number=logs_number)
 
-    app_logger.info(f'Container logs - end')
-    raise typer.Exit(0)
+    app_logger.info(f'Container log streaming completed')
+    raise typer.Exit(0)