thestage 0.5.46__py3-none-any.whl → 0.5.49__py3-none-any.whl

thestage/i18n/translation.py

@@ -1,9 +1,9 @@
-from typing import Optional
-
-from python_gettext_translations.translations import translate
-
-from thestage.config import THESTAGE_LOCAL_LANGUAGE
-
-
-def __(original: str, placeholders: Optional[dict] = None) -> str:
-    return translate(THESTAGE_LOCAL_LANGUAGE, original, placeholders)
+from typing import Optional
+
+from python_gettext_translations.translations import translate
+
+from thestage.config import THESTAGE_LOCAL_LANGUAGE
+
+
+def __(original: str, placeholders: Optional[dict] = None) -> str:
+    return translate(THESTAGE_LOCAL_LANGUAGE, original, placeholders)

thestage/main.py

@@ -1,24 +1,36 @@
-from thestage.services.core_files.config_entity import ConfigEntity
-
-# TODO use this in config_provider
-initial_config: ConfigEntity = ConfigEntity()
-
-def main():
-    try:
-        import warnings
-        warnings.filterwarnings(action='ignore', module='.*paramiko.*')
-
-        from . import __app_name__
-
-        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(config_controller.app, name="config")
-
-        import thestage.config
-        base_controller.app(prog_name=__app_name__)
-    except KeyboardInterrupt:
-        print('THESTAGE: Keyboard Interrupt')
+from thestage.helpers import exception_hook
+import traceback
+
+from thestage.cli_command_helper import get_command_group_help_panel
+from thestage.helpers.logger.app_logger import app_logger, get_log_path_from_os
+from thestage.services.service_factory import ServiceFactory
+from rich import print
+
+
+def main():
+    service_factory = ServiceFactory()
+    config_provider = service_factory.get_config_provider()
+    config = config_provider.build_config()
+
+    try:
+        try:
+            api_client = service_factory.get_thestage_api_client()
+            token_info = api_client.validate_token(config.main.thestage_auth_token)
+            config_provider.update_allowed_commands_and_is_token_valid(validate_token_response=token_info)
+        except Exception as e:
+            app_logger.error(f'{traceback.format_exc()}')
+            print('Unexpected error occurred')  # TODO inquire what we want here if backend is offline
+            print(f'Application logs path: {str(get_log_path_from_os())}')
+            return
+
+        from thestage.controllers import base_controller, container_controller, instance_controller, project_controller, \
+            config_controller
+
+        base_controller.app.add_typer(project_controller.app, name="project", rich_help_panel=get_command_group_help_panel())
+        base_controller.app.add_typer(container_controller.app, name="container", rich_help_panel=get_command_group_help_panel())
+        base_controller.app.add_typer(instance_controller.app, name="instance", rich_help_panel=get_command_group_help_panel())
+        base_controller.app.add_typer(config_controller.app, name="config", rich_help_panel=get_command_group_help_panel())
+
+        base_controller.app()
+    except KeyboardInterrupt:
+        print('THESTAGE: Keyboard Interrupt')

thestage/services/.env

@@ -1,6 +1,6 @@
-THESTAGE_CONFIG_DIR=.thestage
-THESTAGE_CONFIG_FILE=config.json
-THESTAGE_CLI_ENV=DEV
-THESTAGE_API_URL=http://localhost:8100
-THESTAGE_API_URL=http://localhost:8100
-LOG_FILE=thestage.log
+THESTAGE_CONFIG_DIR=.thestage
+THESTAGE_CONFIG_FILE=config.json
+THESTAGE_CLI_ENV=DEV
+THESTAGE_API_URL=http://localhost:8100
+THESTAGE_API_URL=http://localhost:8100
+LOG_FILE=thestage.log

thestage/services/abstract_mapper.py

@@ -1,9 +1,9 @@
-from abc import ABC, abstractmethod
-from typing import Any, Optional, Tuple
-
-
-class AbstractMapper(ABC):
-
-    @abstractmethod
-    def build_entity(self, item: Any) -> Optional[Any]:
-        raise NotImplementedError()
+from abc import ABC, abstractmethod
+from typing import Any, Optional, Tuple
+
+
+class AbstractMapper(ABC):
+
+    @abstractmethod
+    def build_entity(self, item: Any) -> Optional[Any]:
+        raise NotImplementedError()

thestage/services/abstract_service.py

