From c180921bea1422b26816009e25c8643f6ec6cf20 Mon Sep 17 00:00:00 2001
From: "ivan.stasevich" <pravitel2015ify@gmail.com>
Date: Wed, 23 Sep 2026 08:52:23 +0300
Subject: [PATCH 1/6] feat: enhance observability with health and debug routes,
 update tracing configuration

---
 docker-compose.dev.yml                     |  2 +-
 docker-compose.observability.yml           | 36 ++++++++++++++--------
 fastid/api/app.py                          |  3 +-
 fastid/api/routing.py                      | 29 -----------------
 fastid/core/app.py                         | 12 ++++++++
 fastid/core/debug.py                       | 13 ++++++++
 fastid/core/health.py                      | 27 ++++++++++++++++
 fastid/plugins/observability/config.py     |  4 ++-
 fastid/plugins/observability/metrics.py    |  3 +-
 fastid/plugins/observability/prometheus.py |  2 +-
 fastid/plugins/observability/tracing.py    | 17 +++++++---
 11 files changed, 96 insertions(+), 52 deletions(-)
 create mode 100644 fastid/core/debug.py
 create mode 100644 fastid/core/health.py

diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index 8cc7dd1..d05b9ac 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -74,7 +74,7 @@ services:
       - "./certs:/opt/fastid/certs"
 
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8000/api/v1/readiness" ]
+      test: [ "CMD", "curl", "-f", "http://localhost:8000/readiness" ]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/docker-compose.observability.yml b/docker-compose.observability.yml
index aa1f573..d9fffcc 100644
--- a/docker-compose.observability.yml
+++ b/docker-compose.observability.yml
@@ -1,25 +1,35 @@
 x-logging: &default-logging
-  driver: loki
+  driver: json-file
   options:
-    loki-url: '${LOKI_URL:-http://localhost:3100/api/prom/push}'
-    loki-pipeline-stages: |
-      - multiline:
-          firstline: '^\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2}'
-          max_wait_time: 3s
-      - regex:
-          expression: '^(?P<time>\d{4}-\d{2}-\d{2} \d{1,2}:\d{2}:\d{2},d{3}) (?P<message>(?s:.*))$$'
+    max-size: "10m"
+    max-file: "3"
+
+x-observability: &observability
+  evsoft.observability.enabled: "true"
+  evsoft.observability.project: "${APP_PROJECT:-fastid}"
+  evsoft.observability.environment: "${APP_ENVIRONMENT:-development}"
 
 services:
   postgres:
     logging: *default-logging
+    labels:
+      <<: *observability
+      evsoft.observability.service: "postgres"
+
   redis:
     logging: *default-logging
+    labels:
+      <<: *observability
+      evsoft.observability.service: "redis"
+
   mailpit:
     logging: *default-logging
+    labels:
+      <<: *observability
+      evsoft.observability.service: "mailpit"
+
   fastid-app:
     logging: *default-logging
-
-networks:
-  default:
-    name: observability_net
-    external: true
+    labels:
+      <<: *observability
+      evsoft.observability.service: "${APP_SERVICE:-fastid}"
diff --git a/fastid/api/app.py b/fastid/api/app.py
index 960ea6a..5e96b58 100644
--- a/fastid/api/app.py
+++ b/fastid/api/app.py
@@ -16,7 +16,8 @@
 if observability_settings.tracing_enabled:
     tracing_plugin = TracingPlugin(
         app_name=branding_settings.service_name,
-        export_url=observability_settings.tempo_url,
+        environment=observability_settings.environment,
+        otlp_endpoint=observability_settings.otlp_endpoint,
         instrument=["logger", "httpx", "sqlalchemy"],
         engine=engine,
     )
diff --git a/fastid/api/routing.py b/fastid/api/routing.py
index 3c9eb14..c764254 100644
--- a/fastid/api/routing.py
+++ b/fastid/api/routing.py
@@ -1,15 +1,10 @@
-from typing import Any
-
 from fastapi import APIRouter, Depends
 from starlette import status
 
-from fastid.api.exceptions import TestError
 from fastid.apps.router import router as app_router
 from fastid.auth.dependencies import auth_flows
 from fastid.auth.router import router as auth_router
-from fastid.cache.dependencies import CacheDep
 from fastid.core.schemas import ErrorResponse
-from fastid.database.dependencies import UOWDep
 from fastid.notify.router import router as notify_router
 from fastid.oauth.router import router as oauth_router
 from fastid.profile.router import router as profile_router
@@ -34,27 +29,3 @@
 secured_router.include_router(app_router)
 
 api_router.include_router(secured_router)
-
-
-@api_router.get("/readiness", include_in_schema=False)
-async def readiness() -> dict[str, Any]:  # pragma: nocover
-    return {"status": "ok"}
-
-
-@api_router.get("/liveness", include_in_schema=False)
-async def liveness(uow: UOWDep, cache: CacheDep) -> dict[str, Any]:  # pragma: nocover
-    response = {"db": True, "cache": True}
-    try:
-        await uow.healthcheck()
-    except Exception:  # noqa: BLE001
-        response["db"] = False
-    try:
-        await cache.healthcheck()
-    except Exception:  # noqa: BLE001
-        response["cache"] = False
-    return response
-
-
-@api_router.get("/exc", include_in_schema=False)
-def exc() -> dict[str, Any]:
-    raise TestError
diff --git a/fastid/core/app.py b/fastid/core/app.py
index 709cdb5..f17d054 100644
--- a/fastid/core/app.py
+++ b/fastid/core/app.py
@@ -7,9 +7,12 @@
 from fastid.api.app import api_app
 from fastid.cache.dependencies import get_cache
 from fastid.core.config import core_settings
