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

thestage/controllers/utils_controller.py

@@ -1,11 +1,9 @@
 import os
 import pathlib
-from typing import Optional, Dict, Tuple
+from typing import Optional
 
-from thestage.services.core_files.config_entity import ConfigEntity
 from thestage.helpers.error_handler import error_handler
 from thestage.services.service_factory import ServiceFactory
-from thestage.services.config_provider.config_provider import ConfigProvider
 
 
 def get_current_directory() -> pathlib.Path:
@@ -17,12 +15,18 @@ def validate_config_and_get_service_factory(
         working_directory: Optional[str] = None,
 ) -> ServiceFactory:
     local_path = get_current_directory() if not working_directory else os.path.abspath(working_directory)
-    config_provider = ConfigProvider(local_path=local_path)
-    service_factory = ServiceFactory(config_provider=config_provider)
-    config: ConfigEntity = config_provider.get_full_config()
+
+    service_factory = ServiceFactory()
+    config_provider = service_factory.get_config_provider()
+
+    config = config_provider.get_config()
+    config.runtime.working_directory = str(local_path)
+
+    config_provider.update_config(updated_config=config)
 
     validation_service = service_factory.get_validation_service()
-    validation_service.check_token(config=config)
-    config_provider.save_config(config=config)
+
+    validation_service.check_token()
+    config_provider.save_config()
 
     return service_factory

thestage/debug_tests.py

@@ -0,0 +1,12 @@
+import requests
+import os
+
+API_TOKEN = 'eyJhbGciOiJIUzI1NiJ9.eyJqdGkiOiJjNjMzYzRlZC1mOGI2LTRlMWQtODRmOS0zZDM1Zjg1YzZlYzIiLCJzdWIiOiJhcGlVc2VyIiwidXNlcklkIjoyLCJjbGllbnRJZCI6MiwidG9rZW5UeXBlIjoiYWNjZXNzIiwiZXhwIjoxNzc4MjU4Nzg1fQ.q3bGF_ekdXrPGvFpsHzozvIh-XNVky1Jp_mDRW6Woro'
+
+api_url = 'https://backend.thestage.ai/user-api/v1/elastic-model/local-run-bundle/get-available-options'
+headers = {
+    'accept': '*/*',
+    'Authorization': f'Bearer {API_TOKEN}'
+}
+response = requests.post(api_url, headers=headers, json='')
+print(response.json())

thestage/entities/container.py

@@ -10,13 +10,8 @@ class DockerContainerEntity(BaseModel):
         use_enum_values=True,
     )
 
-    # id: Optional[int] = Field(None, alias='id')
     slug: Optional[str] = Field(None, alias='UNIQUE ID')
     status: Optional[str] = Field(None, alias='STATUS')
     title: Optional[str] = Field(None, alias='TITLE')
     instance_type: Optional[str] = Field(None, alias='INSTANCE TYPE')
     instance_slug: Optional[str] = Field(None, alias='INSTANCE UNIQUE ID')
-    # instance_rented_slug: Optional[str] = Field(None, alias='INSTANCE UNIQUE ID')
-    # selfhosted_rented_slug: Optional[str] = Field(None, alias='SELF-HOSTED UNIQUE ID')
-    # system_name: Optional[str] = Field(None, alias='SYSTEM NAME')
-    # docker_image: Optional[str] = Field(None, alias='DOCKER IMAGE')

thestage/entities/rented_instance.py

@@ -10,15 +10,10 @@ class RentedInstanceEntity(BaseModel):
         use_enum_values=True
     )
 
-    # id: Optional[int] = Field(None, alias='ID')
     status: Optional[str] = Field(None, alias='STATUS')
     title: Optional[str] = Field(None, alias='TITLE')
     slug: Optional[str] = Field(None, alias='UNIQUE ID')
     cpu_type: Optional[str] = Field(None, alias='CPU TYPE')
     cpu_cores: Optional[str] = Field(None, alias='CPU CORES')
     gpu_type: Optional[str] = Field(None, alias='GPU TYPE')
