fix public api

src/argenta/__init__.py

@@ -1,6 +1,3 @@
-__all__ = ["App", "Orchestrator", "Router"]
+from argenta.orchestrator.entity import Orchestrator as Orchestrator
-
+from argenta.app.models import App as App
-
+from argenta.router.entity import Router as Router
-from argenta.orchestrator.entity import Orchestrator
-from argenta.app.models import App
-from argenta.router.entity import Router

src/argenta/app/__init__.py

@@ -1,12 +1,4 @@
-__all__ = [
+from argenta.app.models import App as App
-    "App",
+from argenta.app.defaults import PredefinedMessages as PredefinedMessages
-    "PredefinedMessages",
+from argenta.app.dividing_line.models import DynamicDividingLine as DynamicDividingLine, StaticDividingLine as StaticDividingLine
-    "DynamicDividingLine",
+from argenta.app.autocompleter.entity import AutoCompleter as AutoCompleter
-    "StaticDividingLine",
-    "AutoCompleter"
-]
-
-from argenta.app.models import App
-from argenta.app.defaults import PredefinedMessages
-from argenta.app.dividing_line.models import DynamicDividingLine, StaticDividingLine
-from argenta.app.autocompleter.entity import AutoCompleter

src/argenta/app/autocompleter/__init__.py

@@ -1,4 +1 @@
-__all__ = ["AutoCompleter"]
+from argenta.app.autocompleter.entity import AutoCompleter as AutoCompleter
-
-
-from argenta.app.autocompleter.entity import AutoCompleter

src/argenta/app/autocompleter/entity.py

@@ -1,3 +1,5 @@
+__all__ = ["AutoCompleter"]
+
 import os
 import readline
 from typing import Never

src/argenta/app/defaults.py

@@ -1,3 +1,5 @@
+__all__ = ["PredefinedMessages"]
+
 from enum import StrEnum
 
 

src/argenta/app/dividing_line/__init__.py

@@ -1,4 +1 @@
-__all__ = ["StaticDividingLine", "DynamicDividingLine"]
+from argenta.app.dividing_line.models import StaticDividingLine as StaticDividingLine, DynamicDividingLine as DynamicDividingLine
-
-
-from argenta.app.dividing_line.models import StaticDividingLine, DynamicDividingLine

src/argenta/app/dividing_line/models.py

@@ -1,3 +1,5 @@
+__all__ = ["StaticDividingLine", "DynamicDividingLine"]
+
 from abc import ABC
 
 

src/argenta/app/models.py

@@ -1,3 +1,5 @@
+__all__ = ["App"]
+
 import io
 import re
 from contextlib import redirect_stdout

src/argenta/app/protocols.py

@@ -1,3 +1,5 @@
+__all__ = ["NonStandardBehaviorHandler", "EmptyCommandHandler", "Printer", "DescriptionMessageGenerator"]
+
 from typing import Protocol, TypeVar
 
 T = TypeVar('T', contravariant=True) # noqa: WPS111

src/argenta/app/registered_routers/entity.py

@@ -1,3 +1,5 @@
+__all__ = ["RegisteredRouters"]
+
 from typing import Iterator, Optional
 
 from argenta.router import Router

src/argenta/command/__init__.py

@@ -1,12 +1,5 @@
-__all__ = [
+from argenta.command.models import Command as Command, InputCommand as InputCommand
-    "Command",
+from argenta.command.flag.defaults import PredefinedFlags as PredefinedFlags
-    "PossibleValues",
+from argenta.command.flag import (Flag as Flag,
-    "PredefinedFlags",
+								  Flags as Flags,
-    "InputCommand",
+								  PossibleValues as PossibleValues)
-    "Flags",
-    "Flag"
-]
-
-from argenta.command.models import Command, InputCommand
-from argenta.command.flag import defaults as PredefinedFlags
-from argenta.command.flag import (Flag, Flags, PossibleValues)

