argenta 0.3.0__py3-none-any.whl → 0.3.1__py3-none-any.whl

argenta/app/__init__.py

@@ -1,7 +1,3 @@
 from .entity import App
-from .exceptions import (HandlerForUnknownCommandsOnNonMainRouterException,
-                         InvalidDescriptionMessagePatternException,
-                         InvalidRouterInstanceException,
-                         OnlyOneMainRouterIsAllowedException,
-                         MissingMainRouterException,
-                         MissingHandlerForUnknownCommandsException)
+from .exceptions import (InvalidDescriptionMessagePatternException,
+                         InvalidRouterInstanceException)

argenta/app/entity.py

@@ -1,14 +1,15 @@
 from typing import Callable
+from inspect import getfullargspec
+
 from ..command.entity import Command
-from argenta.command.input_comand.entity import InputCommand
-from argenta.command.input_comand.exceptions import InvalidInputFlagException
 from ..router.entity import Router
+from ..command.input_comand.entity import InputCommand
+from ..command.input_comand.exceptions import (IncorrectInputFlagException,
+                                               InvalidInputFlagsHandlerHasBeenAlreadyCreatedException,
+                                               IncorrectNumberArgsHandlerException,
+                                               UnknownCommandHandlerHasBeenAlreadyCreatedException)
 from .exceptions import (InvalidRouterInstanceException,
                          InvalidDescriptionMessagePatternException,
-                         OnlyOneMainRouterIsAllowedException,
-                         MissingMainRouterException,
-                         MissingHandlerForUnknownCommandsException,
-                         HandlerForUnknownCommandsOnNonMainRouterException,
                          NoRegisteredRoutersException,
                          NoRegisteredHandlersException,
                          RepeatedCommandInDifferentRoutersException)
@@ -44,6 +45,8 @@ class App:
         self.repeat_command_groups = repeat_command_groups
 
         self._routers: list[Router] = []
+        self._invalid_input_flags_handler: Callable[[str], None] | None = None
+        self._unknown_command_handler: Callable[[Command], None] | None = None
         self._registered_router_entities: list[dict[str, str | list[dict[str, Callable[[], None] | Command]] | Router]] = []
         self._app_main_router: Router | None = None
         self._description_message_pattern: str = '[{command}] *=*=* {description}'
@@ -52,7 +55,6 @@ class App:
     def start_polling(self) -> None:
         self._validate_number_of_routers()
         self._validate_included_routers()
-        self._validate_main_router()
         self._validate_all_router_commands()
 
         self.print_func(self.initial_message)
@@ -67,11 +69,16 @@ class App:
                 self.print_func(self.prompt)
 
             raw_command: str = input()
+
             try:
                 input_command: InputCommand = InputCommand.parse(raw_command=raw_command)
-            except InvalidInputFlagException:
+            except IncorrectInputFlagException:
+                self.print_func(self.line_separate)
+                if self._invalid_input_flags_handler:
+                    self._invalid_input_flags_handler(raw_command)
+                else:
+                    self.print_func(f'Incorrect flag syntax: "{raw_command}"')
                 self.print_func(self.line_separate)
-                self.print_func(self.command_group_description_separate)
                 if not self.repeat_command_groups:
                     self.print_func(self.prompt)
                 continue
@@ -79,7 +86,8 @@ class App:
             self._checking_command_for_exit_command(input_command.get_string_entity())
             self.print_func(self.line_separate)
 
-            is_unknown_command: bool = self._check_is_command_unknown(input_command.get_string_entity())
+            is_unknown_command: bool = self._check_is_command_unknown(input_command)
+
             if is_unknown_command:
                 if not self.repeat_command_groups:
                     self.print_func(self.prompt)
@@ -111,8 +119,26 @@ class App:
         self._description_message_pattern: str = pattern
 
 
