Compare commits
2 Commits
a2169b2bb1
...
0.0.6
| Author | SHA1 | Date | |
|---|---|---|---|
| c95de5a6e9 | |||
| b3f3068f8d |
@@ -32,12 +32,35 @@ Notes:
|
||||
- Alter FastAPI dependency injection semantics.
|
||||
"""
|
||||
|
||||
import os
|
||||
import re
|
||||
|
||||
from fastapi import FastAPI
|
||||
|
||||
from .binder import bind_routes
|
||||
from .loader import load_openapi
|
||||
from .security import make_security_dependencies, parse_security_schemes
|
||||
|
||||
_env_pattern = re.compile(r"\{(\w+)\}")
|
||||
|
||||
|
||||
def _resolve_env(value: str) -> str:
|
||||
"""Replace {ENV_VAR} placeholders with values from os.environ."""
|
||||
def _replace(m: re.Match) -> str:
|
||||
return os.environ.get(m.group(1), m.group(0))
|
||||
return _env_pattern.sub(_replace, value)
|
||||
|
||||
|
||||
def _resolve_spec_env_vars(obj):
|
||||
"""Recursively resolve {ENV_VAR} in all string values of the spec."""
|
||||
if isinstance(obj, str):
|
||||
return _resolve_env(obj)
|
||||
if isinstance(obj, dict):
|
||||
return {k: _resolve_spec_env_vars(v) for k, v in obj.items()}
|
||||
if isinstance(obj, list):
|
||||
return [_resolve_spec_env_vars(v) for v in obj]
|
||||
return obj
|
||||
|
||||
|
||||
class OpenAPIFirstApp(FastAPI):
|
||||
"""
|
||||
@@ -107,7 +130,7 @@ class OpenAPIFirstApp(FastAPI):
|
||||
super().__init__(**fastapi_kwargs)
|
||||
|
||||
# Load and validate OpenAPI specification
|
||||
self._openapi_spec = load_openapi(openapi_path)
|
||||
self._openapi_spec = _resolve_spec_env_vars(load_openapi(openapi_path))
|
||||
|
||||
# Parse security schemes and build per-route dependencies
|
||||
security_schemes = parse_security_schemes(self._openapi_spec)
|
||||
|
||||
@@ -97,7 +97,10 @@ def _build_dependency(scheme_name: str, scheme: dict) -> Callable | None:
|
||||
scheme_type = scheme.get("type")
|
||||
|
||||
if scheme_type == "http" and scheme.get("scheme") == "bearer":
|
||||
return _make_bearer_dependency(scheme.get("x-introspect-url"))
|
||||
server_url = scheme.get("x-server-url", "")
|
||||
introspect_path = scheme.get("x-introspect-path", "/introspect")
|
||||
introspect_url = server_url + introspect_path if server_url else None
|
||||
return _make_bearer_dependency(introspect_url)
|
||||
|
||||
return None
|
||||
|
||||
|
||||
@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
|
||||
|
||||
[project]
|
||||
name = "openapi-first"
|
||||
version = "0.0.5"
|
||||
version = "0.0.6"
|
||||
description = "Strict OpenAPI-first application bootstrap for FastAPI."
|
||||
readme = "README.md"
|
||||
requires-python = ">=3.10"
|
||||
|
||||
Reference in New Issue
Block a user