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

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

@@ -1,23 +1,17 @@
-
-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"))
 
@@ -65,7 +59,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 +98,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 +188,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 +234,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 +263,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)
 
 
@@ -307,7 +301,7 @@ def start_container(
         action=DockerContainerAction.START
     )
 
-    app_logger.info(f'End start container')
+    app_logger.info(f'Container start completed')
     raise typer.Exit(0)
 
 
@@ -345,7 +339,7 @@ def stop_container(
         action=DockerContainerAction.STOP
     )
 
-    app_logger.info(f'End stop container')
+    app_logger.info(f'Container stop completed')
     raise typer.Exit(0)
 
 
@@ -383,7 +377,7 @@ def restart_container(
         action=DockerContainerAction.RESTART
     )
 
-    app_logger.info(f'End stop container')
+    app_logger.info(f'Container restart completed')
     raise typer.Exit(0)
 
 
@@ -430,5 +424,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')
+    app_logger.info(f'Container log streaming completed')
     raise typer.Exit(0)

thestage/docker_container/communication/docker_container_api_client.py

@@ -0,0 +1,99 @@
+from typing import Optional, List, Dict
+
+from thestage.config.business.config_provider import ConfigProvider
+from thestage.global_dto.enums.order_direction_type import OrderDirectionType
+from thestage.services.clients.thestage_api.core.api_client_core import TheStageApiClientCore
+from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse
+from thestage.services.clients.thestage_api.dtos.entity_filter_request import EntityFilterRequest
+from thestage.services.clients.thestage_api.dtos.paginated_entity_list import PaginatedEntityList
+
+from thestage.docker_container.dto.container_action_request import DockerContainerActionRequest
+from thestage.docker_container.dto.container_response import (
+    DockerContainerDto,
+    DockerContainerViewResponse,
+    ContainerBusinessStatusMapperResponse
+)
+from thestage.docker_container.dto.docker_container_list_request import DockerContainerListRequest
+from thestage.docker_container.dto.docker_container_list_response import DockerContainerListResponse
+
+
+class DockerContainerApiClient(TheStageApiClientCore):
+    def __init__(self, config_provider: ConfigProvider):
+        super().__init__(url=config_provider.get_config().main.thestage_api_url)
+        self.__config_provider = config_provider
+
+    def get_container_list(
+            self,
+            project_public_id: Optional[str] = None,
+            project_slug: Optional[str] = None,
+            statuses: List[str] = [],
+            page: int = 1,
+            limit: int = 10,
+    ) -> PaginatedEntityList[DockerContainerDto]:
+        request = DockerContainerListRequest(
+            statuses=statuses,
+            projectPublicId=project_public_id,
+            projectSlug=project_slug,
+            entityFilterRequest=EntityFilterRequest(
+                orderByField="createdAt",
+                orderByDirection=OrderDirectionType.DESC,
+                page=page,
+                limit=limit,
+            ),
+        )
+
+        response = self._request(
+            method='POST',
+            url='/user-api/v2/docker-container/list',
+            data=request.model_dump(),
+            token=self.__config_provider.get_config().main.thestage_auth_token
+        )
+
+        result = DockerContainerListResponse.model_validate(response) if response else None
+        # return result.paginatedList.entities, result.paginatedList.pagination_data.total_pages if result and result.is_success else None
+        return result.paginatedList if result and result.is_success else None
+
+    def get_container(
+            self,
+            container_slug: Optional[str] = None,
+            container_public_id: Optional[str] = None,
+    ) -> Optional[DockerContainerDto]:
+        data = {
+            "dockerContainerPublicId": container_public_id,
+            "dockerContainerSlug": container_slug,
+        }
+
+        response = self._request(
+            method='POST',
+            url='/user-api/v2/docker-container/view',
+            data=data,
+            token=self.__config_provider.get_config().main.thestage_auth_token,
+        )
+
+        return DockerContainerViewResponse.model_validate(response).docker_container if response else None
+
+    def container_action(
+            self,
+            request_param: DockerContainerActionRequest,
+    ) -> TheStageBaseResponse:
+
+        response = self._request(
+            method='POST',
+            url='/user-api/v2/docker-container/action',
+            data=request_param.model_dump(by_alias=True),
+            token=self.__config_provider.get_config().main.thestage_auth_token,
+        )
+
+        result = TheStageBaseResponse.model_validate(response) if response else None
+        return result
+
+    def get_container_business_status_map(self) -> Optional[Dict[str, str]]:
+        response = self._request(
+            method='POST',
+            url='/user-api/v1/docker-container/status-localized-mapping',
+            data=None,
+            token=self.__config_provider.get_config().main.thestage_auth_token,
+        )
+
+        data = ContainerBusinessStatusMapperResponse.model_validate(response) if response else None
+        return data.docker_container_status_map if data else None

