argenta 1.0.0b1__py3-none-any.whl → 1.0.0b2__py3-none-any.whl

argenta/app/models.py

@@ -238,7 +238,7 @@ class BaseApp:
         :return: None
         """
         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'
+        self._initial_message = f'\n[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')
         self._description_message_gen = lambda command, description: (f'[bold red]{escape("[" + command + "]")}[/bold red] '
@@ -282,7 +282,7 @@ class BaseApp:
         for message in self._messages_on_startup:
             self._print_func(message)
         if self._messages_on_startup:
-            print('\n\n')
+            print('\n')
 
         if not self._repeat_command_groups_description:
             self._print_command_group_description()

argenta/command/flag/models.py

@@ -36,6 +36,9 @@ class BaseFlag:
         """
         return self._prefix
 
+    def __eq__(self, other) -> bool:
+        return self.get_string_entity() == other.get_string_entity()
+
 
 class Flag(BaseFlag):
     def __init__(self, name: str,
@@ -110,3 +113,6 @@ class InputFlag(BaseFlag):
         """
         self._flag_value = value
 
+    def __eq__(self, other) -> bool:
+        return self.get_string_entity() == other.get_string_entity() and self.get_value() == other.get_value()
+

argenta/command/flags/models.py

@@ -58,6 +58,18 @@ class BaseFlags(Generic[FlagType]):
     def __getitem__(self, item):
         return self._flags[item]
 
+    def __bool__(self):
+        return bool(self._flags)
+
+    def __eq__(self, other):
+        if len(self.get_flags()) != len(other.get_flags()):
+            return False
+        else:
+            for flag, other_flag in zip(self.get_flags(), other.get_flags()):
+                if not flag == other_flag:
+                    return False
+        return True
+
 
 class Flags(BaseFlags[Flag]): pass
 

argenta/command/models.py

@@ -39,7 +39,7 @@ class Command(BaseCommand):
         """
         super().__init__(trigger)
         self._registered_flags: Flags = flags if isinstance(flags, Flags) else Flags(flags) if isinstance(flags, Flag) else Flags()
-        self._description = f'Description for "{self._trigger}" command' if not description else description
+        self._description = f'Very useful command' if not description else description
         self._aliases = aliases if isinstance(aliases, list) else []
 
     def get_registered_flags(self) -> Flags:

argenta/response/entity.py

@@ -1,8 +1,15 @@
-from argenta.command.flags.models import ValidInputFlags, UndefinedInputFlags, InvalidValueInputFlags
 from argenta.response.status import Status
+from argenta.command.flags import (ValidInputFlags,
+                                   UndefinedInputFlags,
+                                   InvalidValueInputFlags)
 
 
 class Response:
+    __slots__ = ('status',
+                 'valid_flags',
+                 'undefined_flags',
+                 'invalid_value_flags')
+
     def __init__(self, status: Status = None,
                  valid_flags: ValidInputFlags = ValidInputFlags(),
                  undefined_flags: UndefinedInputFlags = UndefinedInputFlags(),

argenta/router/entity.py

@@ -1,12 +1,15 @@
 from typing import Callable, Literal, Type
-from inspect import getfullargspec, get_annotations
+from inspect import getfullargspec, get_annotations, getsourcefile, getsourcelines
 from rich.console import Console
 
 from argenta.command import Command
 from argenta.command.models import InputCommand
 from argenta.response import Response, Status
 from argenta.router.command_handler.entity import CommandHandlers, CommandHandler
-from argenta.command.flags.models import Flags, InputFlags, UndefinedInputFlags, ValidInputFlags, InvalidValueInputFlags
+from argenta.command.flags.models import (Flags, InputFlags,
+                                          UndefinedInputFlags,
+                                          ValidInputFlags,
+                                          InvalidValueInputFlags)
 from argenta.router.exceptions import (RepeatedFlagNameException,
                                        TooManyTransferredArgsException,
                                        RequiredArgumentNotPassedException,
@@ -26,13 +29,15 @@ class Router:
         self._ignore_command_register: bool = False
 
 
-    def command(self, command: Command) -> Callable:
+    def command(self, command: Command | str) -> Callable:
         """
         Public. Registers handler
         :param command: Registered command
         :return: decorated handler as Callable
         """
         self._validate_command(command)
+        if isinstance(command, str):
+            command = Command(command)
 
         def command_decorator(func):
             Router._validate_func_args(func)
@@ -73,9 +78,7 @@ class Router:
         response: Response = Response()
         if handle_command.get_registered_flags().get_flags():
             if input_command_flags.get_flags():
-                flags, status = self._validate_input_flags(handle_command, input_command_flags)
-                response.valid_flags, response.undefined_flags, response.invalid_value_flags = flags
-                response.status = status
+                response: Response = self._structuring_input_flags(handle_command, input_command_flags)
                 command_handler.handling(response)
             else:
                 response.status = Status.ALL_FLAGS_VALID
@@ -92,15 +95,12 @@ class Router:
 
 
     @staticmethod
-    def _validate_input_flags(handled_command: Command, input_flags: InputFlags) -> tuple[tuple[ValidInputFlags,
-                                                                                                UndefinedInputFlags,
-                                                                                                InvalidValueInputFlags],
-                                                                                          Status]:
+    def _structuring_input_flags(handled_command: Command, input_flags: InputFlags) -> Response:
         """
         Private. Validates flags of input command
         :param handled_command: entity of the handled command
         :param input_flags:
-        :return: is flags of input command valid as bool
+        :return: entity of response as Response
         """
         valid_input_flags: ValidInputFlags = ValidInputFlags()
         invalid_value_input_flags: InvalidValueInputFlags = InvalidValueInputFlags()
@@ -124,25 +124,32 @@ class Router:
         else:
             status = Status.UNDEFINED_AND_INVALID_FLAGS
 
-        return (valid_input_flags, undefined_input_flags, invalid_value_input_flags), status
+        return Response(invalid_value_flags=invalid_value_input_flags,
+                        valid_flags=valid_input_flags,
+                        status=status,
+                        undefined_flags=undefined_input_flags)
 
 
     @staticmethod
-    def _validate_command(command: Command) -> None:
+    def _validate_command(command: Command | str) -> None:
         """
         Private. Validates the command registered in handler
         :param command: validated command
         :return: None if command is valid else raise exception
         """
-        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()
+        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()
 
 
     @staticmethod
@@ -158,10 +165,19 @@ class Router:
         elif len(transferred_args) == 0:
             raise RequiredArgumentNotPassedException()
 
-        arg_annotation: Type = get_annotations(func)[transferred_args[0]]
-        if not arg_annotation is Response:
-            Console().print(f'\n\n[b red]WARNING:[/b red] [i]The type of argument passed to the handler is [/i][blue]{Response}[/blue],'
-                            f' [i]but[/i] [bold blue]{arg_annotation}[/bold blue] [i]is specified[/i]', highlight=False)
+        transferred_arg: str = transferred_args[0]
+        func_annotations: dict[str, Type] = get_annotations(func)
+
+        if arg_annotation := func_annotations.get(transferred_arg):
+            if arg_annotation is Response:
+                pass
+            else:
+                file_path: str = getsourcefile(func)
+                source_line: int = getsourcelines(func)[1]+1
+                fprint = Console().print
+                fprint(f'\nFile "{file_path}", line {source_line}\n[b red]WARNING:[/b red] [i]The typehint '
+                       f'of argument([green]{transferred_arg}[/green]) passed to the handler is [/i][bold blue]{Response}[/bold blue],'
+                       f' [i]but[/i] [bold blue]{arg_annotation}[/bold blue] [i]is specified[/i]\n', highlight=False)
 
 
 

{argenta-1.0.0b1.dist-info → argenta-1.0.0b2.dist-info}/METADATA

@@ -1,13 +1,13 @@
 Metadata-Version: 2.4
 Name: argenta
-Version: 1.0.0b1
-Summary: Python library for creating TUI
+Version: 1.0.0b2
+Summary: Python library for building modular CLI applications
 Author-email: kolo <kolo.is.main@gmail.com>
 License: MIT
 License-File: LICENSE
 Requires-Python: <4.0,>=3.11
 Requires-Dist: art<7.0,>=6.4
-Requires-Dist: pyreadline3<4.0.0,>=3.5.4
+Requires-Dist: pyreadline3>=3.5.4
 Requires-Dist: rich<15.0.0,>=14.0.0
 Description-Content-Type: text/markdown
 

{argenta-1.0.0b1.dist-info → argenta-1.0.0b2.dist-info}/RECORD

@@ -1,7 +1,7 @@
 argenta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argenta/app/__init__.py,sha256=I8FTXU17ajDI-hbC6Rw0LxLmvDYipdQaos3v1pmu14E,57
 argenta/app/defaults.py,sha256=GE4UzsJ7PD7654weNzTFGcBroc_0Zy5H9VL5P8ZbFek,393
-argenta/app/models.py,sha256=h4MKbxu-CaZWV8ydjz14LoWO_TNIgjreY4CZlfBGcwQ,18250
+argenta/app/models.py,sha256=52iXVPQ7ekL5T60ErDR1X-qCmIt8YjzRerd_L8Jkwxo,18246
 argenta/app/autocompleter/__init__.py,sha256=VT_p3QA78UnczV7pYR2NnwQ0Atd8mnDUnLazvUQNqJk,93
 argenta/app/autocompleter/entity.py,sha256=6IurcSTLfiEYrh-yYsCYjrKsJ8_9xds3fxs5sr0FoqE,2901
 argenta/app/dividing_line/__init__.py,sha256=jJZDDZix8XYCAUWW4FzGJH0JmJlchYcx0FPWifjgv1I,147
@@ -10,12 +10,12 @@ argenta/app/registered_routers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 argenta/app/registered_routers/entity.py,sha256=hNaY3YfCp62Dk3U1XGvqTjt8mYDzgXcMsgNJMAqIU4w,1076
 argenta/command/__init__.py,sha256=Plo2Da0fhq8H1eo2mg7nA1-OBLuGjK2BYpDGRvGGMIU,67
 argenta/command/exceptions.py,sha256=QvJl3fY3MxDZscQQKSQ__lRuP9Jd2XVdQOo27TvmVnw,1030
-argenta/command/models.py,sha256=xXQ-xcyEKCMKSTYZTA7nUtg7Fy6vAIzJCeVvWGYQW48,6936
+argenta/command/models.py,sha256=t_NTLc5CIhV210R-GGb9sQyAb3n51XHx9VIQ9KOq2GI,6914
 argenta/command/flag/__init__.py,sha256=4MOxfv8f2SkBzIfVo5LAZUTu4iH1jcs5WzPq60PhFMs,94
 argenta/command/flag/defaults.py,sha256=0wCvh2l3eNU3vTuxuARVaUwhEzG3v9FID0rBbXHyK-k,982
-argenta/command/flag/models.py,sha256=tEc3p_EqOOjUDZ3Qv_wo0eDwbmr7p15u6sOy19zhZcs,3608
+argenta/command/flag/models.py,sha256=SUXDZPEcy7HTboociW6FFQ7bk0gTfwdt39HRx3AxTCo,3870
 argenta/command/flags/__init__.py,sha256=Hpw8RO2_RxdRhS8EqWPGuLwAlmRLA-XkbO7q1iNxrvQ,396
-argenta/command/flags/models.py,sha256=hHgp-SkTZWMjGLVdAwvLDkuulIGBMK2QY6BBP0wTP8o,1938
+argenta/command/flags/models.py,sha256=nkrM9dwrS--_pbpt7n2UEuOPX0QLwJ263_UK0QA85AA,2311
 argenta/orchestrator/__init__.py,sha256=vFtJEJTjFfoYP3DZx0gNlhoa0Tk8u-yzkGIUN3SiABA,86
 argenta/orchestrator/entity.py,sha256=HUKhoEQtiWvxeA3QhSkvTcIgwgXDLjmcB2cBFHlCGhw,1101
 argenta/orchestrator/argparser/__init__.py,sha256=twfb-FQqW4QUo2XkmMASi654KGiimIbrkEzb1ZkMGzU,88
@@ -23,15 +23,15 @@ argenta/orchestrator/argparser/entity.py,sha256=nmwp7dFHTIqLvR9v0n_4j9wvtTowvLK7
 argenta/orchestrator/argparser/arguments/__init__.py,sha256=4T55Tl_4WKOYp9HtVDmzQZylYVKA_cb3XiGoBvAyjNo,318
 argenta/orchestrator/argparser/arguments/models.py,sha256=hSUXBjTsyzNKvyPgWhiNCa4SSQdmixIQnne2A9iuPMc,1546
 argenta/response/__init__.py,sha256=u4NuwUQkWa55aX67hTQs_B_gIaZ9Dn4Fe7xhSFQ_Rpw,128
-argenta/response/entity.py,sha256=_KXv-9oWsh4AfJDN1EZbcoACvtR3S3zruvCmpbK8LqU,942
+argenta/response/entity.py,sha256=Wz-plcx0lDx_VbFQs2I98uxxthZaZ1Gg5YSKfmiwGOQ,1150
 argenta/response/status.py,sha256=owDBpCrJ0Xb6U5RtvYt9HTdM8ouVgJLFdzVD8h-Ho4w,246
 argenta/router/__init__.py,sha256=ldrIWTXNLXUAMAGQ8ex4e8nMso_fhi01nZi2DVzHnnk,66
 argenta/router/defaults.py,sha256=RX3DMbZk7XUbj6uR4uADhZOPqEDoeCz9X-n26YTCCPM,87
-argenta/router/entity.py,sha256=QpTMtz7l5erAmIir4tSsCWy-iOR2e1pkCM6b39fkGYw,9437
+argenta/router/entity.py,sha256=D7wnWSJ1c5hJzfKp3hdTf5AZMMQZ3z82II5lQn6aie4,10005
 argenta/router/exceptions.py,sha256=q6y-4gmbgkX-0U4-qXHDP5HTtUQ_c4svaqVILn-ZzRw,852
 argenta/router/command_handler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argenta/router/command_handler/entity.py,sha256=z7X70yD66hAVug0Q-YKPxTLvYOZrLI6qZnPdFLCNmIQ,2385
-argenta-1.0.0b1.dist-info/METADATA,sha256=Dbccwj_p-SK7sgV38hqwT9raCbC_q_yZHkL16Q6czj0,25723
-argenta-1.0.0b1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-argenta-1.0.0b1.dist-info/licenses/LICENSE,sha256=zmqoGh2n5rReBv4s8wPxF_gZEZDgauJYSPMuPczgOiU,1082
-argenta-1.0.0b1.dist-info/RECORD,,
+argenta-1.0.0b2.dist-info/METADATA,sha256=tAv_oL7bAlFnbqNHx-EU7TKukqloade0HsGDkQnAlgg,25737
+argenta-1.0.0b2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+argenta-1.0.0b2.dist-info/licenses/LICENSE,sha256=zmqoGh2n5rReBv4s8wPxF_gZEZDgauJYSPMuPczgOiU,1082
+argenta-1.0.0b2.dist-info/RECORD,,