-    def get_main_router(self) -> Router:
-        return self._app_main_router
+    def set_invalid_input_flags_handler(self, handler: Callable[[str], None]) -> None:
+        if self._invalid_input_flags_handler:
+            raise InvalidInputFlagsHandlerHasBeenAlreadyCreatedException()
+        else:
+            args = getfullargspec(handler).args
+            if len(args) != 1:
+                raise IncorrectNumberArgsHandlerException()
+            else:
+                self._invalid_input_flags_handler = handler
+
+
+    def set_unknown_command_handler(self, handler: Callable[[str], None]) -> None:
+        if self._unknown_command_handler:
+            raise UnknownCommandHandlerHasBeenAlreadyCreatedException()
+        else:
+            args = getfullargspec(handler).args
+            if len(args) != 1:
+                raise IncorrectNumberArgsHandlerException()
+            else:
+                self._unknown_command_handler = handler
 
 
     def get_all_app_commands(self) -> list[str]:
@@ -123,17 +149,10 @@ class App:
         return all_commands
 
 
-    def include_router(self, router: Router, is_main: True | False = False) -> None:
+    def include_router(self, router: Router) -> None:
         if not isinstance(router, Router):
             raise InvalidRouterInstanceException()
 
-        if is_main:
-            if not self._app_main_router:
-                self._app_main_router = router
-                router.set_router_as_main()
-            else:
-                raise OnlyOneMainRouterIsAllowedException(self._app_main_router.get_name())
-
         router.set_ignore_command_register(self.ignore_command_register)
         self._routers.append(router)
 
@@ -155,23 +174,6 @@ class App:
                 raise NoRegisteredHandlersException(router.get_name())
 
 
-    def _validate_main_router(self):
-        if not self._app_main_router:
-            if len(self._routers) > 1:
-                raise MissingMainRouterException()
-            else:
-                router = self._routers[0]
-                router.set_router_as_main()
-                self._app_main_router = router
-
-        if not self._app_main_router.get_unknown_command_func():
-            raise MissingHandlerForUnknownCommandsException()
-
-        for router in self._routers:
-            if router.get_unknown_command_func() and self._app_main_router is not router:
-                raise HandlerForUnknownCommandsOnNonMainRouterException()
-
-
     def _validate_all_router_commands(self) -> None:
         for idx in range(len(self._registered_router_entities)):
             current_router: Router = self._registered_router_entities[idx]['entity']
@@ -199,17 +201,22 @@ class App:
                     exit(0)
 
 
-    def _check_is_command_unknown(self, command: str):
+    def _check_is_command_unknown(self, command: Command):
         registered_router_entities: list[dict[str, str | list[dict[str, Callable[[], None] | Command]] | Router]] = self._registered_router_entities
         for router_entity in registered_router_entities:
             for command_entity in router_entity['commands']:
-                if command_entity['command'].get_string_entity().lower() == command.lower():
+                if command_entity['command'].get_string_entity().lower() == command.get_string_entity().lower():
                     if self.ignore_command_register:
                         return False
                     else:
-                        if command_entity['command'].get_string_entity() == command:
+                        if command_entity['command'].get_string_entity() == command.get_string_entity():
                             return False
-        self._app_main_router.unknown_command_handler(command)
+
+        if self._unknown_command_handler:
+            self._unknown_command_handler(command)
+        else:
+            print(f"Unknown command: {command.get_string_entity()}")
+
         self.print_func(self.line_separate)
         self.print_func(self.command_group_description_separate)
         return True

argenta/app/exceptions.py

@@ -13,32 +13,6 @@ class InvalidDescriptionMessagePatternException(Exception):
                 f"Your pattern: {self.pattern}")
 
 
-class OnlyOneMainRouterIsAllowedException(Exception):
-    def __init__(self, existing_main_router):
-        self.existing_main_router = existing_main_router
-
-    def __str__(self):
-        return ("Only One Main Router Allowed\n"
-                f"Existing main router is: {self.existing_main_router}")
-
-
-class MissingMainRouterException(Exception):
-    def __str__(self):
-        return ("Missing Main Router\n"
-                "One of the registered routers must be the main one")
-
-
-class MissingHandlerForUnknownCommandsException(Exception):
-    def __str__(self):
-        return ("Missing Handlers For Unknown Commands On The Main Router\n"
-                "The main router must have a declared handler for unknown commands")
-
-
-class HandlerForUnknownCommandsOnNonMainRouterException(Exception):
-    def __str__(self):
-        return '\nThe handler for unknown commands can only be declared for the main router'
-
-
 class NoRegisteredRoutersException(Exception):
     def __str__(self):
         return "No Registered Router Found"