+from fastid.core.debug import debug_router
+from fastid.core.health import health_router
 from fastid.core.lifespan import LifespanTasks
 from fastid.database.dependencies import get_uow_raw
 from fastid.frontend.app import frontend_app
+from fastid.plugins.observability.metrics import get_metrics
 
 
 @asynccontextmanager
@@ -26,6 +29,15 @@ async def lifespan(_app: FastAPI) -> AsyncIterator[None]:
 
 core_app = FastAPI(lifespan=lifespan)
 
+core_app.add_route(
+    "/metrics",
+    get_metrics,
+    include_in_schema=False,
+)
+
+core_app.include_router(health_router)
+core_app.include_router(debug_router)
+
 core_app.mount(core_settings.api_path, api_app)
 core_app.mount(core_settings.admin_path, admin_app)
 core_app.mount(core_settings.frontend_path, frontend_app)
diff --git a/fastid/core/debug.py b/fastid/core/debug.py
new file mode 100644
index 0000000..dc89f23
--- /dev/null
+++ b/fastid/core/debug.py
@@ -0,0 +1,13 @@
+from fastapi import APIRouter
+
+from fastid.api.exceptions import TestError
+
+debug_router = APIRouter(
+    prefix="/debug",
+    include_in_schema=False,
+)
+
+
+@debug_router.get("/exc")
+def exc() -> None:
+    raise TestError
diff --git a/fastid/core/health.py b/fastid/core/health.py
new file mode 100644
index 0000000..d446752
--- /dev/null
+++ b/fastid/core/health.py
@@ -0,0 +1,27 @@
+from typing import Any
+
+from fastapi import APIRouter
+
+from fastid.cache.dependencies import CacheDep
+from fastid.database.dependencies import UOWDep
+
+health_router = APIRouter()
+
+
+@health_router.get("/readiness")
+async def readiness() -> dict[str, Any]:  # pragma: nocover
+    return {"status": "ok"}
+
+
+@health_router.get("/liveness")
+async def liveness(uow: UOWDep, cache: CacheDep) -> dict[str, Any]:  # pragma: nocover
+    response = {"db": True, "cache": True}
+    try:
+        await uow.healthcheck()
+    except Exception:  # noqa: BLE001
+        response["db"] = False
+    try:
+        await cache.healthcheck()
+    except Exception:  # noqa: BLE001
+        response["cache"] = False
+    return response
diff --git a/fastid/plugins/observability/config.py b/fastid/plugins/observability/config.py
index 5aa4288..6d7b5b4 100644
--- a/fastid/plugins/observability/config.py
+++ b/fastid/plugins/observability/config.py
@@ -4,7 +4,9 @@
 class ObservabilitySettings(BaseSettings):
     metrics_enabled: bool = False
     tracing_enabled: bool = False
-    tempo_url: str = "http://host.docker.internal:4317"
+    otlp_endpoint: str = "http://127.0.0.1:4317"
+    service_name: str = "fastid"
+    environment: str = "development"
 
 
 observability_settings = ObservabilitySettings()
diff --git a/fastid/plugins/observability/metrics.py b/fastid/plugins/observability/metrics.py
index e8b02b9..c3bd4a1 100644
--- a/fastid/plugins/observability/metrics.py
+++ b/fastid/plugins/observability/metrics.py
@@ -15,7 +15,7 @@
 
 class EndpointFilter(logging.Filter):
     def filter(self, record: logging.LogRecord) -> bool:
-        return record.getMessage().find("GET /metrics") == -1 and record.getMessage().find("GET /api/v1/metrics") == -1
+        return record.getMessage().find("GET /metrics") == -1
 
 
 class MetricsPlugin(Plugin):
@@ -31,7 +31,6 @@ def install(self, app: FastAPI) -> None:
             PrometheusMiddleware,
             app_name=self.app_name,
         )
-        app.add_route("/metrics", get_metrics)
 
 
 def get_metrics(_request: Request) -> Response:
diff --git a/fastid/plugins/observability/prometheus.py b/fastid/plugins/observability/prometheus.py
index 6cd13ae..a1e81b9 100644
--- a/fastid/plugins/observability/prometheus.py
+++ b/fastid/plugins/observability/prometheus.py
@@ -14,7 +14,7 @@
 
 
 class PrometheusMiddleware(BaseHTTPMiddleware):
-    def __init__(self, app: ASGIApp, *, app_name: str = "fastapiapp") -> None:
+    def __init__(self, app: ASGIApp, *, app_name: str = "fastid") -> None:
         super().__init__(app)
         self.app_name = app_name
         panels.INFO.labels(app_name=self.app_name).inc()
