Resort imports and reformat code after project rename.

src/AWS/Ligare/AWS/ssm.py

@@ -5,8 +5,8 @@
 from os import environ
 from typing import Any, Dict, List, Optional, Type, TypeVar, Union
 
-from Ligare.programming.collections.dict import AnyDict
 from boto3.session import Session
+from Ligare.programming.collections.dict import AnyDict
 
 TConfig = TypeVar("TConfig")
 

src/database/Ligare/database/dependency_injection.py

@@ -1,8 +1,8 @@
+from injector import Binder, CallableProvider, Injector, Module, inject, singleton
 from Ligare.database.config import Config, DatabaseConfig
 from Ligare.database.engine import DatabaseEngine
 from Ligare.database.types import MetaBase
 from Ligare.programming.dependency_injection import ConfigModule
-from injector import Binder, CallableProvider, Injector, Module, inject, singleton
 from sqlalchemy.orm.scoping import ScopedSession
 from sqlalchemy.orm.session import Session
 from typing_extensions import override

src/database/Ligare/database/migrations/alembic/env_setup.py

@@ -4,11 +4,11 @@
 from typing import Any, List, Literal, Protocol, cast, final
 
 from alembic import context
+from injector import inject
 from Ligare.database.config import DatabaseConfig
 from Ligare.database.schema.postgresql import PostgreSQLDialect
 from Ligare.database.schema.sqlite import SQLiteDialect
 from Ligare.database.types import MetaBase
-from injector import inject
 
 # TODO only do this when using PostgreSQL,
 # and detect if the module is installed

src/database/Ligare/database/migrations/alembic/ligare_alembic.py

@@ -215,7 +215,9 @@ def _write_ligare_alembic_config(
         )
         self._copy_files([
             LigareAlembic.FileCopy(
-                Path(Path(__file__).resolve().parent, LigareAlembic.DEFAULT_CONFIG_NAME),
+                Path(
+                    Path(__file__).resolve().parent, LigareAlembic.DEFAULT_CONFIG_NAME
+                ),
                 config_file_destination,
             )
         ])

src/database/Ligare/database/testing/__init__.py

@@ -3,14 +3,12 @@
 from unittest.mock import AsyncMock, MagicMock, NonCallableMagicMock
 
 import pytest
+from injector import Injector
 from Ligare.database.config import Config
 from Ligare.database.dependency_injection import get_database_ioc_container
-from Ligare.database.migrations.alembic.env import (
-    set_up_database as _set_up_database,
-)
+from Ligare.database.migrations.alembic.env import set_up_database as _set_up_database
 from Ligare.database.testing.config import inmemory_database_config
 from Ligare.database.types import MetaBase
-from injector import Injector
 from mock import MagicMock
 from pytest import FixtureRequest
 from pytest_mock import MockerFixture

src/database/test/unit/migrations/alembic/test_ligare_alembic.py

@@ -28,7 +28,9 @@ def set_args(args: list[str]):
 
 
 def mock_alembic(mocker: MockerFixture):
-    return mocker.patch("Ligare.database.migrations.alembic.ligare_alembic.alembic_main")
+    return mocker.patch(
+        "Ligare.database.migrations.alembic.ligare_alembic.alembic_main"
+    )
 
 
 def mock_config(mocker: MockerFixture):
@@ -77,10 +79,14 @@ def test__LigareAlembic__passes_through_to_alembic_with_default_config_when_not_
     ligare_alembic.run()
 
     assert alembic_main.called
-    alembic_main.assert_called_once_with(["-c", LigareAlembic.DEFAULT_CONFIG_NAME] + args)
+    alembic_main.assert_called_once_with(
+        ["-c", LigareAlembic.DEFAULT_CONFIG_NAME] + args
+    )
 
 
-def test__LigareAlembic__creates_default_config(mock_argv: MockArgv, mocker: MockerFixture):
+def test__LigareAlembic__creates_default_config(
+    mock_argv: MockArgv, mocker: MockerFixture
+):
     _ = mock_alembic(mocker)
     _ = mock_config(mocker)
     _ = mock_argv(["upgrade", "head"])

src/database/test/unit/test_dependency_injection.py

