argenta 1.0.5__py3-none-any.whl → 1.0.6__py3-none-any.whl

argenta/app/autocompleter/entity.py

@@ -5,7 +5,7 @@ from typing import Never
 
 class AutoCompleter:
     def __init__(
-        self, history_filename: str = False, autocomplete_button: str = "tab"
+        self, history_filename: str | None = None, autocomplete_button: str = "tab"
     ) -> None:
         """
         Public. Configures and implements auto-completion of input command

argenta/app/models.py

@@ -208,13 +208,12 @@ class BaseApp:
         :param raw_command: the raw input command
         :return: None
         """
-        match error:
-            case UnprocessedInputFlagException():
-                self._incorrect_input_syntax_handler(raw_command)
-            case RepeatedInputFlagsException():
-                self._repeated_input_flags_handler(raw_command)
-            case EmptyInputCommandException():
-                self._empty_input_command_handler()
+        if isinstance(error, UnprocessedInputFlagException):
+            self._incorrect_input_syntax_handler(raw_command)
+        elif isinstance(error, RepeatedInputFlagsException):
+            self._repeated_input_flags_handler(raw_command)
+        elif isinstance(error, EmptyInputCommandException):
+            self._empty_input_command_handler()
 
     def _setup_system_router(self) -> None:
         """
@@ -258,11 +257,11 @@ class BaseApp:
         """
         self._prompt = "[italic dim bold]What do you want to do?\n"
         self._initial_message = (
-            f"\n[bold red]{text2art(self._initial_message, font='tarty1')}\n"
+            "\n"+f"[bold red]{text2art(self._initial_message, font='tarty1')}"+"\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"
+            "[bold red]\n\n"+text2art(self._farewell_message, font='chanky')+"\n[/bold red]\n"
+            "[red i]github.com/koloideal/Argenta[/red i] | [red bold i]made by kolo[/red bold i]\n"
         )
         self._description_message_gen = lambda command, description: (
             f"[bold red]{escape('[' + command + ']')}[/bold red] "
@@ -302,22 +301,30 @@ class BaseApp:
         self._setup_system_router()
 
         for router_entity in self._registered_routers:
-            self._all_registered_triggers_in_default_case.extend(router_entity.get_triggers())
-            self._all_registered_triggers_in_default_case.extend(router_entity.get_aliases())
+            router_triggers = router_entity.get_triggers()
+            router_aliases = router_entity.get_aliases()
+            combined = router_triggers + router_aliases
 
-            self._all_registered_triggers_in_lower_case.extend([x.lower() for x in router_entity.get_triggers()])
-            self._all_registered_triggers_in_lower_case.extend([x.lower() for x in router_entity.get_aliases()])
+            self._all_registered_triggers_in_default_case.extend(combined)
+
+            self._all_registered_triggers_in_lower_case.extend(x.lower() for x in combined)
 
         self._autocompleter.initial_setup(self._all_registered_triggers_in_lower_case)
 
         if self._ignore_command_register:
-            for cmd in set(self._all_registered_triggers_in_lower_case):
-                if self._all_registered_triggers_in_lower_case.count(cmd) != 1:
-                    Console().print(f"\n[b red]WARNING:[/b red] Overlapping trigger or alias: [b blue]{cmd}[/b blue]")
+            seen = {}
+            for item in self._all_registered_triggers_in_lower_case:
+                if item in seen:
+                    Console().print(f"\n[b red]WARNING:[/b red] Overlapping trigger or alias: [b blue]{item}[/b blue]")
+                else:
+                    seen[item] = True
         else:
-            for cmd in set(self._all_registered_triggers_in_default_case):
-                if self._all_registered_triggers_in_default_case.count(cmd) != 1:
-                    Console().print(f"\n[b red]WARNING:[/b red] Overlapping trigger or alias: [b blue]{cmd}[/b blue]")
+            seen = {}
+            for item in self._all_registered_triggers_in_default_case:
+                if item in seen:
+                    Console().print(f"\n[b red]WARNING:[/b red] Overlapping trigger or alias: [b blue]{item}[/b blue]")
+                else:
+                    seen[item] = True
 
         if not self._override_system_messages:
             self._setup_default_view()
@@ -415,11 +422,22 @@ class App(BaseApp):
                 self._print_framed_text(res)
                 continue
 
-            with redirect_stdout(io.StringIO()) as f:
-                for registered_router in self._registered_routers:
-                    registered_router.finds_appropriate_handler(input_command)
-                res: str = f.getvalue()
-            self._print_framed_text(res)
+            for registered_router in self._registered_routers:
+                if registered_router.disable_redirect_stdout:
+                    if isinstance(self._dividing_line, StaticDividingLine):
+                        self._print_func(self._dividing_line.get_full_static_line(self._override_system_messages))
+                        registered_router.finds_appropriate_handler(input_command)
+                        self._print_func(self._dividing_line.get_full_static_line(self._override_system_messages))
+                    else:
+                        self._print_func(StaticDividingLine(self._dividing_line.get_unit_part()).get_full_static_line(self._override_system_messages))
+                        registered_router.finds_appropriate_handler(input_command)
+                        self._print_func(StaticDividingLine(self._dividing_line.get_unit_part()).get_full_static_line(self._override_system_messages))
+                else:
+                    with redirect_stdout(io.StringIO()) as f:
+                        registered_router.finds_appropriate_handler(input_command)
+                        res: str = f.getvalue()
+                    if res:
+                        self._print_framed_text(res)
 
     def include_router(self, router: Router) -> None:
         """

argenta/app/registered_routers/entity.py

@@ -4,7 +4,7 @@ from argenta.router import Router
 
 
 class RegisteredRouters:
-    def __init__(self, registered_routers: list[Router] = None) -> None:
+    def __init__(self, registered_routers: list[Router] | None = None) -> None:
         """
         Private. Combines registered routers
         :param registered_routers: list of the registered routers

argenta/command/flag/models.py

@@ -87,7 +87,7 @@ class Flag(BaseFlag):
 
 class InputFlag(BaseFlag):
     def __init__(
-        self, name: str, prefix: Literal["-", "--", "---"] = "--", value: str = None
+        self, name: str, prefix: Literal["-", "--", "---"] = "--", value: str | None = None
     ):
         """
         Public. The entity of the flag of the entered command

argenta/command/models.py

@@ -5,10 +5,7 @@ from argenta.command.exceptions import (
     RepeatedInputFlagsException,
     EmptyInputCommandException,
 )
-from typing import Generic, TypeVar, cast, Literal
-
-
-InputCommandType = TypeVar("InputCommandType")
+from typing import cast, Literal
 
 
 class BaseCommand:
@@ -31,9 +28,9 @@ class Command(BaseCommand):
     def __init__(
         self,
         trigger: str,
-        description: str = None,
-        flags: Flag | Flags = None,
-        aliases: list[str] = None,
+        description: str | None = None,
+        flags: Flag | Flags | None = None,
+        aliases: list[str] | None = None,
     ):
         """
         Public. The command that can and should be registered in the Router
@@ -109,8 +106,8 @@ class Command(BaseCommand):
         return self._description
 
 
-class InputCommand(BaseCommand, Generic[InputCommandType]):
-    def __init__(self, trigger: str, input_flags: InputFlag | InputFlags = None):
+class InputCommand(BaseCommand):
+    def __init__(self, trigger: str, input_flags: InputFlag | InputFlags | None = None):
         """
         Private. The model of the input command, after parsing
         :param trigger:the trigger of the command
@@ -142,7 +139,7 @@ class InputCommand(BaseCommand, Generic[InputCommandType]):
         return self._input_flags
 
     @staticmethod
-    def parse(raw_command: str) -> InputCommandType:
+    def parse(raw_command: str) -> 'InputCommand':
         """
         Private. Parse the raw input command
         :param raw_command: raw input command

argenta/metrics/main.py

@@ -2,15 +2,15 @@ import io
 from contextlib import redirect_stdout
 from time import time
 
-from argenta.router import Router
-from argenta.command import Command
-from argenta.response import Response
-from argenta.response.status import Status
-from argenta.command.flag import Flag, Flags
 from argenta.app import App
 
 
 def get_time_of_pre_cycle_setup(app: App) -> float:
+    """
+    Public. Return time of pre cycle setup
+    :param app: app instance for testing time of pre cycle setup
+    :return: time of pre cycle setup as float
+    """
     start = time()
     with redirect_stdout(io.StringIO()):
         app.pre_cycle_setup()

argenta/orchestrator/entity.py

@@ -5,13 +5,13 @@ from argenta.orchestrator.argparser import ArgParser
 
 
 class Orchestrator:
-    def __init__(self, arg_parser: ArgParser = False):
+    def __init__(self, arg_parser: ArgParser | None = None):
         """
         Public. An orchestrator and configurator that defines the behavior of an integrated system, one level higher than the App
         :param arg_parser: Cmd argument parser and configurator at startup
         :return: None
         """
-        self.arg_parser: ArgParser | False = arg_parser
+        self.arg_parser: ArgParser | None = arg_parser
         if arg_parser:
             self.arg_parser.register_args()
 

argenta/response/entity.py

@@ -11,7 +11,7 @@ class Response:
 
     def __init__(
         self,
-        status: Status = None,
+        status: Status | None = None,
         valid_flags: ValidInputFlags = ValidInputFlags(),
         undefined_flags: UndefinedInputFlags = UndefinedInputFlags(),
         invalid_value_flags: InvalidValueInputFlags = InvalidValueInputFlags(),

argenta/router/command_handler/entity.py

@@ -38,7 +38,7 @@ class CommandHandler:
 
 
 class CommandHandlers:
-    def __init__(self, command_handlers: list[CommandHandler] = None):
+    def __init__(self, command_handlers: list[CommandHandler] | None = None):
         """
         Private. The model that unites all CommandHandler of the routers
         :param command_handlers: list of CommandHandlers for register

argenta/router/entity.py

@@ -22,13 +22,19 @@ from argenta.router.exceptions import (
 
 
 class Router:
-    def __init__(self, title: str | None = "Awesome title"):
+    def __init__(self, title: str | None = "Awesome title", disable_redirect_stdout: bool = False):
         """
         Public. Directly configures and manages handlers
         :param title: the title of the router, displayed when displaying the available commands
+        :param disable_redirect_stdout: Disables stdout forwarding, if the argument value is True,
+               the StaticDividingLine will be forced to be used as a line separator for this router,
+               disabled forwarding is needed when there is text output in conjunction with a text input request (for example, input()),
+               if the argument value is True, the output of the input() prompt is intercepted and not displayed,
+               which is ambiguous behavior and can lead to unexpected work
         :return: None
         """
         self.title = title
+        self.disable_redirect_stdout = disable_redirect_stdout
 
         self._command_handlers: CommandHandlers = CommandHandlers()
         self._ignore_command_register: bool = False
@@ -39,13 +45,15 @@ class Router:
         :param command: Registered command
         :return: decorated handler as Callable
         """
-        self._validate_command(command)
         if isinstance(command, str):
-            command = Command(command)
+            redefined_command = Command(command)
+        else:
+            redefined_command = command
+        self._validate_command(redefined_command)
 
         def command_decorator(func):
             Router._validate_func_args(func)
-            self._command_handlers.add_handler(CommandHandler(func, command))
+            self._command_handlers.add_handler(CommandHandler(func, redefined_command))
 
             def wrapper(*args, **kwargs):
                 return func(*args, **kwargs)
@@ -117,13 +125,12 @@ class Router:
             flag_status: Literal["Undefined", "Valid", "Invalid"] = (
                 handled_command.validate_input_flag(flag)
             )
-            match flag_status:
-                case "Valid":
-                    valid_input_flags.add_flag(flag)
-                case "Undefined":
-                    undefined_input_flags.add_flag(flag)
-                case "Invalid":
-                    invalid_value_input_flags.add_flag(flag)
+            if flag_status == "Valid":
+                valid_input_flags.add_flag(flag)
+            elif flag_status == "Undefined":
+                undefined_input_flags.add_flag(flag)
+            elif flag_status == "Invalid":
+                invalid_value_input_flags.add_flag(flag)
 
         if (
             not invalid_value_input_flags.get_flags()
@@ -157,19 +164,14 @@ class Router:
         :param command: validated command
         :return: None if command is valid else raise exception
         """
-        match type(command).__name__:
-            case "Command":
-                command_name: str = command.get_trigger()
-                if command_name.find(" ") != -1:
-                    raise TriggerContainSpacesException()
-                flags: Flags = command.get_registered_flags()
-                if flags:
-                    flags_name: list = [x.get_string_entity().lower() for x in flags]
-                    if len(set(flags_name)) < len(flags_name):
-                        raise RepeatedFlagNameException()
-            case "str":
-                if command.find(" ") != -1:
-                    raise TriggerContainSpacesException()
+        command_name: str = command.get_trigger()
+        if command_name.find(" ") != -1:
+            raise TriggerContainSpacesException()
+        flags: Flags = command.get_registered_flags()
+        if flags:
+            flags_name: list = [x.get_string_entity().lower() for x in flags]
+            if len(set(flags_name)) < len(flags_name):
+                raise RepeatedFlagNameException()
 
     @staticmethod
     def _validate_func_args(func: Callable) -> None:
@@ -191,7 +193,7 @@ class Router:
             if arg_annotation is Response:
                 pass
             else:
-                file_path: str = getsourcefile(func)
+                file_path: str | None = getsourcefile(func)
                 source_line: int = getsourcelines(func)[1]
                 fprint = Console().print
                 fprint(f'\nFile "{file_path}", line {source_line}\n[b red]WARNING:[/b red] [i]The typehint '

{argenta-1.0.5.dist-info → argenta-1.0.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: argenta
-Version: 1.0.5
+Version: 1.0.6
 Summary: Python library for building modular CLI applications
 Author-email: kolo <kolo.is.main@gmail.com>
 License: MIT
@@ -73,7 +73,6 @@ if __name__ == '__main__':
 # Features in development
 
 - Full support for autocompleter on Linux
-- Ability to configure stdout capture when handling input by the handler
 
 ## Full [docs](https://argenta-docs.vercel.app) | MIT 2025 kolo | made by [kolo](https://t.me/kolo_id)
 

{argenta-1.0.5.dist-info → argenta-1.0.6.dist-info}/RECORD

@@ -1,39 +1,39 @@
 argenta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argenta/app/__init__.py,sha256=I8FTXU17ajDI-hbC6Rw0LxLmvDYipdQaos3v1pmu14E,57
 argenta/app/defaults.py,sha256=TmpHGfEmJeefgJlgW90rfw9xTgssNANRds6JZqKdDrc,379
-argenta/app/models.py,sha256=8Kr2605VMa2X7S9_XvLLR1WvOh7Y9mf8VqkWgBqNgfg,19777
+argenta/app/models.py,sha256=lY7ZbKxXUcWdJdsIE_oWv2muheK9sDK2ajgl62ki24A,20726
 argenta/app/autocompleter/__init__.py,sha256=VT_p3QA78UnczV7pYR2NnwQ0Atd8mnDUnLazvUQNqJk,93
-argenta/app/autocompleter/entity.py,sha256=QgEZ2Tzfp9liWBCd-BdRpUE-ELUOxAhPpW7KBLVcPRE,3556
+argenta/app/autocompleter/entity.py,sha256=55yUwlCEPPF8Z4t7y8Fl4DgLyH27qeybynXphDJ6XvM,3562
 argenta/app/dividing_line/__init__.py,sha256=jJZDDZix8XYCAUWW4FzGJH0JmJlchYcx0FPWifjgv1I,147
 argenta/app/dividing_line/models.py,sha256=syBTrzcIIt6E6RiaKC9QH3kdAuWLBDNIX0cH7Bnn0mk,2265
 argenta/app/registered_routers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argenta/app/registered_routers/entity.py,sha256=OH7plYfjQrlyVliXE6OLVD2ftOAd5U1VO6SlyvLNikk,1078
+argenta/app/registered_routers/entity.py,sha256=xTRW3R2dWnSOz8QIsiUVmG8VuMJmyOMUqHzEDDpNX-0,1085
 argenta/command/__init__.py,sha256=RvacrM84ZwBdVDy4MUwjLTyzQdDQrjjoikZxwh5ov-0,69
 argenta/command/exceptions.py,sha256=86Gs_9-NutmbSkduEMljtxQHWHhDRFcqyyOKDhQ440o,1060
-argenta/command/models.py,sha256=hhW1FJgRrxLg3MP1FkTqp5t1iDuhKyB4l2QCZ7dC76M,7185
+argenta/command/models.py,sha256=aJ06JARGx7oq9I84VfW1VZrG53tPW6tmY6dWuf3GVZE,7114
 argenta/command/flag/__init__.py,sha256=Xjh_nR4vsHPPHFxQmc5o0673DvbnRkdr_vUaA31GeEk,384
 argenta/command/flag/defaults.py,sha256=1F9bEngv6tB_yn5lLQg5pxWZSuinryfGGdXnWD7EvuY,1035
-argenta/command/flag/models.py,sha256=KAzyoNWVOVLiIT4f8auI15D0TCHosGXHGw_xXRuEtgY,3875
+argenta/command/flag/models.py,sha256=J3KYso6lVzMaOrITZvEANBlJPeib1P-GR4Lif0KRlE0,3882
 argenta/command/flag/flags/__init__.py,sha256=-HfdBZ3WXrjMrM8vEDWg0LLOLuQafqncrjw9KVFyqoE,294
 argenta/command/flag/flags/models.py,sha256=U4nOwCqsCOURGigTKiQx07zBUKj0EoY0fCwgTNq4GIg,2332
 argenta/metrics/__init__.py,sha256=PPLFPxhe4j7r6hP1P1pk0A_gnXgylbTaHqopky872AU,109
-argenta/metrics/main.py,sha256=tMMrbpUIiW4BjYLhB7yWYK4mSBdjppeZtslf4VoXPsI,514
+argenta/metrics/main.py,sha256=c8Ktthxa985kcgXQ-iYBHoFsFr5gtCa-5m1QlSPBleY,488
 argenta/orchestrator/__init__.py,sha256=vFtJEJTjFfoYP3DZx0gNlhoa0Tk8u-yzkGIUN3SiABA,86
-argenta/orchestrator/entity.py,sha256=kgTHGrbWdsTDR7aAKv2Bvm8pO7LKFv7v8Dv1LDsdrTo,1093
+argenta/orchestrator/entity.py,sha256=I0HWZnpoD0Pen5azeTBh8s-CFU8vs0bTILpgRls-1hI,1098
 argenta/orchestrator/argparser/__init__.py,sha256=akbTPC5CfNrgJTVVu1A2E9KeI8KPN4JnMM8M8U21jc8,90
 argenta/orchestrator/argparser/entity.py,sha256=i3lCsCr_8JT09OosvxRuRD7KKP1MgeNFYz5kTTTqu9Q,2087
 argenta/orchestrator/argparser/arguments/__init__.py,sha256=lRsKyJeiibPYhFZoeB3BRfIYM4mlUFp6nZpy9RdbgYg,213
 argenta/orchestrator/argparser/arguments/models.py,sha256=wF4rIaEAx9Rt-c6rAeq6kZLfNPTn4v9WBNt9JHzJ0RA,1548
 argenta/response/__init__.py,sha256=u4NuwUQkWa55aX67hTQs_B_gIaZ9Dn4Fe7xhSFQ_Rpw,128
-argenta/response/entity.py,sha256=urzUQmZxk7BNGJj9tR9AcrTNM5dDLUiGLJDg3VdhDVk,1047
+argenta/response/entity.py,sha256=vUVeiOp8BbuUW2VRtyQlFMQ_-KkQPjOgz9p7DxwyoeE,1054
 argenta/response/status.py,sha256=bWFMHvyIHpOA4LxUQFoSpld-F8gu183M9nY-zN-MiZM,244
 argenta/router/__init__.py,sha256=rvqAx80IXHFdVw7cWBRGaTtb94a4OQQEsMJ5f7YA1gU,68
 argenta/router/defaults.py,sha256=vvkwFYCQdwjtMntfyrJuisxFX8XxeyhDMA-RwteHZGg,87
-argenta/router/entity.py,sha256=7vRhw8_U-gKb2KoKXBCYr8q0inuDQsGrxV49abt6bwU,9607
+argenta/router/entity.py,sha256=dYkAdmHWj2-0y6RH8lDSoLs6gjbtwGoANPe2VzJEbnc,10058
 argenta/router/exceptions.py,sha256=5k0mTHYYItWHzGC0NU5oHHYrHxU0M5fEbO5wne_wFg8,860
 argenta/router/command_handler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argenta/router/command_handler/entity.py,sha256=xmHgbXBvD_-JMLpUPc5w3VVe-upTJ-y4lR13rUiiygo,2387
-argenta-1.0.5.dist-info/METADATA,sha256=4achR5RDIS460uWEATjty-kIc7Q6OVqLvspnCwVMaTU,1649
-argenta-1.0.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-argenta-1.0.5.dist-info/licenses/LICENSE,sha256=zmqoGh2n5rReBv4s8wPxF_gZEZDgauJYSPMuPczgOiU,1082
-argenta-1.0.5.dist-info/RECORD,,
+argenta/router/command_handler/entity.py,sha256=ascEf3AzYcWh-G5cml08WOoRr2q9QkfLP2IaKC1iKWM,2394
+argenta-1.0.6.dist-info/METADATA,sha256=eWiuw7lBvYabikTozeG_PQV_9U2XITr9WK_0Sf1pelA,1576
+argenta-1.0.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+argenta-1.0.6.dist-info/licenses/LICENSE,sha256=zmqoGh2n5rReBv4s8wPxF_gZEZDgauJYSPMuPczgOiU,1082
+argenta-1.0.6.dist-info/RECORD,,