thestage 0.5.43__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.43"
+__version__ = "0.5.45"

thestage/color_scheme/color_scheme.py

@@ -1,6 +1,7 @@
 from enum import Enum
 
-
+# https://rich.readthedocs.io/en/stable/appendix/colors.html
 class ColorScheme(str, Enum):
     GIT_HEADLESS = "orange_red1"
     WARNING = "orange_red1"
+    USEFUL_INFO = "deep_sky_blue1"

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

@@ -183,6 +183,34 @@ def run(
     raise typer.Exit(0)
 
 
+@task_app.command(name='cancel', no_args_is_help=True, help=__("Cancel a task by ID"))
+def cancel_task(
+        task_id: Annotated[int, typer.Argument(
+            help=__("Task ID (required)"),
+        )],
+):
+    """
+        Cancels a task
+    """
+    app_logger.info(f'Start cancel task from {get_current_directory()}')
+
+    if not task_id:
+        typer.echo(__('Task ID is required'))
+        raise typer.Exit(1)
+
+    service_factory = validate_config_and_get_service_factory()
+    config = service_factory.get_config_provider().get_full_config()
+
+    project_service = service_factory.get_project_service()
+
+    project_service.cancel_task(
+        config=config,
+        task_id=task_id
+    )
+
+    raise typer.Exit(0)
+
+
 @task_app.command("ls", help=__("List tasks"))
 def list_runs(
         project_uid: Annotated[str, typer.Argument(help=__("Project unique ID. By default, project info is taken from the current directory"), metavar="OPTIONAL")] = None,
@@ -208,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)
@@ -287,9 +295,9 @@ def checkout_project(
         ),
 ):
     """
-        Initializes project in current working directory
+        Checkout project in current working directory
     """
-    app_logger.info(f'Start project init from {get_current_directory()}')
+    app_logger.info(f'Start project checkout from {get_current_directory()}')
 
     service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
     config = service_factory.get_config_provider().get_full_config()
