argenta 0.3.0a0__tar.gz → 0.3.2__tar.gz

{argenta-0.3.0a0 → argenta-0.3.2}/PKG-INFO

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

argenta-0.3.2/argenta/app/__init__.py

@@ -0,0 +1,3 @@
+from .entity import App
+from .exceptions import (InvalidDescriptionMessagePatternException,
+                         InvalidRouterInstanceException)

{argenta-0.3.0a0 → argenta-0.3.2}/argenta/app/entity.py

@@ -1,14 +1,17 @@
 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 (UnprocessedInputFlagException,
+                                               InvalidInputFlagsHandlerHasBeenAlreadyCreatedException,
+                                               IncorrectNumberOfHandlerArgsException,
+                                               UnknownCommandHandlerHasBeenAlreadyCreatedException,
+                                               RepeatedInputFlagsException,
+                                               RepeatedInputFlagsHandlerHasBeenAlreadyCreatedException)
 from .exceptions import (InvalidRouterInstanceException,
                          InvalidDescriptionMessagePatternException,
-                         OnlyOneMainRouterIsAllowedException,
-                         MissingMainRouterException,
-                         MissingHandlerForUnknownCommandsException,
-                         HandlerForUnknownCommandsOnNonMainRouterException,
                          NoRegisteredRoutersException,
                          NoRegisteredHandlersException,
                          RepeatedCommandInDifferentRoutersException)
@@ -44,6 +47,9 @@ class App:
         self.repeat_command_groups = repeat_command_groups
 
         self._routers: list[Router] = []
+        self._invalid_input_flags_handler: Callable[[str], None] | None = None
+        self._repeated_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 +58,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 +72,26 @@ class App:
                 self.print_func(self.prompt)
 
             raw_command: str = input()
+
             try:
                 input_command: InputCommand = InputCommand.parse(raw_command=raw_command)
-            except InvalidInputFlagException:
+            except UnprocessedInputFlagException:
+                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)
+                if not self.repeat_command_groups:
+                    self.print_func(self.prompt)
+                continue
+            except RepeatedInputFlagsException:
+                self.print_func(self.line_separate)
+                if self._repeated_input_flags_handler:
+                    self._repeated_input_flags_handler(raw_command)
+                else:
+                    self.print_func(f'Repeated input flags: "{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 +99,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 +132,37 @@ 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 IncorrectNumberOfHandlerArgsException()
+            else:
+                self._invalid_input_flags_handler = handler
+
+
+    def set_repeated_input_flags_handler(self, handler: Callable[[str], None]) -> None:
+        if self._repeated_input_flags_handler:
+            raise RepeatedInputFlagsHandlerHasBeenAlreadyCreatedException()
+        else:
+            args = getfullargspec(handler).args
+            if len(args) != 1:
+                raise IncorrectNumberOfHandlerArgsException()
+            else:
+                self._repeated_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 IncorrectNumberOfHandlerArgsException()
+            else:
+                self._unknown_command_handler = handler
 
 
     def get_all_app_commands(self) -> list[str]:
@@ -123,17 +173,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 +198,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.unknown_command_func:
-            raise MissingHandlerForUnknownCommandsException()
-
-        for router in self._routers:
-            if router.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 +225,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-0.3.0a0 → argenta-0.3.2}/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-0.3.0a0 → argenta-0.3.2}/argenta/command/input_comand/entity.py

@@ -1,4 +1,4 @@
-from ..input_comand.exceptions import IncorrectInputFlagException, RepeatedInputFlagsException
+from ..input_comand.exceptions import UnprocessedInputFlagException, RepeatedInputFlagsException
 from ..entity import Command
 from ..params.flag.flags_group.entity import FlagsGroup
 from ..params.flag.input_flag.entity import InputFlag
@@ -29,12 +29,12 @@ class InputCommand(Command, Generic[T]):
             if _.startswith('-'):
                 flag_prefix_last_symbol_index = _.rfind('-')
                 if current_flag_name or len(_) < 2 or len(_[:flag_prefix_last_symbol_index]) > 3:
-                    raise IncorrectInputFlagException()
+                    raise UnprocessedInputFlagException()
                 else:
                     current_flag_name = _
             else:
                 if not current_flag_name:
