argenta 0.3.3__tar.gz → 0.3.5__tar.gz

{argenta-0.3.3 → argenta-0.3.5}/PKG-INFO

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

{argenta-0.3.3 → argenta-0.3.5}/argenta/app/entity.py

@@ -1,19 +1,18 @@
 from typing import Callable
 from inspect import getfullargspec
+import re
 
 from ..command.entity import Command
 from ..router.entity import Router
 from ..command.exceptions import (UnprocessedInputFlagException,
-                                  InvalidInputFlagsHandlerHasBeenAlreadyCreatedException,
-                                  IncorrectNumberOfHandlerArgsException,
-                                  UnknownCommandHandlerHasBeenAlreadyCreatedException,
                                   RepeatedInputFlagsException,
-                                  RepeatedInputFlagsHandlerHasBeenAlreadyCreatedException)
+                                  EmptyInputCommandException)
 from .exceptions import (InvalidRouterInstanceException,
                          InvalidDescriptionMessagePatternException,
                          NoRegisteredRoutersException,
                          NoRegisteredHandlersException,
-                         RepeatedCommandInDifferentRoutersException)
+                         RepeatedCommandInDifferentRoutersException,
+                         IncorrectNumberOfHandlerArgsException)
 
 
 class App:
@@ -46,12 +45,12 @@ 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}'
+        self._registered_router_entities: list[dict[str, str | list[dict[str, Callable[[], None] | Command]] | Router]] = []
+        self._invalid_input_flags_handler: Callable[[str], None] = lambda raw_command: print_func(f'Incorrect flag syntax: "{raw_command}"')
+        self._repeated_input_flags_handler: Callable[[str], None] = lambda raw_command: print_func(f'Repeated input flags: "{raw_command}"')
+        self._empty_input_command_handler: Callable[[], None] = lambda: print_func(f'Empty input command')
+        self._unknown_command_handler: Callable[[Command], None] = lambda command: print_func(f"Unknown command: {command.get_string_entity()}")
 
 
     def start_polling(self) -> None:
@@ -76,31 +75,39 @@ class App:
                 input_command: Command = Command.parse_input_command(raw_command=raw_command)
             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._invalid_input_flags_handler(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._repeated_input_flags_handler(raw_command)
                 self.print_func(self.line_separate)
+
                 if not self.repeat_command_groups:
                     self.print_func(self.prompt)
                 continue
 
-            self._checking_command_for_exit_command(input_command.get_string_entity())
-            self.print_func(self.line_separate)
+            except EmptyInputCommandException:
+                self.print_func(self.line_separate)
+                self._empty_input_command_handler()
+                self.print_func(self.line_separate)
 
+                if not self.repeat_command_groups:
+                    self.print_func(self.prompt)
+                continue
+
+            self._check_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)
 
             if is_unknown_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
@@ -123,53 +130,37 @@ class App:
 
 
     def set_description_message_pattern(self, pattern: str) -> None:
-        try:
-            pattern.format(command='command',
-                           description='description')
-        except KeyError:
+        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)
-        self._description_message_pattern: str = pattern
 
 
     def set_invalid_input_flags_handler(self, handler: Callable[[str], None]) -> None:
-        if self._invalid_input_flags_handler:
-            raise InvalidInputFlagsHandlerHasBeenAlreadyCreatedException()
+        args = getfullargspec(handler).args
+        if len(args) != 1:
+            raise IncorrectNumberOfHandlerArgsException()
         else:
-            args = getfullargspec(handler).args
-            if len(args) != 1:
-                raise IncorrectNumberOfHandlerArgsException()
-            else:
-                self._invalid_input_flags_handler = handler
+            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()
+        args = getfullargspec(handler).args
+        if len(args) != 1:
+            raise IncorrectNumberOfHandlerArgsException()
         else:
-            args = getfullargspec(handler).args
-            if len(args) != 1:
-                raise IncorrectNumberOfHandlerArgsException()
-            else:
-                self._repeated_input_flags_handler = handler
+            self._repeated_input_flags_handler = handler
 
 
     def set_unknown_command_handler(self, handler: Callable[[str], None]) -> None:
-        if self._unknown_command_handler:
-            raise UnknownCommandHandlerHasBeenAlreadyCreatedException()
+        args = getfullargspec(handler).args
+        if len(args) != 1:
+            raise IncorrectNumberOfHandlerArgsException()
         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]:
