Infrastructure -> Outbound

Author: ivan-borovets

alembic.ini

@@ -5,7 +5,7 @@
 # this is typically a path given in POSIX (e.g. forward slashes)
 # format, relative to the token %(here)s which refers to the location of this
 # ini file
-script_location = src/app/infrastructure/persistence_sqla/alembic
+script_location = src/app/outbound/persistence_sqla/alembic
 
 # template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
 # Uncomment the line below if you want the files to be prepended with date and time

pyproject.toml

@@ -97,12 +97,12 @@ containers = ["app"]
 layers = [
   "(main)",
   "presentation",
-  "infrastructure",
+  "outbound",
   "core",
 ]
 ignore_imports = [
-  "app.infrastructure.persistence_sqla.alembic.env ->  app.main.config.loader",
-  "app.infrastructure.persistence_sqla.alembic.env ->  app.main.config.settings",
+  "app.outbound.persistence_sqla.alembic.env ->  app.main.config.loader",
+  "app.outbound.persistence_sqla.alembic.env ->  app.main.config.settings",
 ]
 
 [[tool.importlinter.contracts]]
@@ -137,8 +137,8 @@ forbidden_modules = ["app.core.commands"]
 id = "auth-ctx"
 name = "auth-ctx must use its own adapters"
 type = "forbidden"
-source_modules = ["app.infrastructure.auth_ctx"]
-forbidden_modules = ["app.infrastructure.adapters"]
+source_modules = ["app.outbound.auth_ctx"]
+forbidden_modules = ["app.outbound.adapters"]
 
 [tool.mypy]
 mypy_path = ["src"]
@@ -247,7 +247,7 @@ split-on-trailing-comma = true
 
 [tool.ruff.lint.per-file-ignores]
 "scripts/dishka/plot_dependencies_data.py" = ["T201"]  # print
