fastapi-commons 0.8.2__tar.gz → 0.8.4__tar.gz

{fastapi_commons-0.8.2 → fastapi_commons-0.8.4}/.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.12.3
+    rev: 0.12.5
     hooks:
       - id: uv-lock
   #      - id: uv-export
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.16.2
+    rev: v0.16.4
     hooks:
       # Run the linter.
       - id: ruff-check

{fastapi_commons-0.8.2/src/fastapi_commons.egg-info → fastapi_commons-0.8.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-commons
-Version: 0.8.2
+Version: 0.8.4
 Summary: Re-usable FastAPI code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -19,14 +19,15 @@ Requires-Dist: msgspec~=0.21.1
 Requires-Dist: pydantic[email]~=2.13.4
 Requires-Dist: pydantic-settings~=2.15.0
 Requires-Dist: python-jose~=3.5.0
-Requires-Dist: SQLAlchemy[asyncio]~=2.0.51
+Requires-Dist: SQLAlchemy[asyncio]~=2.0.52
 Requires-Dist: opentelemetry-api~=1.44.0
 Requires-Dist: opentelemetry-sdk~=1.44.0
 Requires-Dist: opentelemetry-exporter-otlp~=1.44.0
 Requires-Dist: opentelemetry-instrumentation-fastapi~=0.65b0
 Requires-Dist: opentelemetry-instrumentation-logging~=0.65b0
 Requires-Dist: prometheus-client~=0.26.0
-Requires-Dist: python3-commons[authn]~=0.24.2
+Requires-Dist: python3-commons[authn]~=0.24.5
+Requires-Dist: starlette~=1.6.0
 Dynamic: license-file
 
 FastAPI commons

{fastapi_commons-0.8.2 → fastapi_commons-0.8.4}/pyproject.toml

@@ -25,14 +25,15 @@ dependencies = [
     "pydantic[email]~=2.13.4",
     "pydantic-settings~=2.15.0",
     "python-jose~=3.5.0",
-    "SQLAlchemy[asyncio]~=2.0.51",
+    "SQLAlchemy[asyncio]~=2.0.52",
     "opentelemetry-api~=1.44.0",
     "opentelemetry-sdk~=1.44.0",
     "opentelemetry-exporter-otlp~=1.44.0",
     "opentelemetry-instrumentation-fastapi~=0.65b0",
     "opentelemetry-instrumentation-logging~=0.65b0",
     "prometheus-client~=0.26.0",
-    "python3-commons[authn]~=0.24.2",
+    "python3-commons[authn]~=0.24.5",
+    "starlette~=1.6.0",
 ]
 
 [dependency-groups]

{fastapi_commons-0.8.2 → fastapi_commons-0.8.4}/src/fastapi_commons/auth.py

@@ -5,9 +5,13 @@ from typing import Annotated, Any, TypeVar
 
 import msgspec
 from fastapi import Depends, HTTPException
-from fastapi.security import HTTPAuthorizationCredentials, HTTPBearer
+from fastapi.security import APIKeyHeader, HTTPAuthorizationCredentials, HTTPBearer
 from jose import ExpiredSignatureError, JWSError, JWTError, jwt
 from python3_commons.auth import OIDCClient, TokenData
+from python3_commons.db.models.auth import ApiKey
+from sqlalchemy import select
+from sqlalchemy.ext.asyncio import AsyncSession
+from starlette import status
 
 from fastapi_commons.conf import api_auth_settings, oidc_settings
 
@@ -17,7 +21,7 @@ bearer_security = HTTPBearer(auto_error=api_auth_settings.enabled)
 oidc_client = OIDCClient(
     oidc_settings.authority_url,
     oidc_settings.client_id,
-    oidc_settings.client_secret,
+    oidc_settings.client_secret.get_secret_value(),
     timeout=oidc_settings.timeout,
     verify_cert=oidc_settings.verify_cert,
     connection_limit=oidc_settings.connection_limit,
@@ -77,3 +81,26 @@ def get_token_verifier[T](
         return token_data
 
     return get_verified_token
+
+
+def get_api_key_verifier(
+    db_dependency: Callable[..., AsyncSession], header_name: str = 'Api-Key'
+) -> Callable[..., Coroutine[Any, Any, ApiKey]]:
+    async def verify_api_key(
+        api_key: Annotated[str, Depends(APIKeyHeader(name=header_name, auto_error=True))],
+        session: Annotated[AsyncSession, Depends(db_dependency)],
+    ) -> ApiKey:
+        stmt = select(ApiKey).where(ApiKey.uid == api_key)
+        result = await session.execute(stmt)
+        api_key_obj = result.scalar_one_or_none()
+
+        if not api_key_obj:
+            raise HTTPException(
+                status_code=status.HTTP_401_UNAUTHORIZED,
+                detail='Invalid API Key',
+                headers={'WWW-Authenticate': 'Api-Key'},
+            )
+
+        return api_key_obj
+
+    return verify_api_key

{fastapi_commons-0.8.2 → fastapi_commons-0.8.4/src/fastapi_commons.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-commons
-Version: 0.8.2
+Version: 0.8.4
 Summary: Re-usable FastAPI code
 Author-email: Oleg Korsak <kamikaze.is.waiting.you@gmail.com>
 License-Expression: GPL-3.0
@@ -19,14 +19,15 @@ Requires-Dist: msgspec~=0.21.1
 Requires-Dist: pydantic[email]~=2.13.4
 Requires-Dist: pydantic-settings~=2.15.0
 Requires-Dist: python-jose~=3.5.0
-Requires-Dist: SQLAlchemy[asyncio]~=2.0.51
+Requires-Dist: SQLAlchemy[asyncio]~=2.0.52
 Requires-Dist: opentelemetry-api~=1.44.0
 Requires-Dist: opentelemetry-sdk~=1.44.0
 Requires-Dist: opentelemetry-exporter-otlp~=1.44.0
 Requires-Dist: opentelemetry-instrumentation-fastapi~=0.65b0
 Requires-Dist: opentelemetry-instrumentation-logging~=0.65b0
 Requires-Dist: prometheus-client~=0.26.0
-Requires-Dist: python3-commons[authn]~=0.24.2
+Requires-Dist: python3-commons[authn]~=0.24.5
+Requires-Dist: starlette~=1.6.0
 Dynamic: license-file
 
 FastAPI commons

{fastapi_commons-0.8.2 → fastapi_commons-0.8.4}/src/fastapi_commons.egg-info/SOURCES.txt

@@ -35,4 +35,5 @@ src/fastapi_commons/middleware/prometheus.py
 tests/__init__.py
 tests/conftest.py
 tests/unit/__init__.py
+tests/unit/test_auth.py
 tests/unit/test_poc.py

{fastapi_commons-0.8.2 → fastapi_commons-0.8.4}/src/fastapi_commons.egg-info/requires.txt

@@ -5,11 +5,12 @@ msgspec~=0.21.1
 pydantic[email]~=2.13.4
 pydantic-settings~=2.15.0
 python-jose~=3.5.0
-SQLAlchemy[asyncio]~=2.0.51
+SQLAlchemy[asyncio]~=2.0.52
 opentelemetry-api~=1.44.0
 opentelemetry-sdk~=1.44.0
 opentelemetry-exporter-otlp~=1.44.0
 opentelemetry-instrumentation-fastapi~=0.65b0
 opentelemetry-instrumentation-logging~=0.65b0
 prometheus-client~=0.26.0
-python3-commons[authn]~=0.24.2
+python3-commons[authn]~=0.24.5
+starlette~=1.6.0

{fastapi_commons-0.8.2 → fastapi_commons-0.8.4}/src/fastapi_commons.egg-info/scm_file_list.json

@@ -29,6 +29,7 @@
     "tests/__init__.py",
     "tests/conftest.py",
     "tests/unit/__init__.py",
+    "tests/unit/test_auth.py",
     "tests/unit/test_poc.py",
     "uv.lock"
   ]

fastapi_commons-0.8.4/src/fastapi_commons.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "0.8.4",
+  "distance": 0,
+  "node": "gdd7b1d3d9a6243ca8443b5791d7e4186be0424b9",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-08-24"
+}

fastapi_commons-0.8.4/tests/unit/test_auth.py

@@ -0,0 +1,55 @@
+from http import HTTPStatus
+from typing import Annotated
+from unittest.mock import AsyncMock, MagicMock
+
+import pytest
+from fastapi import HTTPException
+from python3_commons.db.models.auth import ApiKey
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from fastapi_commons.auth import get_api_key_verifier
+
+
+@pytest.mark.asyncio
+async def test_create_api_key_verifier_success() -> None:
+    # Mock database session
+    mock_session = AsyncMock(spec=AsyncSession)
+    mock_api_key = MagicMock(spec=ApiKey)
+    mock_api_key.uid = 'test-key'
+
+    # Mock result
+    mock_result = MagicMock()
+    mock_result.scalar_one_or_none.return_value = mock_api_key
+    mock_session.execute.return_value = mock_result
+
+    # Create verifier
+    # We pass a mock dependency. For direct calling, we just need Any.
+    verifier = get_api_key_verifier(lambda: mock_session)
+
+    # Test the verifier directly
+    result = await verifier(api_key='test-key', session=mock_session)
+    assert result == mock_api_key
+
+    # Verify DB call
+    mock_session.execute.assert_called_once()
+
+
+@pytest.mark.asyncio
+async def test_create_api_key_verifier_fail() -> None:
+    # Mock database session
+    mock_session = AsyncMock(spec=AsyncSession)
+
+    # Mock result to return None
+    mock_result = MagicMock()
+    mock_result.scalar_one_or_none.return_value = None
+    mock_session.execute.return_value = mock_result
+
+    # Create verifier
+    verifier = get_api_key_verifier(lambda: mock_session)
+
+    # Test the verifier directly and expect HTTPException
+    with pytest.raises(HTTPException) as excinfo:
+        await verifier(api_key='invalid-key', session=mock_session)
+
+    assert excinfo.value.status_code == HTTPStatus.UNAUTHORIZED
+    assert excinfo.value.detail == 'Invalid API Key'