-        all_commands: list[str] = []
-        for router in self._routers:
-            all_commands.extend(router.get_all_commands())
-
-        return all_commands
+            self._unknown_command_handler = handler
 
 
     def include_router(self, router: Router) -> None:
@@ -213,7 +204,7 @@ class App:
                         raise RepeatedCommandInDifferentRoutersException()
 
 
-    def _checking_command_for_exit_command(self, command: str):
+    def _check_command_for_exit_command(self, command: str):
         if command.lower() == self.exit_command.lower():
             if self.ignore_exit_command_register:
                 self.print_func(self.farewell_message)
@@ -234,14 +225,7 @@ class App:
                     else:
                         if command_entity['command'].get_string_entity() == command.get_string_entity():
                             return False
-
-        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)
+        self._unknown_command_handler(command)
         return True
 
 

{argenta-0.3.3 → argenta-0.3.5}/argenta/app/exceptions.py

@@ -28,3 +28,8 @@ class NoRegisteredHandlersException(Exception):
 class RepeatedCommandInDifferentRoutersException(Exception):
     def __str__(self):
         return "Commands in different handlers cannot be repeated"
+
+
+class IncorrectNumberOfHandlerArgsException(Exception):
+    def __str__(self):
+        return "Incorrect Input Flags Handler has incorrect number of arguments"

argenta-0.3.5/argenta/command/__init__.py

@@ -0,0 +1 @@
+from .entity import Command

{argenta-0.3.3 → argenta-0.3.5}/argenta/command/entity.py

@@ -2,7 +2,10 @@ from .params.flag.entity import Flag
 from .params.flag.flags_group.entity import FlagsGroup
 from .exceptions import (InvalidCommandInstanceException,
                          InvalidDescriptionInstanceException,
-                         InvalidFlagsInstanceException, UnprocessedInputFlagException, RepeatedInputFlagsException)
+                         InvalidFlagsInstanceException,
+                         UnprocessedInputFlagException,
+                         RepeatedInputFlagsException,
+                         EmptyInputCommandException)
 
 from typing import Generic, TypeVar
 
@@ -12,11 +15,11 @@ T = TypeVar('T')
 
 class Command(Generic[T]):
     def __init__(self, command: str,
-                 description: str | None = None,
+                 description: str = None,
                  flags: Flag | FlagsGroup | None = None):
         self._command = command
-        self._description = description
-        self._flags: FlagsGroup | None = flags if isinstance(flags, FlagsGroup) else FlagsGroup([flags]) if isinstance(flags, Flag) else flags
+        self._description = f'description for "{self._command}" command' if not description else description
+        self._registered_flags: FlagsGroup | None = flags if isinstance(flags, FlagsGroup) else FlagsGroup([flags]) if isinstance(flags, Flag) else flags
 
         self._input_flags: FlagsGroup | None = None
 
@@ -26,15 +29,11 @@ class Command(Generic[T]):
 
 
     def get_description(self):
-        if not self._description:
-            description = f'description for "{self._command}" command'
-            return description
-        else:
-            return self._description
+        return self._description
 
 
     def get_registered_flags(self):
-        return self._flags
+        return self._registered_flags
 
 
     def validate_commands_params(self):
@@ -42,7 +41,7 @@ class Command(Generic[T]):
             raise InvalidCommandInstanceException(self._command)
         if not isinstance(self._description, str):
             raise InvalidDescriptionInstanceException()
-        if not any([(isinstance(self._flags, FlagsGroup)), not self._flags]):
+        if not any([(isinstance(self._registered_flags, FlagsGroup)), not self._registered_flags]):
             raise InvalidFlagsInstanceException
 
 
@@ -71,6 +70,8 @@ class Command(Generic[T]):
 
     @staticmethod
     def parse_input_command(raw_command: str) -> 'Command[T]':
+        if not raw_command:
+            raise EmptyInputCommandException()
         list_of_tokens = raw_command.split()
         command = list_of_tokens[0]
         list_of_tokens.pop(0)

{argenta-0.3.3 → argenta-0.3.5}/argenta/command/exceptions.py

@@ -29,21 +29,6 @@ class RepeatedInputFlagsException(Exception):
                 f"Duplicate flag was detected in the input: '{self.flag.get_string_entity()}'")
 
 