@@ -1,127 +1,87 @@
-from abc import ABC
-from typing import List, Dict, Any, Optional
-
-import typer
-from tabulate import tabulate
-from thestage.services.core_files.config_entity import ConfigEntity
-from thestage.helpers.logger.app_logger import app_logger
-from thestage.i18n.translation import __
-from thestage.services.abstract_mapper import AbstractMapper
-from thestage.services.clients.thestage_api.dtos.paginated_entity_list import PaginatedEntityList
-from thestage.services.config_provider.config_provider import ConfigProvider
-
-
-class AbstractService(ABC):
-
-    def __init__(
-            self,
-            config_provider: ConfigProvider,
-    ):
-        self._config_provider = config_provider
-
-    def map_frontend_statuses(self, statuses_mapper: Dict[str, str], frontend: List[str]) -> Optional[List[str]]:
-
-        real_statuses = []
-
-        mapper: Dict[str, List] = {}
-        for key, value in statuses_mapper.items():
-
-            map_key = value if ' ' not in value else value.replace(' ', '_')
-            if value not in mapper:
-                mapper[map_key] = [key]
-            else:
-                mapper[map_key].append(key)
-
-        for item in frontend:
-            if item == 'all':
-                return []
-            elif item == 'unknown':
-                continue
-            else:
-                if item in mapper:
-                    real_statuses.extend(mapper[item])
-                else:
-                    app_logger.error(f'Not found status: {item}')
-
-        return real_statuses
-
-
-    # TODO remove recursion
-    def print(
-            self,
-            func_get_data,
-            func_special_params: Dict[str, Any],
-            mapper: AbstractMapper,
-            config: ConfigEntity,
-            headers: List[str],
-            row: int = 5,
-            page: int = 1,
-            show_index: str = 'always',
-            max_col_width: List[Optional[int]] = None,
-            depth: int = 0,
-    ):
-        paginated_entity_list: PaginatedEntityList = func_get_data(
-            config=config,
-            row=row,
-            page=page,
-            **func_special_params,
-        )
-
-        result = list(map(lambda x: mapper.build_entity(x), paginated_entity_list.entities))
-
-        if result:
-            raw_data = [list(item.model_dump(
-                by_alias=True,
-            ).values()) for item in result]
-        else:
-            if depth == 0:
-                typer.echo(__("No items found"))
-            else:
-                typer.echo(__("Listing completed"))
-            raise typer.Exit(0)
-
-        # tabulate() crashes on any None value, check mappers
-
-        typer.echo(__(
-            "Current page: %page% | Total pages: %total_pages% | Items per page: %limit%",
-            {
-                'page': str(page),
-                'limit': str(row),
-                'total_pages': str(paginated_entity_list.pagination_data.total_pages),
-            }
-        ))
-
-        typer.echo(tabulate(
-            raw_data,
-            headers=headers,
-            showindex=show_index,
-            tablefmt="double_grid",
-            maxcolwidths=max_col_width,
-        ))
-
-        if page >= paginated_entity_list.pagination_data.total_pages:
-            typer.echo(__("Listing completed"))
-            raise typer.Exit(0)
-
-        next_page: int = typer.prompt(
-            text=__('Go to next page (0 to exit)?'),
-            default=page + 1,
-            show_choices=False,
-            type=int,
-            show_default=True,
-        )
-        if next_page == 0:
-            raise typer.Exit(0)
-        else:
-            self.print(
-                func_get_data=func_get_data,
-                func_special_params=func_special_params,
-                mapper=mapper,
-                config=config,
-                headers=headers,
-                row=row,
-                page=next_page,
-                max_col_width=max_col_width,
-                show_index=show_index,
-                depth=depth + 1,
-            )
+from abc import ABC
+from typing import List, Dict, Any, Optional
+
+import typer
+from tabulate import tabulate
+from thestage.i18n.translation import __
+from thestage.services.abstract_mapper import AbstractMapper
+from thestage.services.clients.thestage_api.dtos.paginated_entity_list import PaginatedEntityList
+
+
+class AbstractService(ABC):
+    # TODO remove recursion
+    def print(
+            self,
+            func_get_data,
+            func_special_params: Dict[str, Any],
+            mapper: AbstractMapper,
+            headers: List[str],
+            row: int = 5,
+            page: int = 1,
+            show_index: str = 'always',
+            max_col_width: List[Optional[int]] = None,
+            depth: int = 0,
+    ):
+        paginated_entity_list: PaginatedEntityList = func_get_data(
+            row=row,
+            page=page,
+            **func_special_params,
+        )
+
+        result = list(map(lambda x: mapper.build_entity(x), paginated_entity_list.entities))
+
+        if result:
+            raw_data = [list(item.model_dump(
+                by_alias=True,
+            ).values()) for item in result]
+        else:
+            if depth == 0:
+                typer.echo(__("No items found"))
+            else:
+                typer.echo(__("Listing completed"))
+            raise typer.Exit(0)
+
+        # tabulate() crashes on any None value, check mappers
+
+        typer.echo(__(
+            "Current page: %page% | Total pages: %total_pages% | Items per page: %limit%",
+            {
+                'page': str(page),
+                'limit': str(row),
+                'total_pages': str(paginated_entity_list.pagination_data.total_pages),
+            }
+        ))
+
+        typer.echo(tabulate(
+            raw_data,
+            headers=headers,
+            showindex=show_index,
+            tablefmt="double_grid",
+            maxcolwidths=max_col_width,
+        ))
+
+        if page >= paginated_entity_list.pagination_data.total_pages:
+            typer.echo(__("Listing completed"))
+            raise typer.Exit(0)
+
+        next_page: int = typer.prompt(
+            text=__('Go to next page (0 to exit)?'),
+            default=page + 1,
+            show_choices=False,
+            type=int,
+            show_default=True,
+        )
+        if next_page == 0:
+            raise typer.Exit(0)
+        else:
+            self.print(
+                func_get_data=func_get_data,
+                func_special_params=func_special_params,
+                mapper=mapper,
+                headers=headers,
+                row=row,
+                page=next_page,
+                max_col_width=max_col_width,
+                show_index=show_index,
+                depth=depth + 1,
+            )

