diff --git a/pyproject.toml b/pyproject.toml index 9fd14fa..2afea90 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -35,6 +35,7 @@ build-backend = "hatchling.build" [dependency-groups] dev = [ + "isort>=7.0.0", "mypy>=1.14.1", "pytest>=8.3.2", "ruff>=0.12.12", diff --git a/src/argenta/__init__.py b/src/argenta/__init__.py index ae4f3db..94239fd 100644 --- a/src/argenta/__init__.py +++ b/src/argenta/__init__.py @@ -1,3 +1,3 @@ -from argenta.orchestrator.entity import Orchestrator as Orchestrator from argenta.app.models import App as App +from argenta.orchestrator.entity import Orchestrator as Orchestrator from argenta.router.entity import Router as Router diff --git a/src/argenta/app/__init__.py b/src/argenta/app/__init__.py index d4a5d6a..c5d4e46 100644 --- a/src/argenta/app/__init__.py +++ b/src/argenta/app/__init__.py @@ -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.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 diff --git a/src/argenta/app/dividing_line/__init__.py b/src/argenta/app/dividing_line/__init__.py index efe2734..289c51c 100644 --- a/src/argenta/app/dividing_line/__init__.py +++ b/src/argenta/app/dividing_line/__init__.py @@ -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 diff --git a/src/argenta/app/models.py b/src/argenta/app/models.py index 86bebbc..c53aa80 100644 --- a/src/argenta/app/models.py +++ b/src/argenta/app/models.py @@ -5,25 +5,22 @@ import re from contextlib import redirect_stdout 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.markup import escape from argenta.app.autocompleter import AutoCompleter -from argenta.app.dividing_line.models import DynamicDividingLine, StaticDividingLine -from argenta.app.protocols import ( - DescriptionMessageGenerator, - EmptyCommandHandler, - NonStandardBehaviorHandler, - Printer, -) +from argenta.app.dividing_line.models import (DynamicDividingLine, + StaticDividingLine) +from argenta.app.protocols import (DescriptionMessageGenerator, + EmptyCommandHandler, + NonStandardBehaviorHandler, Printer) from argenta.app.registered_routers.entity import RegisteredRouters -from argenta.command.exceptions import ( - EmptyInputCommandException, - InputCommandException, - RepeatedInputFlagsException, - UnprocessedInputFlagException, -) +from argenta.command.exceptions import (EmptyInputCommandException, + InputCommandException, + RepeatedInputFlagsException, + UnprocessedInputFlagException) from argenta.command.models import Command, InputCommand from argenta.response import Response from argenta.router import Router diff --git a/src/argenta/command/__init__.py b/src/argenta/command/__init__.py index 3507d43..67ecd1b 100644 --- a/src/argenta/command/__init__.py +++ b/src/argenta/command/__init__.py @@ -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 import (Flag as Flag, - Flags as Flags, - PossibleValues as PossibleValues) +from argenta.command.models import Command as Command +from argenta.command.models import InputCommand as InputCommand diff --git a/src/argenta/command/exceptions.py b/src/argenta/command/exceptions.py index 159c5cc..60477d9 100644 --- a/src/argenta/command/exceptions.py +++ b/src/argenta/command/exceptions.py @@ -5,10 +5,11 @@ __all__ = [ "EmptyInputCommandException", ] -from argenta.command.flag.models import Flag, InputFlag from abc import ABC, abstractmethod from typing import override +from argenta.command.flag.models import Flag, InputFlag + class InputCommandException(ABC, Exception): """ diff --git a/src/argenta/command/flag/__init__.py b/src/argenta/command/flag/__init__.py index cdae7e6..31433e2 100644 --- a/src/argenta/command/flag/__init__.py +++ b/src/argenta/command/flag/__init__.py @@ -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.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 diff --git a/src/argenta/command/flag/defaults.py b/src/argenta/command/flag/defaults.py index 3c51bfc..5123741 100644 --- a/src/argenta/command/flag/defaults.py +++ b/src/argenta/command/flag/defaults.py @@ -1,9 +1,9 @@ __all__ = ["PredefinedFlags"] -from typing import Literal -from argenta.command.flag.models import Flag, PossibleValues import re +from typing import Literal +from argenta.command.flag.models import Flag, PossibleValues DEFAULT_PREFIX: Literal["-", "--", "---"] = "-" diff --git a/src/argenta/command/flag/flags/__init__.py b/src/argenta/command/flag/flags/__init__.py index 19593ba..a7d3a22 100644 --- a/src/argenta/command/flag/flags/__init__.py +++ b/src/argenta/command/flag/flags/__init__.py @@ -1,4 +1,2 @@ -from argenta.command.flag.flags.models import ( - Flags as Flags, - InputFlags as InputFlags -) +from argenta.command.flag.flags.models import Flags as Flags +from argenta.command.flag.flags.models import InputFlags as InputFlags diff --git a/src/argenta/command/flag/flags/models.py b/src/argenta/command/flag/flags/models.py index 132584a..6dd0206 100644 --- a/src/argenta/command/flag/flags/models.py +++ b/src/argenta/command/flag/flags/models.py @@ -1,9 +1,9 @@ __all__ = ["Flags", "InputFlags"] -from argenta.command.flag.models import InputFlag, Flag -from typing import Generic, TypeVar, override from collections.abc import Iterator +from typing import Generic, TypeVar, override +from argenta.command.flag.models import Flag, InputFlag FlagType = TypeVar("FlagType") diff --git a/src/argenta/command/models.py b/src/argenta/command/models.py index 1286d73..462192d 100644 --- a/src/argenta/command/models.py +++ b/src/argenta/command/models.py @@ -3,15 +3,13 @@ __all__ = [ "InputCommand" ] -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 Never, Self, cast, Literal +from typing import Literal, Never, Self, cast +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] ParseResult = tuple[str, InputFlags] diff --git a/src/argenta/di/__init__.py b/src/argenta/di/__init__.py index 04d5216..e7d5091 100644 --- a/src/argenta/di/__init__.py +++ b/src/argenta/di/__init__.py @@ -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 inject as inject diff --git a/src/argenta/di/integration.py b/src/argenta/di/integration.py index 3a38b47..da26b6c 100644 --- a/src/argenta/di/integration.py +++ b/src/argenta/di/integration.py @@ -3,11 +3,10 @@ __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 dishka.integrations.base import is_dishka_injected, wrap_injection -from argenta.response import Response from argenta.app import App - +from argenta.response import Response T = TypeVar("T") diff --git a/src/argenta/di/providers.py b/src/argenta/di/providers.py index 49b1c0c..baad0c4 100644 --- a/src/argenta/di/providers.py +++ b/src/argenta/di/providers.py @@ -2,9 +2,9 @@ __all__ = [ 'SystemProvider', ] -from argenta.orchestrator.argparser import ArgParser -from dishka import Provider, provide, Scope +from dishka import Provider, Scope, provide +from argenta.orchestrator.argparser import ArgParser from argenta.orchestrator.argparser.entity import ArgSpace diff --git a/src/argenta/metrics/__init__.py b/src/argenta/metrics/__init__.py index 9888ab8..e97a8ca 100644 --- a/src/argenta/metrics/__init__.py +++ b/src/argenta/metrics/__init__.py @@ -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 diff --git a/src/argenta/orchestrator/argparser/__init__.py b/src/argenta/orchestrator/argparser/__init__.py index 92db9bf..6cdfa27 100644 --- a/src/argenta/orchestrator/argparser/__init__.py +++ b/src/argenta/orchestrator/argparser/__init__.py @@ -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.arguments import BooleanArgument as BooleanArgument, ValueArgument as ValueArgument diff --git a/src/argenta/orchestrator/argparser/arguments/__init__.py b/src/argenta/orchestrator/argparser/arguments/__init__.py index 651bc58..b214840 100644 --- a/src/argenta/orchestrator/argparser/arguments/__init__.py +++ b/src/argenta/orchestrator/argparser/arguments/__init__.py @@ -1,5 +1,6 @@ -from argenta.orchestrator.argparser.arguments.models import ( - BooleanArgument as BooleanArgument, - ValueArgument as ValueArgument, +from argenta.orchestrator.argparser.arguments.models import \ + BooleanArgument as BooleanArgument +from argenta.orchestrator.argparser.arguments.models import \ InputArgument as InputArgument -) +from argenta.orchestrator.argparser.arguments.models import \ + ValueArgument as ValueArgument diff --git a/src/argenta/orchestrator/argparser/entity.py b/src/argenta/orchestrator/argparser/entity.py index a48f56d..2d4fb9c 100644 --- a/src/argenta/orchestrator/argparser/entity.py +++ b/src/argenta/orchestrator/argparser/entity.py @@ -6,12 +6,10 @@ __all__ = [ from argparse import ArgumentParser, Namespace from typing import Never, Self -from argenta.orchestrator.argparser.arguments.models import ( - BaseArgument, - BooleanArgument, - InputArgument, - ValueArgument -) +from argenta.orchestrator.argparser.arguments.models import (BaseArgument, + BooleanArgument, + InputArgument, + ValueArgument) class ArgSpace: diff --git a/src/argenta/orchestrator/entity.py b/src/argenta/orchestrator/entity.py index 7a1f739..7745ad9 100644 --- a/src/argenta/orchestrator/entity.py +++ b/src/argenta/orchestrator/entity.py @@ -1,13 +1,11 @@ __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 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=[]) diff --git a/src/argenta/response/entity.py b/src/argenta/response/entity.py index ec0dc41..516e80d 100644 --- a/src/argenta/response/entity.py +++ b/src/argenta/response/entity.py @@ -5,7 +5,6 @@ from dishka import Container from argenta.command.flag.flags.models import InputFlags from argenta.response.status import ResponseStatus - EMPTY_INPUT_FLAGS: InputFlags = InputFlags() diff --git a/src/argenta/router/defaults.py b/src/argenta/router/defaults.py index a47c108..b0b96aa 100644 --- a/src/argenta/router/defaults.py +++ b/src/argenta/router/defaults.py @@ -2,5 +2,4 @@ __all__ = ["system_router"] from argenta.router import Router - system_router = Router(title="System points:") diff --git a/src/argenta/router/entity.py b/src/argenta/router/entity.py index 93fb402..a18f73a 100644 --- a/src/argenta/router/entity.py +++ b/src/argenta/router/entity.py @@ -1,20 +1,20 @@ __all__ = ["Router"] +from inspect import (get_annotations, getfullargspec, getsourcefile, + getsourcelines) from typing import Callable, TypeAlias -from inspect import getfullargspec, get_annotations, getsourcefile, getsourcelines + from rich.console import Console from argenta.command import Command, InputCommand 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.router.exceptions import ( - RepeatedFlagNameException, - RequiredArgumentNotPassedException, - TriggerContainSpacesException, -) - +from argenta.response import Response, ResponseStatus +from argenta.router.command_handler.entity import (CommandHandler, + CommandHandlers) +from argenta.router.exceptions import (RepeatedFlagNameException, + RequiredArgumentNotPassedException, + TriggerContainSpacesException) HandlerFunc: TypeAlias = Callable[..., None]