argenta/command/input_comand/exceptions.py

@@ -21,4 +21,19 @@ class RepeatedInputFlagsException(Exception):
                 f"Duplicate flag was detected in the input: '{self.flag.get_string_entity()}'")
 
 
+class InvalidInputFlagsHandlerHasBeenAlreadyCreatedException(Exception):
+    def __str__(self):
+        return "Invalid Input Flags Handler has already been created"
+
+
+class UnknownCommandHandlerHasBeenAlreadyCreatedException(Exception):
+    def __str__(self):
+        return "Unknown Command Handler has already been created"
+
+
+class IncorrectNumberArgsHandlerException(Exception):
+    def __str__(self):
+        return "Incorrect Input Flags Handler has incorrect number of arguments"
+
+
 

argenta/router/__init__.py

@@ -1,3 +1,2 @@
 from .entity import Router
-from .exceptions import (UnknownCommandHandlerHasAlreadyBeenCreatedException,
-                         InvalidDescriptionInstanceException)
+from .exceptions import InvalidDescriptionInstanceException

argenta/router/entity.py

@@ -1,10 +1,13 @@
 from typing import Callable, Any
+from inspect import getfullargspec
 from ..command.entity import Command
 from ..command.input_comand.entity import InputCommand
 from ..command.input_comand.exceptions import InvalidInputFlagException
 from ..command.params.flag.flags_group.entity import FlagsGroup
-from ..router.exceptions import (UnknownCommandHandlerHasAlreadyBeenCreatedException,
-                                 RepeatedCommandException, RepeatedFlagNameException)
+from ..router.exceptions import (RepeatedCommandException, RepeatedFlagNameException,
+                                 CurrentCommandDoesNotProcessFlagsException,
+                                 TooManyTransferredArgsException,
+                                 RequiredArgumentNotPassedException)
 
 
 class Router:
@@ -16,16 +19,18 @@ class Router:
         self.name = name
 
         self._command_entities: list[dict[str, Callable[[], None] | Command]] = []
-        self._unknown_command_func: Callable[[str], None] | None = None
-        self._is_main_router: bool = False
         self._ignore_command_register: bool = False
 
+        self._unknown_command_handler: Callable[[str], None] | None = None
+        self._not_valid_flag_handler: Callable[[str], None] | None = None
+
 
     def command(self, command: Command) -> Callable[[Any],  Any]:
         command.validate_commands_params()
         self._validate_command(command)
 
         def command_decorator(func):
+            Router._validate_func_args(command, func)
             self._command_entities.append({'handler_func': func,
                                            'command': command})
             def wrapper(*args, **kwargs):
@@ -35,22 +40,11 @@ class Router:
         return command_decorator
 
 
-    def unknown_command(self, func):
-        if self._unknown_command_func is not None:
-            raise UnknownCommandHandlerHasAlreadyBeenCreatedException()
-
-        self._unknown_command_func: Callable = func
-
-        def wrapper(*args, **kwargs):
-            return func(*args, **kwargs)
-        return wrapper
-
-
     def input_command_handler(self, input_command: InputCommand):
         input_command_name: str = input_command.get_string_entity()
         for command_entity in self._command_entities:
             if input_command_name.lower() == command_entity['command'].get_string_entity().lower():
-                if self._ignore_command_register:
+                if command_entity['command'].get_flags():
                     if input_command.get_input_flags():
                         for flag in input_command.get_input_flags():
                             is_valid = command_entity['command'].validate_input_flag(flag)
@@ -58,25 +52,12 @@ class Router:
                                 raise InvalidInputFlagException(flag)
                         return command_entity['handler_func'](input_command.get_input_flags())
                     else:
-                        return command_entity['handler_func']()
+                        return command_entity['handler_func'](FlagsGroup(None))
                 else:
-                    if input_command_name == command_entity['command'].get_string_entity():
-                        if input_command.get_input_flags():
-                            for flag in input_command.get_input_flags():
-                                is_valid = command_entity['command'].validate_input_flag(flag)
-                                if not is_valid:
-                                    raise InvalidInputFlagException(flag)
-                            return command_entity['handler_func'](input_command.get_input_flags())
-                        else:
-                            return command_entity['handler_func']()
-
-
-    def get_unknown_command_func(self):
-        return self._unknown_command_func
-
-
-    def unknown_command_handler(self, unknown_command):
-        self._unknown_command_func(unknown_command)
+                    if input_command.get_input_flags():
+                        raise CurrentCommandDoesNotProcessFlagsException()
+                    else:
+                        return command_entity['handler_func']()
 
 
     def _validate_command(self, command: Command):
@@ -94,10 +75,17 @@ class Router:
                 raise RepeatedFlagNameException()
 
 
-    def set_router_as_main(self):
-        if self.name == 'subordinate':
-            self.name = 'main'
-        self._is_main_router = True
+    @staticmethod
+    def _validate_func_args(command: Command, func: Callable):
+        registered_args = command.get_flags()
+        transferred_args = getfullargspec(func).args
+        if registered_args and transferred_args:
+           if len(transferred_args) != 1:
+                raise TooManyTransferredArgsException()
+        elif registered_args and not transferred_args:
+            raise RequiredArgumentNotPassedException()
+        elif not registered_args and transferred_args:
+            raise TooManyTransferredArgsException()
 
 
     def set_ignore_command_register(self, ignore_command_register: bool):
@@ -123,8 +111,7 @@ class Router:
             'ignore_command_register': self._ignore_command_register,
             'attributes': {
                 'command_entities': self._command_entities,
-                'unknown_command_func': self._unknown_command_func,
-                'is_main_router': self._is_main_router
+                'unknown_command_func': self._unknown_command_handler
             }
 
         }

argenta/router/exceptions.py

@@ -3,11 +3,6 @@ class InvalidDescriptionInstanceException(Exception):
         return "Invalid Description Instance"
 
 
-class UnknownCommandHandlerHasAlreadyBeenCreatedException(Exception):
-    def __str__(self):
-        return "Only one unknown command handler can be declared"
-
-
 class RepeatedCommandException(Exception):
     def __str__(self):
         return "Commands in handler cannot be repeated"
@@ -16,3 +11,18 @@ class RepeatedCommandException(Exception):
 class RepeatedFlagNameException(Exception):
     def __str__(self):
         return "Repeated flag name in register command"
+
+
+class CurrentCommandDoesNotProcessFlagsException(Exception):
+    def __str__(self):
+        return "Current command does not process flags"
+
+
+class TooManyTransferredArgsException(Exception):
+    def __str__(self):
+        return "Too many transferred arguments"
+
+
+class RequiredArgumentNotPassedException(Exception):
+    def __str__(self):
+        return "Required argument not passed"