thestage/docker_container/dto/container_action_request.py

@@ -0,0 +1,11 @@
+from typing import Optional
+
+from pydantic import Field, BaseModel, ConfigDict
+
+from thestage.docker_container.dto.enum.container_pending_action import DockerContainerAction
+
+class DockerContainerActionRequest(BaseModel):
+    model_config = ConfigDict(use_enum_values=True)
+
+    dockerContainerPublicId: Optional[str] = Field(None, alias='dockerContainerPublicId')
+    action: DockerContainerAction = Field(None, alias='action')

thestage/{services/clients/thestage_api/dtos → docker_container/dto}/container_response.py

@@ -2,11 +2,11 @@ from typing import Optional, List, Dict
 
 from pydantic import Field, BaseModel, ConfigDict
 
-from thestage.services.clients.thestage_api.dtos.docker_container_mapping import DockerContainerMappingDto
+from thestage.docker_container.dto.docker_container_mapping import DockerContainerMappingDto
 from thestage.services.clients.thestage_api.dtos.frontend_status import FrontendStatusDto
-from thestage.services.clients.thestage_api.dtos.instance_rented_response import InstanceRentedDto
-from thestage.services.clients.thestage_api.dtos.project_response import ProjectDto
-from thestage.services.clients.thestage_api.dtos.selfhosted_instance_response import SelfHostedInstanceDto
+from thestage.instance.dto.instance_rented_response import InstanceRentedDto
+from thestage.project.dto.project_response import ProjectDto
+from thestage.instance.dto.selfhosted_instance_response import SelfHostedInstanceDto
 from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse, TheStageBasePaginatedResponse
 from thestage.services.clients.thestage_api.dtos.pagination_data import PaginationData
 

thestage/{services/clients/thestage_api/dtos/docker_container_controller → docker_container/dto}/docker_container_list_response.py

@@ -1,11 +1,9 @@
-from typing import List, Optional
-
-from pydantic import Field, ConfigDict, BaseModel
+from pydantic import Field, ConfigDict
 
 from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse
-from thestage.services.clients.thestage_api.dtos.container_response import DockerContainerDto
+from thestage.docker_container.dto.container_response import DockerContainerDto
 from thestage.services.clients.thestage_api.dtos.paginated_entity_list import PaginatedEntityList
-from thestage.services.clients.thestage_api.dtos.pagination_data import PaginationData
+
 
 class DockerContainerListResponse(TheStageBaseResponse):
     model_config = ConfigDict(use_enum_values=True)

thestage/{services/clients/git → git/communication}/git_client.py

@@ -12,9 +12,9 @@ from gitdb.exc import BadName
 from rich import print
 
 from thestage.color_scheme.color_scheme import ColorScheme
-from thestage.config import THESTAGE_CONFIG_DIR
+from thestage.config.env_base import THESTAGE_CONFIG_DIR
 from thestage.exceptions.git_access_exception import GitAccessException
-from thestage.git.ProgressPrinter import ProgressPrinter
+from thestage.git.business.ProgressPrinter import ProgressPrinter
 from thestage.services.filesystem_service import FileSystemService
 
 
@@ -33,7 +33,7 @@ class GitLocalClient:
     ):
         self.__file_system_service = file_system_service
 
-    # todo delete this fuckery
+    # todo delete this
     def __get_repo(self, path: str) -> Repo:
         return git.Repo(path)
 
@@ -392,7 +392,7 @@ class GitLocalClient:
                     repo.git.reset('--hard', f'origin/{repo.active_branch.name}')
                     typer.echo(f'Branch "{repo.active_branch.name}" is now synced to its remote counterpart')
                 else:
-                    typer.echo('simple branch reset is not implemented')
+                    typer.echo('Simple branch reset is not implemented')
 
     # refers to a "headless commit" where something was committed while in detached head state and head is pointing at that commit
     def is_head_committed_in_headless_state(self, path: str) -> bool:

thestage/helpers/error_handler.py

@@ -7,7 +7,7 @@ from click.exceptions import Exit, Abort
 from git import GitCommandError
 from paramiko.ssh_exception import PasswordRequiredException
 
-from thestage.config import THESTAGE_API_URL
+from thestage.config.env_base import THESTAGE_API_URL
 from thestage.exceptions.file_system_exception import FileSystemException
 from thestage.exceptions.remote_server_exception import RemoteServerException
 from thestage.i18n.translation import __
@@ -26,7 +26,7 @@ def error_handler() -> Callable:
                 result = f(*args, **kwargs)
                 return result
             except AuthException as e1:
-                typer.echo(__('Authentication failed: update API token'))
+                typer.echo(__('Authentication failed: update access token'))
                 app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except BusinessLogicException as e2:
