replace seedwork Application with lato Application

.python-version

@@ -1 +1 @@
-3.10.0
+3.11

diary.md

@@ -29,7 +29,7 @@ def get_route_controller(request, module):
 
 
 def post_route_controller(request, module):
-    result = module.execute_command(MyCommand(
+    result = module.execute(MyCommand(
         foo=request.POST.foo,
         bar=request.POST.bar,
     ))

docs/architecture_decision_log/005_separate_commands_and_queries.md

@@ -20,7 +20,7 @@ def get_route_controller(request, module):
 
 
 def post_route_controller(request, module):
-    result = module.execute_command(MyCommand(
+    result = module.execute(MyCommand(
         foo=request.POST.foo,
         bar=request.POST.bar,
     ))

pyproject.toml

@@ -6,10 +6,7 @@ authors = ["Przemysław Górecki <[email protected]>"]
 
 [tool.poetry.dependencies]
 python = "^3.10.0"
-pytest = "^6.2.4"
-pydantic = "^1.8.2"
 black = "^21.5b1"
-fastapi = "^0.95.2"
 uvicorn = "^0.14.0"
 starlette-context = "^0.3.3"
 SQLAlchemy = "^1.4.22"
@@ -29,6 +26,9 @@ httpx = "^0.23.1"
 requests = "^2.28.1"
 bcrypt = "^4.0.1"
 mypy = "^1.4.1"
+fastapi = "^0.110.0"
+lato = "^0.10.0"
+pydantic-settings = "^2.2.1"
 
 [tool.poetry.dev-dependencies]
 poethepoet = "^0.10.0"

src/api/dependencies.py

@@ -5,7 +5,7 @@
 
 from modules.iam.application.services import IamService
 from modules.iam.domain.entities import User
-from seedwork.application import Application, TransactionContext
+from lato import Application, TransactionContext
 
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="token")
 
@@ -28,5 +28,5 @@ async def get_authenticated_user(
     access_token: Annotated[str, Depends(oauth2_scheme)],
     ctx: Annotated[TransactionContext, Depends(get_transaction_context)],
 ) -> User:
-    current_user = ctx.get_service(IamService).find_user_by_access_token(access_token)
+    current_user = ctx[IamService].find_user_by_access_token(access_token)
     return current_user

src/api/main.py

@@ -6,7 +6,7 @@
 from api.dependencies import oauth2_scheme  # noqa
 from api.routers import bidding, catalog, diagnostics, iam
 from config.api_config import ApiConfig
-from config.container import TopLevelContainer
+from config.container import create_application, ApplicationContainer
 from seedwork.domain.exceptions import DomainException, EntityNotFoundException
 from seedwork.infrastructure.database import Base
 from seedwork.infrastructure.logging import LoggerFactory, logger
@@ -15,29 +15,30 @@
 LoggerFactory.configure(logger_name="api")
 
 # dependency injection container
-container = TopLevelContainer()
-container.config.from_pydantic(ApiConfig())
+config = ApiConfig()
+container = ApplicationContainer(config=config)
+db_engine = container.db_engine()
+logger.info(f"using db engine {db_engine}, creating tables")
+Base.metadata.create_all(db_engine)
+logger.info("setup complete")
 
-app = FastAPI(debug=container.config.DEBUG)
+app = FastAPI(debug=config.DEBUG)
 
 app.include_router(catalog.router)
 app.include_router(bidding.router)
 app.include_router(iam.router)
 app.include_router(diagnostics.router)
 app.container = container
 
-db_engine = container.db_engine()
-logger.info(f"using db engine {db_engine}, creating tables")
-Base.metadata.create_all(db_engine)
-logger.info("setup complete")
+
 
 try:
     import uuid
 
     from modules.iam.application.services import IamService
 
     with app.container.application().transaction_context() as ctx:
-        iam_service = ctx.get_service(IamService)
+        iam_service = ctx[IamService]
         iam_service.create_user(
             user_id=uuid.UUID(int=1),
             email="[email protected]",

src/api/models/bidding.py

@@ -10,15 +10,24 @@ class BidReadModel(BaseModel):
     currency: str
     bidder_id: GenericUUID
     bidder_username: str
+
+    class Config:
+        arbitrary_types_allowed = True
 
 
 class BiddingResponse(BaseModel):
     listing_id: GenericUUID
     auction_status: str = "active"  # active, ended
     auction_end_date: datetime
     bids: list[BidReadModel]
+
+    class Config:
+        arbitrary_types_allowed = True
 
 
 class PlaceBidRequest(BaseModel):
     bidder_id: GenericUUID
     amount: float
+
+    class Config:
+        arbitrary_types_allowed = True

src/api/routers/bidding.py

@@ -7,7 +7,7 @@
 from config.container import inject
 from modules.bidding.application.command import PlaceBidCommand, RetractBidCommand
 from modules.bidding.application.query.get_bidding_details import GetBiddingDetails
-from seedwork.application import Application
+from lato import Application
 
 router = APIRouter()
 
@@ -25,12 +25,11 @@ async def get_bidding_details_of_listing(
     Shows listing details
     """
     query = GetBiddingDetails(listing_id=listing_id)
-    query_result = app.execute_query(query)
-    payload = query_result.payload
+    result = app.execute(query)
     return BiddingResponse(
-        listing_id=str(payload.id),
-        auction_end_date=payload.ends_at,
-        bids=payload.bids,
+        listing_id=result.id,
+        auction_end_date=result.ends_at,
+        bids=result.bids,
     )
 
 
@@ -53,15 +52,14 @@ async def place_bid(
         bidder_id=request_body.bidder_id,
         amount=request_body.amount,
     )
-    result = app.execute_command(command)
+    app.execute(command)
 
     query = GetBiddingDetails(listing_id=listing_id)
-    query_result = app.execute_query(query)
-    payload = query_result.payload
+    result = app.execute(query)
     return BiddingResponse(
-        listing_id=str(payload.id),
-        auction_end_date=payload.ends_at,
-        bids=payload.bids,
+        listing_id=result.id,
+        auction_end_date=result.ends_at,
+        bids=result.bids,
     )
 
 
@@ -81,7 +79,7 @@ async def retract_bid(
         listing_id=listing_id,
         bidder_id="",
     )
-    app.execute_command(command)
+    app.execute(command)
 
     query = GetBiddingDetails(listing_id=listing_id)
     query_result = app.execute_query(query)

src/api/routers/catalog.py

@@ -23,13 +23,13 @@
 
 @router.get("/catalog", tags=["catalog"], response_model=ListingIndexModel)
 @inject
-async def get_all_listings(app: Annotated[Application, Depends(get_application)]):
+def get_all_listings(app: Annotated[Application, Depends(get_application)]):
     """
     Shows all published listings in the catalog
     """
     query = GetAllListings()
-    query_result = app.execute_query(query)
-    return dict(data=query_result.payload)
+    result = app.execute(query)
+    return dict(data=result)
 
 
 @router.get("/catalog/{listing_id}", tags=["catalog"], response_model=ListingReadModel)
@@ -64,7 +64,7 @@ async def create_listing(
         ask_price=Money(request_body.ask_price_amount, request_body.ask_price_currency),
         seller_id=current_user.id,
     )
-    app.execute_command(command)
+    app.execute(command)
 
     query = GetListingDetails(listing_id=command.listing_id)
     query_result = app.execute_query(query)
@@ -87,7 +87,7 @@ async def delete_listing(
         listing_id=listing_id,
         seller_id=current_user.id,
     )
-    app.execute_command(command)
+    app.execute(command)
 
 
 @router.post(
@@ -109,8 +109,8 @@ async def publish_listing(
         listing_id=listing_id,
         seller_id=current_user.id,
     )
-    app.execute_command(command)
+    app.execute(command)
 
     query = GetListingDetails(listing_id=listing_id)
-    query_result = app.execute_query(query)
-    return dict(query_result.payload)
+    response = app.execute(query)
+    return response

src/api/routers/diagnostics.py

@@ -3,10 +3,10 @@
 from fastapi import APIRouter, Depends
 
 from api.dependencies import (
-    TransactionContext,
+    Application,
     User,
     get_authenticated_user,
-    get_transaction_context,
+    get_application,
 )
 
 from .iam import UserResponse
@@ -16,13 +16,13 @@
 
 @router.get("/debug", tags=["diagnostics"])
 async def debug(
-    ctx: Annotated[TransactionContext, Depends(get_transaction_context)],
+    app: Annotated[Application, Depends(get_application)],
     current_user: Annotated[User, Depends(get_authenticated_user)],
 ):
     return dict(
-        app_id=id(ctx.app),
-        name=ctx.app.name,
-        version=ctx.app.version,
+        app_id=id(app),
+        name=app.name,
+        version=app["app_version"],
         user=UserResponse(
             id=str(current_user.id),
             username=current_user.username,

src/api/routers/iam.py

@@ -36,7 +36,7 @@ async def login(
     form_data: OAuth2PasswordRequestForm = Depends(),
 ) -> LoginResponse:
     try:
-        iam_service = ctx.get_service(IamService)
+        iam_service = ctx[IamService]
         user = iam_service.authenticate_with_name_and_password(
             form_data.username, form_data.password
         )

src/api/tests/test_bidding.py

@@ -11,7 +11,7 @@
 def setup_app_for_bidding_tests(app, listing_id, seller_id, bidder_id):
     logger.info("Adding users")
     with app.transaction_context() as ctx:
-        iam_service = ctx.dependency_provider["iam_service"]
+        iam_service = ctx["iam_service"]
 
         iam_service.create_user(
             user_id=seller_id,
@@ -27,7 +27,7 @@ def setup_app_for_bidding_tests(app, listing_id, seller_id, bidder_id):
         )
 
     logger.info("Adding listing")
-    app.execute_command(
+    app.execute(
         CreateListingDraftCommand(
             listing_id=listing_id,
             title="Foo",
@@ -36,7 +36,7 @@ def setup_app_for_bidding_tests(app, listing_id, seller_id, bidder_id):
             seller_id=seller_id,
         )
     )
-    app.execute_command(
+    app.execute(
         PublishListingDraftCommand(listing_id=listing_id, seller_id=seller_id)
     )
     logger.info("test setup complete")
@@ -52,4 +52,5 @@ def test_place_bid(app, api_client):
     url = f"/bidding/{listing_id}/place_bid"
 
     response = api_client.post(url, json={"bidder_id": str(bidder_id), "amount": 11})
+    json = response.json()
     assert response.status_code == 200

src/api/tests/test_catalog.py

@@ -17,7 +17,7 @@ def test_empty_catalog_list(api_client):
 @pytest.mark.integration
 def test_catalog_list_with_one_item(app, api_client):
     # arrange
-    app.execute_command(
+    app.execute(
         CreateListingDraftCommand(
             listing_id=GenericUUID(int=1),
             title="Foo",
@@ -50,7 +50,7 @@ def test_catalog_list_with_one_item(app, api_client):
 @pytest.mark.integration
 def test_catalog_list_with_two_items(app, api_client):
     # arrange
-    app.execute_command(
+    app.execute(
         CreateListingDraftCommand(
             listing_id=GenericUUID(int=1),
             title="Foo #1",
@@ -59,7 +59,7 @@ def test_catalog_list_with_two_items(app, api_client):
             seller_id=GenericUUID(int=2),
         )
     )
-    app.execute_command(
+    app.execute(
         CreateListingDraftCommand(
             listing_id=GenericUUID(int=2),
             title="Foo #2",
@@ -88,7 +88,7 @@ def test_catalog_create_draft_fails_due_to_incomplete_data(
 @pytest.mark.integration
 def test_catalog_delete_draft(app, authenticated_api_client):
     current_user = authenticated_api_client.current_user
-    app.execute_command(
+    app.execute(
         CreateListingDraftCommand(
             listing_id=GenericUUID(int=1),
             title="Listing to be deleted",
@@ -115,7 +115,7 @@ def test_catalog_publish_listing_draft(app, authenticated_api_client):
     # arrange
     current_user = authenticated_api_client.current_user
     listing_id = GenericUUID(int=1)
-    app.execute_command(
+    app.execute(
         CreateListingDraftCommand(
             listing_id=listing_id,
             title="Listing to be published",
@@ -136,7 +136,7 @@ def test_published_listing_appears_in_biddings(app, authenticated_api_client):
     # arrange
     listing_id = GenericUUID(int=1)
     current_user = authenticated_api_client.current_user
-    app.execute_command(
+    app.execute(
         CreateListingDraftCommand(
             listing_id=listing_id,
             title="Listing to be published",
@@ -145,7 +145,7 @@ def test_published_listing_appears_in_biddings(app, authenticated_api_client):
             seller_id=current_user.id,
         )
     )
-    app.execute_command(
+    app.execute(
         PublishListingDraftCommand(
             listing_id=listing_id,
             seller_id=current_user.id,

src/api/tests/test_login.py

@@ -8,7 +8,7 @@
 def test_login_with_api_token(app, api_client):
     # arrange
     with app.transaction_context() as ctx:
-        iam_service = ctx.get_service(IamService)
+        iam_service = ctx[IamService]
         iam_service.create_user(
             user_id=GenericUUID(int=1),
             email="[email protected]",
@@ -31,7 +31,7 @@ def test_login_with_api_token(app, api_client):
 def test_login_with_invalid_username_returns_400(app, api_client):
     # arrange
     with app.transaction_context() as ctx:
-        iam_service = ctx.get_service(IamService)
+        iam_service = ctx[IamService]
         iam_service.create_user(
             user_id=GenericUUID(int=1),
             email="[email protected]",
@@ -53,7 +53,7 @@ def test_login_with_invalid_username_returns_400(app, api_client):
 def test_login_with_invalid_password_returns_400(app, api_client):
     # arrange
     with app.transaction_context() as ctx:
-        iam_service = ctx.get_service(IamService)
+        iam_service = ctx[IamService]
         iam_service.create_user(
             user_id=GenericUUID(int=1),
             email="[email protected]",