thestage 0.6.7__tar.gz → 0.7.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thestage
-Version: 0.6.7
+Version: 0.7.0
 Summary: 
 License-File: LICENSE.txt
 Author: TheStage AI team

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

@@ -1,7 +1,7 @@
 [tool.poetry]
 name = "thestage"
 
-version = "0.6.7"
+version = "0.7.0"
 
 description = ""
 authors = ["TheStage AI team <hello@thestage.ai>"]

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

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

{thestage-0.6.7 → thestage-0.7.0}/thestage/cli_command.py

@@ -27,10 +27,13 @@ class CliCommand(str, Enum):
     CONTAINER_CONNECT = "CONTAINER_CONNECT"
     CONTAINER_UPLOAD = "CONTAINER_UPLOAD"
     CONTAINER_DOWNLOAD = "CONTAINER_DOWNLOAD"
+    CONTAINER_CREATE = "CONTAINER_CREATE"
     CONTAINER_START = "CONTAINER_START"
     CONTAINER_STOP = "CONTAINER_STOP"
+    CONTAINER_DELETE = "CONTAINER_DELETE"
     CONTAINER_RESTART = "CONTAINER_RESTART"
     CONTAINER_LOGS = "CONTAINER_LOGS"
+    CONTAINER_IMAGE_LS = "CONTAINER_IMAGE_LS"
     INSTANCE_RENTED_LS = "INSTANCE_RENTED_LS"
     INSTANCE_RENTED_CONNECT = "INSTANCE_RENTED_CONNECT"
     INSTANCE_SELF_HOSTED_LS = "INSTANCE_SELF_HOSTED_LS"

{thestage-0.6.7 → thestage-0.7.0}/thestage/cli_command_helper.py

@@ -4,7 +4,7 @@ import typer
 
 from thestage.cli_command import CliCommand, CliCommandAvailability
 from thestage.color_scheme.color_scheme import ColorScheme
-from thestage.config import config_storage
+from thestage.config.business import config_storage
 from rich import print
 
 
@@ -43,7 +43,7 @@ def is_command_deprecated(command: CliCommand) -> bool:
 
 def check_command_permission(executed_command: CliCommand):
     if config_storage.APP_CONFIG.runtime.is_token_valid == False and executed_command != CliCommand.CONFIG_SET:
-        print(f"[{ColorScheme.WARNING.value}]Your API Token is not valid. You can update the token using 'thestage config set' command[{ColorScheme.WARNING.value}]")
+        print(f"[{ColorScheme.WARNING.value}]Your access Token is not valid. You can update access token using 'thestage config set' command[{ColorScheme.WARNING.value}]")
 
     is_allowed = config_storage.APP_CONFIG.runtime.allowed_commands.get(executed_command) == CliCommandAvailability.ALLOWED
     if not is_allowed:

{thestage-0.6.7 → thestage-0.7.0}/thestage/config/__init__.py

@@ -15,4 +15,4 @@ if locale.getlocale():
 translation = Path(f'i18n/')
 
 if translation.exists() and translation.is_dir():
-    init_translations(f'i18n/')
+    init_translations(f'i18n/')

{thestage-0.6.7/thestage/services → thestage-0.7.0/thestage/config/business}/app_config_service.py

@@ -3,11 +3,10 @@ import os
 import click
 import typer
 
-from thestage.services.config_provider.config_provider import ConfigProvider
-from thestage.services.core_files.config_entity import ConfigEntity
+from thestage.config.business.config_provider import ConfigProvider
+from thestage.global_dto.enums.yes_no_response import YesOrNoResponse
 from thestage.i18n.translation import __
-from thestage.entities.enums.yes_no_response import YesOrNoResponse
-from thestage.services.validation_service import ValidationService
+from thestage.config.business.validation_service import ValidationService
 
 
 class AppConfigService:

{thestage-0.6.7/thestage/services/config_provider → thestage-0.7.0/thestage/config/business}/config_provider.py

