thestage 0.5.44__py3-none-any.whl → 0.5.45__py3-none-any.whl

thestage/__init__.py

@@ -1,3 +1,3 @@
 from . import *
 __app_name__ = "thestage"
-__version__ = "0.5.44"
+__version__ = "0.5.45"

thestage/controllers/container_controller.py

@@ -3,13 +3,10 @@ import re
 from pathlib import Path
 from typing import Optional, List
 
-from thestage.entities.container import DockerContainerEntity
 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.clients.thestage_api.dtos.enums.container_status import DockerContainerStatus
 from thestage.services.container.container_service import ContainerService
-from thestage.services.container.mapper.container_mapper import ContainerMapper
 from thestage.helpers.logger.app_logger import app_logger
 from thestage.controllers.utils_controller import validate_config_and_get_service_factory, get_current_directory
 

thestage/controllers/instance_controller.py

@@ -57,46 +57,12 @@ def rented_list(
     config = service_factory.get_config_provider().get_full_config()
 
     instance_service: InstanceService = service_factory.get_instance_service()
-    instance_rented_status_map = service_factory.get_thestage_api_client().get_rented_business_status_map(config.main.thestage_auth_token)
-
-    if not statuses:
-        statuses = ({key: instance_rented_status_map[key] for key in [
-            InstanceRentedBusinessStatus.ONLINE,
-            InstanceRentedBusinessStatus.CREATING,
-            InstanceRentedBusinessStatus.TERMINATING,
-            InstanceRentedBusinessStatus.REBOOTING,
-        ]}).values()
-
-    if "all" in statuses:
-        statuses = instance_rented_status_map.values()
-
-    for input_status_item in statuses:
-        if input_status_item not in instance_rented_status_map.values():
-            typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
-                'invalid_status': input_status_item,
-                'valid_statuses': str(list(instance_rented_status_map.values()))
-            }))
-            raise typer.Exit(1)
-
-    typer.echo(__(
-        "Listing rented server instances with the following statuses: %statuses%, to view all rented server instances, use --status all",
-        placeholders={
-            'statuses': ', '.join([status_item for status_item in statuses])
-        }))
-
-    backend_statuses: List[str] = [key for key, value in instance_rented_status_map.items() if value in statuses]
-
-    instance_service.print(
-        func_get_data=instance_service.get_rented_list,
-        func_special_params={
-            'statuses': backend_statuses,
-        },
-        mapper=InstanceMapper(),
+
+    instance_service.print_rented_instance_list(
         config=config,
-        headers=list(map(lambda x: x.alias, RentedInstanceEntity.model_fields.values())),
+        statuses=statuses,
         row=row,
-        page=page,
-        show_index="never",
+        page=page
     )
 
     typer.echo(__("Rented server instances listing complete"))
@@ -175,45 +141,12 @@ def self_hosted_list(
     config = service_factory.get_config_provider().get_full_config()
 
     instance_service: InstanceService = service_factory.get_instance_service()
-    selfhosted_instance_status_map = service_factory.get_thestage_api_client().get_selfhosted_business_status_map(config.main.thestage_auth_token)
-
-    if not statuses:
-        statuses = ({key: selfhosted_instance_status_map[key] for key in [
-            SelfhostedBusinessStatus.AWAITING_CONFIGURATION,
-            SelfhostedBusinessStatus.RUNNING,
-            SelfhostedBusinessStatus.TERMINATED,
-        ]}).values()
-
-    if "all" in statuses:
-        statuses = selfhosted_instance_status_map.values()
-
-    for input_status_item in statuses:
-        if input_status_item not in selfhosted_instance_status_map.values():
-            typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
-                'invalid_status': input_status_item,
-                'valid_statuses': str(list(selfhosted_instance_status_map.values()))
-            }))
-            raise typer.Exit(1)
-
-    typer.echo(__(
-        "Listing self-hosted instances with the following statuses: %statuses%, to view all self-hosted instances, use --status all",
-        placeholders={
-            'statuses': ', '.join([status_item for status_item in statuses])
-        }))
-
-    backend_statuses: List[str] = [key for key, value in selfhosted_instance_status_map.items() if value in statuses]
-
-    instance_service.print(
-        func_get_data=instance_service.get_self_hosted_list,
-        func_special_params={
-            'statuses': backend_statuses,
-        },
-        mapper=SelfHostedMapper(),
+
+    instance_service.print_self_hosted_instance_list(
         config=config,
-        headers=list(map(lambda x: x.alias, SelfHostedInstanceEntity.model_fields.values())),
+        statuses=statuses,
         row=row,
-        page=page,
-        show_index="never",
+        page=page
     )
 
     typer.echo(__("Self-hosted instances listing complete"))

thestage/controllers/project_controller.py

@@ -236,29 +236,9 @@ def list_runs(
 
     service_factory = validate_config_and_get_service_factory()
     config = service_factory.get_config_provider().get_full_config()
-
     project_service: ProjectService = service_factory.get_project_service()
 
-    if not project_uid:
-        project_config: ProjectConfig = service_factory.get_config_provider().read_project_config()
-        if not project_config:
-            typer.echo(__("Provide the project unique ID or run this command from within an initialized project directory"))
-            raise typer.Exit(1)
-        project_uid = project_config.slug
-
-    project_service.print(
-        func_get_data=project_service.get_project_task_list,
-        func_special_params={
-            'project_slug': project_uid,
-        },
-        mapper=ProjectTaskMapper(),
-        config=config,
-        headers=list(map(lambda x: x.alias, ProjectTaskEntity.model_fields.values())),
-        row=row,
-        page=page,
-        max_col_width=[100, 100, 100, 100, 100, 100, 100, 100],
-        show_index="never",
-    )
+    project_service.print_task_list(config, project_uid, row, page)
 
     typer.echo(__("Tasks listing complete"))
     raise typer.Exit(0)
@@ -664,58 +644,9 @@ def list_inference_simulators(
 
     service_factory = validate_config_and_get_service_factory()
     config = service_factory.get_config_provider().get_full_config()
-
     project_service: ProjectService = service_factory.get_project_service()
-    if not project_uid:
-        project_config: ProjectConfig = service_factory.get_config_provider().read_project_config()
-        if not project_config:
-            typer.echo(__("Provide the project unique ID or run this command from within an initialized project directory"))
-            raise typer.Exit(1)
-        project_uid = project_config.slug
-
-    inference_simulator_status_map = service_factory.get_thestage_api_client().get_inference_simulator_business_status_map(
-        config.main.thestage_auth_token)
-
-    if not statuses:
-        statuses = ({key: inference_simulator_status_map[key] for key in [
-            InferenceSimulatorStatus.SCHEDULED,
-            InferenceSimulatorStatus.CREATING,
-            InferenceSimulatorStatus.RUNNING,
-        ]}).values()
-
-    if "all" in statuses:
-        statuses = inference_simulator_status_map.values()
-
-    for input_status_item in statuses:
-        if input_status_item not in inference_simulator_status_map.values():
-            typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
-                'invalid_status': input_status_item,
-                'valid_statuses': str(list(inference_simulator_status_map.values()))
-            }))
-            raise typer.Exit(1)
 
