argenta 1.1.1rc0__py3-none-any.whl → 1.1.2__py3-none-any.whl

argenta/command/models.py

@@ -1,35 +1,28 @@
-from argenta.command.flag.models import Flag, InputFlag
+from argenta.command.flag.models import Flag, InputFlag, ValidationStatus
 from argenta.command.flag.flags.models import InputFlags, Flags
 from argenta.command.exceptions import (
     UnprocessedInputFlagException,
     RepeatedInputFlagsException,
     EmptyInputCommandException,
 )
-from typing import cast, Literal
+from typing import Never, Self, cast, Literal
 
 
-class BaseCommand:
-    def __init__(self, trigger: str) -> None:
-        """
-        Private. Base class for all commands
-        :param trigger: A string trigger, which, when entered by the user, indicates that the input corresponds to the command
-        """
-        self._trigger = trigger
+ParseFlagsResult = tuple[InputFlags, str | None, str | None]
+ParseResult = tuple[str, InputFlags]
 
-    def get_trigger(self) -> str:
-        """
-        Public. Returns the trigger of the command
-        :return: the trigger of the command as str
-        """
-        return self._trigger
+MIN_FLAG_PREFIX: str = "-"
+DEFAULT_WITHOUT_FLAGS: Flags = Flags()
+
+DEFAULT_WITHOUT_INPUT_FLAGS: InputFlags = InputFlags()
 
 
-class Command(BaseCommand):
+class Command:
     def __init__(
         self,
-        trigger: str,
+        trigger: str, *, 
         description: str | None = None,
-        flags: Flag | Flags | None = None,
+        flags: Flag | Flags = DEFAULT_WITHOUT_FLAGS,
         aliases: list[str] | None = None,
     ):
         """
@@ -39,157 +32,120 @@ class Command(BaseCommand):
         :param flags: processed commands
         :param aliases: string synonyms for the main trigger
         """
-        super().__init__(trigger)
-        self._registered_flags: Flags = (
-            flags
-            if isinstance(flags, Flags)
-            else Flags(flags)
-            if isinstance(flags, Flag)
-            else Flags()
-        )
-        self._description = "Very useful command" if not description else description
-        self._aliases = aliases if isinstance(aliases, list) else []
-
-    def get_registered_flags(self) -> Flags:
-        """
-        Private. Returns the registered flags
-        :return: the registered flags as Flags
-        """
-        return self._registered_flags
-
-    def get_aliases(self) -> list[str] | list:
-        """
-        Public. Returns the aliases of the command
-        :return: the aliases of the command as list[str] | list
-        """
-        return self._aliases
+        self.registered_flags: Flags = flags if isinstance(flags, Flags) else Flags([flags])
+        self.trigger: str = trigger
+        self.description: str = description if description else "Command without description"
+        self.aliases: list[str] = aliases if aliases else []
 
     def validate_input_flag(
         self, flag: InputFlag
-    ) -> Literal["Undefined", "Valid", "Invalid"]:
+    ) -> ValidationStatus:
         """
         Private. Validates the input flag
         :param flag: input flag for validation
         :return: is input flag valid as bool
         """
-        registered_flags: Flags | None = self.get_registered_flags()
-        if registered_flags:
-            if isinstance(registered_flags, Flag):
-                if registered_flags.get_string_entity() == flag.get_string_entity():
-                    is_valid = registered_flags.validate_input_flag_value(
-                        flag.get_value()
-                    )
-                    if is_valid:
-                        return "Valid"
-                    else:
-                        return "Invalid"
+        registered_flags: Flags = self.registered_flags
+        for registered_flag in registered_flags:
+            if registered_flag.string_entity == flag.string_entity:
+                is_valid = registered_flag.validate_input_flag_value(flag.input_value)
+                if is_valid:
+                    return ValidationStatus.VALID
                 else:
-                    return "Undefined"
-            else:
-                for registered_flag in registered_flags:
-                    if registered_flag.get_string_entity() == flag.get_string_entity():
-                        is_valid = registered_flag.validate_input_flag_value(
-                            flag.get_value()
-                        )
-
-                        if is_valid:
-                            return "Valid"
-                        else:
-                            return "Invalid"
-                return "Undefined"
-        return "Undefined"
-
-    def get_description(self) -> str:
-        """
-        Private. Returns the description of the command
-        :return: the description of the command as str
-        """
-        return self._description
+                    return ValidationStatus.INVALID
+        return ValidationStatus.UNDEFINED
 
 
-class InputCommand(BaseCommand):
-    def __init__(self, trigger: str, input_flags: InputFlag | InputFlags | None = None):
+class InputCommand:
+    def __init__(self, trigger: str, *, 
+                 input_flags: InputFlag | InputFlags = DEFAULT_WITHOUT_INPUT_FLAGS):
         """
         Private. The model of the input command, after parsing
         :param trigger:the trigger of the command
         :param input_flags: the input flags
         :return: None
         """