@@ -5,15 +5,16 @@ import os
 from pathlib import Path
 from typing import Optional, Dict, Any
 
+from thestage.config.env_base import THESTAGE_AUTH_TOKEN, THESTAGE_API_URL, THESTAGE_CONFIG_DIR, \
+    THESTAGE_CONFIG_FILE
 from thestage.cli_command import CliCommand, CliCommandAvailability, ALWAYS_AVAILABLE_COMMANDS
 from thestage.services.clients.thestage_api.dtos.validate_token_response import ValidateTokenResponse
-from thestage.services.core_files.config_entity import ConfigEntity
+from thestage.config.dto.config_entity import ConfigEntity
 from thestage.helpers.ssh_util import parse_private_key
-from thestage.services.connect.dto.remote_server_config import RemoteServerConfig
+from thestage.config.dto.remote_server_config import RemoteServerConfig
 from thestage.services.filesystem_service import FileSystemService
-from thestage.services.project.dto.project_config import ProjectConfig
-from thestage.config import THESTAGE_CONFIG_DIR, THESTAGE_CONFIG_FILE, THESTAGE_AUTH_TOKEN, THESTAGE_API_URL, \
-    config_storage
+from thestage.project.dto.project_config import ProjectConfig
+from thestage.config.business import config_storage
 
 
 class ConfigProvider:

{thestage-0.6.7/thestage/config → thestage-0.7.0/thestage/config/business}/config_storage.py

@@ -1,5 +1,5 @@
 from typing import Optional
 
-from thestage.services.core_files.config_entity import ConfigEntity
+from thestage.config.dto.config_entity import ConfigEntity
 
 APP_CONFIG: Optional[ConfigEntity] = None

{thestage-0.6.7/thestage/services → thestage-0.7.0/thestage/config/business}/validation_service.py

@@ -1,22 +1,21 @@
 import typer
 
+from thestage.config.business.config_provider import ConfigProvider
+from thestage.config.dto.config_entity import ConfigEntity
 from thestage.i18n.translation import __
-# from thestage.main import update_allowed_commands
-from thestage.services.clients.thestage_api.api_client import TheStageApiClient
-from thestage.services.config_provider.config_provider import ConfigProvider
-from thestage.services.core_files.config_entity import ConfigEntity
+from thestage.services.clients.thestage_api.core.api_client_core import TheStageApiClientCore
 
 
 class ValidationService:
-    _thestage_api_client: TheStageApiClient = None
+    _core_client: TheStageApiClientCore = None
     _config_provider: ConfigProvider = None
 
     def __init__(
             self,
-            thestage_api_client: TheStageApiClient,
+            core_client: TheStageApiClientCore,
             config_provider: ConfigProvider,
     ):
-        self._thestage_api_client = thestage_api_client
+        self._core_client = core_client
         self._config_provider = config_provider
 
 