-"src/app/infrastructure/persistence_sqla/alembic/**" = ["ALL"]
+"src/app/outbound/persistence_sqla/alembic/**" = ["ALL"]
 "tests/**" = [
   "ARG002",  # unused-method-argument
   "PLC2801",  # unnecessary-dunder-call
@@ -263,7 +263,7 @@ split-on-trailing-comma = true
 [tool.slotscheck]
 strict-imports = true
 exclude-modules = '''
-^app\.infrastructure\.persistence_sqla\.alembic
+^app\.outbound\.persistence_sqla\.alembic
 '''
 
 [tool.typos.files]

src/app/main/config/settings.py

@@ -3,8 +3,8 @@
 
 from pydantic import BaseModel, Field, PostgresDsn
 
-from app.infrastructure.auth_ctx.jwt_types import JwtAlgorithm
 from app.main.config.logging_ import LoggingLevel
+from app.outbound.auth_ctx.jwt_types import JwtAlgorithm
 
 
 class AppSettings(BaseModel):

src/app/main/ioc/core.py

@@ -18,19 +18,19 @@
 from app.core.common.services.user import UserService
 from app.core.queries.list_users import ListUsers
 from app.core.queries.ports.user_reader import UserReader
-from app.infrastructure.adapters.auth_session_access_revoker import AuthSessionAccessRevoker
-from app.infrastructure.adapters.auth_session_identity_provider import AuthSessionIdentityProvider
-from app.infrastructure.adapters.bcrypt_password_hasher import (
+from app.main.config.settings import PasswordHasherSettings
+from app.outbound.adapters.auth_session_access_revoker import AuthSessionAccessRevoker
+from app.outbound.adapters.auth_session_identity_provider import AuthSessionIdentityProvider
+from app.outbound.adapters.bcrypt_password_hasher import (
     BcryptPasswordHasher,
     HasherSemaphore,
     HasherThreadPoolExecutor,
 )
-from app.infrastructure.adapters.sqla_flusher import SqlaFlusher
-from app.infrastructure.adapters.sqla_transaction_manager import SqlaTransactionManager
-from app.infrastructure.adapters.sqla_user_reader import SqlaUserReader
-from app.infrastructure.adapters.sqla_user_tx_storage import SqlaUserTxStorage
-from app.infrastructure.adapters.system_utc_timer import SystemUtcTimer
-from app.main.config.settings import PasswordHasherSettings
+from app.outbound.adapters.sqla_flusher import SqlaFlusher
+from app.outbound.adapters.sqla_transaction_manager import SqlaTransactionManager
+from app.outbound.adapters.sqla_user_reader import SqlaUserReader
+from app.outbound.adapters.sqla_user_tx_storage import SqlaUserTxStorage
+from app.outbound.adapters.system_utc_timer import SystemUtcTimer
 
 
 class CoreProvider(Provider):

src/app/main/ioc/infrastructure.py src/app/main/ioc/outbound.pysrc/app/main/ioc/infrastructure.py renamed to src/app/main/ioc/outbound.py

@@ -8,19 +8,6 @@
 from sqlalchemy.ext.asyncio import AsyncEngine, AsyncSession, async_sessionmaker, create_async_engine
 from starlette.requests import Request
 
-from app.infrastructure.adapters.bcrypt_password_hasher import HasherSemaphore, HasherThreadPoolExecutor
-from app.infrastructure.auth_ctx.cookie_manager import CookieManager, CookieName
-from app.infrastructure.auth_ctx.handlers.change_password import ChangePassword
-from app.infrastructure.auth_ctx.handlers.log_in import LogIn
-from app.infrastructure.auth_ctx.handlers.log_out import LogOut
-from app.infrastructure.auth_ctx.handlers.sign_up import SignUp
-from app.infrastructure.auth_ctx.jwt_processor import JwtProcessor
-from app.infrastructure.auth_ctx.service import AuthService
-from app.infrastructure.auth_ctx.sqla_transaction_manager import AuthSqlaTransactionManager
-from app.infrastructure.auth_ctx.sqla_tx_storage import AuthSessionSqlaTxStorage
-from app.infrastructure.auth_ctx.sqla_user_tx_storage import AuthSqlaUserTxStorage
-from app.infrastructure.auth_ctx.types_ import AuthAsyncSession
-from app.infrastructure.auth_ctx.utc_timer import AuthSessionUtcTimer
 from app.main.config.settings import (
     CookieSettings,
     JwtSettings,
@@ -29,6 +16,19 @@
     SessionSettings,
     SqlaSettings,
 )
+from app.outbound.adapters.bcrypt_password_hasher import HasherSemaphore, HasherThreadPoolExecutor
+from app.outbound.auth_ctx.cookie_manager import CookieManager, CookieName
+from app.outbound.auth_ctx.handlers.change_password import ChangePassword
+from app.outbound.auth_ctx.handlers.log_in import LogIn
+from app.outbound.auth_ctx.handlers.log_out import LogOut
+from app.outbound.auth_ctx.handlers.sign_up import SignUp
+from app.outbound.auth_ctx.jwt_processor import JwtProcessor
+from app.outbound.auth_ctx.service import AuthService
+from app.outbound.auth_ctx.sqla_transaction_manager import AuthSqlaTransactionManager
+from app.outbound.auth_ctx.sqla_tx_storage import AuthSessionSqlaTxStorage
+from app.outbound.auth_ctx.sqla_user_tx_storage import AuthSqlaUserTxStorage
+from app.outbound.auth_ctx.types_ import AuthAsyncSession
+from app.outbound.auth_ctx.utc_timer import AuthSessionUtcTimer
 
 logger = logging.getLogger(__name__)
 
@@ -168,7 +168,7 @@ class RequestProvider(Provider):
     request = from_context(provides=Request, scope=Scope.REQUEST)
 
 
-def infrastructure_providers() -> tuple[Provider, ...]:
+def outbound_providers() -> tuple[Provider, ...]:
     return (
         HasherThreadPoolProvider(),
         PersistenceSqlaProvider(),

src/app/main/ioc/provider_registry.py

@@ -3,11 +3,11 @@
 from dishka import Provider
 
 from app.main.ioc.core import CoreProvider
-from app.main.ioc.infrastructure import infrastructure_providers
+from app.main.ioc.outbound import outbound_providers
 
 
 def get_providers() -> Iterable[Provider]:
     return (
         CoreProvider(),
-        *infrastructure_providers(),
+        *outbound_providers(),
     )

src/app/main/run.py

@@ -5,7 +5,6 @@
 from dishka.integrations.fastapi import setup_dishka
 from fastapi import FastAPI
 
-from app.infrastructure.persistence_sqla.mappings.all import map_tables
 from app.main.config.loader import (
     load_app_settings,
     load_cookie_settings,
@@ -26,6 +25,7 @@
 )
 from app.main.ioc.provider_registry import get_providers
 from app.main.setup import setup_global_exception_handlers, setup_logging, setup_middlewares
+from app.outbound.persistence_sqla.mappings.all import map_tables
 from app.presentation.http.root_router import make_fastapi_root_router
 
 

src/app/infrastructure/__init__.py src/app/outbound/__init__.pysrc/app/infrastructure/__init__.py renamed to src/app/outbound/__init__.py

@@ -1,6 +1,6 @@
 from app.core.common.entities.types_ import UserId
 from app.core.common.ports.access_revoker import AccessRevoker
-from app.infrastructure.auth_ctx.service import AuthService
+from app.outbound.auth_ctx.service import AuthService
 
 
 class AuthSessionAccessRevoker(AccessRevoker):