Refactor dependency injection to use provider functions instead of container classes

Author: borys25ol

conduit/core/dependencies.py

@@ -4,7 +4,16 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from conduit.api.schemas.requests.article import ArticlesFilters, ArticlesPagination
-from conduit.core.container import container
+from conduit.core.providers import (
+    get_article_service,
+    get_auth_token_service,
+    get_comment_service,
+    get_db_session,
+    get_profile_service,
+    get_tag_service,
+    get_user_auth_service,
+    get_user_service,
+)
 from conduit.core.security import HTTPTokenHeader
 from conduit.domain.dtos.user import UserDTO
 from conduit.services.article import ArticleService
@@ -31,15 +40,15 @@
 JWTToken = Annotated[str, Depends(token_security)]
 JWTTokenOptional = Annotated[str, Depends(token_security_optional)]
 
-DBSession = Annotated[AsyncSession, Depends(container.session)]
+DBSession = Annotated[AsyncSession, Depends(get_db_session)]
 
-IAuthTokenService = Annotated[AuthTokenService, Depends(container.auth_token_service)]
-IUserAuthService = Annotated[UserAuthService, Depends(container.user_auth_service)]
-IUserService = Annotated[UserService, Depends(container.user_service)]
-IProfileService = Annotated[ProfileService, Depends(container.profile_service)]
-ITagService = Annotated[TagService, Depends(container.tag_service)]
-IArticleService = Annotated[ArticleService, Depends(container.article_service)]
-ICommentService = Annotated[CommentService, Depends(container.comment_service)]
+IAuthTokenService = Annotated[AuthTokenService, Depends(get_auth_token_service)]
+IUserAuthService = Annotated[UserAuthService, Depends(get_user_auth_service)]
+IUserService = Annotated[UserService, Depends(get_user_service)]
+IProfileService = Annotated[ProfileService, Depends(get_profile_service)]
+ITagService = Annotated[TagService, Depends(get_tag_service)]
+IArticleService = Annotated[ArticleService, Depends(get_article_service)]
+ICommentService = Annotated[CommentService, Depends(get_comment_service)]
 
 DEFAULT_ARTICLES_LIMIT = 20
 DEFAULT_ARTICLES_OFFSET = 0

conduit/core/providers.py

@@ -0,0 +1,130 @@
+from __future__ import annotations
+
+from collections.abc import AsyncIterator
+from functools import lru_cache
+
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from conduit.core.config import get_app_settings
+from conduit.core.container import container
+from conduit.domain.repositories.article import IArticleRepository
+from conduit.domain.repositories.article_tag import IArticleTagRepository
+from conduit.domain.repositories.comment import ICommentRepository
+from conduit.domain.repositories.favorite import IFavoriteRepository
+from conduit.domain.repositories.follower import IFollowerRepository
+from conduit.domain.repositories.tag import ITagRepository
+from conduit.domain.repositories.user import IUserRepository
+from conduit.domain.services.article import IArticleService
+from conduit.domain.services.auth import IUserAuthService
+from conduit.domain.services.auth_token import IAuthTokenService
+from conduit.domain.services.comment import ICommentService
+from conduit.domain.services.profile import IProfileService
+from conduit.domain.services.tag import ITagService
+from conduit.domain.services.user import IUserService
+from conduit.infrastructure.repositories.article import ArticleRepository
+from conduit.infrastructure.repositories.article_tag import ArticleTagRepository
+from conduit.infrastructure.repositories.comment import CommentRepository
+from conduit.infrastructure.repositories.favorite import FavoriteRepository
+from conduit.infrastructure.repositories.follower import FollowerRepository
+from conduit.infrastructure.repositories.tag import TagRepository
+from conduit.infrastructure.repositories.user import UserRepository
+from conduit.services.article import ArticleService
+from conduit.services.auth import UserAuthService
+from conduit.services.auth_token import AuthTokenService
+from conduit.services.comment import CommentService
+from conduit.services.profile import ProfileService
+from conduit.services.tag import TagService
+from conduit.services.user import UserService
+
+
+async def get_db_session() -> AsyncIterator[AsyncSession]:
+    async for session in container.session():
+        yield session
+
+
+@lru_cache
+def get_user_repo() -> IUserRepository:
+    return UserRepository()
+
+
+@lru_cache
+def get_article_repo() -> IArticleRepository:
+    return ArticleRepository()
+
+
+@lru_cache
+def get_article_tag_repo() -> IArticleTagRepository:
+    return ArticleTagRepository()
+
+
+@lru_cache
+def get_comment_repo() -> ICommentRepository:
+    return CommentRepository()
+
+
+@lru_cache
+def get_tag_repo() -> ITagRepository:
+    return TagRepository()
+
+
+@lru_cache
+def get_favorite_repo() -> IFavoriteRepository:
+    return FavoriteRepository()
+
+
+@lru_cache
+def get_follower_repo() -> IFollowerRepository:
+    return FollowerRepository()
+
+
+@lru_cache
+def get_auth_token_service() -> IAuthTokenService:
+    settings = get_app_settings()
+    return AuthTokenService(
+        secret_key=settings.jwt_secret_key,
+        token_expiration_minutes=settings.jwt_token_expiration_minutes,
+        algorithm=settings.jwt_algorithm,
+    )
+
+
+@lru_cache
+def get_user_service() -> IUserService:
+    return UserService(user_repo=get_user_repo())
+
+
+@lru_cache
+def get_profile_service() -> IProfileService:
+    return ProfileService(
+        user_service=get_user_service(), follower_repo=get_follower_repo()
+    )
+
+
+@lru_cache
+def get_user_auth_service() -> IUserAuthService:
+    return UserAuthService(
+        user_service=get_user_service(), auth_token_service=get_auth_token_service()
+    )
+
+
+@lru_cache
+def get_tag_service() -> ITagService:
+    return TagService(tag_repo=get_tag_repo())
+
+
+@lru_cache
+def get_article_service() -> IArticleService:
+    return ArticleService(
+        article_repo=get_article_repo(),
+        article_tag_repo=get_article_tag_repo(),
+        favorite_repo=get_favorite_repo(),
+        profile_service=get_profile_service(),
+    )
+
+
+@lru_cache
+def get_comment_service() -> ICommentService:
+    return CommentService(
+        article_repo=get_article_repo(),
+        comment_repo=get_comment_repo(),
+        profile_service=get_profile_service(),
+    )