diff --git a/fastid/plugins/observability/tracing.py b/fastid/plugins/observability/tracing.py
index 407c728..7c269ea 100644
--- a/fastid/plugins/observability/tracing.py
+++ b/fastid/plugins/observability/tracing.py
@@ -52,12 +52,14 @@ def __init__(
         self,
         *,
         app_name: str = "fastid",
-        export_url: str = "http://localhost:4317",
+        environment: str = "development",
+        otlp_endpoint: str = "http://127.0.0.1:4317",
         instrument: Sequence[Instrument] = ("logger", "httpx"),
         **extra: Any,
     ) -> None:
         self.app_name = app_name
-        self.export_url = export_url
+        self.environment = environment
+        self.otlp_endpoint = otlp_endpoint
         self.instrument = instrument
         self.extra = extra
 
@@ -66,12 +68,19 @@ def install(self, app: FastAPI) -> None:
         resource = Resource.create(
             attributes={
                 "service.name": self.app_name,
-                "compose_service": self.app_name,
+                "deployment.environment.name": self.environment,
             },
         )
         tracer = TracerProvider(resource=resource)
         trace.set_tracer_provider(tracer)
-        tracer.add_span_processor(BatchSpanProcessor(OTLPSpanExporter(endpoint=self.export_url)))
+        tracer.add_span_processor(
+            BatchSpanProcessor(
+                OTLPSpanExporter(
+                    endpoint=self.otlp_endpoint,
+                    insecure=True,
+                )
+            )
+        )
         if "logger" in self.instrument:
             LoggingInstrumentor().instrument(tracer_provider=tracer, set_logging_format=True)
         if "httpx" in self.instrument:

From 91ff27e3846b55c9f6392da7c365f4404afd83a3 Mon Sep 17 00:00:00 2001
From: "ivan.stasevich" <pravitel2015ify@gmail.com>
Date: Wed, 23 Sep 2026 13:00:05 +0300
Subject: [PATCH 2/6] feat: fix poetry.lock & pyproject.toml

---
 .env.example            |   2 -
 .gitattributes          |   6 ++
 .gitignore              |   8 ++
 .pre-commit-config.yaml |   4 +-
 .secrets.baseline       | 165 ----------------------------------------
 poetry.lock             |  18 ++++-
 pyproject.toml          |  25 +++---
 7 files changed, 47 insertions(+), 181 deletions(-)
 delete mode 100644 .env.example
 create mode 100644 .gitattributes
 delete mode 100644 .secrets.baseline