@@ -1,7 +1,7 @@
+from injector import Injector
 from Ligare.database.config import DatabaseConfig
 from Ligare.database.dependency_injection import ScopedSessionModule
 from Ligare.programming.dependency_injection import ConfigModule
-from injector import Injector
 from sqlalchemy.orm.session import Session
 
 

src/database/test/unit/test_engine.py

@@ -132,9 +132,7 @@ def test__PostgreSQLScopedSession__create__uses_correct_connection_pool_type(
 def test__PostgreSQLScopedSession__create__verifies_dependencies_installed(
     mocker: MockerFixture,
 ):
-    _ = mocker.patch(
-        "Ligare.database.engine.postgresql.find_spec", return_value=None
-    )
+    _ = mocker.patch("Ligare.database.engine.postgresql.find_spec", return_value=None)
 
     with pytest.raises(ModuleNotFoundError):
         _ = PostgreSQLScopedSession.create(POSTGRESQL_TEST_CONNECTION_STR)

src/identity/Ligare/identity/dependency_injection.py

@@ -1,10 +1,10 @@
-from Ligare.identity.config import SAML2Config, SSOConfig
-from Ligare.identity.SAML2 import SAML2Client
-from Ligare.programming.collections.dict import AnyDict
 from flask import url_for
 
 # from flask import url_for
 from injector import Binder, CallableProvider, Module, inject, singleton
+from Ligare.identity.config import SAML2Config, SSOConfig
+from Ligare.identity.SAML2 import SAML2Client
+from Ligare.programming.collections.dict import AnyDict
 from saml2 import BINDING_HTTP_POST, BINDING_HTTP_REDIRECT
 from typing_extensions import override
 

src/platform/Ligare/platform/dependency_injection.py

@@ -1,13 +1,13 @@
 from logging import Logger
 
+from flask import Config as Config
+from injector import Binder, Module, provider
 from Ligare.database.dependency_injection import ScopedSessionModule
 from Ligare.database.types import MetaBase
 from Ligare.platform.identity import Role as DbRole
 from Ligare.platform.identity import User as DbUser
 from Ligare.platform.identity.user_loader import Role, UserLoader, UserMixin
 from Ligare.programming.patterns.dependency_injection import LoggerModule
-from flask import Config as Config
-from injector import Binder, Module, provider
 from sqlalchemy.orm.scoping import ScopedSession
 from typing_extensions import override
 

src/platform/test/unit/identity/test_loader.py

@@ -1,5 +1,6 @@
 from typing import Sequence
 
+from injector import Injector
 from Ligare.platform.dependency_injection import UserLoaderModule
 from Ligare.platform.identity import Role as DbRole
 from Ligare.platform.identity import User as DbUser
@@ -10,7 +11,6 @@
     UserLoader,
     UserMixin,
 )
-from injector import Injector
 from typing_extensions import override
 
 

src/programming/Ligare/programming/dependency_injection.py

@@ -1,5 +1,5 @@
-from Ligare.programming.config import AbstractConfig
 from injector import Binder, Module
+from Ligare.programming.config import AbstractConfig
 from typing_extensions import override
 
 

src/programming/test/unit/patterns/test_dependency_injection.py

@@ -2,12 +2,9 @@
 from dataclasses import dataclass
 from logging import Logger
 
-from Ligare.programming.patterns.dependency_injection import (
-    BatchModule,
-    LoggerModule,
-)
-from Ligare.programming.str import get_random_str
 from injector import Injector
+from Ligare.programming.patterns.dependency_injection import BatchModule, LoggerModule
+from Ligare.programming.str import get_random_str
 from pytest import LogCaptureFixture
 
 

src/programming/test/unit/test_dependency_injection.py

@@ -1,6 +1,6 @@
+from injector import Injector
 from Ligare.programming.config import AbstractConfig
 from Ligare.programming.dependency_injection import ConfigModule
-from injector import Injector
 
 
 def test__ConfigModule__injector_binds_Config_module_to_AbstractConfig_by_default():

src/web/Ligare/web/application.py

@@ -10,14 +10,14 @@
 from typing import Generator, Generic, Optional, TypeVar, cast
 
 import json_logging