-    # ram_size_gb: Optional[int] = Field(None, alias='RAM SIZE GB')
     ip_address: Optional[str] = Field(None, alias='IP ADDRESS')
-    # username: Optional[str] = Field(None, alias='USERNAME')
-    # created_at: Optional[str] = Field(None, alias='CREATED AT')
-    # updated_at: Optional[str] = Field(None, alias='UPDATED AT')

thestage/entities/self_hosted_instance.py

@@ -16,5 +16,3 @@ class SelfHostedInstanceEntity(BaseModel):
     cpu_cores: Optional[int] = Field(None, alias='CPU_CORES')
     gpu_type: Optional[str] = Field(str, alias='GPU_TYPE')
     ip_address: Optional[str] = Field(None, alias='IP_ADDRESS')
-    # created_at: Optional[str] = Field(None, alias='CREATED_AT')
-    # updated_at: Optional[str] = Field(None, alias='UPDATED_AT')

thestage/helpers/error_handler.py

@@ -27,11 +27,11 @@ def error_handler() -> Callable:
                 return result
             except AuthException as e1:
                 typer.echo(__('Authentication failed: update API token'))
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except BusinessLogicException as e2:
                 typer.echo(__('Business logic error encountered: contact TheStage AI team'))
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except ConfigException as e3:
                 typer.echo(__(
@@ -40,7 +40,7 @@ def error_handler() -> Callable:
                         'error_message': e3.get_message()
                     }
                 ))
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except FileSystemException as e4:
                 typer.echo(__(
@@ -49,7 +49,7 @@ def error_handler() -> Callable:
                         'error_message': e4.get_message()
                     }
                 ))
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except HttpClientException as e5:
                 typer.echo(__(
@@ -60,8 +60,8 @@ def error_handler() -> Callable:
                         'error_message': e5.get_message()
                     }
                 ))
-                app_logger.info(f"Connection error to {THESTAGE_API_URL} - {e5}")
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f"Connection error to {THESTAGE_API_URL} - {e5}")
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except GitAccessException as e6:
                 typer.echo(e6.get_message())
@@ -72,11 +72,11 @@ def error_handler() -> Callable:
                         'git_url': e6.get_url(),
                     }
                 ))
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except GitCommandError as e7:
                 typer.echo(f'Git command error encountered: {e7.stderr} (status: {e7.status})')
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except RemoteServerException as e8:
                 typer.echo(__(
@@ -85,21 +85,21 @@ def error_handler() -> Callable:
                         'ip_address': e8.ip_address,
                         'username': e8.username,
                     }))
-                app_logger.info(f'Error connecting to server or Docker container at {e8.ip_address} as {e8.username} - {e8}')
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'Error connecting to server or Docker container at {e8.ip_address} as {e8.username} - {e8}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except Abort as e9:
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except requests.exceptions.ConnectionError as e10:
                 # TODO we don't know for sure if it is Thestage connection error - throw appropriate exception (on token validation?)
                 typer.echo("Connection error")
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except PasswordRequiredException as e11:
                 # technically we can use encrypted keys but dealing with passwords is big bs
                 typer.echo("Provided key requires password. Please use non-encrypted key.")
-                app_logger.info(f'{traceback.format_exc()}')
+                app_logger.error(f'{traceback.format_exc()}')
                 raise typer.Exit(1)
             except Exception as e100:
                 if isinstance(e100, Exit):
@@ -109,7 +109,7 @@ def error_handler() -> Callable:
                     # typer.echo(e100.__class__.__name__)
                     # print(traceback.format_exc())
                     # TODO send all exceptions to backend?
-                    app_logger.info(f'{traceback.format_exc()}')
+                    app_logger.error(f'{traceback.format_exc()}')
                     raise typer.Exit(1)
         return wrapper
     return wrap