src/argenta/command/exceptions.py

@@ -1,3 +1,10 @@
+__all__ = [
+	"InputCommandException",
+	"UnprocessedInputFlagException",
+	"RepeatedInputFlagsException",
+	"EmptyInputCommandException",
+]
+
 from argenta.command.flag.models import Flag, InputFlag
 from abc import ABC, abstractmethod
 from typing import override

src/argenta/command/flag/__init__.py

@@ -1,11 +1,7 @@
-__all__ = [
+from argenta.command.flag.models import (
-    "Flag",
+    Flag as Flag,
-    "InputFlag",
+    InputFlag as InputFlag,
-    "Flags", 
+    PossibleValues as PossibleValues,
-    "PossibleValues",
+    ValidationStatus as ValidationStatus
-    "ValidationStatus"
+)
-]
+from argenta.command.flag.flags.models import Flags as Flags
-
-
-from argenta.command.flag.models import Flag, InputFlag, PossibleValues, ValidationStatus
-from argenta.command.flag.flags.models import Flags

src/argenta/command/flag/defaults.py

@@ -1,3 +1,5 @@
+__all__ = ["PredefinedFlags"]
+
 from typing import Literal
 from argenta.command.flag.models import Flag, PossibleValues
 import re
@@ -5,6 +7,8 @@ import re
 
 DEFAULT_PREFIX: Literal["-", "--", "---"] = "-"
 
+
+class PredefinedFlags:
 	HELP = Flag(name="help", possible_values=PossibleValues.NEITHER)
 	SHORT_HELP = Flag(name="H", prefix=DEFAULT_PREFIX, possible_values=PossibleValues.NEITHER)
 

src/argenta/command/flag/flags/__init__.py

@@ -1,10 +1,4 @@
-__all__ = [
-    "Flags",
-    "InputFlags"
-]
-
-
 from argenta.command.flag.flags.models import (
-    Flags,
+    Flags as Flags,
-    InputFlags
+    InputFlags as InputFlags
 )

src/argenta/command/flag/flags/models.py

@@ -1,3 +1,5 @@
+__all__ = ["Flags", "InputFlags"]
+
 from argenta.command.flag.models import InputFlag, Flag
 from typing import Generic, TypeVar, override
 from collections.abc import Iterator
@@ -103,4 +105,3 @@ class InputFlags(BaseFlags[InputFlag]):
             return False
         else:
             raise TypeError
-

src/argenta/command/flag/models.py

@@ -1,3 +1,5 @@
+__all__ = ["PossibleValues", "ValidationStatus", "Flag", "InputFlag"]
+
 from enum import Enum
 from re import Pattern
 from typing import Literal, override

src/argenta/command/models.py

@@ -1,3 +1,8 @@
+__all__ = [
+    "Command",
+    "InputCommand"
+]
+
 from argenta.command.flag.models import Flag, InputFlag, ValidationStatus
 from argenta.command.flag.flags.models import InputFlags, Flags
 from argenta.command.exceptions import (

src/argenta/di/integration.py

@@ -20,9 +20,10 @@ def inject(func: Callable[..., T]) -> Callable[..., T]:
     )
 
 
-def setup_dishka(app: App, *, auto_inject: bool = False) -> None:
+def setup_dishka(app: App, container: Container, *, auto_inject: bool = False) -> None:
     if auto_inject:
         _auto_inject_handlers(app)