@@ -315,11 +323,8 @@ def checkout_project(
     raise typer.Exit(0)
 
 
-@config_app.command(name='set-default-container', no_args_is_help=True, help=__("Set default docker container for a project installation"))
-def set_default_container(
-        container_uid: Annotated[Optional[str], typer.Argument(
-            help=__("Unique ID of the container to use by default for running tasks"),
-        )] = None,
+@app.command(name='pull', help=__("Pulls the changes from the remote project repository. Equivalent to 'git pull'."))
+def pull_project(
         working_directory: Optional[str] = typer.Option(
             None,
             "--working-directory",
@@ -327,6 +332,56 @@ def set_default_container(
             help=__("Full path to working directory"),
             is_eager=False,
         ),
+):
+    """
+        Pull project in current working directory
+    """
+    app_logger.info(f'Start project pull from {get_current_directory()}')
+
+    service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
+    config = service_factory.get_config_provider().get_full_config()
+
+    project_service = service_factory.get_project_service()
+
+    project_service.pull_project(
+        config=config,
+    )
+
+    raise typer.Exit(0)
+
+
+@app.command(name='reset', help=__("Resets the current project branch to remote counterpart. All working tree changes will be lost. Equivalent to 'git fetch && git reset --hard origin/{ref}'."))
+def reset_project(
+        working_directory: Optional[str] = typer.Option(
+            None,
+            "--working-directory",
+            "-wd",
+            help=__("Full path to working directory"),
+            is_eager=False,
+        ),
+):
+    """
+        Pull project in current working directory
+    """
+    app_logger.info(f'Start project pull from {get_current_directory()}')
+
+    service_factory = validate_config_and_get_service_factory(working_directory=working_directory)
+    config = service_factory.get_config_provider().get_full_config()
+
+    project_service = service_factory.get_project_service()
+
+    project_service.reset_project(
+        config=config
+    )
+
+    raise typer.Exit(0)
+
+
+@config_app.command(name='set-default-container', no_args_is_help=True, help=__("Set default docker container for a project installation"))
+def set_default_container(
+        container_uid: Annotated[Optional[str], typer.Argument(
+            help=__("Unique ID of the container to use by default for running tasks"),
+        )] = None,
         unset_default_container: Optional[bool] = typer.Option(
             False,
             "--unset",
@@ -334,6 +389,13 @@ def set_default_container(
             help=__("Unsets the default docker container"),
             is_eager=False,
         ),
+        working_directory: Optional[str] = typer.Option(
+            None,
+            "--working-directory",
+            "-wd",
+            help=__("Full path to working directory"),
+            is_eager=False,
+        ),
 ):
     """
         Initializes project in current working directory
@@ -582,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)
@@ -671,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

@@ -10,15 +10,16 @@ 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.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:
     __base_name_remote: str = 'origin'
     __base_name_local: str = 'main'
-    __git_ignore_thestage_line: str = '/.thestage/'
+    __git_ignore_thestage_line: str = f'/{THESTAGE_CONFIG_DIR}/'
 
     __special_main_branches = ['main', 'master']
 
@@ -26,10 +27,11 @@ class GitLocalClient:
 
     def __init__(
             self,
-            file_system_service: FileSystemServiceCore,
+            file_system_service: FileSystemService,
     ):
         self.__file_system_service = file_system_service
 
+    # todo delete this fuckery
     def __get_repo(self, path: str) -> Repo:
         return git.Repo(path)
 
@@ -105,32 +107,37 @@ class GitLocalClient:
         with repo.git.custom_environment(GIT_SSH_COMMAND=git_ssh_cmd):
             remote: Remote = repo.remote(self.__base_name_remote)
             if remote:
+                progress = ProgressPrinter()
                 try:
-                    remote.fetch()
-                except GitCommandError as base_ex:
-                    msg = base_ex.stderr
-                    if msg and 'fatal: Could not read from remote repository' in msg:
-                        raise GitAccessException(
-                            message='You dont have access to repository, or repository not found.',
-                            url=self.build_http_repo_url(git_path=remote.url),
-                            dop_message=msg,
-                        )
-                    else:
-                        raise base_ex
-
-    def git_pull(self, path: str, deploy_key_path: str, branch: Optional[str] = None):
+                    remote.fetch(progress=progress)
+                except GitCommandError as ex:
+                    for line in progress.allDroppedLines():
+                        # returning the whole output if failed - so that user have any idea what's going on
+                        print(f'>> {line}')
+                    raise ex
+
+
+    def git_pull(self, path: str, deploy_key_path: str):
         repo = self.__get_repo(path=path)
         git_ssh_cmd = 'ssh -F /dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i %s' % deploy_key_path
 
         with repo.git.custom_environment(GIT_SSH_COMMAND=git_ssh_cmd):
             local_branch = self.__base_name_local
-            if branch:
-                if self.__base_name_remote in branch:
-                    local_branch = branch.replace(f"{self.__base_name_remote}/", '').strip()
-                else:
-                    local_branch = branch
+            if repo.active_branch.name:
+                local_branch = repo.active_branch.name
 
-            repo.git.pull(self.__base_name_remote, local_branch)
+            origin = repo.remote(self.__base_name_remote)
+
+            if origin:
+                progress = ProgressPrinter()
+                try:
+                    origin.pull(refspec=local_branch, progress=progress)
+                    typer.echo(f"Pulled remote changes to branch '{local_branch}'")
+                except GitCommandError as ex:
+                    for line in progress.allDroppedLines():
+                        # returning the whole output if failed - so that user have any idea what's going on
+                        print(f'>> {line}')
+                    raise ex
 
     def find_main_branch_name(self, path: str) -> Optional[str]:
         repo = self.__get_repo(path=path)
@@ -275,10 +282,16 @@ class GitLocalClient:
         if repo:
             return repo.head.is_detached
 
-    def reset_hard(self, path: str):
+    def reset_hard(self, path: str, deploy_key_path: str, reset_to_origin: bool):
         repo = self.__get_repo(path=path)
         if repo:
-            repo.git.reset('--hard')
+            git_ssh_cmd = 'ssh -F /dev/null -o StrictHostKeyChecking=no -o IdentitiesOnly=yes -i %s' % deploy_key_path
+            with repo.git.custom_environment(GIT_SSH_COMMAND=git_ssh_cmd):
+                if reset_to_origin:
+                    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')
 
     # 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:
@@ -297,6 +310,11 @@ class GitLocalClient:
             for branch in repo.heads:
                 if branch.name == branch_name:
                     return True
+
+            for ref in repo.remotes.origin.refs:
+                if ref.remote_head == branch_name:
+                    typer.echo(f'Found remote branch "{branch_name}"')
+                    return True
         return False
 
     def checkout_to_new_branch(self, path: str, branch_name: str):