argenta 0.3.4__tar.gz → 0.3.5__tar.gz

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

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

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

@@ -1,17 +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,
-                                  IncorrectNumberOfHandlerArgsException,
                                   RepeatedInputFlagsException,
                                   EmptyInputCommandException)
 from .exceptions import (InvalidRouterInstanceException,
                          InvalidDescriptionMessagePatternException,
                          NoRegisteredRoutersException,
                          NoRegisteredHandlersException,
-                         RepeatedCommandInDifferentRoutersException)
+                         RepeatedCommandInDifferentRoutersException,
+                         IncorrectNumberOfHandlerArgsException)
 
 
 class App:
@@ -129,12 +130,13 @@ class App:
 
 
     def set_description_message_pattern(self, pattern: str) -> None:
-        try:
-            pattern.format(command='command', description='description')
-        except KeyError:
-            raise InvalidDescriptionMessagePatternException(pattern)
-        else:
+        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)
 
 
     def set_invalid_input_flags_handler(self, handler: Callable[[str], None]) -> None:

{argenta-0.3.4 → 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.4 → argenta-0.3.5}/argenta/command/entity.py

@@ -15,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
 
@@ -29,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):
@@ -45,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
 
 

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

@@ -29,11 +29,6 @@ class RepeatedInputFlagsException(Exception):
                 f"Duplicate flag was detected in the input: '{self.flag.get_string_entity()}'")
 
 
-class IncorrectNumberOfHandlerArgsException(Exception):
-    def __str__(self):
-        return "Incorrect Input Flags Handler has incorrect number of arguments"
-
-
 class EmptyInputCommandException(Exception):
     def __str__(self):
         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.4 → argenta-0.3.5}/argenta/command/params/flag/entity.py

@@ -48,5 +48,4 @@ class Flag:
                     return True
                 else:
                     return False
-        else:
-            return True
+        return True

{argenta-0.3.4 → 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.4 → argenta-0.3.5}/pyproject.toml

@@ -1,9 +1,9 @@
 [project]
 name = "argenta"
-version = "0.3.4"
+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"