+    Response.patch_by_container(container)
 
 
 def _get_container_from_response(
@@ -33,7 +34,6 @@ def _get_container_from_response(
             if hasattr(arg, "_dishka_container"):
                 return arg._dishka_container  # pyright: ignore[reportPrivateUsage]
             break
-
     raise RuntimeError("dishka container not found in Response")
 
 

src/argenta/di/providers.py

@@ -1,3 +1,7 @@
+__all__ = [
+    'SystemProvider',
+]
+
 from argenta.orchestrator.argparser import ArgParser
 from dishka import Provider, provide, Scope
 

src/argenta/metrics/__init__.py

@@ -1,4 +1 @@
-__all__ = ["get_time_of_pre_cycle_setup"]
+from argenta.metrics.main import get_time_of_pre_cycle_setup as get_time_of_pre_cycle_setup
-
-
-from argenta.metrics.main import get_time_of_pre_cycle_setup

src/argenta/metrics/main.py

@@ -1,3 +1,7 @@
+__all__ = [
+    'get_time_of_pre_cycle_setup',
+]
+
 import io
 from contextlib import redirect_stdout
 from time import time

src/argenta/orchestrator/__init__.py

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

src/argenta/orchestrator/argparser/__init__.py

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

src/argenta/orchestrator/argparser/arguments/__init__.py

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

src/argenta/orchestrator/argparser/arguments/models.py

@@ -1,3 +1,9 @@
+__all__ = [
+    'BooleanArgument',
+    'ValueArgument',
+    'InputArgument'
+]
+
 from typing import Literal
 
 

src/argenta/orchestrator/argparser/entity.py

@@ -1,3 +1,8 @@
+__all__ = [
+    "ArgSpace",
+    "ArgParser",
+]
+
 from argparse import ArgumentParser, Namespace
 from typing import Never, Self
 
@@ -75,4 +80,3 @@ class ArgParser:
     def parse_args(self) -> ArgSpace:
         return ArgSpace.from_namespace(namespace=self._core.parse_args(),
                                        processed_args=self.processed_args)
-        

src/argenta/orchestrator/entity.py

@@ -1,5 +1,6 @@
+__all__ = ["Orchestrator"]
+
 from argenta.app import App
-from argenta.response import Response
 
 from argenta.orchestrator.argparser import ArgParser
 from argenta.di.integration import setup_dishka
@@ -31,7 +32,6 @@ class Orchestrator:
         :return: None
         """
         container = make_container(SystemProvider(self._arg_parser), *self._custom_providers)
-        Response.patch_by_container(container)
+        setup_dishka(app, container, auto_inject=self._auto_inject_handlers)
-        setup_dishka(app, auto_inject=self._auto_inject_handlers)
 
         app.run_polling()

src/argenta/response/__init__.py

@@ -1,5 +1,2 @@
-__all__ = ["Response", "ResponseStatus"]
+from argenta.response.entity import Response as Response
-
+from argenta.response.status import ResponseStatus as ResponseStatus
-
-from argenta.response.entity import Response
-from argenta.response.status import ResponseStatus

src/argenta/response/entity.py

@@ -1,3 +1,5 @@
+__all__ = ["Response"]
+
 from dishka import Container
 
 from argenta.command.flag.flags.models import InputFlags

src/argenta/response/status.py

@@ -1,3 +1,5 @@
+__all__ = ["ResponseStatus"]
+
 from enum import Enum
 
 

src/argenta/router/__init__.py

@@ -1,4 +1 @@
-from argenta.router.entity import Router
+from argenta.router.entity import Router as Router
-
-
-__all__ = ["Router"]

src/argenta/router/command_handler/entity.py

@@ -1,3 +1,5 @@
+__all__ = ["CommandHandler", "CommandHandlers"]
+
 from collections.abc import Iterator
 from typing import Callable
 

src/argenta/router/defaults.py

@@ -1,3 +1,5 @@
+__all__ = ["system_router"]
+
 from argenta.router import Router
 
 

src/argenta/router/entity.py

@@ -1,3 +1,5 @@
+__all__ = ["Router"]
+
 from typing import Callable, TypeAlias
 from inspect import getfullargspec, get_annotations, getsourcefile, getsourcelines
 from rich.console import Console

src/argenta/router/exceptions.py

@@ -1,3 +1,5 @@
+__all__ = ["RepeatedFlagNameException", "RequiredArgumentNotPassedException", "TriggerContainSpacesException"]
+
 from typing import override