-from Ligare.AWS.ssm import SSMParameters
-from Ligare.programming.config import AbstractConfig, ConfigBuilder, load_config
-from Ligare.programming.dependency_injection import ConfigModule
 from connexion import FlaskApp
 from flask import Blueprint, Flask
 from flask_injector import FlaskInjector
 from injector import Module
 from lib_programname import get_path_executed_script
+from Ligare.AWS.ssm import SSMParameters
+from Ligare.programming.config import AbstractConfig, ConfigBuilder, load_config
+from Ligare.programming.dependency_injection import ConfigModule
 
 from .config import Config
 from .middleware import (

src/web/Ligare/web/middleware/__init__.py

@@ -2,6 +2,9 @@
 from logging import Logger
 from typing import Awaitable, Callable, TypeAlias, TypeVar
 
+from connexion import FlaskApp
+from flask import Flask, Response
+from flask.typing import ResponseReturnValue
 from Ligare.web.middleware.flask import (
     register_flask_api_request_handlers,
     register_flask_api_response_handlers,
@@ -11,9 +14,6 @@
     register_openapi_api_response_handlers,
     register_openapi_context_middleware,
 )
-from connexion import FlaskApp
-from flask import Flask, Response
-from flask.typing import ResponseReturnValue
 from werkzeug.exceptions import HTTPException, Unauthorized
 
 # pyright: reportUnusedFunction=false

src/web/Ligare/web/middleware/dependency_injection.py

@@ -1,14 +1,14 @@
 from functools import partial
 from typing import Any, Callable, Protocol, Tuple, Type, cast
 
-from Ligare.programming.patterns.dependency_injection import LoggerModule
 from connexion import ConnexionMiddleware, FlaskApp
 from connexion.apps.flask import FlaskASGIApp, FlaskOperation
 from connexion.middleware.main import MiddlewarePosition
 from flask import Config as Config
 from flask import Flask
 from flask_injector import FlaskInjector, wrap_function
 from injector import Binder, Injector, Module
+from Ligare.programming.patterns.dependency_injection import LoggerModule
 from starlette.types import ASGIApp, Receive, Scope, Send
 from typing_extensions import override
 

src/web/Ligare/web/middleware/openapi/__init__.py

@@ -11,7 +11,6 @@
 import starlette
 import starlette.datastructures
 import starlette.requests
-from Ligare.programming.collections.dict import AnyDict, merge
 from connexion import ConnexionMiddleware, FlaskApp, context, utils
 from connexion.middleware import MiddlewarePosition
 from flask import Flask, Request, Response, request
@@ -21,6 +20,7 @@
 from flask.typing import ResponseReturnValue
 from flask_login import AnonymousUserMixin, current_user
 from injector import inject
+from Ligare.programming.collections.dict import AnyDict, merge
 from starlette.datastructures import Address
 from starlette.types import ASGIApp, Receive, Scope, Send
 from typing_extensions import TypedDict, final

src/web/Ligare/web/middleware/openapi/cors.py

@@ -1,7 +1,7 @@
-from Ligare.web.config import Config
 from connexion import FlaskApp
 from connexion.middleware import MiddlewarePosition
 from injector import Module, inject
+from Ligare.web.config import Config
 from starlette.middleware.cors import CORSMiddleware
 
 

src/web/Ligare/web/middleware/sso.py

@@ -18,12 +18,6 @@
 from urllib.parse import urlparse
 
 import flask_login
-from Ligare.identity.config import Config, SAML2Config, SSOConfig
-from Ligare.identity.dependency_injection import SAML2Module, SSOModule
-from Ligare.identity.SAML2 import SAML2Client
-from Ligare.platform.identity.user_loader import Role, UserId, UserLoader, UserMixin
-from Ligare.web.config import Config
-from Ligare.web.encryption import decrypt_flask_cookie
 from connexion import FlaskApp
 from flask import (
     Blueprint,
@@ -44,6 +38,12 @@
 from flask_login import current_user
 from flask_login import login_required as flask_login_required
 from injector import Binder, Injector, Module, inject
+from Ligare.identity.config import Config, SAML2Config, SSOConfig
+from Ligare.identity.dependency_injection import SAML2Module, SSOModule
+from Ligare.identity.SAML2 import SAML2Client
+from Ligare.platform.identity.user_loader import Role, UserId, UserLoader, UserMixin
+from Ligare.web.config import Config
+from Ligare.web.encryption import decrypt_flask_cookie
 from saml2.validate import (
     MustValueError,
     NotValid,

src/web/Ligare/web/scaffolding/scaffolder.py

@@ -9,8 +9,8 @@
 from pathlib import Path
 from typing import Any, Literal, final
 
-from Ligare.programming.collections.dict import merge
 from jinja2 import BaseLoader, Environment, PackageLoader, Template
+from Ligare.programming.collections.dict import merge
 
 # fmt: off
 from pkg_resources import IResourceProvider, ResourceManager, get_provider

src/web/Ligare/web/testing/create_app.py

@@ -24,6 +24,13 @@
 import pytest
 import yaml
 from _pytest.fixtures import SubRequest
+from connexion import FlaskApp
+from flask import Flask, Request, Response, session
+from flask.ctx import RequestContext
+from flask.sessions import SecureCookieSession
+from flask.testing import FlaskClient
+from flask_injector import FlaskInjector
+from injector import Module
 from Ligare.database.migrations.alembic.env import set_up_database
 from Ligare.identity.config import SAML2Config, SSOConfig
 from Ligare.platform.dependency_injection import UserLoaderModule
@@ -47,13 +54,6 @@
 )
 from Ligare.web.encryption import encrypt_flask_cookie
 from Ligare.web.middleware.sso import SAML2MiddlewareModule
-from connexion import FlaskApp
-from flask import Flask, Request, Response, session
-from flask.ctx import RequestContext
-from flask.sessions import SecureCookieSession
-from flask.testing import FlaskClient
-from flask_injector import FlaskInjector
-from injector import Module
 from mock import MagicMock
 from pytest import FixtureRequest
 from pytest_mock import MockerFixture

src/web/test/unit/application/test_create_flask_app.py

@@ -4,6 +4,7 @@
 from typing import cast
 
 import pytest
+from flask import Blueprint, Flask
 from Ligare.programming.config import AbstractConfig
 from Ligare.programming.str import get_random_str
 from Ligare.web.application import App, configure_blueprint_routes
@@ -12,7 +13,6 @@
     CreateFlaskApp,
     FlaskClientInjectorConfigurable,
 )
-from flask import Blueprint, Flask
 from mock import MagicMock
 from pydantic import BaseModel
 from pytest_mock import MockerFixture

src/web/test/unit/application/test_create_openapi_app.py

@@ -1,13 +1,13 @@
 from os import environ
 
 import pytest
+from connexion import FlaskApp
+from flask import Flask
 from Ligare.programming.config import AbstractConfig
 from Ligare.programming.str import get_random_str
 from Ligare.web.application import App, configure_openapi
 from Ligare.web.config import Config, FlaskConfig, FlaskOpenApiConfig
 from Ligare.web.testing.create_app import CreateOpenAPIApp
-from connexion import FlaskApp
-from flask import Flask
 from mock import MagicMock
 from pydantic import BaseModel
 from pytest_mock import MockerFixture
@@ -169,9 +169,7 @@ def test__CreateOpenAPIApp__create_app__configures_appropriate_app_type_based_on
         _ = mocker.patch("Ligare.web.application.register_api_response_handlers")
         _ = mocker.patch("Ligare.web.application.configure_dependencies")
 
-        configure_method_mock = mocker.patch(
-            "Ligare.web.application.configure_openapi"
-        )
+        configure_method_mock = mocker.patch("Ligare.web.application.configure_openapi")
         config = Config(
             flask=FlaskConfig(app_name=app_name, openapi=FlaskOpenApiConfig())
         )

src/web/test/unit/encryption/test_encryption.py

@@ -1,12 +1,12 @@
 import pytest
+from flask import Flask
+from injector import Injector
 from Ligare.programming.str import get_random_str
 from Ligare.web.encryption import (
     _EMPTY_SECRET_KEY_MESSAGE,  # pyright:ignore[reportPrivateUsage]
 )
 from Ligare.web.encryption import decrypt_flask_cookie, encrypt_flask_cookie
 from Ligare.web.middleware.dependency_injection import AppModule
-from flask import Flask
-from injector import Injector
 from mock import MagicMock