@@ -25,7 +24,7 @@ class ValidationService:
         token = config.main.thestage_auth_token
         if not token:
             token: str = typer.prompt(
-                text=f'Authenticate using valid TheStage AI API token ({config.main.thestage_api_url})',
+                text=f'Authenticate using valid TheStage AI access token ({config.main.thestage_api_url})',
                 show_choices=False,
                 type=str,
                 show_default=False,
@@ -35,11 +34,11 @@ class ValidationService:
         if not token:
             return
 
-        token_validate_response = self._thestage_api_client.validate_token(token=token)
+        token_validate_response = self._core_client.validate_token(token=token)
         is_valid = token_validate_response.is_success if token_validate_response else False
         if not is_valid:
             typer.echo(__(
-                'API token is invalid: generate API token using TheStage AI WebApp'
+                'Access token is invalid: generate access token using TheStage AI WebApp'
             ))
             raise typer.Exit(1)
 

thestage-0.6.7/thestage/controllers/config_controller.py → thestage-0.7.0/thestage/config/communication/config_command.py

@@ -4,12 +4,12 @@ import click
 
 from thestage.cli_command import CliCommand
 from thestage.cli_command_helper import get_command_metadata, check_command_permission
-from thestage.services.core_files.config_entity import ConfigEntity
+from thestage.config.dto.config_entity import ConfigEntity
+from thestage.global_dto.enums.yes_no_response import YesOrNoResponse
 
-from thestage.entities.enums.yes_no_response import YesOrNoResponse
 from thestage.i18n.translation import __
 from thestage.helpers.logger.app_logger import app_logger, get_log_path_from_os
-from thestage.services.connect.connect_service import ConnectService
+from thestage.connect.business.connect_service import ConnectService
 from thestage.services.service_factory import ServiceFactory
 from thestage.controllers.utils_controller import get_current_directory
 
@@ -48,9 +48,9 @@ def config_get():
 def config_set(
     token: str = typer.Option(
             None,
-            "--api-token",
+            "--access-token",
             "-t",
-            help=__("Set or update API token"),
+            help=__("Set or update access token"),
             is_eager=False,
         ),
 ):
@@ -107,7 +107,7 @@ def upload_ssh_key(
     check_command_permission(command_name)
 
     if sum(v is not None for v in [instance_rented_public_id, instance_rented_slug]) > 1:
-        typer.echo("Please provide a single identifier for rented instance - ID or name.")
+        typer.echo("Provide a single identifier for rented instance - ID or name.")
         raise typer.Exit(1)
 
     service_factory = ServiceFactory()
@@ -137,7 +137,7 @@ def upload_ssh_key(
                 raise typer.Exit(0)
         ssh_key_contents = ssh_key_path.open("r").read()
         if 'private key-----' in ssh_key_contents.lower():
-            typer.echo(f"{ssh_key_path} is identified as a private key. Please provide a public SSH key.")
+            typer.echo(f"{ssh_key_path} is identified as a private key. Provide a public SSH key.")
             raise typer.Exit(1)
 
     connect_service.upload_ssh_key(

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

@@ -4,35 +4,39 @@ import typer
 from thestage.cli_command import CliCommand
 from thestage.cli_command_helper import check_command_permission
 from thestage.color_scheme.color_scheme import ColorScheme
+from thestage.connect.communication.connect_api_client import ConnectApiClient
 from thestage.i18n.translation import __
+from thestage.instance.communication.instance_api_client import InstanceApiClient
 from thestage.services.clients.thestage_api.core.http_client_exception import HttpClientException
-from thestage.services.clients.thestage_api.dtos.enums.instance_rented_status import InstanceRentedBusinessStatus
+from thestage.instance.dto.enum.instance_rented_status import InstanceRentedBusinessStatus
 from thestage.services.abstract_service import AbstractService
 from thestage.helpers.error_handler import error_handler
-from thestage.services.clients.thestage_api.api_client import TheStageApiClient
-from thestage.services.clients.thestage_api.dtos.instance_rented_response import InstanceRentedDto
-from thestage.services.container.container_service import ContainerService
-from thestage.services.instance.instance_service import InstanceService
-from thestage.services.logging.logging_service import LoggingService
+from thestage.instance.dto.instance_rented_response import InstanceRentedDto
+from thestage.docker_container.business.container_service import ContainerService
+from thestage.instance.business.instance_service import InstanceService
+from thestage.logging.business.logging_service import LoggingService
 from rich import print
 
 
 class ConnectService(AbstractService):
-    __thestage_api_client: TheStageApiClient = None
+    __connect_api_client: ConnectApiClient = None
+    __instance_api_client: InstanceApiClient = None
     __instance_service: InstanceService = None
     __container_service: ContainerService = None
     __logging_service: LoggingService = None
 
     def __init__(
             self,
-            thestage_api_client: TheStageApiClient,
+            instance_api_client: InstanceApiClient,
+            connect_api_client: ConnectApiClient,
             instance_service: InstanceService,
             container_service: ContainerService,
             logging_service: LoggingService,
     ):
         super(ConnectService, self).__init__(
         )
-        self.__thestage_api_client = thestage_api_client
+        self.__instance_api_client = instance_api_client
+        self.__connect_api_client = connect_api_client
         self.__instance_service = instance_service
         self.__container_service = container_service
         self.__logging_service = logging_service
@@ -45,7 +49,7 @@ class ConnectService(AbstractService):
             username: Optional[str],
             private_key_path: Optional[str],
     ):
-        resolved_options = self.__thestage_api_client.resolve_user_input(entity_identifier=input_entity_identifier)
+        resolved_options = self.__connect_api_client.resolve_user_input(entity_identifier=input_entity_identifier)
         entities_available_for_connect_count = 0
         task_presence = False
         container_presence = False
@@ -55,8 +59,8 @@ 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.value if task_item.canConnect else 'default'
+                message = f"Found a task 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'
                 print(f"[{line_color}]{message}[{line_color}]")
                 if task_item.canConnect:
                     task_presence = True
@@ -144,21 +148,20 @@ class ConnectService(AbstractService):
         instance_rented: Optional[InstanceRentedDto] = None
         if instance_slug or instance_public_id:
             try:
-                instance_rented = self.__thestage_api_client.get_rented_instance(
+                instance_rented = self.__instance_api_client.get_rented_instance(
                     instance_public_id=instance_public_id,
                     instance_slug=instance_slug
                 )
             except HttpClientException as e:
                 instance_rented = None
 
-            # if no instances found - exit 1
             if instance_rented is None:
                 typer.echo(f"No rented instance found with matching identifier")
                 raise typer.Exit(1)
 
         note_to_send: Optional[str] = None
 
-        is_user_already_has_key_response = self.__thestage_api_client.is_user_has_ssh_public_key(
+        is_user_already_has_key_response = self.__connect_api_client.is_user_has_ssh_public_key(
             public_key=public_key_contents
         )
 
@@ -167,17 +170,17 @@ class ConnectService(AbstractService):
 
         if is_adding_key_to_user and not note_to_send:
             note_to_send: str = typer.prompt(
-                text=__('SSH key will be added to your profile. Please provide a title for this key'),
+                text=__('SSH key will be added to your profile. Provide a name for this key'),
                 show_choices=False,
                 type=str,
                 show_default=False,
             )
 
         if not is_adding_key_to_user and not instance_rented:
-            typer.echo("Key already exists on your profile")
+            typer.echo("Key already exists in your profile")
 
         if is_adding_key_to_user:
-            add_ssh_key_to_user_response = self.__thestage_api_client.add_public_ssh_key_to_user(
+            add_ssh_key_to_user_response = self.__connect_api_client.add_public_ssh_key_to_user(
                 public_key=public_key_contents,
                 note=note_to_send
             )
@@ -185,7 +188,7 @@ class ConnectService(AbstractService):
             ssh_key_pair_public_id = add_ssh_key_to_user_response.sshKeyPairPublicId
 
         if instance_rented:
-            self.__thestage_api_client.add_public_ssh_key_to_instance_rented(
+            self.__connect_api_client.add_public_ssh_key_to_instance_rented(
                 instance_rented_public_id=instance_rented.public_id,
                 ssh_key_pair_public_id=ssh_key_pair_public_id
             )

{thestage-0.6.7/thestage/services → thestage-0.7.0/thestage/connect/business}/remote_server_service.py

@@ -12,15 +12,14 @@ from paramiko.client import SSHClient
 from paramiko.pkey import PKey
 from paramiko.sftp_client import SFTPClient
 
-from thestage.entities.file_item import FileItemEntity
-from thestage.services.core_files.config_entity import ConfigEntity
+from thestage.config.business.config_provider import ConfigProvider
+from thestage.global_dto.file_item import FileItemEntity
 from thestage.exceptions.remote_server_exception import RemoteServerException
 from thestage.helpers.logger.app_logger import app_logger
-from thestage.entities.enums.shell_type import ShellType
+from thestage.global_dto.enums.shell_type import ShellType
 from thestage.helpers.ssh_util import parse_private_key
 from thestage.i18n.translation import __
 from thestage.services.clients.thestage_api.dtos.sftp_path_helper import SftpFileItemEntity
-from thestage.services.config_provider.config_provider import ConfigProvider
 from thestage.services.filesystem_service import FileSystemService
 
 old_value: int = 0
@@ -361,7 +360,7 @@ class RemoteServerService:
 
         return client, sftp
 
-    # TODO what the fuck does this method do?
+    # TODO what does this method do?
     @staticmethod
     def _check_if_file_name_in_path(path: str, file_template: Optional[str] = None) -> bool:
         # strange logic

thestage-0.7.0/thestage/connect/communication/connect_api_client.py

@@ -0,0 +1,84 @@
+from typing import Optional
+
+from thestage.config.business.config_provider import ConfigProvider
+from thestage.services.clients.thestage_api.core.api_client_core import TheStageApiClientCore
+from thestage.connect.dto.add_ssh_key_to_user_request import AddSshKeyToUserRequest
+from thestage.connect.dto.add_ssh_key_to_user_response import AddSshKeyToUserResponse
+from thestage.connect.dto.is_user_has_public_ssh_key_request import IsUserHasSshPublicKeyRequest
+from thestage.connect.dto.is_user_has_public_ssh_key_response import IsUserHasSshPublicKeyResponse
+from thestage.connect.dto.add_ssh_public_key_to_instance_request import AddSshPublicKeyToInstanceRequest
+from thestage.connect.dto.add_ssh_public_key_to_instance_response import AddSshPublicKeyToInstanceResponse
+from thestage.connect.dto.connect_resolve_response import ConnectResolveOptionsResponse
+
+
+class ConnectApiClient(TheStageApiClientCore):
+    def __init__(self, config_provider: ConfigProvider):
+        super().__init__(url=config_provider.get_config().main.thestage_api_url)
+        self.__config_provider = config_provider
+
+    def add_public_ssh_key_to_user(self, public_key: str, note: str) -> AddSshKeyToUserResponse:
+        request = AddSshKeyToUserRequest(
+            sshKey=public_key,
+            note=note
+        )
+
+        response = self._request(
+            method='POST',
+            url='/user-api/v2/ssh-key/add-public-key-to-user',
+            data=request.model_dump(),
+            token=self.__config_provider.get_config().main.thestage_auth_token,
+        )
+
+        result = AddSshKeyToUserResponse.model_validate(response) if response else None
+        return result
+
+
+    def is_user_has_ssh_public_key(self, public_key: str) -> IsUserHasSshPublicKeyResponse:
+        request = IsUserHasSshPublicKeyRequest(
+            sshKey=public_key,
+        )
+
+        response = self._request(
+            method='POST',
+            url='/user-api/v2/ssh-key/is-user-has-public-ssh-key',
+            data=request.model_dump(),
+            token=self.__config_provider.get_config().main.thestage_auth_token,
+        )
+
+        result = IsUserHasSshPublicKeyResponse.model_validate(response) if response else None
+        return result
+
+
+    def add_public_ssh_key_to_instance_rented(self, instance_rented_public_id: str,
+                                              ssh_key_pair_public_id: str) -> AddSshPublicKeyToInstanceResponse:
+        request = AddSshPublicKeyToInstanceRequest(
+            instanceRentedPublicId=instance_rented_public_id,
+            sshPublicKeyPublicId=ssh_key_pair_public_id,
+        )
+
+        response = self._request(
+            method='POST',
+            url='/user-api/v2/ssh-key/add-public-ssh-key-to-instance-rented',
+            data=request.model_dump(),
+            token=self.__config_provider.get_config().main.thestage_auth_token,
+        )
+
+        result = AddSshPublicKeyToInstanceResponse.model_validate(response) if response else None
+        return result
+
+    def resolve_user_input(
+            self,
+            entity_identifier: str
+    ) -> Optional[ConnectResolveOptionsResponse]:
+        data = {
+            "entityIdentifier": entity_identifier,
+        }
+
+        response = self._request(
+            method='POST',
+            url='/user-api/v1/resolve-user-input',
+            data=data,
+            token=self.__config_provider.get_config().main.thestage_auth_token,
+        )
+
+        return ConnectResolveOptionsResponse.model_validate(response) if response else None

{thestage-0.6.7/thestage/services/clients/thestage_api/dtos/ssh_key_controller → thestage-0.7.0/thestage/connect/dto}/add_ssh_key_to_user_response.py

@@ -3,7 +3,6 @@ from typing import Optional
 from pydantic import Field, ConfigDict
 
 from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse
-from thestage.services.task.dto.task_dto import TaskDto
 
 
 class AddSshKeyToUserResponse(TheStageBaseResponse):

{thestage-0.6.7/thestage/services/clients/thestage_api/dtos/ssh_key_controller → thestage-0.7.0/thestage/connect/dto}/add_ssh_public_key_to_instance_response.py

@@ -1,9 +1,6 @@
-from typing import Optional
-
-from pydantic import Field, ConfigDict
+from pydantic import ConfigDict
 
 from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse
-from thestage.services.task.dto.task_dto import TaskDto
 
 
 class AddSshPublicKeyToInstanceResponse(TheStageBaseResponse):

{thestage-0.6.7/thestage/services/clients/thestage_api/dtos/base_controller → thestage-0.7.0/thestage/connect/dto}/connect_resolve_response.py

@@ -4,7 +4,6 @@ from pydantic import Field, BaseModel
 
 from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse
 from thestage.services.clients.thestage_api.dtos.frontend_status import FrontendStatusDto
-from thestage.services.task.dto.task_dto import TaskDto
 
 
 class EntityMatchData(BaseModel):

{thestage-0.6.7 → thestage-0.7.0}/thestage/controllers/base_controller.py

@@ -10,12 +10,12 @@ from thestage import __app_name__, __version__
 
 import typer
 
-from thestage.services.connect.connect_service import ConnectService
+from thestage.connect.business.connect_service import ConnectService
 
 app = typer.Typer(no_args_is_help=True,)
 
 
-@app.command(name='version', help="Get application's name and version", no_args_is_help=False, **get_command_metadata(CliCommand.VERSION))
+@app.command(name='version', help="Show application name and version", no_args_is_help=False, **get_command_metadata(CliCommand.VERSION))
 def version():
     command_name = CliCommand.VERSION
     app_logger.info(f'Running {command_name} from {get_current_directory()}')

thestage-0.7.0/thestage/debug_main.dist.py

@@ -0,0 +1,30 @@
+from thestage import __app_name__
+from thestage.controllers.base_controller import app as main_app
+
+from thestage.docker_container.communication.docker_command import app as container_app
+from thestage.instance.communication.instance_command import app as instance_app
+from thestage.project.communication.project_command import app as project_app
+from thestage.config.communication.config_command import app as config_app
+from thestage.task.communication.task_command import app as task_app
+
+main_app.add_typer(container_app, name="container")
+main_app.add_typer(instance_app, name="instance")
+main_app.add_typer(config_app, name="config")
+main_app.add_typer(project_app, name="project")
+main_app.add_typer(task_app, name="task")
+
+def main():
+    project_app([
+        "run",
+        "-wd",
+        "/Users/alexey/Documents/clonetest",
+        "-cid",
+        '62-1',
+        '-t',
+        'task',
+        "echo 123",
+        "-nl"
+    ], prog_name=__app_name__)
+
+if __name__ == "__main__":
+    main()