-    typer.echo(__(
-        "Listing inference simulators with the following statuses: %statuses%, to view all inference simulators, use --status all",
-        placeholders={
-            'statuses': ', '.join([status_item for status_item in statuses])
-        }))
-
-    backend_statuses: List[str] = [key for key, value in inference_simulator_status_map.items() if value in statuses]
-
-    project_service.print(
-        func_get_data=project_service.get_project_inference_simulator_list,
-        func_special_params={
-            'project_slug': project_uid,
-            'statuses': backend_statuses,
-        },
-        mapper=ProjectInferenceSimulatorMapper(),
-        config=config,
-        headers=list(map(lambda x: x.alias, ProjectInferenceSimulatorEntity.model_fields.values())),
-        row=row,
-        page=page,
-        max_col_width=[100, 100, 100, 100, 100, 100, 100, 100],
-        show_index="never",
-    )
+    project_service.print_inference_simulator_list(config, project_uid, statuses, row, page)
 
     typer.echo(__("Inference simulators listing complete"))
     raise typer.Exit(0)
@@ -753,58 +684,9 @@ def list_inference_simulator_models(
 
     service_factory = validate_config_and_get_service_factory()
     config = service_factory.get_config_provider().get_full_config()
-
     project_service: ProjectService = service_factory.get_project_service()
-    if not project_uid:
-        project_config: ProjectConfig = service_factory.get_config_provider().read_project_config()
-        if not project_config:
-            typer.echo(__("Provide the project unique ID or run this command from within an initialized project directory"))
-            raise typer.Exit(1)
-        project_uid = project_config.slug
-
-    inference_simulator_model_status_map = service_factory.get_thestage_api_client().get_inference_simulator_model_business_status_map(
-        config.main.thestage_auth_token)
-
-    if not statuses:
-        statuses = ({key: inference_simulator_model_status_map[key] for key in [
-            InferenceModelStatus.SCHEDULED,
-            InferenceModelStatus.PROCESSING,
-            InferenceModelStatus.PUSH_SUCCEED,
-        ]}).values()
-
-    if "all" in statuses:
-        statuses = inference_simulator_model_status_map.values()
-
-    for input_status_item in statuses:
-        if input_status_item not in inference_simulator_model_status_map.values():
-            typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
-                'invalid_status': input_status_item,
-                'valid_statuses': str(list(inference_simulator_model_status_map.values()))
-            }))
-            raise typer.Exit(1)
 
-    typer.echo(__(
-        "Listing inference simulator models with the following statuses: %statuses%, to view all inference simulator models, use --status all",
-        placeholders={
-            'statuses': ', '.join([status_item for status_item in statuses])
-        }))
-
-    backend_statuses: List[str] = [key for key, value in inference_simulator_model_status_map.items() if value in statuses]
-
-    project_service.print(
-        func_get_data=project_service.get_project_inference_simulator_model_list,
-        func_special_params={
-            'project_slug': project_uid,
-            'statuses': backend_statuses,
-        },
-        mapper=ProjectInferenceSimulatorModelMapper(),
-        config=config,
-        headers=list(map(lambda x: x.alias, ProjectInferenceSimulatorModelEntity.model_fields.values())),
-        row=row,
-        page=page,
-        max_col_width=[100, 100, 100, 100, 100, 100, 100, 100],
-        show_index="never",
-    )
+    project_service.print_inference_simulator_model_list(config, project_uid, statuses, row, page)
 
     typer.echo(__("Inference simulator models listing complete"))
     raise typer.Exit(0)

thestage/main.py

@@ -1,3 +1,8 @@
+from thestage.services.core_files.config_entity import ConfigEntity
+
+# TODO use this in config_provider
+initial_config: ConfigEntity = ConfigEntity()
+
 def main():
     try:
         import warnings
@@ -8,9 +13,9 @@ def main():
         from thestage.controllers import base_controller, container_controller, instance_controller, project_controller, \
             config_controller
 
+        base_controller.app.add_typer(project_controller.app, name="project")
         base_controller.app.add_typer(container_controller.app, name="container")
         base_controller.app.add_typer(instance_controller.app, name="instance")
-        base_controller.app.add_typer(project_controller.app, name="project")
         base_controller.app.add_typer(config_controller.app, name="config")
 
         import thestage.config

thestage/services/clients/git/git_client.py

@@ -13,7 +13,7 @@ from thestage.color_scheme.color_scheme import ColorScheme
 from thestage.config import THESTAGE_CONFIG_DIR
 from thestage.exceptions.git_access_exception import GitAccessException
 from thestage.git.ProgressPrinter import ProgressPrinter
-from thestage.services.filesystem_service import FileSystemServiceCore
+from thestage.services.filesystem_service import FileSystemService
 
 
 class GitLocalClient:
@@ -27,7 +27,7 @@ class GitLocalClient:
 
     def __init__(
             self,
-            file_system_service: FileSystemServiceCore,
+            file_system_service: FileSystemService,
     ):
         self.__file_system_service = file_system_service
 

thestage/services/clients/thestage_api/api_client.py

@@ -85,12 +85,11 @@ from thestage.services.clients.thestage_api.dtos.task_controller.task_list_for_p
 from thestage.services.clients.thestage_api.dtos.task_controller.task_status_localized_map_response import \
     TaskStatusLocalizedMapResponse
 from thestage.services.clients.thestage_api.dtos.task_controller.task_view_response import TaskViewResponse
-from thestage.services.clients.thestage_api.dtos.user_profile import UserProfileResponse
 from thestage.services.clients.thestage_api.dtos.instance_rented_response import InstanceRentedListResponse, \
     InstanceRentedDto, InstanceRentedItemResponse, InstanceRentedBusinessStatusMapperResponse
 
-from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse, \
-    TheStageBasePaginatedResponse
+from thestage.services.clients.thestage_api.dtos.base_response import TheStageBaseResponse
+from thestage.services.clients.thestage_api.dtos.user_controller.user_profile import UserProfileResponse
 from thestage.services.project.dto.inference_simulator_dto import InferenceSimulatorDto
 from thestage.services.project.dto.inference_simulator_model_dto import InferenceSimulatorModelDto
 from thestage.services.task.dto.task_dto import TaskDto
@@ -146,7 +145,6 @@ class TheStageApiClient(TheStageApiClientCore):
         result = TaskListForProjectResponse.model_validate(response) if response else None
         return result.tasks if result and result.is_success else None
 