-        super().__init__(trigger)
-        self._input_flags: InputFlags = (
-            input_flags
-            if isinstance(input_flags, InputFlags)
-            else InputFlags(input_flags)
-            if isinstance(input_flags, InputFlag)
-            else InputFlags()
-        )
-
-    def _set_input_flags(self, input_flags: InputFlags) -> None:
-        """
-        Private. Sets the input flags
-        :param input_flags: the input flags to set
-        :return: None
-        """
-        self._input_flags = input_flags
-
-    def get_input_flags(self) -> InputFlags:
-        """
-        Private. Returns the input flags
-        :return: the input flags as InputFlags
-        """
-        return self._input_flags
+        self.trigger: str = trigger
+        self.input_flags: InputFlags = input_flags if isinstance(input_flags, InputFlags) else InputFlags([input_flags])
 
-    @staticmethod
-    def parse(raw_command: str) -> "InputCommand":
+    @classmethod
+    def parse(cls, raw_command: str) -> Self:
         """
         Private. Parse the raw input command
         :param raw_command: raw input command
         :return: model of the input command, after parsing as InputCommand
         """
-        if not raw_command:
-            raise EmptyInputCommandException()
+        trigger, input_flags = CommandParser(raw_command).parse_raw_command()
 
-        list_of_tokens = raw_command.split()
-        command = list_of_tokens.pop(0)
-
-        input_flags: InputFlags = InputFlags()
-        current_flag_name, current_flag_value = None, None
-
-        for k, _ in enumerate(list_of_tokens):
-            if _.startswith("-"):
-                if len(_) < 2 or len(_[: _.rfind("-")]) > 3:
-                    raise UnprocessedInputFlagException()
-                current_flag_name = _
-            else:
-                if not current_flag_name or current_flag_value:
-                    raise UnprocessedInputFlagException()
-                current_flag_value = _
-
-            if current_flag_name:
-                if not len(list_of_tokens) == k + 1:
-                    if not list_of_tokens[k + 1].startswith("-"):
-                        continue
-
-                input_flag = InputFlag(
-                    name=current_flag_name[current_flag_name.rfind("-") + 1 :],
-                    prefix=cast(
-                        Literal["-", "--", "---"],
-                        current_flag_name[: current_flag_name.rfind("-") + 1],
-                    ),
-                    value=current_flag_value,
-                )
-
-                all_flags = [
-                    flag.get_string_entity() for flag in input_flags.get_flags()
-                ]
-                if input_flag.get_string_entity() not in all_flags:
-                    input_flags.add_flag(input_flag)
-                else:
-                    raise RepeatedInputFlagsException(input_flag)
+        return cls(trigger=trigger, input_flags=input_flags)
+        
+
+class CommandParser:
+    def __init__(self, raw_command: str) -> None:
+        self.raw_command: str = raw_command
+        self._parsed_input_flags: InputFlags = InputFlags()
+
+    def parse_raw_command(self) -> ParseResult:
+        if not self.raw_command:
+            raise EmptyInputCommandException()
 
-                current_flag_name, current_flag_value = None, None
+        input_flags, crnt_flag_name, crnt_flag_val = self._parse_flags(self.raw_command.split()[1:])
 
-        if any([current_flag_name, current_flag_value]):
+        if any([crnt_flag_name, crnt_flag_val]):
             raise UnprocessedInputFlagException()
         else:
-            return InputCommand(trigger=command, input_flags=input_flags)
+            return (self.raw_command.split()[0], input_flags)
+
+    def _parse_flags(self, _tokens: list[str] | list[Never]) -> ParseFlagsResult:
+        crnt_flg_name, crnt_flg_val = None, None
+        for index, token in enumerate(_tokens):
+            crnt_flg_name, crnt_flg_val = _parse_single_token(token, crnt_flg_name, crnt_flg_val)
+
+            if not crnt_flg_name or self._is_next_token_value(index, _tokens):
+                continue
+
+            input_flag = InputFlag(
+                name=crnt_flg_name[crnt_flg_name.rfind(MIN_FLAG_PREFIX) + 1:],
+                prefix=cast(
+                    Literal["-", "--", "---"],
+                    crnt_flg_name[:crnt_flg_name.rfind(MIN_FLAG_PREFIX) + 1],
+                ),
+                input_value=crnt_flg_val,
+                status=None
+            )
+            
+            if input_flag in self._parsed_input_flags:
+                raise RepeatedInputFlagsException(input_flag)
+            
+            self._parsed_input_flags.add_flag(input_flag)
+            crnt_flg_name, crnt_flg_val = None, None
+
+        return (self._parsed_input_flags, crnt_flg_name, crnt_flg_val)
+    
+    def _is_next_token_value(self, current_index: int,
+                                   _tokens: list[str] | list[Never]) -> bool:
+        next_index = current_index + 1
+        if next_index >= len(_tokens):
+            return False  
+        
+        next_token = _tokens[next_index]
+        return not next_token.startswith(MIN_FLAG_PREFIX)
+    
+def _parse_single_token(
+    token: str,
+    crnt_flag_name: str | None,
+    crnt_flag_val: str | None
+) -> tuple[str | None, str | None]:
+    if not token.startswith(MIN_FLAG_PREFIX):
+        if not crnt_flag_name or crnt_flag_val:
+            raise UnprocessedInputFlagException
+        return crnt_flag_name, token
+
+    prefix = token[:token.rfind(MIN_FLAG_PREFIX)]
+    if len(token) < 2 or len(prefix) > 2:
+        raise UnprocessedInputFlagException
+
+    new_flag_name = token
+    new_flag_value = None
+
+    return new_flag_name, new_flag_value

argenta/di/__init__.py

@@ -0,0 +1,2 @@
+from argenta.di.integration import inject as inject
+from argenta.di.integration import FromDishka as FromDishka

argenta/di/integration.py

@@ -0,0 +1,45 @@
+__all__ = ["inject", "setup_dishka", "FromDishka"]
+
+from typing import Any, Callable, TypeVar
+
+from dishka import Container, FromDishka
+from dishka.integrations.base import wrap_injection, is_dishka_injected
+
+from argenta.response import Response
+from argenta.app import App
+
+
+T = TypeVar("T")
+
+
+def inject(func: Callable[..., T]) -> Callable[..., T]:
+    return wrap_injection(
+        func=func,
+        is_async=False,
+        container_getter=_get_container_from_response,
+    )
+
+
+def setup_dishka(app: App, *, auto_inject: bool = False) -> None:
+    if auto_inject:
+        _auto_inject_handlers(app)
+
+
+def _get_container_from_response(
+    args: tuple[Any, ...], kwargs: dict[str, Any]
+) -> Container:
+    for arg in args:
+        if isinstance(arg, Response):
+            if hasattr(arg, "_dishka_container"):
+                return arg._dishka_container  # pyright: ignore[reportPrivateUsage]
+            break
+
+    raise RuntimeError("dishka container not found in Response")
+
+
+def _auto_inject_handlers(app: App) -> None:
+    for router in app.registered_routers:
+        for command_handler in router.command_handlers:
+            if not is_dishka_injected(command_handler.handler_as_func):
+                injected_handler = inject(command_handler.handler_as_func)
+                command_handler.handler_as_func = injected_handler

argenta/di/providers.py

@@ -0,0 +1,14 @@
+from argenta.orchestrator.argparser import ArgParser
+from dishka import Provider, provide, Scope
+
+from argenta.orchestrator.argparser.entity import ArgSpace
+
+
+class SystemProvider(Provider):
+    def __init__(self, arg_parser: ArgParser):
+        super().__init__()
+        self._arg_parser: ArgParser = arg_parser
+
+    @provide(scope=Scope.APP)
+    def get_argspace(self) -> ArgSpace:
+        return self._arg_parser.parse_args()

argenta/metrics/main.py

@@ -2,7 +2,7 @@ import io
 from contextlib import redirect_stdout
 from time import time
 
-from argenta.app import App
+from argenta import App
 
 
 def get_time_of_pre_cycle_setup(app: App) -> float:
@@ -13,6 +13,6 @@ def get_time_of_pre_cycle_setup(app: App) -> float:
     """
     start = time()
     with redirect_stdout(io.StringIO()):
-        app.pre_cycle_setup()
+        app._pre_cycle_setup() # pyright: ignore[reportPrivateUsage]
     end = time()
     return end - start

argenta/orchestrator/__init__.py

@@ -1,4 +1,4 @@
-__all__ = ["Orchestrator"]
-
+__all__ = ["ArgParser", "Orchestrator"]
 
+from argenta.orchestrator.argparser.entity import ArgParser
 from argenta.orchestrator.entity import Orchestrator

argenta/orchestrator/argparser/__init__.py

@@ -1,4 +1,9 @@
-__all__ = ["ArgParser"]
+__all__ = [
+    "ArgParser",
+    "BooleanArgument",
+    "ValueArgument"
+]
 
 
 from argenta.orchestrator.argparser.entity import ArgParser
+from argenta.orchestrator.argparser.arguments import BooleanArgument, ValueArgument

argenta/orchestrator/argparser/arguments/__init__.py

@@ -1,8 +1,8 @@
-__all__ = ["BooleanArgument", "PositionalArgument", "OptionalArgument"]
+__all__ = ["BooleanArgument", "ValueArgument", "InputArgument"]
 
 
 from argenta.orchestrator.argparser.arguments.models import (
     BooleanArgument,
-    PositionalArgument,
-    OptionalArgument,
+    ValueArgument,
+    InputArgument
 )

argenta/orchestrator/argparser/arguments/models.py

@@ -1,56 +1,82 @@
-from abc import ABC, abstractmethod
 from typing import Literal
 
 
-class BaseArgument(ABC):
+class BaseArgument:
     """
     Private. Base class for all arguments
     """
-
-    @abstractmethod
-    def get_string_entity(self) -> str:
-        """
-        Public. Returns the string representation of the argument
-        :return: the string representation as a str
+    def __init__(self, name: str, *,
+                       help: str,
+                       is_deprecated: bool,
+                       prefix: Literal["-", "--", "---"]):
         """
-        pass
-
-
-class PositionalArgument(BaseArgument):
-    def __init__(self, name: str):
-        """
-        Public. Required argument at startup
-        :param name: name of the argument, must not start with minus (-)
+        Public. Boolean argument, does not require a value
+        :param name: name of the argument
+        :param help: help message for the argument
+        :param is_required: whether the argument is required
+        :param is_deprecated: whether the argument is deprecated
         """
-        self.name = name
-
-    def get_string_entity(self):
-        return self.name
+        self.name: str = name
+        self.help: str = help
+        self.is_deprecated: bool = is_deprecated
+        self.prefix: Literal["-", "--", "---"] = prefix
+        
+    @property
+    def string_entity(self) -> str:
+        return self.prefix + self.name
 
 
-class OptionalArgument(BaseArgument):
-    def __init__(self, name: str, prefix: Literal["-", "--", "---"] = "--"):
+class ValueArgument(BaseArgument):
+    def __init__(self, name: str, *,
+                prefix: Literal["-", "--", "---"] = "--",
+                help: str = "Help message for the value argument", 
+                possible_values: list[str] | None = None,
+                default: str | None = None,
+                is_required: bool = False,
+                is_deprecated: bool = False):
         """
-        Public. Optional argument, must have the value
+        Public. Value argument, must have the value
         :param name: name of the argument
-        :param prefix: prefix of the argument
+        :param prefix: prefix for the argument
+        :param help: help message for the argument
+        :param possible_values: list of possible values for the argument
+        :param default: default value for the argument
+        :param is_required: whether the argument is required
+        :param is_deprecated: whether the argument is deprecated
         """
-        self.name = name
-        self.prefix = prefix
-
-    def get_string_entity(self):
-        return self.prefix + self.name
+        self.default: str | None = default
+        self.possible_values: list[str] | None = possible_values
+        self.is_required: bool = is_required
+        self.action: str = "store"
+        super().__init__(name, prefix=prefix, help=help, is_deprecated=is_deprecated)
 
 
 class BooleanArgument(BaseArgument):
-    def __init__(self, name: str, prefix: Literal["-", "--", "---"] = "--"):
+    def __init__(self, name: str, *,
+                prefix: Literal["-", "--", "---"] = "--",
+                help: str = "Help message for the boolean argument",
+                is_deprecated: bool = False):
         """
         Public. Boolean argument, does not require a value
         :param name: name of the argument
