tiny-service-core 0.1.2__tar.gz → 0.2.0__tar.gz

{tiny_service_core-0.1.2 → tiny_service_core-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: tiny-service-core
-Version: 0.1.2
+Version: 0.2.0
 Summary: 🪐 Shared functionality for tiny microservices
 Keywords: async,fastapi,microservice,core
 Author: Aliaksei Urbanski
@@ -36,14 +36,13 @@ Requires-Dist: asyncpg ; extra == 'db'
 Requires-Dist: sentry-sdk[asyncpg,sqlalchemy] ; extra == 'db'
 Requires-Dist: sqlmodel ; extra == 'db'
 Requires-Dist: fastapi[standard] ; extra == 'dev'
-Requires-Dist: httpx ; extra == 'http-client'
-Requires-Dist: sentry-sdk[httpx] ; extra == 'http-client'
+Requires-Dist: httpx2 ; extra == 'http-client'
 Requires-Dist: python-multipart ; extra == 'multipart'
 Maintainer: Aliaksei Urbanski
 Maintainer-email: Aliaksei Urbanski <aliaksei.urbanski@gmail.com>
 Requires-Python: >=3.12
-Project-URL: Issues, https://github.com/Jamim/tiny-service-core/issues
 Project-URL: Repository, https://github.com/Jamim/tiny-service-core
+Project-URL: Issues, https://github.com/Jamim/tiny-service-core/issues
 Provides-Extra: cache
 Provides-Extra: db
 Provides-Extra: dev
@@ -103,7 +102,7 @@ Current version glues together these components:
     * [asyncpg][asyncpg]
     * [Alembic][alembic]
   - `http-client`
-    * [HTTPX][httpx]
+    * [HTTPX2][httpx2]
 
 [fastapi]: https://fastapi.tiangolo.com
 [pydantic-settings]: https://docs.pydantic.dev/latest/concepts/pydantic_settings/
@@ -112,6 +111,6 @@ Current version glues together these components:
 [sqlmodel]: https://sqlmodel.tiangolo.com
 [asyncpg]: https://github.com/MagicStack/asyncpg
 [alembic]: https://alembic.sqlalchemy.org
-[httpx]: https://www.python-httpx.org
+[httpx2]: https://httpx2.pydantic.dev
 
 [installing-extras]: https://packaging.python.org/en/latest/tutorials/installing-packages/#installing-extras

{tiny_service_core-0.1.2 → tiny_service_core-0.2.0}/README.md

@@ -50,7 +50,7 @@ Current version glues together these components:
     * [asyncpg][asyncpg]
     * [Alembic][alembic]
   - `http-client`
-    * [HTTPX][httpx]
+    * [HTTPX2][httpx2]
 
 [fastapi]: https://fastapi.tiangolo.com
 [pydantic-settings]: https://docs.pydantic.dev/latest/concepts/pydantic_settings/
@@ -59,6 +59,6 @@ Current version glues together these components:
 [sqlmodel]: https://sqlmodel.tiangolo.com
 [asyncpg]: https://github.com/MagicStack/asyncpg
 [alembic]: https://alembic.sqlalchemy.org
-[httpx]: https://www.python-httpx.org
+[httpx2]: https://httpx2.pydantic.dev
 
 [installing-extras]: https://packaging.python.org/en/latest/tutorials/installing-packages/#installing-extras

{tiny_service_core-0.1.2 → tiny_service_core-0.2.0}/pyproject.toml

@@ -3,7 +3,7 @@ name = "tiny-service-core"
 description = "🪐 Shared functionality for tiny microservices"
 
 # https://github.com/astral-sh/uv/issues/11718
-version = "0.1.2"
+version = "0.2.0"
 
 readme = "README.md"
 license = { text = "MIT" }
@@ -61,8 +61,7 @@ db = [
     "sqlmodel",
 ]
 http-client = [
-    "httpx",
-    "sentry-sdk[httpx]",
+    "httpx2",
 ]
 multipart = [
     "python-multipart",
@@ -84,7 +83,7 @@ Repository = "https://github.com/Jamim/tiny-service-core"
 Issues = "https://github.com/Jamim/tiny-service-core/issues"
 
 [build-system]
-requires = ["uv_build>=0.9.15,<0.10.0"]
+requires = ["uv_build<1.0"]
 build-backend = "uv_build"
 
 [tool.uv.build-backend]

{tiny_service_core-0.1.2 → tiny_service_core-0.2.0}/src/core/config.py

@@ -41,6 +41,14 @@ class CacheSettings(BaseSettings):
 
 class DBSettings(BaseSettings):
     db_url: str
+    db_isolation_level: Literal[
+        'SERIALIZABLE',
+        'REPEATABLE READ',
+        'READ COMMITTED',
+        'READ UNCOMMITTED',
+        'AUTOCOMMIT',
+        None,
+    ] = None
 
 
 class HTTPClientSettings(BaseSettings):
@@ -50,7 +58,7 @@ class HTTPClientSettings(BaseSettings):
 OPTIONAL_SETTINGS: dict[str, type[BaseSettings]] = {
     'redis': CacheSettings,
     'sqlmodel': DBSettings,
-    'httpx': HTTPClientSettings,
+    'httpx2': HTTPClientSettings,
 }
 
 settings_bases = [AppSettings, SentrySettings]

{tiny_service_core-0.1.2 → tiny_service_core-0.2.0}/src/core/deps/db.py

@@ -1,19 +1,19 @@
 from collections.abc import AsyncGenerator
-from typing import Annotated, cast
+from typing import Annotated
 
 from fastapi import Depends, Request
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.ext.asyncio import async_sessionmaker
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 
 async def get_session(request: Request) -> AsyncGenerator[AsyncSession]:
-    async_session = sessionmaker(
+    async_session = async_sessionmaker(
         request.app.state.db,
         class_=AsyncSession,
         expire_on_commit=False,
+        autoflush=False,
     )
-    session = cast(AsyncSession, async_session())
-    async with session:
+    async with async_session() as session:
         yield session
 
 

{tiny_service_core-0.1.2 → tiny_service_core-0.2.0}/src/core/deps/http_client.py

@@ -1,7 +1,7 @@
 from typing import Annotated, cast
 
 from fastapi import Depends, Request
-from httpx import AsyncClient
+from httpx2 import AsyncClient
 
 
 def get_http_client(request: Request) -> AsyncClient:

{tiny_service_core-0.1.2 → tiny_service_core-0.2.0}/src/core/lifespan.py

@@ -1,14 +1,18 @@
 import asyncio
-from collections.abc import AsyncGenerator, Awaitable, Callable
+from collections.abc import AsyncGenerator
 from contextlib import asynccontextmanager
-from typing import Any, cast
+from typing import cast
 
 from fastapi import FastAPI
 from starlette.datastructures import State
 
 from . import settings
+from .typing import CleanUpFunc, CoreInitFunc
 
-type CleanUpFunc = Callable[[], Awaitable[None]]
+try:
+    from app.lifespan import INIT_FUNCS as APP_INIT_FUNCS
+except ImportError:
+    APP_INIT_FUNCS = []
 
 
 def init_cache(state: State, cache_url: str) -> CleanUpFunc:
@@ -21,12 +25,16 @@ def init_cache(state: State, cache_url: str) -> CleanUpFunc:
 def init_db(state: State, db_url: str) -> CleanUpFunc:
     from sqlalchemy.ext.asyncio import create_async_engine
 
-    state.db = create_async_engine(db_url)
+    kwargs = {}
+    if settings.db_isolation_level:
+        kwargs['isolation_level'] = settings.db_isolation_level
+
+    state.db = create_async_engine(db_url, **kwargs)
     return cast(CleanUpFunc, state.db.dispose)
 
 
 def init_http_client(state: State, retries: int) -> CleanUpFunc:
-    from httpx import AsyncClient, AsyncHTTPTransport
+    from httpx2 import AsyncClient, AsyncHTTPTransport
 
     state.http_client = AsyncClient(
         transport=AsyncHTTPTransport(retries=retries)
@@ -34,7 +42,7 @@ def init_http_client(state: State, retries: int) -> CleanUpFunc:
     return cast(CleanUpFunc, state.http_client.aclose)
 
 
-INIT_FUNCS: dict[str, Callable[[State, Any], CleanUpFunc]] = {
+INIT_FUNCS: dict[str, CoreInitFunc] = {
     'cache_url': init_cache,
     'db_url': init_db,
     'http_retries': init_http_client,
@@ -50,6 +58,11 @@ async def lifespan(app: FastAPI) -> AsyncGenerator[None]:
         if value:
             clean_up_funcs.append(init_func(app.state, value))
 
+    for app_init_func in APP_INIT_FUNCS:
+        clean_up = app_init_func(app.state)
+        if clean_up:
+            clean_up_funcs.append(clean_up)
+
     yield
 
     await asyncio.gather(*(func() for func in clean_up_funcs))

tiny_service_core-0.2.0/src/core/typing.py

@@ -0,0 +1,8 @@
+from collections.abc import Awaitable, Callable
+from typing import Any
+
+from starlette.datastructures import State
+
+type CleanUpFunc = Callable[[], Awaitable[None]]
+type CoreInitFunc = Callable[[State, Any], CleanUpFunc]
+type AppInitFunc = Callable[[State], CleanUpFunc | None]