thestage/services/app_config_service.py

@@ -1,51 +1,52 @@
-import os
-
-import click
-import typer
-from thestage.services.core_files.config_entity import ConfigEntity
-from thestage.i18n.translation import __
-from thestage.entities.enums.yes_no_response import YesOrNoResponse
-from thestage.services.config_provider.config_provider import ConfigProvider
-from thestage.services.validation_service import ValidationService
-
-
-class AppConfigService:
-
-    __validation_service: ValidationService
-    __config_provider: ConfigProvider
-
-    def __init__(
-            self,
-            validation_service: ValidationService,
-            config_provider: ConfigProvider,
-    ):
-        self.__validation_service = validation_service
-        self.__config_provider = config_provider
-
-    def app_change_token(
-            self,
-            config: ConfigEntity,
-            token: str,
-    ):
-        if config.main.thestage_auth_token:
-            response: YesOrNoResponse = typer.prompt(
-                text=__('Do you want to change current token?'),
-                show_choices=True,
-                default=YesOrNoResponse.YES.value,
-                type=click.Choice([r.value for r in YesOrNoResponse]),
-                show_default=True,
-            )
-            if response == YesOrNoResponse.NO:
-                raise typer.Exit(0)
-
-        config.main.thestage_auth_token = token
-
-        self.__validation_service.check_token(config=config)
-        self.__config_provider.save_config(config=config)
-
-    @staticmethod
-    def app_remove_env():
-        os.unsetenv('THESTAGE_CONFIG_FILE')
-        os.unsetenv('THESTAGE_API_URL')
-        os.unsetenv('THESTAGE_LOG_FILE')
-        os.unsetenv('THESTAGE_AUTH_TOKEN')
+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.i18n.translation import __
+from thestage.entities.enums.yes_no_response import YesOrNoResponse
+from thestage.services.validation_service import ValidationService
+
+
+class AppConfigService:
+
+    __validation_service: ValidationService
+
+    def __init__(
+            self,
+            validation_service: ValidationService,
+            config_provider: ConfigProvider,
+    ):
+        self.__validation_service = validation_service
+        self.__config_provider = config_provider
+
+    def app_change_token(
+            self,
+            token: str,
+    ):
+        config = self.__config_provider.get_config()
+
+        if config.main.thestage_auth_token:
+            response: YesOrNoResponse = typer.prompt(
+                text=__('Do you want to change current token?'),
+                show_choices=True,
+                default=YesOrNoResponse.YES.value,
+                type=click.Choice([r.value for r in YesOrNoResponse]),
+                show_default=True,
+            )
+            if response == YesOrNoResponse.NO:
+                raise typer.Exit(0)
+
+        config.main.thestage_auth_token = token
+        self.__config_provider.update_config(updated_config=config)
+        self.__validation_service.check_token()
+        self.__config_provider.save_config()
+
+    @staticmethod
+    def app_remove_env():
+        os.unsetenv('THESTAGE_CONFIG_FILE')
+        os.unsetenv('THESTAGE_API_URL')
+        os.unsetenv('THESTAGE_LOG_FILE')
+        os.unsetenv('THESTAGE_AUTH_TOKEN')