{argenta-0.3.0.dist-info → argenta-0.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: argenta
-Version: 0.3.0
+Version: 0.3.1
 Summary: python library for creating custom shells
 License: MIT
 Author: kolo

{argenta-0.3.0.dist-info → argenta-0.3.1.dist-info}/RECORD

@@ -1,13 +1,13 @@
 argenta/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-argenta/app/__init__.py,sha256=jXP3ishSp3fF7fePZOtd_LAbBfn_RuNwnGidpk9H-74,415
-argenta/app/entity.py,sha256=GdcqloQoShiCRv9GahWJfV4F_pCcK3bGFkVPoj3AnrQ,10468
-argenta/app/exceptions.py,sha256=8p8_ucklfmHlUPaiMS7D_026laep-fr4bTXdRRJtB_k,2030
+argenta/app/__init__.py,sha256=yOt8-2lholVRUtLPwAXuemh115q1unP1PKLBR_7cd4E,152
+argenta/app/entity.py,sha256=wVhagcMloMIh3INmeflAIfMJ_Jgh9K35LB2-FCBwzrs,10840
+argenta/app/exceptions.py,sha256=7_p_5NS_paLAU3xGAWufpfkdTxRx07T2zWYzGKdlCMs,1086
 argenta/command/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argenta/command/entity.py,sha256=9FkU_NbI1WsXrnKA1Ba86xwYoRwLLdk81yI9dj7RsF8,2451
 argenta/command/exceptions.py,sha256=qTt3G0XaWW5BBQyxNkVWFY0SMGn92VuxvSRs0G37lHI,366
 argenta/command/input_comand/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argenta/command/input_comand/entity.py,sha256=YyJPMV8Hy1QSgvgu_w9cjWdiQ2JXG21EbCabns4w_ek,2585
-argenta/command/input_comand/exceptions.py,sha256=rVFOMkF-8ItwAs_JXofAZG3aTQvdn11SwJ3d39hH-4k,748
+argenta/command/input_comand/exceptions.py,sha256=16KtQpv2ZkXPQLu0V28HGoGjfXlxtyJe90pTjDYQbng,1252
 argenta/command/params/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argenta/command/params/flag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argenta/command/params/flag/entity.py,sha256=gUax6hkuSuarH8yQwFC4QsGql8n1POi19Ww4yEh2c2k,1446
@@ -15,10 +15,10 @@ argenta/command/params/flag/flags_group/__init__.py,sha256=47DEQpj8HBSa-_TImW-5J
 argenta/command/params/flag/flags_group/entity.py,sha256=aFbo5mzevuDxVb8VpaRCUSgUCLn6GK-ODCz5N5650Q8,638
 argenta/command/params/flag/input_flag/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 argenta/command/params/flag/input_flag/entity.py,sha256=KHoZRE7pRc30LyS6yF_7G7IrA8DrH-gS-Hg_qNstkzU,195
-argenta/router/__init__.py,sha256=RvVORE4g0uIWWuQHav0KK-I7AlCuXW4HeW-8MW7fOyo,168
-argenta/router/entity.py,sha256=0kx6iDa3rOe5Zr7TB3BpXjpDJqy-gjfqtdYJsitVJy0,5587
-argenta/router/exceptions.py,sha256=np8hclunhbyt9E2oZym3g9-5a6UpEj9s_52OR6QA56s,551
-argenta-0.3.0.dist-info/LICENSE,sha256=zmqoGh2n5rReBv4s8wPxF_gZEZDgauJYSPMuPczgOiU,1082
-argenta-0.3.0.dist-info/METADATA,sha256=qpC9EWXrK66dlv02BMHGIwaYTaYVkNdzbaVNa7q78BE,12638
-argenta-0.3.0.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
-argenta-0.3.0.dist-info/RECORD,,
+argenta/router/__init__.py,sha256=ZedowNgGR9OphLSg9fXp6-uvjyf23rbq-rEtuHScAIM,87
+argenta/router/entity.py,sha256=NvJZXZl03UTnJOBPsN9KNn4DB7HUL_CQxvrCzICIuWY,5268
+argenta/router/exceptions.py,sha256=MAgKSmH5hHmIvHAQlIvM1V7Ft_35GA2X3F5e7bR4vcE,789
+argenta-0.3.1.dist-info/LICENSE,sha256=zmqoGh2n5rReBv4s8wPxF_gZEZDgauJYSPMuPczgOiU,1082
+argenta-0.3.1.dist-info/METADATA,sha256=V0qTkOj2nemtbDlKt8tLm7vi1AroOHwo7RMltFKHwlc,12638
+argenta-0.3.1.dist-info/WHEEL,sha256=IYZQI976HJqqOpQU6PHkJ8fb3tMNBFjg-Cn-pwAbaFM,88
+argenta-0.3.1.dist-info/RECORD,,