thestage/helpers/exception_hook.py

@@ -0,0 +1,14 @@
+import sys
+import traceback
+
+from thestage.helpers.logger.app_logger import app_logger
+
+
+def exception_handler(exception_type, exception, tb):
+    print(exception)
+    tb_list = traceback.format_exception(exception_type, exception, tb)
+    tb_text = ''.join(tb_list)
+    app_logger.error(tb_text)
+
+
+sys.excepthook = exception_handler

thestage/helpers/logger/app_logger.py

@@ -2,7 +2,7 @@ import logging
 import platform
 from logging.handlers import RotatingFileHandler
 from pathlib import Path
-
+from thestage import __app_name__, __version__
 
 from thestage.config import THESTAGE_CONFIG_DIR
 
@@ -31,16 +31,15 @@ def get_log_path_from_os() -> Path:
 
 
 def build_logger(level) -> logging.Logger:
-    logger = logging.getLogger("thestage_log")
+    logger = logging.getLogger(f"{__app_name__} v{__version__}")
     formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
     logger.setLevel(level)
-    # logger.remove()
 
     log_path = get_log_path_from_os()
     tsr_log_file = log_path.joinpath(THESTAGE_LOGGING_FILE)
 
     if tsr_log_file:
-        file_h = RotatingFileHandler(filename=tsr_log_file, maxBytes=1024, backupCount=5)
+        file_h = RotatingFileHandler(filename=tsr_log_file, maxBytes=1024 * 10, backupCount=5)
         file_h.setLevel(level)
         file_h.setFormatter(formatter)
         logger.addHandler(file_h)

thestage/main.py

@@ -1,24 +1,36 @@
-from thestage.services.core_files.config_entity import ConfigEntity
+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
 
-# TODO use this in config_provider
-initial_config: ConfigEntity = ConfigEntity()
 
 def main():
-    try:
-        import warnings
-        warnings.filterwarnings(action='ignore', module='.*paramiko.*')
+    service_factory = ServiceFactory()
+    config_provider = service_factory.get_config_provider()
+    config = config_provider.build_config()
 
-        from . import __app_name__
+    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")
-        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")
+        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())
 
-        import thestage.config
-        base_controller.app(prog_name=__app_name__)
+        base_controller.app()
     except KeyboardInterrupt:
         print('THESTAGE: Keyboard Interrupt')

thestage/services/abstract_service.py

@@ -3,56 +3,18 @@ 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,
@@ -61,7 +23,6 @@ class AbstractService(ABC):
             depth: int = 0,
     ):
         paginated_entity_list: PaginatedEntityList = func_get_data(
-            config=config,
             row=row,
             page=page,
             **func_special_params,
@@ -117,7 +78,6 @@ class AbstractService(ABC):
                 func_get_data=func_get_data,
                 func_special_params=func_special_params,
                 mapper=mapper,
-                config=config,
                 headers=headers,
                 row=row,
                 page=next_page,

thestage/services/app_config_service.py

@@ -2,17 +2,17 @@ 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.config_provider.config_provider import ConfigProvider
 from thestage.services.validation_service import ValidationService
 
 
 class AppConfigService:
 
     __validation_service: ValidationService
-    __config_provider: ConfigProvider
 
     def __init__(
             self,
@@ -24,9 +24,10 @@ class AppConfigService:
 
     def app_change_token(
             self,
-            config: ConfigEntity,
             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?'),
@@ -39,9 +40,9 @@ class AppConfigService:
                 raise typer.Exit(0)
 
         config.main.thestage_auth_token = token
-
-        self.__validation_service.check_token(config=config)
-        self.__config_provider.save_config(config=config)
+        self.__config_provider.update_config(updated_config=config)
+        self.__validation_service.check_token()
+        self.__config_provider.save_config()
 
     @staticmethod
     def app_remove_env():