@@ -98,7 +98,7 @@ def error_handler() -> Callable:
                 raise typer.Exit(1)
             except PasswordRequiredException as e11:
                 # technically we can use encrypted keys but dealing with passwords is big bs
-                typer.echo("Provided key requires password. Please use non-encrypted key.")
+                typer.echo("Provided key requires password. Use non-encrypted key.")
                 app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except Exception as e100:

thestage/helpers/logger/app_logger.py

@@ -3,10 +3,8 @@ import platform
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
 from thestage import __app_name__, __version__
+from thestage.config.env_base import THESTAGE_CONFIG_DIR, THESTAGE_LOGGING_FILE
 
-from thestage.config import THESTAGE_CONFIG_DIR
-
-from thestage.config import THESTAGE_LOGGING_FILE
 from thestage.exceptions.file_system_exception import FileSystemException
 
 

thestage/i18n/en_GB/messages.po

@@ -161,7 +161,7 @@ msgstr "Add URL to your own repository"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/controllers/sketch_controller.py
-msgid "This folder is not empty, we can not clone here"
+msgid "This folder is not empty, we cannot clone here"
 msgstr "Cannot clone: the folder is not empty"
 
 # Branch: feature/add_new_method_for_containers
@@ -362,7 +362,7 @@ msgstr "Task title is required: please type or select to auto-generate"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/sketch/sketch_service.py
-msgid "Task title can not be empty"
+msgid "Task title cannot be empty"
 msgstr "Task title is required"
 
 # Branch: feature/add_new_method_for_containers
@@ -427,7 +427,7 @@ msgstr "Incorrect slug specified: sketch not found"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/sketch/sketch_service.py
-msgid "You have local repo with remote, we can not work with this"
+msgid "You have local repo with remote, we cannot work with this"
 msgstr "Your local repository is linked to a remote: this configuration is not supported for the current operation"
 
 # Branch: feature/add_new_method_for_containers
@@ -442,12 +442,12 @@ msgstr "Your local repo has been modified and is not empty, please create an emp
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/sketch/sketch_service.py
-msgid "We can not add remote, something wrong"
+msgid "We cannot add remote, something wrong"
 msgstr "Cannot add remote, something wrong"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/sketch/sketch_service.py
-msgid "You have local repo, we can not work with this"
+msgid "You have local repo, we cannot work with this"
 msgstr "Local repository in use: not supported for current operation"
 
 # Branch: feature/add_new_method_for_containers
@@ -517,12 +517,12 @@ msgstr "Path not found"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/filesystem_service.py
-msgid "We can not make dir"
+msgid "We cannot make dir"
 msgstr "Failed to create directory"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/filesystem_service.py
-msgid "We can not make file"
+msgid "We cannot make file"
 msgstr "Failed to create file"
 
 # Branch: feature/add_new_method_for_containers
@@ -692,12 +692,12 @@ msgstr "Cannot connect to rented or self-hosted instance"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/container/container_service.py
-msgid "Container name not present, can not connect to container"
+msgid "Container name not present, cannot connect to container"
 msgstr "Cannot connect to container: please specify container slug"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/container/container_service.py
-msgid "We can not get shell on container (bash, shell), please use standard shell"
+msgid "We cannot get shell on container (bash, shell), please use standard shell"
 msgstr "Unable to access the requested shell (bash, shell) in the container: please use the default shell available in the container"
 
 # Branch: feature/add_new_method_for_containers
@@ -722,7 +722,7 @@ msgstr "Specify username to connect to server instance"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/container/container_service.py
-msgid "Container is running, can not start working server"
+msgid "Container is running, cannot start working server"
 msgstr "Container is running: cannot start running container"
 
 # Branch: feature/add_new_method_for_containers
@@ -797,7 +797,7 @@ msgstr "Server instance slug not found"
 
 # Branch: feature/add_new_method_for_containers
 #: tsr/services/sketch/sketch_service.py
-msgid "Slug can not be empty"
+msgid "Slug cannot be empty"
 msgstr "Specify slug"
 
 # Branch: main
@@ -928,17 +928,17 @@ msgstr ""
 
 # Branch: main
 #: tsr/services/container/container_service.py
-msgid "Error, can not find mapping folders"
+msgid "Error, cannot find mapping folders"
 msgstr ""
 
 # Branch: main
 #: tsr/services/container/container_service.py
-msgid "Error, can not find mapping for /public folder"
+msgid "Error, cannot find mapping for /public folder"
 msgstr ""
 
 # Branch: main
 #: tsr/services/remote_server_service.py
-msgid "Can not find mapping folders"
+msgid "cannot find mapping folders"
 msgstr ""
 
 # Branch: main