argenta 0.4.8__tar.gz → 0.4.10__tar.gz

{argenta-0.4.8 → argenta-0.4.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: argenta
-Version: 0.4.8
+Version: 0.4.10
 Summary: Python library for creating TUI
 License: MIT
 Author: kolo
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 ---
 
 ## Описание
-**Argenta** — Python library for creating custom shells
+**Argenta** — Python library for creating TUI
 
 ![prewiev](https://github.com/koloideal/Argenta/blob/kolo/imgs/mock_app_preview_last.png?raw=True)  
 Пример внешнего вида TUI, написанного с помощью Argenta  
@@ -121,6 +121,7 @@ App(prompt: str = 'What do you want to do?\n',
     ignore_command_register: bool = True,
     dividing_line: StaticDividingLine | DynamicDividingLine = StaticDividingLine(),
     repeat_command_groups: bool = True,
+    full_override_system_messages: bool = False
     print_func: Callable[[str], None] = Console().print)
 ```
 **Аргументы:**
@@ -134,6 +135,7 @@ App(prompt: str = 'What do you want to do?\n',
 - `ignore_command_register` (`bool`): Игнорировать регистр всех команд.
 - `dividing_line` (`StaticDividingLine | DynamicDividingLine`): Разделительная строка.
 - `repeat_command_groups` (`bool`): Повторять описание команд перед вводом.
+- `full_override_system_messages` (`bool`): Переопределить ли дефолтное оформление сообщений ([подробнее см.](#override_defaults))
 - `print_func` (`Callable[[str], None]`): Функция вывода текста в терминал.
 
 ---
@@ -241,6 +243,11 @@ App(prompt: str = 'What do you want to do?\n',
 - Наиболее частые сообщение при запуске предопределены и доступны для быстрого
 использования: `argenta.app.defaults.PredeterminedMessages`
 
+<a name="override_defaults"></a>
+- Если `override_system_messages`=`False`, то при переопределении таких атрибутов как `initial_message` и
+`farawell_message` будет использовано дефолтное оформление текста, в виде красного ascii арта, при значении
+`override_system_messages`=`True` системные сообщения будут отображены в точности какими были переданы
+
 
 
 

{argenta-0.4.8 → argenta-0.4.10}/README.md

@@ -3,7 +3,7 @@
 ---
 
 ## Описание
-**Argenta** — Python library for creating custom shells
+**Argenta** — Python library for creating TUI
 
 ![prewiev](https://github.com/koloideal/Argenta/blob/kolo/imgs/mock_app_preview_last.png?raw=True)  
 Пример внешнего вида TUI, написанного с помощью Argenta  
@@ -104,6 +104,7 @@ App(prompt: str = 'What do you want to do?\n',
     ignore_command_register: bool = True,
     dividing_line: StaticDividingLine | DynamicDividingLine = StaticDividingLine(),
     repeat_command_groups: bool = True,
+    full_override_system_messages: bool = False
     print_func: Callable[[str], None] = Console().print)
 ```
 **Аргументы:**
@@ -117,6 +118,7 @@ App(prompt: str = 'What do you want to do?\n',
 - `ignore_command_register` (`bool`): Игнорировать регистр всех команд.
 - `dividing_line` (`StaticDividingLine | DynamicDividingLine`): Разделительная строка.
 - `repeat_command_groups` (`bool`): Повторять описание команд перед вводом.
+- `full_override_system_messages` (`bool`): Переопределить ли дефолтное оформление сообщений ([подробнее см.](#override_defaults))
 - `print_func` (`Callable[[str], None]`): Функция вывода текста в терминал.
 
 ---
@@ -224,6 +226,11 @@ App(prompt: str = 'What do you want to do?\n',
 - Наиболее частые сообщение при запуске предопределены и доступны для быстрого
 использования: `argenta.app.defaults.PredeterminedMessages`
 
+<a name="override_defaults"></a>
+- Если `override_system_messages`=`False`, то при переопределении таких атрибутов как `initial_message` и
+`farawell_message` будет использовано дефолтное оформление текста, в виде красного ascii арта, при значении
+`override_system_messages`=`True` системные сообщения будут отображены в точности какими были переданы
+
 
 
 

argenta-0.4.10/argenta/app/__init__.py

@@ -0,0 +1,3 @@
+__all__ = ["App"]
+
+from argenta.app.models import App

argenta-0.4.10/argenta/app/dividing_line/__init__.py

@@ -0,0 +1,4 @@
+__all__ = ["StaticDividingLine", "DynamicDividingLine"]
+
+
+from argenta.app.dividing_line.models import StaticDividingLine, DynamicDividingLine

{argenta-0.4.8 → argenta-0.4.10}/argenta/app/models.py

@@ -21,17 +21,18 @@ from argenta.app.registered_routers.entity import RegisteredRouters
 
 
 
-class BaseApp:
+class AppInit:
     def __init__(self,
                  prompt: str = '[italic dim bold]What do you want to do?\n',
-                 initial_message: str = 'Argenta',
-                 farewell_message: str = 'See you',
+                 initial_message: str = '\nArgenta\n',
+                 farewell_message: str = '\nSee you\n',
                  exit_command: str = 'Q',
                  exit_command_description: str = 'Exit command',
                  system_points_title: str = 'System points:',
                  ignore_command_register: bool = True,
                  dividing_line: StaticDividingLine | DynamicDividingLine = StaticDividingLine(),
                  repeat_command_groups: bool = True,
+                 full_override_system_messages: bool = False,
                  print_func: Callable[[str], None] = Console().print) -> None:
         self._prompt = prompt
         self._print_func = print_func
@@ -41,45 +42,74 @@ class BaseApp:
         self._dividing_line = dividing_line
         self._ignore_command_register = ignore_command_register
         self._repeat_command_groups_description = repeat_command_groups
+        self._full_override_system_messages = full_override_system_messages
 
-        self.farewell_message = farewell_message
-        self.initial_message = initial_message
+        self._farewell_message = farewell_message
+        self._initial_message = initial_message
 
         self._description_message_pattern: str = '[bold red][{command}][/bold red] [blue dim]*=*=*[/blue dim] [bold yellow italic]{description}'
         self._registered_routers: RegisteredRouters = RegisteredRouters()
         self._messages_on_startup = []
 
-        self.invalid_input_flags_handler: Callable[[str], None] = lambda raw_command: print_func(f'[red bold]Incorrect flag syntax: {raw_command}')
-        self.repeated_input_flags_handler: Callable[[str], None] = lambda raw_command: print_func(f'[red bold]Repeated input flags: {raw_command}')
-        self.empty_input_command_handler: Callable[[], None] = lambda: print_func('[red bold]Empty input command')
-        self.unknown_command_handler: Callable[[InputCommand], None] = lambda command: print_func(f"[red bold]Unknown command: {command.get_trigger()}")
-        self.exit_command_handler: Callable[[], None] = lambda: print_func(self.farewell_message)
+        self._invalid_input_flags_handler: Callable[[str], None] = lambda raw_command: print_func(f'[red bold]Incorrect flag syntax: {raw_command}')
+        self._repeated_input_flags_handler: Callable[[str], None] = lambda raw_command: print_func(f'[red bold]Repeated input flags: {raw_command}')
+        self._empty_input_command_handler: Callable[[], None] = lambda: print_func('[red bold]Empty input command')
+        self._unknown_command_handler: Callable[[InputCommand], None] = lambda command: print_func(f"[red bold]Unknown command: {command.get_trigger()}")
+        self._exit_command_handler: Callable[[], None] = lambda: print_func(self._farewell_message)
 
-        self._setup_default_view(is_initial_message_default=initial_message == 'Argenta',
-                                 is_farewell_message_default=farewell_message == 'See you')
 
+class AppSetters(AppInit):
+    def set_description_message_pattern(self, pattern: str) -> None:
+        first_check = re.match(r'.*{command}.*', pattern)
+        second_check = re.match(r'.*{description}.*', pattern)
 
-    def _setup_default_view(self, is_initial_message_default: bool,
-                            is_farewell_message_default: bool):
-        if is_initial_message_default:
-            self.initial_message = f'\n[bold red]{text2art('Argenta', font='tarty1')}\n\n'
-        if is_farewell_message_default:
-            self.farewell_message = (f'[bold red]\n{text2art('\nSee   you\n', font='chanky')}[/bold red]\n'
-                                     f'[red i]github.com/koloideal/Argenta[/red i] | '
-                                     f'[red bold i]made by kolo[/red bold i]\n')
+        if bool(first_check) and bool(second_check):
+            self._description_message_pattern: str = pattern
+        else:
+            raise InvalidDescriptionMessagePatternException(pattern)
 
 
-    def _validate_number_of_routers(self) -> None:
-        if not self._registered_routers:
-            raise NoRegisteredRoutersException()
+    def set_invalid_input_flags_handler(self, handler: Callable[[str], None]) -> None:
+        self._invalid_input_flags_handler = handler
 
 
-    def _validate_included_routers(self) -> None:
-        for router in self._registered_routers:
-            if not router.get_command_handlers():
-                raise NoRegisteredHandlersException(router.get_name())
+    def set_repeated_input_flags_handler(self, handler: Callable[[str], None]) -> None:
+        self._repeated_input_flags_handler = handler
+
+
+    def set_unknown_command_handler(self, handler: Callable[[str], None]) -> None:
+        self._unknown_command_handler = handler
+
+
+    def set_empty_command_handler(self, handler: Callable[[], None]) -> None:
+        self._empty_input_command_handler = handler
 
 
+    def set_exit_command_handler(self, handler: Callable[[], None]) -> None:
+        self._exit_command_handler = handler
+
+
+class AppPrinters(AppInit):
+    def _print_command_group_description(self):
+        for registered_router in self._registered_routers:
+            self._print_func(registered_router.get_title())
+            for command_handler in registered_router.get_command_handlers():
+                self._print_func(self._description_message_pattern.format(
+                        command=command_handler.get_handled_command().get_trigger(),
+                        description=command_handler.get_handled_command().get_description()))
+            self._print_func('')
+
+
+    def _print_framed_text_with_dynamic_line(self, text: str):
+        clear_text = re.sub(r'\u001b\[[0-9;]*m', '', text)
+        max_length_line = max([len(line) for line in clear_text.split('\n')])
+        max_length_line = max_length_line if 10 <= max_length_line <= 80 else 80 if max_length_line > 80 else 10
+        self._print_func(self._dividing_line.get_full_line(max_length_line))
+        print(text.strip('\n'))
+        self._print_func(self._dividing_line.get_full_line(max_length_line))
+
+
+class AppNonStandardHandlers(AppPrinters):
     def _is_exit_command(self, command: InputCommand):
         if command.get_trigger().lower() == self._exit_command.lower():
             if self._ignore_command_register:
@@ -101,53 +131,64 @@ class BaseApp:
                     return False
         if isinstance(self._dividing_line, StaticDividingLine):
             self._print_func(self._dividing_line.get_full_line())
-            self.unknown_command_handler(command)
+            self._unknown_command_handler(command)
             self._print_func(self._dividing_line.get_full_line())
         elif isinstance(self._dividing_line, DynamicDividingLine):
             with redirect_stdout(io.StringIO()) as f:
-                self.unknown_command_handler(command)
+                self._unknown_command_handler(command)
                 res: str = f.getvalue()
             self._print_framed_text_with_dynamic_line(res)
         return True
 
 
-    def _print_command_group_description(self):
-        for registered_router in self._registered_routers:
-            self._print_func(registered_router.get_title())
-            for command_handler in registered_router.get_command_handlers():
-                self._print_func(self._description_message_pattern.format(
-                        command=command_handler.get_handled_command().get_trigger(),
-                        description=command_handler.get_handled_command().get_description()))
-            self._print_func('')
-
-
     def _error_handler(self, error: BaseInputCommandException, raw_command: str) -> None:
         match error:
             case UnprocessedInputFlagException():
-                self.invalid_input_flags_handler(raw_command)
+                self._invalid_input_flags_handler(raw_command)
             case RepeatedInputFlagsException():
-                self.repeated_input_flags_handler(raw_command)
+                self._repeated_input_flags_handler(raw_command)
             case EmptyInputCommandException():
-                self.empty_input_command_handler()
+                self._empty_input_command_handler()
 
 
-    def _print_framed_text_with_dynamic_line(self, text: str):
-        clear_text = re.sub(r'\u001b\[[0-9;]*m', '', text)
-        max_length_line = max([len(line) for line in clear_text.split('\n')])
-        max_length_line = max_length_line if 10 <= max_length_line <= 80 else 80 if max_length_line > 80 else 10
-        self._print_func(self._dividing_line.get_full_line(max_length_line))
-        print(text.strip('\n'))
-        self._print_func(self._dividing_line.get_full_line(max_length_line))
+class AppValidators(AppInit):
+    def _validate_number_of_routers(self) -> None:
+        if not self._registered_routers:
+            raise NoRegisteredRoutersException()
 
 
+    def _validate_included_routers(self) -> None:
+        for router in self._registered_routers:
+            if not router.get_command_handlers():
+                raise NoRegisteredHandlersException(router.get_name())
 
-class App(BaseApp):
-    def start_polling(self) -> None:
+
+class AppSetups(AppValidators, AppPrinters):
+    def _setup_system_router(self):
+        system_router.set_title(self._system_points_title)
+
+        @system_router.command(Command(self._exit_command, self._exit_command_description))
+        def exit_command():
+            self._exit_command_handler()
+
+        if system_router not in self._registered_routers.get_registered_routers():
+            system_router.set_ignore_command_register(self._ignore_command_register)
+            self._registered_routers.add_registered_router(system_router)
+
+    def _setup_default_view(self):
+        if not self._full_override_system_messages:
+            self._initial_message = f'\n[bold red]{text2art(self._initial_message, font='tarty1')}\n\n'
+            self._farewell_message = (
+                f'[bold red]\n{text2art(f'\n{self._farewell_message}\n', font='chanky')}[/bold red]\n'
+                f'[red i]github.com/koloideal/Argenta[/red i] | [red bold i]made by kolo[/red bold i]\n')
+
+    def _pre_cycle_setup(self):
+        self._setup_default_view()
         self._setup_system_router()
         self._validate_number_of_routers()
         self._validate_included_routers()
 
-        self._print_func(self.initial_message)
+        self._print_func(self._initial_message)
 
         for message in self._messages_on_startup:
             self._print_func(message)
@@ -155,6 +196,10 @@ class App(BaseApp):
         if not self._repeat_command_groups_description:
             self._print_command_group_description()
 
+
+class App(AppSetters, AppNonStandardHandlers, AppSetups):
+    def start_polling(self) -> None:
+        self._pre_cycle_setup()
         while True:
             if self._repeat_command_groups_description:
                 self._print_command_group_description()
@@ -213,24 +258,3 @@ class App(BaseApp):
     def add_message_on_startup(self, message: str) -> None:
         self._messages_on_startup.append(message)
 
-
-    def set_description_message_pattern(self, pattern: str) -> None:
-        first_check = re.match(r'.*{command}.*', pattern)
-        second_check = re.match(r'.*{description}.*', pattern)
-
-        if bool(first_check) and bool(second_check):
-            self._description_message_pattern: str = pattern
-        else:
-            raise InvalidDescriptionMessagePatternException(pattern)
-
-
-    def _setup_system_router(self):
-        system_router.set_title(self._system_points_title)
-        @system_router.command(Command(self._exit_command, self._exit_command_description))
-        def exit_command():
-            self.exit_command_handler()
-
-        if system_router not in self._registered_routers.get_registered_routers():
-            self.include_router(system_router)
-
-

argenta-0.4.10/argenta/command/__init__.py

@@ -0,0 +1,3 @@
+__all__ = ["Command"]
+
+from argenta.command.models import Command

argenta-0.4.10/argenta/command/flag/__init__.py

@@ -0,0 +1,4 @@
+__all__ = ('InputFlags', 'InputFlag', 'Flag', 'Flags')
+
+
+from argenta.command.flag.models import InputFlags, InputFlag, Flags, Flag

argenta-0.4.10/argenta/router/__init__.py

@@ -0,0 +1,4 @@
+__all__ = ["Router"]
+
+
+from argenta.router.entity import Router

{argenta-0.4.8 → argenta-0.4.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "argenta"
-version = "0.4.8"
+version = "0.4.10"
 description = "Python library for creating TUI"
 authors = [
     {name = "kolo", email = "kolo.is.main@gmail.com"}

argenta-0.4.8/argenta/app/__init__.py

@@ -1,3 +0,0 @@
-__all__ = ["App"]
-
-from .models import App

argenta-0.4.8/argenta/command/__init__.py

@@ -1,3 +0,0 @@
-__all__ = ["Command"]
-
-from .models import Command

argenta-0.4.8/argenta/command/flag/__init__.py

@@ -1,4 +0,0 @@
-__all__ = ('InputFlags', 'InputFlag', 'Flag', 'Flags')
-
-
-from .models import InputFlags, InputFlag, Flags, Flag

argenta-0.4.8/argenta/router/__init__.py

@@ -1,4 +0,0 @@
-__all__ = ["Router"]
-
-
-from .entity import Router