-                    raise IncorrectInputFlagException()
+                    raise UnprocessedInputFlagException()
                 else:
                     current_flag_value = _
             if current_flag_name and current_flag_value:
@@ -55,7 +55,7 @@ class InputCommand(Command, Generic[T]):
                 current_flag_name = None
                 current_flag_value = None
         if any([current_flag_name, current_flag_value]):
-            raise IncorrectInputFlagException()
+            raise UnprocessedInputFlagException()
         if len(flags.get_flags()) == 0:
             return InputCommand(command=command)
         else:

argenta-0.3.2/argenta/command/input_comand/exceptions.py

@@ -0,0 +1,37 @@
+from ..params.flag.input_flag.entity import InputFlag
+
+
+class UnprocessedInputFlagException(Exception):
+    def __str__(self):
+        return "Unprocessed Input Flags"
+
+
+class RepeatedInputFlagsException(Exception):
+    def __init__(self, flag: InputFlag):
+        self.flag = flag
+    def __str__(self):
+        return ("Repeated Input Flags\n"
+                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 RepeatedInputFlagsHandlerHasBeenAlreadyCreatedException(Exception):
+    def __str__(self):
+        return "Repeated Input Flags Handler has already been created"
+
+
+class UnknownCommandHandlerHasBeenAlreadyCreatedException(Exception):
+    def __str__(self):
+        return "Unknown Command Handler has already been created"
+
+
+class IncorrectNumberOfHandlerArgsException(Exception):
+    def __str__(self):
+        return "Incorrect Input Flags Handler has incorrect number of arguments"
+
+
+

{argenta-0.3.0a0 → argenta-0.3.2}/argenta/command/params/flag/flags_group/entity.py

@@ -20,3 +20,6 @@ class FlagsGroup:
 
     def __next__(self):
         return next(iter(self))
+
+    def __getitem__(self, item):
+        return self._flags[item]

argenta-0.3.2/argenta/router/__init__.py

@@ -0,0 +1,2 @@
+from .entity import Router
+from .exceptions import InvalidDescriptionInstanceException

{argenta-0.3.0a0 → argenta-0.3.2}/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,
+                                 TooManyTransferredArgsException,
+                                 RequiredArgumentNotPassedException,
+                                 NotValidInputFlagHandlerHasBeenAlreadyCreatedException,
+                                 IncorrectNumberOfHandlerArgsException)
 
 
 class Router:
@@ -16,9 +19,9 @@ 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._ignore_command_register: bool = False
+
+        self._not_valid_flag_handler: Callable[[Command], None] | None = None
 
 
     def command(self, command: Command) -> Callable[[Any],  Any]:
@@ -26,6 +29,7 @@ class Router:
         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):
@@ -34,52 +38,55 @@ class Router:
 
         return command_decorator
 
+    def not_valid_input_flag(self, func):
+        if self._not_valid_flag_handler:
+            raise NotValidInputFlagHandlerHasBeenAlreadyCreatedException()
+        else:
+            processed_args = getfullargspec(func).args
+            if len(processed_args) != 1:
+                raise IncorrectNumberOfHandlerArgsException()
+            else:
+                self._not_valid_flag_handler = func
+                def wrapper(*args, **kwargs):
+                    return func(*args, **kwargs)
 
-    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
+                return wrapper
 
 
     def input_command_handler(self, input_command: InputCommand):
         input_command_name: str = input_command.get_string_entity()
+        input_command_flags: FlagsGroup = input_command.get_input_flags()
         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 input_command.get_input_flags():
-                        for flag in input_command.get_input_flags():
+                if command_entity['command'].get_flags():
+                    if input_command_flags:
+                        for flag in input_command_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())
+                                if self._not_valid_flag_handler:
+                                    self._not_valid_flag_handler(input_command)
+                                else:
+                                    print(f"Undefined or incorrect input flag: '{flag.get_string_entity()} {flag.get_value()}'")
+                                return
+                        return command_entity['handler_func'](input_command_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())
+                    if input_command_flags:
+                        if self._not_valid_flag_handler:
+                            self._not_valid_flag_handler(input_command)
                         else:
