Add wirio

Author: AndreuCodina

notebooks/notebook.ipynb

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

pyproject.toml

@@ -4,14 +4,14 @@ version = "0.1.0"
 requires-python = ">=3.14"
 dependencies = [
     "aiohttp>=3.13.3",
-    "aspy-dependency-injection>=0.5.0",
     "asyncpg>=0.31.0",
-    "azure-monitor-opentelemetry>=1.8.4",
+    "azure-monitor-opentelemetry>=1.8.5",
     "fastapi[standard-no-fastapi-cloud-cli]>=0.128.0",
     "greenlet>=3.3.1",
     "pydantic>=2.12.5",
     "pydantic-settings[azure-key-vault]>=2.12.0",
     "sqlmodel>=0.0.31",
+    "wirio>=0.7.0",
 ]
 
 [dependency-groups]
@@ -22,7 +22,7 @@ dev = [
     "pytest-cov>=7.0.0",
     "pytest-mock>=3.15.1",
     "ruff>=0.14.14",
-    "ty>=0.0.13",
+    "ty>=0.0.14",
 ]
 
 [build-system]

scripts/script.py

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

src/python_template/api/main.py

@@ -1,5 +1,5 @@
-from aspy_dependency_injection.service_collection import ServiceCollection
 from fastapi import FastAPI
+from wirio.service_container import ServiceContainer
 
 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 = ServiceCollection()
+services = ServiceContainer()
 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

@@ -1,7 +1,6 @@
 import logging
 from logging import Logger
 
-from aspy_dependency_injection.service_collection import ServiceCollection
 from azure.identity import DefaultAzureCredential
 from azure.monitor.opentelemetry import configure_azure_monitor
 from sqlalchemy.ext.asyncio import (
@@ -10,13 +9,14 @@
     async_sessionmaker,
     create_async_engine,
 )
+from wirio.service_container import ServiceContainer
 
 from python_template.api.application_settings import ApplicationSettings
 from python_template.common.application_environment import ApplicationEnvironment
 
 
 def add_observability(
-    services: ServiceCollection, application_settings: ApplicationSettings
+    services: ServiceContainer, application_settings: ApplicationSettings
 ) -> None:
     def inject_logging() -> Logger:
         return logging.getLogger(__name__)
@@ -32,7 +32,7 @@ def inject_logging() -> Logger:
         )
 
 
-def add_sqlmodel(services: ServiceCollection) -> None:
+def add_sqlmodel(services: ServiceContainer) -> None:
     def inject_async_engine(application_settings: ApplicationSettings) -> AsyncEngine:
         return create_async_engine(application_settings.postgresql_connection_string)
 

src/python_template/api/workflows/products/product_router.py

@@ -1,7 +1,7 @@
 from typing import Annotated
 
-from aspy_dependency_injection.annotations import Inject
 from fastapi import APIRouter
+from wirio.annotations import FromServices
 
 from python_template.api.workflows.products.discontinue_product.discontinue_product_request import (
     DiscontinueProductRequest,
@@ -28,14 +28,14 @@
 @product_router.post("")
 async def publish_product(
     request: PublishProductRequest,
-    workflow: Annotated[PublishProductWorkflow, Inject()],
+    workflow: Annotated[PublishProductWorkflow, FromServices()],
 ) -> PublishProductResponse:
     return await workflow.execute(request)
 
 
 @product_router.post("/discontinue")
 async def discontinue_product(
     request: DiscontinueProductRequest,
-    workflow: Annotated[DiscontinueProductWorkflow, Inject()],
+    workflow: Annotated[DiscontinueProductWorkflow, FromServices()],
 ) -> None:
     await workflow.execute(request)

tests/integration/api/conftest.py

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

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

@@ -1,6 +1,6 @@
 import pytest
-from aspy_dependency_injection.service_provider import ServiceProvider
 from sqlalchemy.ext.asyncio import AsyncSession
+from wirio.service_container import ServiceContainer
 
 from python_template.api.workflows.products.discontinue_product.discontinue_product_request import (
     DiscontinueProductRequest,
@@ -14,11 +14,9 @@
 
 class TestDiscontinueProductWorkflow:
     @pytest.fixture(autouse=True)
-    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 setup(self, services_fixture: ServiceContainer) -> None:
+        self.workflow = await services_fixture.get(DiscontinueProductWorkflow)
+        self.sql_session = await services_fixture.get(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 aspy_dependency_injection.service_provider import ServiceProvider
+from wirio.service_container import ServiceContainer
 
 from python_template.api.workflows.products.publish_product.publish_product_workflow import (
     PublishProductWorkflow,
@@ -11,10 +11,8 @@
 
 class TestPublishProductWorkflow:
     @pytest.fixture(autouse=True)
-    async def setup(self, service_provider: ServiceProvider) -> None:
-        self.workflow = await service_provider.get_required_service(
-            PublishProductWorkflow
-        )
+    async def setup(self, services_fixture: ServiceContainer) -> None:
+        self.workflow = await services_fixture.get(PublishProductWorkflow)
 
     async def test_publish_product(self) -> None:
         request = PublishProductRequestBuilder().build()