-
     def get_inference_simulator_list_for_project(
             self,
             token: str,
@@ -203,7 +201,6 @@ class TheStageApiClient(TheStageApiClientCore):
         result = InferenceSimulatorModelListForProjectResponse.model_validate(response) if response else None
         return result.inferenceSimulatorModels if result and result.is_success else None
 
-
     def get_rented_instance_list(
             self,
             token: str,
@@ -260,7 +257,7 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return data.taskStatusMap if data else None
 
-    def get_rented_item(
+    def get_rented_instance(
             self,
             token: str,
             instance_slug: Optional[str] = None,
@@ -282,7 +279,7 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return InstanceRentedItemResponse.model_validate(response).instance_rented if response else None
 
-    def get_selfhosted_item(
+    def get_selfhosted_instance(
             self,
             token: str,
             instance_slug: Optional[str] = None,
@@ -347,19 +344,6 @@ class TheStageApiClient(TheStageApiClientCore):
         data = SelfHostedRentedRentedBusinessStatusMapperResponse.model_validate(response) if response else None
         return data.selfhosted_instance_business_status_map if data else None
 
-    def get_profile(
-            self,
-            token: str,
-    ) -> Optional[UserProfileResponse]:
-
-        response = self._request(
-            method='GET',
-            url='/frontend-api/user/my-profile',
-            token=token,
-        )
-
-        result = UserProfileResponse.model_validate(response) if response else None
-        return result if result else None
 
     def cancel_task(
             self,
@@ -521,8 +505,9 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return ProjectRunTaskResponse.model_validate(response) if response else None
 
-
-    async def poll_logs_httpx(self, token: str, docker_container_id: Optional[int], last_log_timestamp: str, last_log_id: str, task_id: Optional[int] = None, inference_simulator_id: Optional[int] = None) -> Optional[LogPollingResponse]:
+    async def poll_logs_httpx(self, token: str, docker_container_id: Optional[int], last_log_timestamp: str,
+                              last_log_id: str, task_id: Optional[int] = None,
+                              inference_simulator_id: Optional[int] = None) -> Optional[LogPollingResponse]:
         request_headers = {'Content-Type': 'application/json'}
         if token: request_headers['Authorization'] = f"Bearer {token}"
 
@@ -544,7 +529,6 @@ class TheStageApiClient(TheStageApiClientCore):
 
             return LogPollingResponse.model_validate(response.json()) if response else None
 
-
     def add_public_ssh_key_to_user(self, token: str, public_key: str, note: str) -> AddSshKeyToUserResponse:
         request = AddSshKeyToUserRequest(
             sshKey=public_key,
@@ -561,7 +545,6 @@ class TheStageApiClient(TheStageApiClientCore):
         result = AddSshKeyToUserResponse.model_validate(response) if response else None
         return result
 
-
     def is_user_has_ssh_public_key(self, token: str, public_key: str) -> IsUserHasSshPublicKeyResponse:
         request = IsUserHasSshPublicKeyRequest(
             sshKey=public_key,
@@ -577,8 +560,8 @@ class TheStageApiClient(TheStageApiClientCore):
         result = IsUserHasSshPublicKeyResponse.model_validate(response) if response else None
         return result
 
-
-    def add_public_ssh_key_to_instance_rented(self, token: str, instance_rented_id: int, ssh_key_pair_id: int) -> AddSshPublicKeyToInstanceResponse:
+    def add_public_ssh_key_to_instance_rented(self, token: str, instance_rented_id: int,
+                                              ssh_key_pair_id: int) -> AddSshPublicKeyToInstanceResponse:
         request = AddSshPublicKeyToInstanceRequest(
             instanceRentedId=instance_rented_id,
             sshPublicKeyId=ssh_key_pair_id,
@@ -594,7 +577,6 @@ class TheStageApiClient(TheStageApiClientCore):
         result = AddSshPublicKeyToInstanceResponse.model_validate(response) if response else None
         return result
 
-
     def start_project_inference_simulator(
             self,
             token: str,
@@ -625,7 +607,6 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return ProjectStartInferenceSimulatorResponse.model_validate(response) if response else None
 
-
     def push_project_inference_simulator_model(
             self,
             token: str,
@@ -644,7 +625,6 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return ProjectPushInferenceSimulatorModelResponse.model_validate(response) if response else None
 
-
     def get_inference_simulator_business_status_map(self, token: str, ) -> Optional[Dict[str, str]]:
         response = self._request(
             method='POST',
@@ -657,7 +637,6 @@ class TheStageApiClient(TheStageApiClientCore):
 
         return data.inference_simulator_status_map if data else None
 
-
     def get_inference_simulator_model_business_status_map(self, token: str, ) -> Optional[Dict[str, str]]:
         response = self._request(
             method='POST',
@@ -688,7 +667,6 @@ class TheStageApiClient(TheStageApiClientCore):
         )
         return GetInferenceSimulatorResponse.model_validate(response) if response else None
 
-
     @error_handler()
     def deploy_inference_model_to_instance(
             self,
@@ -702,8 +680,8 @@ class TheStageApiClient(TheStageApiClientCore):
         request = DeployInferenceModelToInstanceRequest(
             inferenceSimulatorSlug=unique_id_with_timestamp,
             modelSlug=unique_id,
-            instanceRentedSlug = rented_instance_unique_id,
-            selfhostedInstanceSlug = self_hosted_instance_unique_id
+            instanceRentedSlug=rented_instance_unique_id,
+            selfhostedInstanceSlug=self_hosted_instance_unique_id
         )
 
         response = self._request(
@@ -714,7 +692,6 @@ class TheStageApiClient(TheStageApiClientCore):
         )
         return DeployInferenceModelToInstanceResponse.model_validate(response) if response else None
 
-
     @error_handler()
     def deploy_inference_model_to_sagemaker(
             self,
@@ -735,8 +712,9 @@ class TheStageApiClient(TheStageApiClientCore):
         )
         return DeployInferenceModelToSagemakerResponse.model_validate(response) if response else None
 
-
-    def query_user_logs(self, token: str, limit: int, task_id: Optional[int] = None, inference_simulator_id: Optional[int] = None, container_id: Optional[int] = None) -> UserLogsQueryResponse:
+    def query_user_logs(self, token: str, limit: int, task_id: Optional[int] = None,
+                        inference_simulator_id: Optional[int] = None,
+                        container_id: Optional[int] = None) -> UserLogsQueryResponse:
         request = UserLogsQueryRequest(
             inferenceSimulatorId=inference_simulator_id,
             taskId=task_id,
@@ -753,4 +731,4 @@ class TheStageApiClient(TheStageApiClientCore):
         )
 
         result = UserLogsQueryResponse.model_validate(response) if response else None
-        return result
+        return result

thestage/services/clients/thestage_api/dtos/{user_profile.py → user_controller/user_profile.py}

@@ -3,7 +3,10 @@ from typing import Optional
 from pydantic import BaseModel, Field
 
 
-class UserProfileResponse(BaseModel):
-    name: Optional[str] = Field(None, alias='name')
+class UserProfile(BaseModel):
     email: Optional[str] = Field(None, alias='email')
-    metamask_wallet: Optional[str] = Field(None, alias='metamaskWallet')
+
+
+
+class UserProfileResponse(BaseModel):
+    userProfile: Optional[UserProfile] = Field(None, alias='userProfile')

thestage/services/config_provider/config_provider.py

@@ -10,7 +10,7 @@ from thestage.exceptions.file_system_exception import FileSystemException
 from thestage.services.core_files.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.services.filesystem_service import FileSystemServiceCore
+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
 
@@ -20,30 +20,27 @@ class ConfigProvider():
     _local_config_path: Optional[Path] = None
     _global_config_path: Optional[Path] = None
     _global_config_file: Optional[Path] = None
-    _file_system_service = FileSystemServiceCore
+    _file_system_service = FileSystemService
 
 
     def __init__(
             self,
             local_path: Optional[str] = None,
     ):
-        self._file_system_service = FileSystemServiceCore()
+        self._file_system_service = FileSystemService()
         if local_path:
             self._local_path = self._file_system_service.get_path(directory=local_path, auto_create=False)
 
-        config_folder_name = self._file_system_service.get_path(f"{THESTAGE_CONFIG_DIR}", False)
-        self._local_config_path = self._local_path.joinpath(config_folder_name)
+        self._local_config_path = self._local_path.joinpath(THESTAGE_CONFIG_DIR)
 
         home_dir = self._file_system_service.get_home_path()
-        self._global_config_path = home_dir.joinpath(config_folder_name)
+        self._global_config_path = home_dir.joinpath(THESTAGE_CONFIG_DIR)
 
         if self._global_config_path:
             if not self._global_config_path.exists():
                 self._file_system_service.create_if_not_exists_dir(self._global_config_path)
 
-        self._global_config_file = self._global_config_path.joinpath(
-            self._file_system_service.get_path(f"{THESTAGE_CONFIG_FILE}", False)
-        )
+        self._global_config_file = self._global_config_path.joinpath(THESTAGE_CONFIG_FILE)
         if not self._global_config_file.exists():
             self._file_system_service.create_if_not_exists_file(self._global_config_file)
 
@@ -61,7 +58,7 @@ class ConfigProvider():
         if config_from_env:
             self.__update_config_values_dict(values_to_update=config_values, new_values=config_from_env)
 
-        config_from_file = self.__read_config_file(self._global_config_file)
+        config_from_file = self._file_system_service.read_config_file(self._global_config_file)
         if config_from_file:
             self.__update_config_values_dict(values_to_update=config_values, new_values=config_from_file)
 
@@ -112,7 +109,7 @@ class ConfigProvider():
         if not project_data_filepath.exists():
             return None
 
-        config_data = self.__read_config_file(project_data_filepath) if project_data_filepath and project_data_filepath.exists() else {}
+        config_data = self._file_system_service.read_config_file(project_data_filepath) if project_data_filepath and project_data_filepath.exists() else {}
         return ProjectConfig.model_validate(config_data)
 
 
@@ -165,7 +162,7 @@ class ConfigProvider():
         if not config_filepath.is_file():
             return None
 
-        config_data = self.__read_config_file(config_filepath) if config_filepath and config_filepath.exists() else {}
+        config_data = self._file_system_service.read_config_file(config_filepath) if config_filepath and config_filepath.exists() else {}
         return RemoteServerConfig.model_validate(config_data)
 
 
@@ -188,22 +185,6 @@ class ConfigProvider():
             else:
                 values_to_update['main'] = new_values['main']
 
-
-    def __read_config_file(self, path: Path) -> Dict[str, Any]:
-        result = {}
-        try:
-            if path and path.exists():
-                with path.open("r") as file:
-                    try:
-                        if os.stat(path).st_size != 0:
-                            result = json.load(file)
-                    except JSONDecodeError:
-                        pass
-        except OSError:
-            raise FileSystemException(f"Could not open config file: {path}")
-        return result
-
-
     @staticmethod
     def __save_config_file(data: Dict, file_path: Path):
         with open(file_path, 'w') as configfile:
@@ -211,7 +192,7 @@ class ConfigProvider():
 
 
     def save_config(self, config: ConfigEntity):
-        data: Dict[str, Any] = self.__read_config_file(self._global_config_file)
+        data: Dict[str, Any] = self._file_system_service.read_config_file(self._global_config_file)
         data.update(config.model_dump(exclude_none=True, by_alias=True, exclude={'runtime', 'RUNTIME', 'daemon', 'DAEMON'}))
         self.__save_config_file(data=data, file_path=self._global_config_file)
 

thestage/services/connect/connect_service.py

@@ -50,20 +50,25 @@ class ConnectService(AbstractService):
     ):
         config = self._config_provider.get_full_config()
 
-        # TODO make a single separate method that will return all needed info
         try:
-            instance_selfhosted = self.__thestage_api_client.get_selfhosted_item(token=config.main.thestage_auth_token, instance_slug=uid)
+            instance_selfhosted = self.__thestage_api_client.get_selfhosted_instance(token=config.main.thestage_auth_token, instance_slug=uid)
         except HttpClientException as e:
+            if e.get_status_code() == 403:
+                typer.echo("Missing permission to view self-hosted instances")
             instance_selfhosted = None
 
         try:
-            instance_rented = self.__thestage_api_client.get_rented_item(token=config.main.thestage_auth_token, instance_slug=uid)
+            instance_rented = self.__thestage_api_client.get_rented_instance(token=config.main.thestage_auth_token, instance_slug=uid)
         except HttpClientException as e:
+            if e.get_status_code() == 403:
+                typer.echo("Missing permission to view rented instances")
             instance_rented = None
 
         try:
             container = self.__thestage_api_client.get_container(token=config.main.thestage_auth_token, container_slug=uid, )
-        except Exception as e:
+        except HttpClientException as e:
+            if e.get_status_code() == 403:
+                typer.echo("Missing permission to view containers")
             container = None
 
         task: Optional[TaskDto] = None
@@ -71,6 +76,8 @@ class ConnectService(AbstractService):
             try:
                 task_view_response = self.__thestage_api_client.get_task(token=config.main.thestage_auth_token, task_id=int(uid))
             except HttpClientException as e:
+                if e.get_status_code() == 403:
+                    typer.echo("Missing permission to view tasks")
                 task_view_response = None
             if task_view_response and task_view_response.task:
                 task = task_view_response.task
@@ -148,7 +155,7 @@ class ConnectService(AbstractService):
         instance_rented: Optional[InstanceRentedDto] = None
         if instance_slug:
             try:
-                instance_rented = self.__thestage_api_client.get_rented_item(token=config.main.thestage_auth_token, instance_slug=instance_slug)
+                instance_rented = self.__thestage_api_client.get_rented_instance(token=config.main.thestage_auth_token, instance_slug=instance_slug)
             except HttpClientException as e:
                 instance_rented = None
 

thestage/services/container/container_service.py

@@ -10,7 +10,7 @@ from thestage.services.clients.thestage_api.dtos.enums.container_status import D
 from thestage.entities.enums.shell_type import ShellType
 from thestage.services.clients.thestage_api.dtos.paginated_entity_list import PaginatedEntityList
 from thestage.services.container.mapper.container_mapper import ContainerMapper
-from thestage.services.filesystem_service import FileSystemServiceCore
+from thestage.services.filesystem_service import FileSystemService
 from thestage.services.remote_server_service import RemoteServerService
 from thestage.i18n.translation import __
 from thestage.services.abstract_service import AbstractService
@@ -29,7 +29,7 @@ class ContainerService(AbstractService):
             thestage_api_client: TheStageApiClient,
             config_provider: ConfigProvider,
             remote_server_service: RemoteServerService,
-            file_system_service: FileSystemServiceCore,
+            file_system_service: FileSystemService,
     ):
         super(ContainerService, self).__init__(
             config_provider=config_provider

thestage/services/core_files/config_entity.py

@@ -7,11 +7,6 @@ class MainConfigEntity(BaseModel):
     thestage_auth_token: Optional[str] = Field(None, alias='thestage_auth_token')
     thestage_api_url: Optional[str] = Field(None, alias='thestage_api_url')
 
-
-class DaemonConfigEntity(BaseModel):
-    daemon_token: Optional[str] = Field(None, alias='daemon_token')
-    backend_api_url: Optional[str] = Field(None, alias='backend_api_url')
-
 # not saved to file
 class RuntimeConfigEntity(BaseModel):
     working_directory: Optional[str] = Field(None, alias='working_directory')
@@ -19,7 +14,7 @@ class RuntimeConfigEntity(BaseModel):
 
 
 class ConfigEntity(BaseModel):
+    global_config_path: str = Field(None, alias='global_config_path')
+    can_use_inference: bool = Field(None, alias='can_use_inference')
     main: MainConfigEntity = Field(default_factory=MainConfigEntity, alias='main')
     runtime: RuntimeConfigEntity = Field(default_factory=RuntimeConfigEntity, alias="runtime") # TODO merge with main
-    daemon: DaemonConfigEntity = Field(default_factory=DaemonConfigEntity, alias="daemon") # TODO this should not be in core package
-    start_on_daemon: bool = Field(False, alias='start_on_daemon') # TODO this should not be in core package

thestage/services/filesystem_service.py

@@ -1,13 +1,15 @@
+import json
 import os
 import shutil
+from json import JSONDecodeError
 from pathlib import Path
-from typing import Optional, List
+from typing import Optional, List, Dict, Any
 
 from thestage.entities.file_item import FileItemEntity
 from thestage.exceptions.file_system_exception import FileSystemException
 
 
-class FileSystemServiceCore:
+class FileSystemService:
 
     def get_ssh_path(self) -> Optional[Path]:
         home_path = self.get_home_path()
@@ -114,3 +116,18 @@ class FileSystemServiceCore:
         real_path = self.get_path(directory=path, auto_create=False)
         if real_path and real_path.exists():
             shutil.rmtree(real_path)
+
+
+    def read_config_file(self, path: Path) -> Dict[str, Any]:
+        result = {}
+        try:
+            if path and path.exists():
+                with path.open("r") as file:
+                    try:
+                        if os.stat(path).st_size != 0:
+                            result = json.load(file)
+                    except JSONDecodeError:
+                        pass
+        except OSError:
+            raise FileSystemException(f"Could not open config file: {path}")
+        return result

thestage/services/instance/instance_service.py

@@ -2,6 +2,9 @@ from pathlib import Path
 from typing import List, Optional, Dict
 
 import typer
+
+from thestage.entities.rented_instance import RentedInstanceEntity
+from thestage.entities.self_hosted_instance import SelfHostedInstanceEntity
 from thestage.services.core_files.config_entity import ConfigEntity
 from thestage.i18n.translation import __
 from thestage.services.clients.thestage_api.dtos.enums.selfhosted_status import SelfhostedBusinessStatus
@@ -13,6 +16,8 @@ from thestage.services.clients.thestage_api.dtos.instance_rented_response import
 from thestage.services.clients.thestage_api.dtos.paginated_entity_list import PaginatedEntityList
 from thestage.services.clients.thestage_api.dtos.selfhosted_instance_response import SelfHostedInstanceDto
 from thestage.services.config_provider.config_provider import ConfigProvider
+from thestage.services.instance.mapper.instance_mapper import InstanceMapper
+from thestage.services.instance.mapper.selfhosted_mapper import SelfHostedMapper
 from thestage.services.remote_server_service import RemoteServerService
 
 
@@ -32,22 +37,22 @@ class InstanceService(AbstractService):
         self.__thestage_api_client = thestage_api_client
         self.__remote_server_service = remote_server_service
 
-    def get_rented_item(
+    def get_rented_instance(
             self,
             config: ConfigEntity,
             instance_slug: str,
     ) -> Optional[InstanceRentedDto]:
-        return self.__thestage_api_client.get_rented_item(
+        return self.__thestage_api_client.get_rented_instance(
             token=config.main.thestage_auth_token,
             instance_slug=instance_slug,
         )
 
-    def get_self_hosted_item(
+    def get_self_hosted_instance(
             self,
             config: ConfigEntity,
             instance_slug: str,
     ) -> Optional[SelfHostedInstanceDto]:
-        return self.__thestage_api_client.get_selfhosted_item(
+        return self.__thestage_api_client.get_selfhosted_instance(
             token=config.main.thestage_auth_token,
             instance_slug=instance_slug,
         )
@@ -121,7 +126,7 @@ class InstanceService(AbstractService):
             config: ConfigEntity,
             input_ssh_key_path: Optional[str]
     ):
-        instance = self.get_rented_item(config=config, instance_slug=instance_rented_slug)
+        instance = self.get_rented_instance(config=config, instance_slug=instance_rented_slug)
 
         if instance:
             self.check_instance_status_to_connect(
@@ -162,7 +167,7 @@ class InstanceService(AbstractService):
             username = 'root'
             typer.echo(__("No remote server username provided, using 'root' as username"))
 
-        instance = self.get_self_hosted_item(config=config, instance_slug=selfhosted_instance_slug)
+        instance = self.get_self_hosted_instance(config=config, instance_slug=selfhosted_instance_slug)
 
         if instance:
             self.check_selfhosted_status_to_connect(
@@ -222,3 +227,92 @@ class InstanceService(AbstractService):
             limit=row,
         )
         return data
+
+
+    @error_handler()
+    def print_self_hosted_instance_list(self, config: ConfigEntity, statuses, row, page):
+        selfhosted_instance_status_map = self.__thestage_api_client.get_selfhosted_business_status_map(config.main.thestage_auth_token)
+
+        if not statuses:
+            statuses = ({key: selfhosted_instance_status_map[key] for key in [
+                SelfhostedBusinessStatus.AWAITING_CONFIGURATION,
+                SelfhostedBusinessStatus.RUNNING,
+                SelfhostedBusinessStatus.TERMINATED,
+            ]}).values()
+
+        if "all" in statuses:
+            statuses = selfhosted_instance_status_map.values()
+
+        for input_status_item in statuses:
+            if input_status_item not in selfhosted_instance_status_map.values():
+                typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
+                    'invalid_status': input_status_item,
+                    'valid_statuses': str(list(selfhosted_instance_status_map.values()))
+                }))
+                raise typer.Exit(1)
+
+        typer.echo(__(
+            "Listing self-hosted instances with the following statuses: %statuses%, to view all self-hosted instances, use --status all",
+            placeholders={
+                'statuses': ', '.join([status_item for status_item in statuses])
+            }))
+
+        backend_statuses: List[str] = [key for key, value in selfhosted_instance_status_map.items() if value in statuses]
+
+        self.print(
+            func_get_data=self.get_self_hosted_list,
+            func_special_params={
+                'statuses': backend_statuses,
+            },
+            mapper=SelfHostedMapper(),
+            config=config,
+            headers=list(map(lambda x: x.alias, SelfHostedInstanceEntity.model_fields.values())),
+            row=row,
+            page=page,
+            show_index="never",
+        )
+
+
+    @error_handler()
+    def print_rented_instance_list(self, config: ConfigEntity, statuses, row, page):
+        instance_rented_status_map = self.__thestage_api_client.get_rented_business_status_map(config.main.thestage_auth_token)
+
+        if not statuses:
+            statuses = ({key: instance_rented_status_map[key] for key in [
+                InstanceRentedBusinessStatus.ONLINE,
+                InstanceRentedBusinessStatus.CREATING,
+                InstanceRentedBusinessStatus.TERMINATING,
+                InstanceRentedBusinessStatus.REBOOTING,
+            ]}).values()
+
+        if "all" in statuses:
+            statuses = instance_rented_status_map.values()
+
+        for input_status_item in statuses:
+            if input_status_item not in instance_rented_status_map.values():
+                typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
+                    'invalid_status': input_status_item,
+                    'valid_statuses': str(list(instance_rented_status_map.values()))
+                }))
+                raise typer.Exit(1)
+
+        typer.echo(__(
+            "Listing rented server instances with the following statuses: %statuses%, to view all rented server instances, use --status all",
+            placeholders={
+                'statuses': ', '.join([status_item for status_item in statuses])
+            }))
+
+        backend_statuses: List[str] = [key for key, value in instance_rented_status_map.items() if value in statuses]
+
+        self.print(
+            func_get_data=self.get_rented_list,
+            func_special_params={
+                'statuses': backend_statuses,
+            },
+            mapper=InstanceMapper(),
+            config=config,
+            headers=list(map(lambda x: x.alias, RentedInstanceEntity.model_fields.values())),
+            row=row,
+            page=page,
+            show_index="never",
+        )

thestage/services/project/project_service.py

@@ -12,7 +12,12 @@ import typer
 from git import Commit
 from tabulate import tabulate
 
+from thestage.entities.project_inference_simulator import ProjectInferenceSimulatorEntity
+from thestage.entities.project_inference_simulator_model import ProjectInferenceSimulatorModelEntity
+from thestage.entities.project_task import ProjectTaskEntity
 from thestage.services.clients.thestage_api.core.http_client_exception import HttpClientException
+from thestage.services.clients.thestage_api.dtos.enums.inference_model_status import InferenceModelStatus
+from thestage.services.clients.thestage_api.dtos.enums.inference_simulator_status import InferenceSimulatorStatus
 from thestage.services.core_files.config_entity import ConfigEntity
 from thestage.color_scheme.color_scheme import ColorScheme
 from thestage.entities.enums.yes_no_response import YesOrNoResponse
@@ -36,9 +41,12 @@ from thestage.services.clients.thestage_api.dtos.project_controller.project_star
     ProjectStartInferenceSimulatorResponse
 from thestage.services.clients.thestage_api.dtos.project_response import ProjectDto
 from thestage.services.clients.thestage_api.dtos.task_controller.task_view_response import TaskViewResponse
-from thestage.services.filesystem_service import FileSystemServiceCore
+from thestage.services.filesystem_service import FileSystemService
 from thestage.services.project.dto.inference_simulator_dto import InferenceSimulatorDto
 from thestage.services.project.dto.inference_simulator_model_dto import InferenceSimulatorModelDto
+from thestage.services.project.mapper.project_inference_simulator_mapper import ProjectInferenceSimulatorMapper
+from thestage.services.project.mapper.project_inference_simulator_model_mapper import \
+    ProjectInferenceSimulatorModelMapper
 from thestage.services.task.dto.task_dto import TaskDto
 from thestage.services.project.dto.project_config import ProjectConfig
 from thestage.services.project.mapper.project_task_mapper import ProjectTaskMapper
@@ -58,7 +66,7 @@ class ProjectService(AbstractService):
             thestage_api_client: TheStageApiClient,
             config_provider: ConfigProvider,
             remote_server_service: RemoteServerService,
-            file_system_service: FileSystemServiceCore,
+            file_system_service: FileSystemService,
             git_local_client: GitLocalClient,
     ):
         super(ProjectService, self).__init__(
@@ -1139,3 +1147,134 @@ class ProjectService(AbstractService):
             deploy_key_path=project_config.deploy_key_path,
             reset_to_origin=True
         )
+
+
+    @error_handler()
+    def print_inference_simulator_list(self, config, project_uid, statuses, row, page):
+        if not project_uid:
+            project_config: ProjectConfig = self.__config_provider.read_project_config()
+            if not project_config:
+                typer.echo(__("Provide the project unique ID or run this command from within an initialized project directory"))
+                raise typer.Exit(1)
+            project_uid = project_config.slug
+
+        inference_simulator_status_map = self.__thestage_api_client.get_inference_simulator_business_status_map(
+            config.main.thestage_auth_token)
+
+        if not statuses:
+            statuses = ({key: inference_simulator_status_map[key] for key in [
+                InferenceSimulatorStatus.SCHEDULED,
+                InferenceSimulatorStatus.CREATING,
+                InferenceSimulatorStatus.RUNNING,
+            ]}).values()
+
+        if "all" in statuses:
+            statuses = inference_simulator_status_map.values()
+
+        for input_status_item in statuses:
+            if input_status_item not in inference_simulator_status_map.values():
+                typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
+                    'invalid_status': input_status_item,
+                    'valid_statuses': str(list(inference_simulator_status_map.values()))
+                }))
+                raise typer.Exit(1)
+
+        typer.echo(__(
+            "Listing inference simulators with the following statuses: %statuses%, to view all inference simulators, use --status all",
+            placeholders={
+                'statuses': ', '.join([status_item for status_item in statuses])
+            }))
+
+        backend_statuses: List[str] = [key for key, value in inference_simulator_status_map.items() if value in statuses]
+
+        self.print(
+            func_get_data=self.get_project_inference_simulator_list,
+            func_special_params={
+                'project_slug': project_uid,
+                'statuses': backend_statuses,
+            },
+            mapper=ProjectInferenceSimulatorMapper(),
+            config=config,
+            headers=list(map(lambda x: x.alias, ProjectInferenceSimulatorEntity.model_fields.values())),
+            row=row,
+            page=page,
+            max_col_width=[100, 100, 100, 100, 100, 100, 100, 100],
+            show_index="never",
+        )
+
+
+    @error_handler()
+    def print_inference_simulator_model_list(self, config, project_uid, statuses, row, page):
+        if not project_uid:
+            project_config: ProjectConfig = self.__config_provider.read_project_config()
+            if not project_config:
+                typer.echo(__("Provide the project unique ID or run this command from within an initialized project directory"))
+                raise typer.Exit(1)
+            project_uid = project_config.slug
+
+        inference_simulator_model_status_map = self.__thestage_api_client.get_inference_simulator_model_business_status_map(
+            config.main.thestage_auth_token)
+
+        if not statuses:
+            statuses = ({key: inference_simulator_model_status_map[key] for key in [
+                InferenceModelStatus.SCHEDULED,
+                InferenceModelStatus.PROCESSING,
+                InferenceModelStatus.PUSH_SUCCEED,
+            ]}).values()
+
+        if "all" in statuses:
+            statuses = inference_simulator_model_status_map.values()
+
+        for input_status_item in statuses:
+            if input_status_item not in inference_simulator_model_status_map.values():
+                typer.echo(__("'%invalid_status%' is not one of %valid_statuses%", {
+                    'invalid_status': input_status_item,
+                    'valid_statuses': str(list(inference_simulator_model_status_map.values()))
+                }))
+                raise typer.Exit(1)
+
+        typer.echo(__(
+            "Listing inference simulator models with the following statuses: %statuses%, to view all inference simulator models, use --status all",
+            placeholders={
+                'statuses': ', '.join([status_item for status_item in statuses])
+            }))
+
+        backend_statuses: List[str] = [key for key, value in inference_simulator_model_status_map.items() if value in statuses]
+
+        self.print(
+            func_get_data=self.get_project_inference_simulator_model_list,
+            func_special_params={
+                'project_slug': project_uid,
+                'statuses': backend_statuses,
+            },
+            mapper=ProjectInferenceSimulatorModelMapper(),
+            config=config,
+            headers=list(map(lambda x: x.alias, ProjectInferenceSimulatorModelEntity.model_fields.values())),
+            row=row,
+            page=page,
+            max_col_width=[100, 100, 100, 100, 100, 100, 100, 100],
+            show_index="never",
+        )
+
+
+    def print_task_list(self, config: ConfigEntity, project_uid, row, page):
+        if not project_uid:
+            project_config: ProjectConfig = self.__config_provider.read_project_config()
+            if not project_config:
+                typer.echo(__("Provide the project unique ID or run this command from within an initialized project directory"))
+                raise typer.Exit(1)
+            project_uid = project_config.slug
+
+        self.print(
+            func_get_data=self.get_project_task_list,
+            func_special_params={
+                'project_slug': project_uid,
+            },
+            mapper=ProjectTaskMapper(),
+            config=config,
+            headers=list(map(lambda x: x.alias, ProjectTaskEntity.model_fields.values())),
+            row=row,
+            page=page,
+            max_col_width=[100, 100, 100, 100, 100, 100, 100, 100],
+            show_index="never",
+        )

thestage/services/remote_server_service.py

@@ -21,7 +21,7 @@ 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 FileSystemServiceCore
+from thestage.services.filesystem_service import FileSystemService
 
 old_value: int = 0
 
@@ -30,7 +30,7 @@ class RemoteServerService:
 
     def __init__(
             self,
-            file_system_service: FileSystemServiceCore,
+            file_system_service: FileSystemService,
             config_provider: ConfigProvider,
     ):
         self.__file_system_service = file_system_service

thestage/services/service_factory.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from thestage.services.connect.connect_service import ConnectService
-from thestage.services.filesystem_service import FileSystemServiceCore
+from thestage.services.filesystem_service import FileSystemService
 from thestage.services.logging.logging_service import LoggingService
 from thestage.services.project.project_service import ProjectService
 from thestage.services.remote_server_service import RemoteServerService
@@ -18,7 +18,7 @@ class ServiceFactory:
     __config_provider: Optional[ConfigProvider] = None
     __thestage_api_client: Optional[TheStageApiClient] = None
     __git_local_client: Optional[GitLocalClient] = None
-    __file_system_service: Optional[FileSystemServiceCore] = None
+    __file_system_service: Optional[FileSystemService] = None
 
     def __init__(
             self,
@@ -84,9 +84,9 @@ class ServiceFactory:
             self.__git_local_client = GitLocalClient(file_system_service=self.get_file_system_service())
         return self.__git_local_client
 
-    def get_file_system_service(self) -> FileSystemServiceCore:
+    def get_file_system_service(self) -> FileSystemService:
         if not self.__file_system_service:
-            self.__file_system_service = FileSystemServiceCore()
+            self.__file_system_service = FileSystemService()
         return self.__file_system_service
 
     def get_app_config_service(self, config_provider: Optional[ConfigProvider] = None,) -> AppConfigService:

thestage/services/validation_service.py

@@ -53,10 +53,4 @@ class ValidationService:
             if not config.main.thestage_auth_token:
                 present_token = False
 
-            if config.start_on_daemon:
-                if config.daemon and config.daemon.daemon_token:
-                    present_token = True
-                else:
-                    present_token = False
-
         return present_token

{thestage-0.5.44.dist-info → thestage-0.5.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: thestage
-Version: 0.5.44
+Version: 0.5.45
 Summary: 
 Author: TheStage AI team
 Author-email: hello@thestage.ai
@@ -21,7 +21,7 @@ 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: tabulate (>=0.9.0,<0.10.0)
-Requires-Dist: typer[all] (>=0.9.0,<0.10.0)
+Requires-Dist: typer[all] (>=0.15.2,<0.16.0)
 Description-Content-Type: text/markdown
 
 # Introduction

{thestage-0.5.44.dist-info → thestage-0.5.45.dist-info}/RECORD

@@ -1,4 +1,4 @@
-thestage/__init__.py,sha256=DhlhvDK-7GKoSl3QZHDW8oTMV7AnpgXhIye7Rw0LV10,65
+thestage/__init__.py,sha256=jF3zpsm_hT2fThFl_9xh6OFpHhG5nMHLJtncxIQBu1A,65
 thestage/__main__.py,sha256=4ObdWrDRaIASaR06IxtFSsoMu58eyL0MnD64habvPj8,101
 thestage/color_scheme/color_scheme.py,sha256=qaSSS_OzPsqI7yV1TC3Ne0PnsWDWo5xqU8j_7JYG-TI,210
 thestage/config/__init__.py,sha256=RNobilYVK1WAM1utcQ8ZuATKc9Zh9M9BAjCLZTnR_TA,428
@@ -6,9 +6,9 @@ thestage/config/env_base.py,sha256=RNBQ17yk1ieu1kdUlM7Qe7mDCoxstgGUwwhe265o4dQ,3
 thestage/controllers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thestage/controllers/base_controller.py,sha256=lX0XsBc7ZEPD_I56cN8IBAVuWGIkOkr7JHvist3_FEM,2135
 thestage/controllers/config_controller.py,sha256=Gzd61UeU1igFT4QUyrZ4dOo_QaNEuXuSEIroXpbBhPA,5365
-thestage/controllers/container_controller.py,sha256=C3WC-Ypeg-vpC8LyCcPZVszbiaDYf2aQzTxYC2PPG8g,15210
-thestage/controllers/instance_controller.py,sha256=pFhkO7U2Ta0_1dzskEj8hbE7Izw_7I4SDbq5O5-bfIY,9757
-thestage/controllers/project_controller.py,sha256=GcfwJfn7_AfVBeGcm3jOVr38SOUT26yyyv91MyDX-YU,36725
+thestage/controllers/container_controller.py,sha256=sSjrkjCQtn-DQJTeUCYYdzwOoGIGniA-MQ3y3BleVsE,14967
+thestage/controllers/instance_controller.py,sha256=3jaM7bYICviAl9_rgkt4S1v9S-bEAAJ18qKDzuMpZlQ,6687
+thestage/controllers/project_controller.py,sha256=ueQJI7lAwwPMJa7evVg_unUnAsTmgz204veOQIxFWSU,31778
 thestage/controllers/utils_controller.py,sha256=FV35yte7jTZRzy2DaL3OZCNzmlVrsNKxksC8P0FD7hM,1030
 thestage/debug_main.dist.py,sha256=UPIJ58yf-6FtXZj-FLAwxi7HononseuCYm9xb5KlxTs,783
 thestage/entities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -41,7 +41,7 @@ thestage/helpers/logger/app_logger.py,sha256=hUuxgUsj4pl9Ogjt1xJePTf71iVxKzyx46d
 thestage/helpers/ssh_util.py,sha256=JuDwddHxEGcA24Y8a-jLv339cG-jq4hEaBAl5TSVVFw,1262
 thestage/i18n/en_GB/messages.po,sha256=BuVIhd5TRQkgFkAbTGvbSRuO88lSJGpnk9TT2J9BC8E,32375
 thestage/i18n/translation.py,sha256=c62OicQ4phSMuqDe7hqGebIsk0W2-8ZJUfgfdtjjqEc,284
-thestage/main.py,sha256=3gHKEbOmpUTT5byvD9gPgT2uoaijAJUoa7G5dSnVlbs,784
+thestage/main.py,sha256=qjlm4kSgT4Gnr4kyjYmHypj0RTk90JYHscP1w8P1Zwg,935
 thestage/services/.env,sha256=K2VpzFAVjD75XawAHZdR0HWmypryA_mXNY4WHNgR-wQ,184
 thestage/services/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thestage/services/abstract_mapper.py,sha256=_q7YLkPNRsNW5wOCqvZIu1KfpLkc7uVaAQKrMZtsGuY,218
@@ -50,9 +50,9 @@ thestage/services/app_config_service.py,sha256=a7zrbVCJx6XCSRCMv346AYQ_gV3fzw8g7
 thestage/services/clients/.DS_Store,sha256=EYALnKLNXhZ-2jJTMck8Fo1bIxlFCvaXGUUUf-lgHxM,6148
 thestage/services/clients/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thestage/services/clients/git/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thestage/services/clients/git/git_client.py,sha256=2qARWz1VQBKZTG4Spdkx0wBf5oGyU3d9Hnqmeuz8Bbs,12724
+thestage/services/clients/git/git_client.py,sha256=y1ZHgFu5l6tQ3l7SCJVLP81VDGTkCWofhOsVruZwJHo,12716
 thestage/services/clients/thestage_api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thestage/services/clients/thestage_api/api_client.py,sha256=ZkEbYOg79-RkG9on64tWTto1zXKnG38eKgIy7aS-2lc,29586
+thestage/services/clients/thestage_api/api_client.py,sha256=W28SETPflYnOQgb0WoGaleqYtR8EtiOYllcOqUbK-pE,29336
 thestage/services/clients/thestage_api/core/api_client_abstract.py,sha256=nJ0OiT4Ecexp-3HHK332pvyzrf1JsZ1WQYdvn-aeIL8,2984
 thestage/services/clients/thestage_api/core/api_client_core.py,sha256=WwtzdTAxog-l2UU8Up40BxepgM7OTXn-XHgzlHorXT0,908
 thestage/services/clients/thestage_api/core/http_client_exception.py,sha256=JH-874Gu9T1b1_FpPBLqdyt9U0PyhpwRCe_oDc6c_jI,385
@@ -131,19 +131,19 @@ thestage/services/clients/thestage_api/dtos/task_controller/task_list_for_projec
 thestage/services/clients/thestage_api/dtos/task_controller/task_list_for_project_response.py,sha256=r2R2efDZmaAyfiNs_kuftpgaP-j6VWpKnA1qkHDQfII,466
 thestage/services/clients/thestage_api/dtos/task_controller/task_status_localized_map_response.py,sha256=Q0YahAKtlWIV0l2XXEwzjjyORchPlBolA2xXZ8c3zpw,285
 thestage/services/clients/thestage_api/dtos/task_controller/task_view_response.py,sha256=30P19Fipas4wzHguvzmxsAoDkKcGNbcKQ_SjJOQVsq8,462
-thestage/services/clients/thestage_api/dtos/user_profile.py,sha256=kWnGeYKe4umMzWBqzk0y0aWx8czZ-zs2WRvVRSopcFA,286
+thestage/services/clients/thestage_api/dtos/user_controller/user_profile.py,sha256=cDH5azyVBXi3V7kIOEuzsF1aKONQnxcI7YsDwXjRmuE,268
 thestage/services/config_provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thestage/services/config_provider/config_provider.py,sha256=7vVCwQO-LsY4erkOcl6PG5A-ZrZx7HulFCz7Ncv9OCo,9729
-thestage/services/connect/connect_service.py,sha256=6XK2ttKSAly3Vh0SOwM2FVY0OHyjp61XUpTKagX51NI,9508
+thestage/services/config_provider/config_provider.py,sha256=_BNP_pAw40deKyMzDuTR6ze3on-NCxR_yKwl8ZcoUEU,9115
+thestage/services/connect/connect_service.py,sha256=bVUqHh3-AdEhNmh0iRmgBIuR3z7k7rAkE5ldH9dHA5U,9916
 thestage/services/connect/dto/remote_server_config.py,sha256=yuO0tTAgUxCiQ-h1nVvWUMlCUtR-WB_eOH6KYspV7zQ,272
 thestage/services/container/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thestage/services/container/container_service.py,sha256=1ZVoGpdxQqU0dRuL-Zxh3Y6h8CPcymVEK8CqfyCuCw0,14767
+thestage/services/container/container_service.py,sha256=wqgteC2fVue0rCKnZIRPyhGH3Is1L2E2nMt8i0wYlyA,14759
 thestage/services/container/mapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thestage/services/container/mapper/container_mapper.py,sha256=ymIjBLGZnpodh0W2KwNUqRxT0VgM1hsCViNza1nhWHk,1088
-thestage/services/core_files/config_entity.py,sha256=RlTNEWEgKs7WvI7291tAXhKHb2XROgoilIR4eImqM60,1150
-thestage/services/filesystem_service.py,sha256=UN5b5jtxeSAGM1yIDIyj3_Gfjixt_KsfqKSWG-gD49w,4270
+thestage/services/core_files/config_entity.py,sha256=qMMjqQrTQmlts93r_NunR5na5uScc526NV9_a3SgPVQ,867
+thestage/services/filesystem_service.py,sha256=U_-U7UcTMFwJeYu-iD8OVYQgcKjTnnrENKVqfDqQwY4,4832
 thestage/services/instance/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-thestage/services/instance/instance_service.py,sha256=AuhU__G1iBvxiHTp7OadgiRCpuOHbzcVW6ZlcsIw4ME,9270
+thestage/services/instance/instance_service.py,sha256=cAuyDozqVNy9FkyQqMu037LghqaUeFfmR9kGbUxLhY4,13371
 thestage/services/instance/mapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 thestage/services/instance/mapper/instance_mapper.py,sha256=OA0-Z6ODfAK1yBjf7nF-JDKERr8lZUm5vYKk_TFw-v8,1132
 thestage/services/instance/mapper/selfhosted_mapper.py,sha256=KpkvsDV0OWzHhN53md4mgo3xc8siM5idDwL_pSRTouE,1286
@@ -161,13 +161,13 @@ thestage/services/project/mapper/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 thestage/services/project/mapper/project_inference_simulator_mapper.py,sha256=UdOu9IIF5rlNPoWSaaeSKU3ODe8E5uSMgm2V5ywMWKE,812
 thestage/services/project/mapper/project_inference_simulator_model_mapper.py,sha256=PWY0iWbXhvD-G0X0_aQZAFY2bqc0lvRJcQAyC8Y-88Q,869
 thestage/services/project/mapper/project_task_mapper.py,sha256=SHIEXjYwt4vm2B1X2QiI4sCPbBarum0bTOnmTWPOlto,813
-thestage/services/project/project_service.py,sha256=q8j3JE2RhzBa1NiJ6PSfgClOSbpJhzGUN4Alv2Y_7FE,53246
-thestage/services/remote_server_service.py,sha256=3VPgd9ckxXOxXGGvb3JeJ0LwuZx2gd2jWn3Pf-CxqVk,23264
-thestage/services/service_factory.py,sha256=tWbFFDO6TeOz5jSYbe-OabqTmsjR9Xs1OZmd49Aj3g0,5098
+thestage/services/project/project_service.py,sha256=dvWKLV0M5LieO4v0Kye4wQbs-kQmGhifomCsmpxhEBM,59743
+thestage/services/remote_server_service.py,sha256=AsTzlI7mvlJpqFqrhn4o9l3CYliLgeq3GQdyaZ17m9c,23256
+thestage/services/service_factory.py,sha256=Hx9DeFP3x3FDj2g9FCuUnAQSUEfZbJGli_WD805wg40,5082
 thestage/services/task/dto/task_dto.py,sha256=PJwrUsLLAoO2uA9xvzb27b9iYAoNiBcsHSxKERh2VFo,2335
-thestage/services/validation_service.py,sha256=ABb-ok-SGITE6jm8AR1hiYHYgGZL7ri02Yi0OCXbofo,2008
-thestage-0.5.44.dist-info/LICENSE.txt,sha256=U9QrxfdD7Ie7r8z1FleuvOGQvgCF1m0Mjd78cFvWaHE,572
-thestage-0.5.44.dist-info/METADATA,sha256=ZFWB66Hr0zToO8AHTYEn-EibANQG09L_dBpBh0o-yaw,5557
-thestage-0.5.44.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-thestage-0.5.44.dist-info/entry_points.txt,sha256=57pMhs8zaCM-jgeTffC0WVqCsh35Uq_dUDmzXR80CI4,47
-thestage-0.5.44.dist-info/RECORD,,
+thestage/services/validation_service.py,sha256=RFVZA_Ri2bzOBKGz6qs5WHK8Z7wVNUMjuj8uRz38YbU,1798
+thestage-0.5.45.dist-info/LICENSE.txt,sha256=U9QrxfdD7Ie7r8z1FleuvOGQvgCF1m0Mjd78cFvWaHE,572
+thestage-0.5.45.dist-info/METADATA,sha256=nrVxlmjYX1TjrTIIAjbQFWLwLvoH4XaJuUSptgY6yFk,5558
+thestage-0.5.45.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+thestage-0.5.45.dist-info/entry_points.txt,sha256=57pMhs8zaCM-jgeTffC0WVqCsh35Uq_dUDmzXR80CI4,47
+thestage-0.5.45.dist-info/RECORD,,