-                            return command_entity['handler_func']()
-
-
-    def unknown_command_handler(self, unknown_command):
-        self.unknown_command_func(unknown_command)
+                            print(f"Undefined or incorrect input flag: '{input_command_flags[0].get_string_entity()} {input_command_flags[0].get_value()}'")
+                        return
+                    else:
+                        return command_entity['handler_func']()
 
 
     def _validate_command(self, command: Command):
         command_name: str = command.get_string_entity()
-        if command in self.get_all_commands():
+        if command_name in self.get_all_commands():
             raise RepeatedCommandException()
-        if self.ignore_command_register:
+        if self._ignore_command_register:
             if command_name.lower() in [x.lower() for x in self.get_all_commands()]:
                 raise RepeatedCommandException()
 
@@ -90,14 +97,21 @@ 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):
-        self.ignore_command_register = ignore_command_register
+        self._ignore_command_register = ignore_command_register
 
 
     def get_command_entities(self) -> list[dict[str, Callable[[], None] | Command]]:
@@ -116,11 +130,9 @@ class Router:
         return {
             'title': self.title,
             'name': self.name,
-            'ignore_command_register': self.ignore_command_register,
+            '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
             }
 
         }

argenta-0.3.2/argenta/router/exceptions.py

@@ -0,0 +1,36 @@
+from ..command.params.flag.input_flag.entity import InputFlag
+
+
+class InvalidDescriptionInstanceException(Exception):
+    def __str__(self):
+        return "Invalid Description Instance"
+
+
+class RepeatedCommandException(Exception):
+    def __str__(self):
+        return "Commands in handler cannot be repeated"
+
+
+class RepeatedFlagNameException(Exception):
+    def __str__(self):
+        return "Repeated flag name in register command"
+
+
+class TooManyTransferredArgsException(Exception):
+    def __str__(self):
+        return "Too many transferred arguments"
+
+
+class RequiredArgumentNotPassedException(Exception):
+    def __str__(self):
+        return "Required argument not passed"
+
+
+class NotValidInputFlagHandlerHasBeenAlreadyCreatedException(Exception):
+    def __str__(self):
+        return "Invalid Input Flag Handler has already been created"
+
+
+class IncorrectNumberOfHandlerArgsException(Exception):
+    def __str__(self):
+        return "Incorrect Input Flags Handler has incorrect number of arguments"

{argenta-0.3.0a0 → argenta-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "argenta"
-version = "0.3.0-alpha"
+version = "0.3.2"
 description = "python library for creating custom shells"
 authors = [
     {name = "kolo",email = "kolo.is.main@gmail.com"}
@@ -33,6 +33,4 @@ numpy = "^2.2.2"
 word2number = "^1.1"
 numexpr = "^2.10.2"
 requests = "^2.32.3"
-tqdm = "^4.67.1"
-setuptools = "^75.8.0"
 

argenta-0.3.0a0/argenta/app/__init__.py

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

argenta-0.3.0a0/argenta/command/input_comand/exceptions.py

@@ -1,24 +0,0 @@
-from ..params.flag.input_flag.entity import InputFlag
-
-
-class InvalidInputFlagException(Exception):
-    def __init__(self, flag: InputFlag):
-        self.flag = flag
-    def __str__(self):
-        return ("Invalid Input Flags\n"
-                f"Unknown or invalid input flag: '{self.flag.get_string_entity()} {self.flag.get_value()}'")
-
-class IncorrectInputFlagException(Exception):
-    def __str__(self):
-        return "Incorrect Input Flags"
-
-
-class RepeatedInputFlagsException(Exception):
-    def __init__(self, flag: InputFlag):
-        self.flag = flag
-    def __str__(self):
-        return ("Repeated Input Flags\n"
-                f"Duplicate flag was detected in the input: '{self.flag.get_string_entity()}'")
-
-
-

argenta-0.3.0a0/argenta/router/__init__.py

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

argenta-0.3.0a0/argenta/router/exceptions.py

@@ -1,18 +0,0 @@
-class InvalidDescriptionInstanceException(Exception):
-    def __str__(self):
-        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"
-
-
-class RepeatedFlagNameException(Exception):
-    def __str__(self):
-        return "Repeated flag name in register command"