-class InvalidInputFlagsHandlerHasBeenAlreadyCreatedException(Exception):
+class EmptyInputCommandException(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"
+        return "Input Command is empty"

argenta-0.3.5/argenta/command/params/flag/__init__.py

@@ -0,0 +1,2 @@
+from .entity import Flag
+from .flags_group.entity import FlagsGroup

{argenta-0.3.3 → argenta-0.3.5}/argenta/command/params/flag/entity.py

@@ -36,6 +36,7 @@ class Flag:
                 return True
             else:
                 return False
+
         if isinstance(self.possible_flag_values, list):
             if self.ignore_flag_value_register:
                 if input_flag_value.lower() in [x.lower() for x in self.possible_flag_values]:
@@ -47,5 +48,4 @@ class Flag:
                     return True
                 else:
                     return False
-        else:
-            return True
+        return True

{argenta-0.3.3 → argenta-0.3.5}/argenta/router/entity.py

@@ -1,11 +1,12 @@
 from typing import Callable, Any
 from inspect import getfullargspec
+
 from ..command.entity import Command
+from ..command.params.flag.entity import Flag
 from ..command.params.flag.flags_group.entity import FlagsGroup
 from ..router.exceptions import (RepeatedCommandException, RepeatedFlagNameException,
                                  TooManyTransferredArgsException,
                                  RequiredArgumentNotPassedException,
-                                 NotValidInputFlagHandlerHasBeenAlreadyCreatedException,
                                  IncorrectNumberOfHandlerArgsException)
 
 
@@ -20,7 +21,7 @@ class Router:
         self._command_entities: list[dict[str, Callable[[], None] | Command]] = []
         self._ignore_command_register: bool = False
 
-        self._not_valid_flag_handler: Callable[[Command], None] | None = None
+        self._not_valid_flag_handler: Callable[[Flag], None] = lambda flag: print(f"Undefined or incorrect input flag: '{flag.get_string_entity()} {flag.get_value()}'")
 
 
     def command(self, command: Command) -> Callable[[Any],  Any]:
@@ -37,19 +38,12 @@ class Router:
 
         return command_decorator
 
-    def not_valid_input_flag(self, func):
-        if self._not_valid_flag_handler:
-            raise NotValidInputFlagHandlerHasBeenAlreadyCreatedException()
+    def set_invalid_input_flag_handler(self, func):
+        processed_args = getfullargspec(func).args
+        if len(processed_args) != 1:
+            raise IncorrectNumberOfHandlerArgsException()
         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)
-
-                return wrapper
+            self._not_valid_flag_handler = func
 
 
     def input_command_handler(self, input_command: Command):
@@ -62,20 +56,14 @@ class Router:
                         for flag in input_command_flags:
                             is_valid = command_entity['command'].validate_input_flag(flag)
                             if not is_valid:
-                                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()}'")
+                                self._not_valid_flag_handler(flag)
                                 return
                         return command_entity['handler_func'](input_command_flags)
                     else:
                         return command_entity['handler_func'](FlagsGroup(None))
                 else:
                     if input_command_flags:
-                        if self._not_valid_flag_handler:
-                            self._not_valid_flag_handler(input_command)
-                        else:
-                            print(f"Undefined or incorrect input flag: '{input_command_flags[0].get_string_entity()} {input_command_flags[0].get_value()}'")
+                        self._not_valid_flag_handler(input_command_flags[0])
                         return
                     else:
                         return command_entity['handler_func']()
@@ -125,28 +113,9 @@ class Router:
         return self.title
 
 
-    def get_router_info(self) -> dict:
-        return {
-            'title': self.title,
-            'name': self.name,
-            'ignore_command_register': self._ignore_command_register,
-            'attributes': {
-                'command_entities': self._command_entities,
-            }
-
-        }
-
-
     def get_all_commands(self) -> list[str]:
         all_commands: list[str] = []
         for command_entity in self._command_entities:
             all_commands.append(command_entity['command'].get_string_entity())
 
         return all_commands
-
-    def get_all_flags(self) -> list[FlagsGroup]:
-        all_flags: list[FlagsGroup] = []
-        for command_entity in self._command_entities:
-            all_flags.append(command_entity['command'].get_registered_flags())
-
-        return all_flags

{argenta-0.3.3 → argenta-0.3.5}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "argenta"
-version = "0.3.3"
+version = "0.3.5"
 description = "python library for creating custom shells"
 authors = [
-    {name = "kolo",email = "kolo.is.main@gmail.com"}
+    {name = "kolo", email = "kolo.is.main@gmail.com"}
 ]
 license = {text = "MIT"}
 readme = "README.md"