-        :param prefix: prefix of the argument
+        :param help: help message for the argument
+        :param is_required: whether the argument is required
+        :param is_deprecated: whether the argument is deprecated
         """
-        self.name = name
-        self.prefix = prefix
+        self.action: str = "store_true"
+        super().__init__(name, prefix=prefix, help=help, is_deprecated=is_deprecated)
 
-    def get_string_entity(self):
-        return self.prefix + self.name
+
+class InputArgument:
+    def __init__(self, name: str,
+                       value: str | None,
+                       founder_class: type[BaseArgument]) -> None:
+        self.name: str = name
+        self.value: str | None = value
+        self.founder_class: type[BaseArgument] = founder_class
+    
+    def __str__(self) -> str:
+        return f"InputArgument({self.name}={self.value})"
+       
+    def __repr__(self) -> str:
+        return f"InputArgument<name={self.name}, value={self.value}, founder_class={self.founder_class.__name__}>"

argenta/orchestrator/argparser/entity.py

@@ -1,16 +1,44 @@
-from argparse import ArgumentParser
+from argparse import ArgumentParser, Namespace
+from typing import Never, Self
 
 from argenta.orchestrator.argparser.arguments.models import (
+    BaseArgument,
     BooleanArgument,
-    OptionalArgument,
-    PositionalArgument,
+    InputArgument,
+    ValueArgument
 )
 
+        
+class ArgSpace:
+    def __init__(self, all_arguments: list[InputArgument]) -> None:
+        self.all_arguments = all_arguments
+    
+    @classmethod
+    def from_namespace(cls, namespace: Namespace, 
+                            processed_args: list[ValueArgument | BooleanArgument]) -> Self:
+        name_type_paired_args: dict[str, type[BaseArgument]] = {
+            arg.name: type(arg)
+            for arg in processed_args   
+        }
+        return cls([InputArgument(name=name, 
+                                  value=value, 
+                                  founder_class=name_type_paired_args[name]) 
+                    for name, value in vars(namespace).items()])
+        
+    def get_by_name(self, name: str) -> InputArgument | None:
+        for arg in self.all_arguments:
+            if arg.name == name:
+                return arg
+        return None
+        
+    def get_by_type(self, arg_type: type[BaseArgument]) -> list[InputArgument] | list[Never]:
+        return [arg for arg in self.all_arguments if arg.founder_class is arg_type]
+        
 
 class ArgParser:
     def __init__(
         self,
-        processed_args: list[PositionalArgument | OptionalArgument | BooleanArgument],
+        processed_args: list[ValueArgument | BooleanArgument], *,
         name: str = "Argenta",
         description: str = "Argenta available arguments",
         epilog: str = "github.com/koloideal/Argenta | made by kolo",
@@ -22,38 +50,29 @@ class ArgParser:
         :param epilog: the epilog of the ArgParse instance
         :param processed_args: registered and processed arguments
         """
-        self.name = name
-        self.description = description
-        self.epilog = epilog
+        self.name: str = name
+        self.description: str = description
+        self.epilog: str = epilog
+        self.processed_args: list[ValueArgument | BooleanArgument] = processed_args
 
-        self.entity: ArgumentParser = ArgumentParser(
-            prog=name, description=description, epilog=epilog
-        )
-        self.args: (
-            list[PositionalArgument | OptionalArgument | BooleanArgument] | None
-        ) = processed_args
+        self._core: ArgumentParser = ArgumentParser(prog=name, description=description, epilog=epilog)
+        
+        for arg in processed_args:
+            if isinstance(arg, BooleanArgument):
+                _ = self._core.add_argument(arg.string_entity,    
+                                            action=arg.action,
+                                            help=arg.help,
+                                            deprecated=arg.is_deprecated)
+            else:
+                _ = self._core.add_argument(arg.string_entity,    
+                                            action=arg.action,
+                                            help=arg.help,
+                                            default=arg.default,
+                                            choices=arg.possible_values,
+                                            required=arg.is_required,
+                                            deprecated=arg.is_deprecated)
 
-    def set_args(
-        self, *args: PositionalArgument | OptionalArgument | BooleanArgument
-    ) -> None:
-        """
-        Public. Sets the arguments to be processed
-        :param args: processed arguments
-        :return: None
-        """
-        self.args.extend(args)
-
-    def register_args(self) -> None:
-        """
-        Private. Registers initialized command line arguments
-        :return: None
-        """
-        if not self.args:
-            return
-        for arg in self.args:
-            if type(arg) is PositionalArgument:
-                self.entity.add_argument(arg.get_string_entity())
-            elif type(arg) is OptionalArgument:
-                self.entity.add_argument(arg.get_string_entity())
-            elif type(arg) is BooleanArgument:
-                self.entity.add_argument(arg.get_string_entity(), action="store_true")
+    def parse_args(self) -> ArgSpace:
+        return ArgSpace.from_namespace(namespace=self._core.parse_args(),
+                                       processed_args=self.processed_args)
+