Update wirio

Author: AndreuCodina

notebooks/notebook.ipynb

@@ -2,7 +2,7 @@
  "cells": [
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -12,11 +12,20 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": null,
    "metadata": {},
    "outputs": [],
    "source": [
-    "email_service = await services.get(EmailService)\n",
+    "service_provider = services.build_service_provider()"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "email_service = await service_provider.get_required_service(EmailService)\n",
     "await email_service.send_email()"
    ]
   }

pyproject.toml

@@ -11,7 +11,7 @@ dependencies = [
     "pydantic>=2.12.5",
     "pydantic-settings[azure-key-vault]>=2.12.0",
     "sqlmodel>=0.0.31",
-    "wirio>=0.7.0",
+    "wirio>=0.8.0",
 ]
 
 [dependency-groups]

scripts/script.py

@@ -5,8 +5,8 @@
 
 
 async def main() -> None:
-    async with services:
-        email_service = await services.get(EmailService)
+    async with services.build_service_provider() as service_provider:
+        email_service = await service_provider.get_required_service(EmailService)
         await email_service.send_email()
 
 

src/python_template/api/main.py

@@ -1,5 +1,5 @@
 from fastapi import FastAPI
-from wirio.service_container import ServiceContainer
+from wirio.service_collection import ServiceCollection
 
 from python_template.api.application_settings import ApplicationSettings
 from python_template.api.service_collection_extensions import (
@@ -24,7 +24,7 @@
 app = FastAPI(openapi_url=openapi_url)
 app.include_router(product_router)
 
-services = ServiceContainer()
+services = ServiceCollection()
 application_settings = ApplicationSettings()  # ty:ignore[missing-argument]
 services.add_singleton(ApplicationSettings, application_settings)
 add_observability(services, application_settings)

src/python_template/api/service_collection_extensions.py

@@ -9,14 +9,14 @@
     async_sessionmaker,
     create_async_engine,
 )
-from wirio.service_container import ServiceContainer
+from wirio.service_collection import ServiceCollection
 
 from python_template.api.application_settings import ApplicationSettings
 from python_template.common.application_environment import ApplicationEnvironment
 
 
 def add_observability(
-    services: ServiceContainer, application_settings: ApplicationSettings
+    services: ServiceCollection, application_settings: ApplicationSettings
 ) -> None:
     def inject_logging() -> Logger:
         return logging.getLogger(__name__)
@@ -32,7 +32,7 @@ def inject_logging() -> Logger:
         )
 
 
-def add_sqlmodel(services: ServiceContainer) -> None:
+def add_sqlmodel(services: ServiceCollection) -> None:
     def inject_async_engine(application_settings: ApplicationSettings) -> AsyncEngine:
         return create_async_engine(application_settings.postgresql_connection_string)
 

tests/integration/api/conftest.py

@@ -1,12 +1,12 @@
 from collections.abc import AsyncGenerator
 
 import pytest
-from wirio.service_container import ServiceContainer
+from wirio.service_provider import ServiceProvider
 
 from python_template.api.main import services
 
 
 @pytest.fixture
-async def services_fixture() -> AsyncGenerator[ServiceContainer]:
-    async with services:
-        yield services
+async def service_provider() -> AsyncGenerator[ServiceProvider]:
+    async with services.build_service_provider() as service_provider:
+        yield service_provider

tests/integration/api/workflows/products/discontinue_product/test_discontinue_product_workflow.py

@@ -1,6 +1,6 @@
 import pytest
 from sqlalchemy.ext.asyncio import AsyncSession
-from wirio.service_container import ServiceContainer
+from wirio.service_provider import ServiceProvider
 
 from python_template.api.workflows.products.discontinue_product.discontinue_product_request import (
     DiscontinueProductRequest,
@@ -14,9 +14,11 @@
 
 class TestDiscontinueProductWorkflow:
     @pytest.fixture(autouse=True)
-    async def setup(self, services_fixture: ServiceContainer) -> None:
-        self.workflow = await services_fixture.get(DiscontinueProductWorkflow)
-        self.sql_session = await services_fixture.get(AsyncSession)
+    async def setup(self, service_provider: ServiceProvider) -> None:
+        self.workflow = await service_provider.get_required_service(
+            DiscontinueProductWorkflow
+        )
+        self.sql_session = await service_provider.get_required_service(AsyncSession)
 
     async def test_discontinue_product(self) -> None:
         product = ProductBuilder().build()

tests/integration/api/workflows/products/publish_product/test_publish_product_workflow.py

@@ -1,5 +1,5 @@
 import pytest
-from wirio.service_container import ServiceContainer
+from wirio.service_provider import ServiceProvider
 
 from python_template.api.workflows.products.publish_product.publish_product_workflow import (
     PublishProductWorkflow,
@@ -11,8 +11,10 @@
 
 class TestPublishProductWorkflow:
     @pytest.fixture(autouse=True)
-    async def setup(self, services_fixture: ServiceContainer) -> None:
-        self.workflow = await services_fixture.get(PublishProductWorkflow)
+    async def setup(self, service_provider: ServiceProvider) -> None:
+        self.workflow = await service_provider.get_required_service(
+            PublishProductWorkflow
+        )
 
     async def test_publish_product(self) -> None:
         request = PublishProductRequestBuilder().build()