diff --git a/.env.example b/.env.example
deleted file mode 100644
index 2aa8dd5..0000000
--- a/.env.example
+++ /dev/null
@@ -1,2 +0,0 @@
-POSTGRES_PASSWORD="changethis"
-REDIS_PASSWORD="changethis"
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..53f95df
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,6 @@
+* text=auto eol=lf
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.ps1 text eol=crlf
+docker/Dockerfile text eol=lf
+docker/*.sh text eol=lf
diff --git a/.gitignore b/.gitignore
index 7d19c4a..6500825 100644
--- a/.gitignore
+++ b/.gitignore
@@ -164,4 +164,12 @@ cython_debug/
 .dev.env
 !.env.example
 certs
+
+# Git worktrees
+.worktrees/
+
+# AI agents
 .codegraph/
+docs/adr/
+docs/superpowers/
+docs/glossary.md
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0d6a98c..9e7b2a8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -59,7 +59,9 @@ repos:
     hooks:
       - id: detect-secrets
         args: [
-          '--baseline', '.secrets.baseline',
+          '--exclude-files', 'docs',
+          '--exclude-files', 'migrations',
+          '--exclude-files', 'alembic.ini',
         ]
         exclude: package.lock.json
         stages: [ pre-commit, pre-merge-commit, manual ]
diff --git a/.secrets.baseline b/.secrets.baseline
deleted file mode 100644
index 943aa6a..0000000
--- a/.secrets.baseline
+++ /dev/null
@@ -1,165 +0,0 @@
-{
-  "version": "1.5.0",
-  "plugins_used": [
-    {
-      "name": "ArtifactoryDetector"
-    },
-    {
-      "name": "AWSKeyDetector"
-    },
-    {
-      "name": "AzureStorageKeyDetector"
-    },
-    {
-      "name": "Base64HighEntropyString",
-      "limit": 4.5
-    },
-    {
-      "name": "BasicAuthDetector"
-    },
-    {
-      "name": "CloudantDetector"
-    },
-    {
-      "name": "DiscordBotTokenDetector"
-    },
-    {
-      "name": "GitHubTokenDetector"
-    },
-    {
-      "name": "GitLabTokenDetector"
-    },
-    {
-      "name": "HexHighEntropyString",
-      "limit": 3.0
-    },
-    {
-      "name": "IbmCloudIamDetector"
-    },
-    {
-      "name": "IbmCosHmacDetector"
-    },
-    {
-      "name": "IPPublicDetector"
-    },
-    {
-      "name": "JwtTokenDetector"
-    },
-    {
-      "name": "KeywordDetector",
-      "keyword_exclude": ""
-    },
-    {
-      "name": "MailchimpDetector"
-    },
-    {
-      "name": "NpmDetector"
-    },
-    {
-      "name": "OpenAIDetector"
-    },
-    {
-      "name": "PrivateKeyDetector"
-    },
-    {
-      "name": "PypiTokenDetector"
-    },
-    {
-      "name": "SendGridDetector"
-    },
-    {
-      "name": "SlackDetector"
-    },
-    {
-      "name": "SoftlayerDetector"
-    },
-    {
-      "name": "SquareOAuthDetector"
-    },
-    {
-      "name": "StripeDetector"
-    },
-    {
-      "name": "TelegramBotTokenDetector"
-    },
-    {
-      "name": "TwilioKeyDetector"
-    }
-  ],
-  "filters_used": [
-    {
-      "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
-    },
-    {
-      "path": "detect_secrets.filters.common.is_baseline_file",
-      "filename": ".secrets.baseline"
-    },
-    {
-      "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
-      "min_level": 2
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_indirect_reference"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_likely_id_string"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_lock_file"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_potential_uuid"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_sequential_string"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_swagger_file"
-    },
-    {
-      "path": "detect_secrets.filters.heuristic.is_templated_secret"
-    },
-    {
-      "path": "detect_secrets.filters.regex.should_exclude_file",
-      "pattern": [
-        "migrations/*"
-      ]
-    }
-  ],
-  "results": {
-    ".env.example": [
-      {
-        "type": "Secret Keyword",
-        "filename": ".env.example",
-        "hashed_secret": "cdb0e76c1a69873cbdcdbe0a142d56c023dc9f22",
-        "is_verified": false,
-        "line_number": 1
-      }
-    ],
-    "alembic.ini": [
-      {
-        "type": "Basic Auth Credentials",
-        "filename": "alembic.ini",
-        "hashed_secret": "9d4e1e23bd5b727046a9e3b4b7db57bd8d6ee684",
-        "is_verified": false,
-        "line_number": 62
-      }
-    ],
-    "app\\db\\config.py": [
-      {
-        "type": "Basic Auth Credentials",
-        "filename": "app\\db\\config.py",
-        "hashed_secret": "cdb0e76c1a69873cbdcdbe0a142d56c023dc9f22",
-        "is_verified": false,
-        "line_number": 7
-      }
-    ]
-  },
-  "generated_at": "2026-05-29T10:11:37Z"
-}
diff --git a/poetry.lock b/poetry.lock
index 0158551..0d5f9b0 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -370,6 +370,22 @@ files = [
 frozenlist = ">=1.1.0"
 typing-extensions = {version = ">=4.2", markers = "python_version < \"3.13\""}
 
+[[package]]
+name = "aiosqlite"
+version = "0.22.1"
+description = "asyncio bridge to the standard sqlite3 module"
+optional = false
+python-versions = ">=3.9"
+groups = ["dev"]
+files = [
+    {file = "aiosqlite-0.22.1-py3-none-any.whl", hash = "sha256:21c002eb13823fad740196c5a2e9d8e62f6243bd9e7e4a1f87fb5e44ecb4fceb"},
+    {file = "aiosqlite-0.22.1.tar.gz", hash = "sha256:043e0bd78d32888c0a9ca90fc788b38796843360c855a7262a532813133a0650"},
+]
+
+[package.extras]
+dev = ["attribution (==1.8.0)", "black (==25.11.0)", "build (>=1.2)", "coverage[toml] (==7.10.7)", "flake8 (==7.3.0)", "flake8-bugbear (==24.12.12)", "flit (==3.12.0)", "mypy (==1.19.0)", "ufmt (==2.8.0)", "usort (==1.0.8.post1)"]
+docs = ["sphinx (==8.1.3)", "sphinx-mdinclude (==0.6.2)"]
+
 [[package]]
 name = "alembic"
 version = "1.18.0"
@@ -5111,4 +5127,4 @@ type = ["pytest-mypy"]
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.12"
-content-hash = "b1791a972d4445d49ce544f1c02ade34f45b590888d4c6e2d13b46f04ea078cf"
+content-hash = "70fced1ba446b5a402a112d57972978012389b624b7e484712ab85a64663e1c9"
diff --git a/pyproject.toml b/pyproject.toml
index 16d867d..8fbec05 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -7,19 +7,19 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.12"
-fastapi = {extras = ["all"], version = "^0.115.5"}
-sqlalchemy = { extras = ["asyncio"], version = "^2.0.30" }
+fastapi = {extras = ["all"], version = "^0.115.14"}
+sqlalchemy = { extras = ["asyncio"], version = "^2.0.45" }
 gunicorn = "^26.0.0"
 gunicorn-h1c = { version = "0.6.5", markers = "sys_platform != 'win32'" }
-alembic = "^1.13.1"
+alembic = "^1.18.0"
 asyncpg = "^0.29.0"
 passlib = "^1.7.4"
 bcrypt = "^4.3.0"
-pyjwt = {extras = ["crypto"], version = "^2.9.0"}
+pyjwt = {extras = ["crypto"], version = "^2.10.1"}
 sqladmin = "^0.22.0"
-humanize = "^4.10.0"
-redis = "^5.0.8"
-aiogram = "^3.13.0"
+humanize = "^4.15.0"
+redis = "^5.3.1"
+aiogram = "^3.22.0"
 opentelemetry-sdk = "^1.31.1"
 opentelemetry-instrumentation-fastapi = "^0.52b1"
 opentelemetry-instrumentation-logging = "^0.52b1"
@@ -36,20 +36,20 @@ sqlalchemy-continuum = "^1.5.2"
 
 
 [tool.poetry.group.dev.dependencies]
-mypy = "^1.10.0"
-ruff = "^0.7.1"
-pre-commit = "^3.7.0"
+mypy = "^1.19.1"
+ruff = "^0.7.4"
+pre-commit = "^3.8.0"
 pytest = "^9.0.2"
 pytest-asyncio = "^1.3.0"
 sqlalchemy-utils = "^0.41.2"
 faker = "^28.4.1"
 codespell = "^2.4.1"
 detect-secrets = "^1.5.0"
-coverage = {extras = ["html"], version = "^7.8.0"}
+coverage = {extras = ["html"], version = "^7.13.1"}
 smokeshow = "^0.5.0"
+aiosqlite = "^0.22.1"
 fastlink = "^0.1.6"
 
-
 [tool.poetry.group.docs.dependencies]
 mkdocs-material = "^9.6.14"
 mkdocs-minify-plugin = "^0.8.0"
@@ -57,6 +57,7 @@ mdx-include = "^1.4.2"
 mkdocs-markdownextradata-plugin = "^0.2.6"
 markdown-include-variants = "^0.0.4"
 
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

From 3e37c5dd93203789e88f3d5f689cb26dbfa7c9b5 Mon Sep 17 00:00:00 2001
From: "ivan.stasevich" <pravitel2015ify@gmail.com>
Date: Wed, 23 Sep 2026 13:10:14 +0300
Subject: [PATCH 3/6] feat: update Docker Compose files for observability and
 production configurations

---
 .gitignore                       |  2 ++
 Makefile                         | 20 +++++------
 docker-compose.dev.yml           | 60 --------------------------------
 docker-compose.observability.yml | 35 -------------------
 docker-compose.prod.yml          |  6 ----
 5 files changed, 10 insertions(+), 113 deletions(-)
 delete mode 100644 docker-compose.observability.yml
 delete mode 100644 docker-compose.prod.yml

diff --git a/.gitignore b/.gitignore
index 6500825..bc6feae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -173,3 +173,5 @@ certs
 docs/adr/
 docs/superpowers/
 docs/glossary.md
+docker-compose.observability.yml
+docker-compose.prod.yml
diff --git a/Makefile b/Makefile
index 11caafb..829f289 100644
--- a/Makefile
+++ b/Makefile
@@ -7,15 +7,15 @@ certs:
 
 .PHONY: deps
 deps:
-	docker compose -f docker-compose.dev.yml up postgres redis -d --build --remove-orphans --wait
+	docker compose -f docker-compose.yml -f docker-compose.dev.yml up postgres redis -d --build --remove-orphans --wait
 
 .PHONY: up
 up:
-	docker compose -f docker-compose.dev.yml up --build --remove-orphans --wait
+	docker compose -f docker-compose.yml -f docker-compose.dev.yml up --build --remove-orphans --wait
 
 .PHONY: start
 start:
-	docker compose -f docker-compose.dev.yml start
+	docker compose -f docker-compose.yml -f docker-compose.dev.yml start
 
 .PHONY: build
 build:
@@ -27,15 +27,11 @@ up-obs:
 
 .PHONY: up-prod
 up-prod:
-	docker compose -f docker-compose.dev.yml -f docker-compose.prod.yml up --build --remove-orphans --wait
+	docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.prod.yml up --build --remove-orphans --wait
 
 .PHONY: up-prod-obs
 up-prod-obs:
-	docker compose -f docker-compose.dev.yml -f docker-compose.prod.yml -f docker-compose.observability.yml up --build --remove-orphans --wait
-
-.PHONY: up-example
-up-example:
-	docker compose -f docker-compose.example.yml up --build --remove-orphans --wait
+	docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.prod.yml -f docker-compose.observability.yml up --build --remove-orphans --wait
 
 .PHONY: test
 test:
@@ -51,15 +47,15 @@ testcov:
 
 .PHONY: stop
 stop:
-	docker compose -f docker-compose.dev.yml stop
+	docker compose -f docker-compose.yml -f docker-compose.dev.yml stop
 
 .PHONY: down
 down:
-	docker compose -f docker-compose.dev.yml down
+	docker compose -f docker-compose.yml -f docker-compose.dev.yml down
 
 .PHONY: restart
 restart:
-	docker compose -f docker-compose.dev.yml restart
+	docker compose -f docker-compose.yml -f docker-compose.dev.yml restart
 
 .PHONY: lint
 lint:
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
index d05b9ac..c20d7c4 100644
--- a/docker-compose.dev.yml
+++ b/docker-compose.dev.yml
@@ -1,84 +1,24 @@
 services:
   postgres:
-    env_file:
-      - .env
-    image: postgres:16-alpine
-    environment:
-      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:?database password required}
-      POSTGRES_USER: ${POSTGRES_USER:-fastid}
-      POSTGRES_DB: ${POSTGRES_DB:-fastid}
-    volumes:
-      - pg_data:/var/lib/postgresql/data
     ports:
       - "5412:5432"
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER} -d ${POSTGRES_DB}"]
-      interval: 10s
-      retries: 5
-      start_period: 30s
-      timeout: 10s
-
   redis:
-    env_file:
-      - .env
-    image: redis:7-alpine
-    command: redis-server --requirepass ${REDIS_PASSWORD:?redis password required}
     ports:
       - "6312:6379"
-    healthcheck:
-      test: ["CMD", "redis-cli", "ping"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
   mailpit:
-    image: axllent/mailpit:v1.30.1
     ports:
       - "8025:8025"
       - "1025:1025"
-    healthcheck:
-      test: ["CMD", "wget", "--no-verbose", "--tries=1", "--spider", "http://localhost:8025/readyz"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
-
   fastid-app:
     build:
       context: .
       dockerfile: docker/Dockerfile
       target: dev
-    env_file: .env
-    ports:
-      - "8012:8000"
-    depends_on:
-      postgres:
-        condition: service_healthy
-      redis:
-        condition: service_healthy
-      mailpit:
-        condition: service_healthy
-
-    environment:
-      FASTID_DB_URL: ${FASTID_DB_URL:-postgresql+asyncpg://${POSTGRES_USER:-fastid}:${POSTGRES_PASSWORD:?database password required}@postgres:5432/${POSTGRES_DB:-fastid}}
-      FASTID_REDIS_URL: ${FASTID_REDIS_URL:-redis://:${REDIS_PASSWORD:?redis password required}@redis:6379/0}
-      FASTID_SMTP_ENABLED: ${FASTID_SMTP_ENABLED:-true}
-      FASTID_SMTP_HOST: ${FASTID_SMTP_HOST:-mailpit}
-      FASTID_SMTP_PORT: ${FASTID_SMTP_PORT:-1025}
-
     volumes:
       - "./migrations:/opt/fastid/migrations"
       - "./fastid:/opt/fastid/fastid"
       - "./templates:/opt/fastid/templates"
       - "./static:/opt/fastid/static"
-      - "./certs:/opt/fastid/certs"
-
-    healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8000/readiness" ]
-      interval: 30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
 
 volumes:
   pg_data:
diff --git a/docker-compose.observability.yml b/docker-compose.observability.yml
deleted file mode 100644
index d9fffcc..0000000
--- a/docker-compose.observability.yml
+++ /dev/null
@@ -1,35 +0,0 @@
-x-logging: &default-logging
-  driver: json-file
-  options:
-    max-size: "10m"
-    max-file: "3"
-
-x-observability: &observability
-  evsoft.observability.enabled: "true"
-  evsoft.observability.project: "${APP_PROJECT:-fastid}"
-  evsoft.observability.environment: "${APP_ENVIRONMENT:-development}"
-
-services:
-  postgres:
-    logging: *default-logging
-    labels:
-      <<: *observability
-      evsoft.observability.service: "postgres"
-
-  redis:
-    logging: *default-logging
-    labels:
-      <<: *observability
-      evsoft.observability.service: "redis"
-
-  mailpit:
-    logging: *default-logging
-    labels:
-      <<: *observability
-      evsoft.observability.service: "mailpit"
-
-  fastid-app:
-    logging: *default-logging
-    labels:
-      <<: *observability
-      evsoft.observability.service: "${APP_SERVICE:-fastid}"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
deleted file mode 100644
index c437f2a..0000000
--- a/docker-compose.prod.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-services:
-  fastid-app:
-    build:
-      context: .
-      dockerfile: docker/Dockerfile
-      target: prod

From eebd91579e72a6b0a966f1f8985676b48ced5e17 Mon Sep 17 00:00:00 2001
From: "ivan.stasevich" <pravitel2015ify@gmail.com>
Date: Wed, 23 Sep 2026 13:13:09 +0300
Subject: [PATCH 4/6] feat: update healthcheck endpoint in Docker Compose
 configuration

---
 .github/workflows/test.yml | 6 +++---
 docker-compose.yml         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index d0a3bd6..002cf61 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,8 +60,8 @@ jobs:
       - name: Setup test environment
         run: |
           touch .env
-          docker compose -f docker-compose.dev.yml down -v --remove-orphans
-          docker compose -f docker-compose.dev.yml up postgres redis -d --wait --remove-orphans
+          docker compose -f docker-compose.yml -f docker-compose.dev.yml down -v --remove-orphans
+          docker compose -f docker-compose.yml -f docker-compose.dev.yml up postgres redis -d --wait --remove-orphans
           poetry run make certs
 
       - name: Run tests
@@ -77,7 +77,7 @@ jobs:
 
       - name: Teardown test environment
         run: |
-          docker compose -f docker-compose.dev.yml down -v --remove-orphans
+          docker compose -f docker-compose.yml -f docker-compose.dev.yml down -v --remove-orphans
 
       - name: Store coverage files
         uses: actions/upload-artifact@v4
diff --git a/docker-compose.yml b/docker-compose.yml
index f59ffe3..c929f09 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,7 +61,7 @@ services:
       - "./certs:/opt/fastid/certs"
 
     healthcheck:
-      test: [ "CMD", "curl", "-f", "http://localhost:8000/api/v1/readiness" ]
+      test: [ "CMD", "curl", "-f", "http://localhost:8000/readiness" ]
       interval: 30s
       timeout: 10s
       retries: 3

From fbf00c2f078e0a1e47ca01d36c8755ad644e2318 Mon Sep 17 00:00:00 2001
From: "ivan.stasevich" <pravitel2015ify@gmail.com>
Date: Wed, 23 Sep 2026 13:42:07 +0300
Subject: [PATCH 5/6] feat: rename Docker Compose files and update .gitignore;
 remove CORS plugin

---
 .gitignore                                |  6 ++---
 README.md                                 |  2 +-
 docker-compose.dev.yml => compose-dev.yml |  0
 docker-compose.yml => compose.yml         |  0
 fastid/api/cors.py                        | 29 -----------------------
 fastid/core/schemas.py                    |  2 +-
 6 files changed, 4 insertions(+), 35 deletions(-)
 rename docker-compose.dev.yml => compose-dev.yml (100%)
 rename docker-compose.yml => compose.yml (100%)
 delete mode 100644 fastid/api/cors.py

diff --git a/.gitignore b/.gitignore
index bc6feae..591aa01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -160,10 +160,8 @@ cython_debug/
 .idea/
 
 # Environments
-*.env
-.dev.env
-!.env.example
-certs
+*.env*
+certs/
 
 # Git worktrees
 .worktrees/
diff --git a/README.md b/README.md
index 1e90e5c..2255809 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@
 ### Download the Compose file
 
 ```bash
-wget https://raw.githubusercontent.com/everysoftware/fastid/refs/heads/master/docker-compose.yml
+wget https://raw.githubusercontent.com/everysoftware/fastid/refs/heads/master/compose.yml
 ```
 
 ### Generate keys
diff --git a/docker-compose.dev.yml b/compose-dev.yml
similarity index 100%
rename from docker-compose.dev.yml
rename to compose-dev.yml
diff --git a/docker-compose.yml b/compose.yml
similarity index 100%
rename from docker-compose.yml
rename to compose.yml
diff --git a/fastid/api/cors.py b/fastid/api/cors.py
deleted file mode 100644
index cd09d41..0000000
--- a/fastid/api/cors.py
+++ /dev/null
@@ -1,29 +0,0 @@
-from collections.abc import Sequence
-
-from fastapi import FastAPI
-from fastapi.middleware.cors import CORSMiddleware
-
-from fastid.core.base import Plugin
-
-
-class CORSPlugin(Plugin):
-    name = "cors"
-
-    def __init__(
-        self,
-        *,
-        origins: Sequence[str] = (),
-        origin_regex: str | None = None,
-    ) -> None:
-        self.origins = origins
-        self.origin_regex = origin_regex
-
-    def install(self, app: FastAPI) -> None:
-        app.add_middleware(
-            CORSMiddleware,
-            allow_origins=self.origins,
-            allow_origin_regex=self.origin_regex,
-            allow_credentials=True,
-            allow_methods=["*"],
-            allow_headers=["*"],
-        )
diff --git a/fastid/core/schemas.py b/fastid/core/schemas.py
index ede6365..afdae16 100644
--- a/fastid/core/schemas.py
+++ b/fastid/core/schemas.py
@@ -8,7 +8,7 @@
 from pydantic_settings import BaseSettings as PydanticBaseSettings
 from pydantic_settings import SettingsConfigDict
 
-ENV_FILE = ".env"
+ENV_FILE = (".env", ".env.local")
 ENV_PREFIX = "fastid_"
 
 

From 9912d6f0639baaced1dab0d6995d200a5a776b33 Mon Sep 17 00:00:00 2001
From: "ivan.stasevich" <pravitel2015ify@gmail.com>
Date: Wed, 23 Sep 2026 14:01:08 +0300
Subject: [PATCH 6/6] feat: rename Docker Compose files and update test
 fixtures for core client

---
 .github/workflows/test.yml    |  6 +++---
 .gitignore                    |  4 ++--
 Makefile                      | 22 +++++++++++++---------
 tests/api/test_healthcheck.py | 17 ++++-------------
 tests/conftest.py             | 19 +++++++++++++++++++
 5 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 002cf61..092172f 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -60,8 +60,8 @@ jobs:
       - name: Setup test environment
         run: |
           touch .env
-          docker compose -f docker-compose.yml -f docker-compose.dev.yml down -v --remove-orphans
-          docker compose -f docker-compose.yml -f docker-compose.dev.yml up postgres redis -d --wait --remove-orphans
+          docker compose -f compose.yml -f compose-dev.yml down -v --remove-orphans
+          docker compose -f compose.yml -f compose-dev.yml up postgres redis -d --wait --remove-orphans
           poetry run make certs
 
       - name: Run tests
@@ -77,7 +77,7 @@ jobs:
 
       - name: Teardown test environment
         run: |
-          docker compose -f docker-compose.yml -f docker-compose.dev.yml down -v --remove-orphans
+          docker compose -f compose.yml -f compose-dev.yml down -v --remove-orphans
 
       - name: Store coverage files
         uses: actions/upload-artifact@v4
diff --git a/.gitignore b/.gitignore
index 591aa01..66f5203 100644
--- a/.gitignore
+++ b/.gitignore
@@ -171,5 +171,5 @@ certs/
 docs/adr/
 docs/superpowers/
 docs/glossary.md
-docker-compose.observability.yml
-docker-compose.prod.yml
+compose-obs.yml
+compose-prod.yml
diff --git a/Makefile b/Makefile
index 829f289..a466e75 100644
--- a/Makefile
+++ b/Makefile
@@ -7,15 +7,19 @@ certs:
 
 .PHONY: deps
 deps:
-	docker compose -f docker-compose.yml -f docker-compose.dev.yml up postgres redis -d --build --remove-orphans --wait
+	docker compose -f compose.yml -f compose-dev.yml up postgres redis -d --build --remove-orphans --wait
 
 .PHONY: up
 up:
-	docker compose -f docker-compose.yml -f docker-compose.dev.yml up --build --remove-orphans --wait
+	docker compose -f compose.yml -f compose-dev.yml up --build --remove-orphans --wait
+
+.PHONY: recreate
+recreate:
+	docker compose -f compose.yml -f compose-dev.yml up --build --force-recreate --remove-orphans --wait
 
 .PHONY: start
 start:
-	docker compose -f docker-compose.yml -f docker-compose.dev.yml start
+	docker compose -f compose.yml -f compose-dev.yml start
 
 .PHONY: build
 build:
@@ -23,15 +27,15 @@ build:
 
 .PHONY: up-obs
 up-obs:
-	docker compose -f docker-compose.dev.yml -f docker-compose.observability.yml up --build --remove-orphans --wait
+	docker compose -f compose-dev.yml -f compose-observability.yml up --build --remove-orphans --wait
 
 .PHONY: up-prod
 up-prod:
-	docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.prod.yml up --build --remove-orphans --wait
+	docker compose -f compose.yml -f compose-dev.yml -f compose-prod.yml up --build --remove-orphans --wait
 
 .PHONY: up-prod-obs
 up-prod-obs:
-	docker compose -f docker-compose.yml -f docker-compose.dev.yml -f docker-compose.prod.yml -f docker-compose.observability.yml up --build --remove-orphans --wait
+	docker compose -f compose.yml -f compose-dev.yml -f compose-prod.yml -f compose-obs.yml up --build --remove-orphans --wait
 
 .PHONY: test
 test:
@@ -47,15 +51,15 @@ testcov:
 
 .PHONY: stop
 stop:
-	docker compose -f docker-compose.yml -f docker-compose.dev.yml stop
+	docker compose -f compose.yml -f compose-dev.yml stop
 
 .PHONY: down
 down:
-	docker compose -f docker-compose.yml -f docker-compose.dev.yml down
+	docker compose -f compose.yml -f compose-dev.yml down
 
 .PHONY: restart
 restart:
-	docker compose -f docker-compose.yml -f docker-compose.dev.yml restart
+	docker compose -f compose.yml -f compose-dev.yml restart
 
 .PHONY: lint
 lint:
diff --git a/tests/api/test_healthcheck.py b/tests/api/test_healthcheck.py
index 534ec27..b2a5c7a 100644
--- a/tests/api/test_healthcheck.py
+++ b/tests/api/test_healthcheck.py
@@ -1,22 +1,13 @@
-from fastapi import status
 from httpx import AsyncClient
 
 
-async def test_readiness(client: AsyncClient) -> None:
-    response = await client.get("/readiness")
+async def test_readiness(core_client: AsyncClient) -> None:
+    response = await core_client.get("/readiness")
     response.raise_for_status()
     assert response.json() == {"status": "ok"}
 
 
-async def test_liveness(client: AsyncClient) -> None:
-    response = await client.get("/liveness")
+async def test_liveness(core_client: AsyncClient) -> None:
+    response = await core_client.get("/liveness")
     response.raise_for_status()
     assert response.json() == {"db": True, "cache": True}
-
-
-async def test_exception(client: AsyncClient) -> None:
-    response = await client.get("/exc")
-    assert response.status_code == status.HTTP_400_BAD_REQUEST
-    content = response.json()
-    assert content["msg"] == "Test error"
-    assert content["type"] == "test_error"
diff --git a/tests/conftest.py b/tests/conftest.py
index 4033d24..c7f1c9b 100644
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -12,6 +12,7 @@
 from fastid.cache.config import redis_settings
 from fastid.cache.dependencies import get_cache
 from fastid.cache.storage import CacheStorage, RedisStorage
+from fastid.core.app import core_app
 from fastid.core.dependencies import log_provider
 from fastid.database.dependencies import get_uow_raw
 from fastid.database.uow import SQLAlchemyUOW
@@ -96,6 +97,24 @@ async def frontend_client() -> AsyncIterator[AsyncClient]:
     frontend_app.dependency_overrides = {}
 
 
+@pytest.fixture
+async def core_client() -> AsyncIterator[AsyncClient]:
+    core_app.dependency_overrides[get_uow_raw] = get_test_uow
+    core_app.dependency_overrides[get_cache] = get_test_cache
+    core_app.dependency_overrides[get_smtp] = lambda: MagicMock()
+    core_app.dependency_overrides[get_bot] = lambda: AsyncMock()
+
+    transport = ASGITransport(app=core_app)
+    async with AsyncClient(
+        transport=transport,
+        base_url="http://testserver",
+        headers={"Content-Type": "application/json"},
+    ) as client:
+        yield client
+
+    core_app.dependency_overrides = {}
+
+
 @pytest.fixture
 async def conn(engine: AsyncEngine) -> AsyncIterator[AsyncConnection]:
     async with engine.begin() as conn:  # type: AsyncConnection