imports sort

This commit is contained in:
2025-10-13 14:28:11 +03:00
parent 36b4d16610
commit a5e72161ef
23 changed files with 79 additions and 81 deletions
+1
View File
@@ -35,6 +35,7 @@ build-backend = "hatchling.build"
[dependency-groups] [dependency-groups]
dev = [ dev = [
"isort>=7.0.0",
"mypy>=1.14.1", "mypy>=1.14.1",
"pytest>=8.3.2", "pytest>=8.3.2",
"ruff>=0.12.12", "ruff>=0.12.12",
+1 -1
View File
@@ -1,3 +1,3 @@
from argenta.orchestrator.entity import Orchestrator as Orchestrator
from argenta.app.models import App as App from argenta.app.models import App as App
from argenta.orchestrator.entity import Orchestrator as Orchestrator
from argenta.router.entity import Router as Router from argenta.router.entity import Router as Router
+6 -3
View File
@@ -1,4 +1,7 @@
from argenta.app.models import App as App
from argenta.app.defaults import PredefinedMessages as PredefinedMessages
from argenta.app.dividing_line.models import DynamicDividingLine as DynamicDividingLine, StaticDividingLine as StaticDividingLine
from argenta.app.autocompleter.entity import AutoCompleter as AutoCompleter from argenta.app.autocompleter.entity import AutoCompleter as AutoCompleter
from argenta.app.defaults import PredefinedMessages as PredefinedMessages
from argenta.app.dividing_line.models import \
DynamicDividingLine as DynamicDividingLine
from argenta.app.dividing_line.models import \
StaticDividingLine as StaticDividingLine
from argenta.app.models import App as App
+4 -1
View File
@@ -1 +1,4 @@
from argenta.app.dividing_line.models import StaticDividingLine as StaticDividingLine, DynamicDividingLine as DynamicDividingLine from argenta.app.dividing_line.models import \
DynamicDividingLine as DynamicDividingLine
from argenta.app.dividing_line.models import \
StaticDividingLine as StaticDividingLine
+11 -14
View File
@@ -5,25 +5,22 @@ import re
from contextlib import redirect_stdout from contextlib import redirect_stdout
from typing import Never, TypeAlias from typing import Never, TypeAlias
from art import text2art # pyright: ignore[reportMissingTypeStubs, reportUnknownVariableType] from art import \
text2art # pyright: ignore[reportMissingTypeStubs, reportUnknownVariableType]
from rich.console import Console from rich.console import Console
from rich.markup import escape from rich.markup import escape
from argenta.app.autocompleter import AutoCompleter from argenta.app.autocompleter import AutoCompleter
from argenta.app.dividing_line.models import DynamicDividingLine, StaticDividingLine from argenta.app.dividing_line.models import (DynamicDividingLine,
from argenta.app.protocols import ( StaticDividingLine)
DescriptionMessageGenerator, from argenta.app.protocols import (DescriptionMessageGenerator,
EmptyCommandHandler, EmptyCommandHandler,
NonStandardBehaviorHandler, NonStandardBehaviorHandler, Printer)
Printer,
)
from argenta.app.registered_routers.entity import RegisteredRouters from argenta.app.registered_routers.entity import RegisteredRouters
from argenta.command.exceptions import ( from argenta.command.exceptions import (EmptyInputCommandException,
EmptyInputCommandException, InputCommandException,
InputCommandException, RepeatedInputFlagsException,
RepeatedInputFlagsException, UnprocessedInputFlagException)
UnprocessedInputFlagException,
)
from argenta.command.models import Command, InputCommand from argenta.command.models import Command, InputCommand
from argenta.response import Response from argenta.response import Response
from argenta.router import Router from argenta.router import Router
+5 -4
View File
@@ -1,5 +1,6 @@
from argenta.command.models import Command as Command, InputCommand as InputCommand from argenta.command.flag import Flag as Flag
from argenta.command.flag import Flags as Flags
from argenta.command.flag import PossibleValues as PossibleValues
from argenta.command.flag.defaults import PredefinedFlags as PredefinedFlags from argenta.command.flag.defaults import PredefinedFlags as PredefinedFlags
from argenta.command.flag import (Flag as Flag, from argenta.command.models import Command as Command
Flags as Flags, from argenta.command.models import InputCommand as InputCommand
PossibleValues as PossibleValues)
+2 -1
View File
@@ -5,10 +5,11 @@ __all__ = [
"EmptyInputCommandException", "EmptyInputCommandException",
] ]
from argenta.command.flag.models import Flag, InputFlag
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from typing import override from typing import override
from argenta.command.flag.models import Flag, InputFlag
class InputCommandException(ABC, Exception): class InputCommandException(ABC, Exception):
""" """
+4 -6
View File
@@ -1,7 +1,5 @@
from argenta.command.flag.models import (
Flag as Flag,
InputFlag as InputFlag,
PossibleValues as PossibleValues,
ValidationStatus as ValidationStatus
)
from argenta.command.flag.flags.models import Flags as Flags from argenta.command.flag.flags.models import Flags as Flags
from argenta.command.flag.models import Flag as Flag
from argenta.command.flag.models import InputFlag as InputFlag
from argenta.command.flag.models import PossibleValues as PossibleValues
from argenta.command.flag.models import ValidationStatus as ValidationStatus
+2 -2
View File
@@ -1,9 +1,9 @@
__all__ = ["PredefinedFlags"] __all__ = ["PredefinedFlags"]
from typing import Literal
from argenta.command.flag.models import Flag, PossibleValues
import re import re
from typing import Literal
from argenta.command.flag.models import Flag, PossibleValues
DEFAULT_PREFIX: Literal["-", "--", "---"] = "-" DEFAULT_PREFIX: Literal["-", "--", "---"] = "-"
+2 -4
View File
@@ -1,4 +1,2 @@
from argenta.command.flag.flags.models import ( from argenta.command.flag.flags.models import Flags as Flags
Flags as Flags, from argenta.command.flag.flags.models import InputFlags as InputFlags
InputFlags as InputFlags
)
+2 -2
View File
@@ -1,9 +1,9 @@
__all__ = ["Flags", "InputFlags"] __all__ = ["Flags", "InputFlags"]
from argenta.command.flag.models import InputFlag, Flag
from typing import Generic, TypeVar, override
from collections.abc import Iterator from collections.abc import Iterator
from typing import Generic, TypeVar, override
from argenta.command.flag.models import Flag, InputFlag
FlagType = TypeVar("FlagType") FlagType = TypeVar("FlagType")
+6 -8
View File
@@ -3,15 +3,13 @@ __all__ = [
"InputCommand" "InputCommand"
] ]
from argenta.command.flag.models import Flag, InputFlag, ValidationStatus from typing import Literal, Never, Self, cast
from argenta.command.flag.flags.models import InputFlags, Flags
from argenta.command.exceptions import (
UnprocessedInputFlagException,
RepeatedInputFlagsException,
EmptyInputCommandException,
)
from typing import Never, Self, cast, Literal
from argenta.command.exceptions import (EmptyInputCommandException,
RepeatedInputFlagsException,
UnprocessedInputFlagException)
from argenta.command.flag.flags.models import Flags, InputFlags
from argenta.command.flag.models import Flag, InputFlag, ValidationStatus
ParseFlagsResult = tuple[InputFlags, str | None, str | None] ParseFlagsResult = tuple[InputFlags, str | None, str | None]
ParseResult = tuple[str, InputFlags] ParseResult = tuple[str, InputFlags]
+1 -1
View File
@@ -1,2 +1,2 @@
from argenta.di.integration import inject as inject
from argenta.di.integration import FromDishka as FromDishka from argenta.di.integration import FromDishka as FromDishka
from argenta.di.integration import inject as inject
+2 -3
View File
@@ -3,11 +3,10 @@ __all__ = ["inject", "setup_dishka", "FromDishka"]
from typing import Any, Callable, TypeVar from typing import Any, Callable, TypeVar
from dishka import Container, FromDishka from dishka import Container, FromDishka
from dishka.integrations.base import wrap_injection, is_dishka_injected from dishka.integrations.base import is_dishka_injected, wrap_injection
from argenta.response import Response
from argenta.app import App from argenta.app import App
from argenta.response import Response
T = TypeVar("T") T = TypeVar("T")
+2 -2
View File
@@ -2,9 +2,9 @@ __all__ = [
'SystemProvider', 'SystemProvider',
] ]
from argenta.orchestrator.argparser import ArgParser from dishka import Provider, Scope, provide
from dishka import Provider, provide, Scope
from argenta.orchestrator.argparser import ArgParser
from argenta.orchestrator.argparser.entity import ArgSpace from argenta.orchestrator.argparser.entity import ArgSpace
+2 -1
View File
@@ -1 +1,2 @@
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 as get_time_of_pre_cycle_setup
@@ -1,2 +1,5 @@
from argenta.orchestrator.argparser.arguments import \
BooleanArgument as BooleanArgument
from argenta.orchestrator.argparser.arguments import \
ValueArgument as ValueArgument
from argenta.orchestrator.argparser.entity import ArgParser as ArgParser from argenta.orchestrator.argparser.entity import ArgParser as ArgParser
from argenta.orchestrator.argparser.arguments import BooleanArgument as BooleanArgument, ValueArgument as ValueArgument
@@ -1,5 +1,6 @@
from argenta.orchestrator.argparser.arguments.models import ( from argenta.orchestrator.argparser.arguments.models import \
BooleanArgument as BooleanArgument, BooleanArgument as BooleanArgument
ValueArgument as ValueArgument, from argenta.orchestrator.argparser.arguments.models import \
InputArgument as InputArgument InputArgument as InputArgument
) from argenta.orchestrator.argparser.arguments.models import \
ValueArgument as ValueArgument
+4 -6
View File
@@ -6,12 +6,10 @@ __all__ = [
from argparse import ArgumentParser, Namespace from argparse import ArgumentParser, Namespace
from typing import Never, Self from typing import Never, Self
from argenta.orchestrator.argparser.arguments.models import ( from argenta.orchestrator.argparser.arguments.models import (BaseArgument,
BaseArgument, BooleanArgument,
BooleanArgument, InputArgument,
InputArgument, ValueArgument)
ValueArgument
)
class ArgSpace: class ArgSpace:
+4 -6
View File
@@ -1,13 +1,11 @@
__all__ = ["Orchestrator"] __all__ = ["Orchestrator"]
from argenta.app import App
from argenta.orchestrator.argparser import ArgParser
from argenta.di.integration import setup_dishka
from argenta.di.providers import SystemProvider
from dishka import Provider, make_container from dishka import Provider, make_container
from argenta.app import App
from argenta.di.integration import setup_dishka
from argenta.di.providers import SystemProvider
from argenta.orchestrator.argparser import ArgParser
DEFAULT_ARGPARSER: ArgParser = ArgParser(processed_args=[]) DEFAULT_ARGPARSER: ArgParser = ArgParser(processed_args=[])
-1
View File
@@ -5,7 +5,6 @@ from dishka import Container
from argenta.command.flag.flags.models import InputFlags from argenta.command.flag.flags.models import InputFlags
from argenta.response.status import ResponseStatus from argenta.response.status import ResponseStatus
EMPTY_INPUT_FLAGS: InputFlags = InputFlags() EMPTY_INPUT_FLAGS: InputFlags = InputFlags()
-1
View File
@@ -2,5 +2,4 @@ __all__ = ["system_router"]
from argenta.router import Router from argenta.router import Router
system_router = Router(title="System points:") system_router = Router(title="System points:")
+9 -9
View File
@@ -1,20 +1,20 @@
__all__ = ["Router"] __all__ = ["Router"]
from inspect import (get_annotations, getfullargspec, getsourcefile,
getsourcelines)
from typing import Callable, TypeAlias from typing import Callable, TypeAlias
from inspect import getfullargspec, get_annotations, getsourcefile, getsourcelines
from rich.console import Console from rich.console import Console
from argenta.command import Command, InputCommand from argenta.command import Command, InputCommand
from argenta.command.flag import ValidationStatus from argenta.command.flag import ValidationStatus
from argenta.response import Response, ResponseStatus
from argenta.router.command_handler.entity import CommandHandlers, CommandHandler
from argenta.command.flag.flags import Flags, InputFlags from argenta.command.flag.flags import Flags, InputFlags
from argenta.router.exceptions import ( from argenta.response import Response, ResponseStatus
RepeatedFlagNameException, from argenta.router.command_handler.entity import (CommandHandler,
RequiredArgumentNotPassedException, CommandHandlers)
TriggerContainSpacesException, from argenta.router.exceptions import (RepeatedFlagNameException,
) RequiredArgumentNotPassedException,
TriggerContainSpacesException)
HandlerFunc: TypeAlias = Callable[..., None] HandlerFunc: TypeAlias = Callable[..., None]