AP0.1: Backend, Frontend minimal, Tests und CI fuer Dev/Prod-Deploy.
Deploy Development / deploy (push) Successful in 41s
Test Suite / compose-smoke (push) Failing after 3s
Test Suite / pytest-backend (push) Has been skipped
Test Suite / lint-backend (push) Successful in 1s
Test Suite / build-frontend (push) Successful in 1m7s
Test Suite / k6 /api/health Baseline (push) Has been skipped
Test Suite / playwright-smoke (push) Has been skipped
Deploy Development / deploy (push) Successful in 41s
Test Suite / compose-smoke (push) Failing after 3s
Test Suite / pytest-backend (push) Has been skipped
Test Suite / lint-backend (push) Successful in 1s
Test Suite / build-frontend (push) Successful in 1m7s
Test Suite / k6 /api/health Baseline (push) Has been skipped
Test Suite / playwright-smoke (push) Has been skipped
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
1ce20d8bdb
commit
0e5bf72dee
30 files changed
+828
-422
No files matched your search
@@ -0,0 +1,16 @@
|
||||
FROM python:3.12-slim
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
RUN apt-get update && apt-get install -y postgresql-client \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
|
||||
COPY requirements.txt .
|
||||
ENV PIP_DEFAULT_TIMEOUT=120
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
|
||||
COPY . .
|
||||
|
||||
EXPOSE 8000
|
||||
|
||||
CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000"]
|
||||
@@ -1,14 +0,0 @@
|
||||
# Backend
|
||||
|
||||
FastAPI-Anwendung — noch anzulegen.
|
||||
|
||||
Erwartete Struktur (analog shinkan-jinkendo):
|
||||
|
||||
```
|
||||
backend/
|
||||
├── Dockerfile
|
||||
├── main.py
|
||||
├── requirements.txt
|
||||
├── migrations/
|
||||
└── routers/
|
||||
```
|
||||
@@ -0,0 +1,38 @@
|
||||
"""PostgreSQL connection helpers."""
|
||||
|
||||
import os
|
||||
|
||||
import psycopg2
|
||||
from psycopg2.extensions import connection
|
||||
|
||||
|
||||
def db_params() -> dict[str, str]:
|
||||
return {
|
||||
"host": os.getenv("DB_HOST", "localhost"),
|
||||
"port": os.getenv("DB_PORT", "5432"),
|
||||
"dbname": os.getenv("DB_NAME", "kairo_dev"),
|
||||
"user": os.getenv("DB_USER", "kairo_dev"),
|
||||
"password": os.getenv("DB_PASSWORD", "dev_password"),
|
||||
}
|
||||
|
||||
|
||||
def get_connection() -> connection:
|
||||
p = db_params()
|
||||
return psycopg2.connect(
|
||||
host=p["host"],
|
||||
port=p["port"],
|
||||
database=p["dbname"],
|
||||
user=p["user"],
|
||||
password=p["password"],
|
||||
)
|
||||
|
||||
|
||||
def check_db() -> bool:
|
||||
conn = get_connection()
|
||||
try:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute("SELECT 1")
|
||||
cur.fetchone()
|
||||
return True
|
||||
finally:
|
||||
conn.close()
|
||||
@@ -0,0 +1,71 @@
|
||||
"""Jinkendo Kairo — FastAPI application entry point."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
from fastapi import FastAPI
|
||||
from fastapi.middleware.cors import CORSMiddleware
|
||||
|
||||
from db import check_db
|
||||
from version import APP_NAME, APP_VERSION, DB_SCHEMA_VERSION
|
||||
|
||||
if os.getenv("SKIP_DB_MIGRATE", "").strip().lower() in ("1", "true", "yes"):
|
||||
print("[SKIP_DB_MIGRATE] Migrationen übersprungen")
|
||||
else:
|
||||
import run_migrations
|
||||
|
||||
exit_code = run_migrations.main()
|
||||
if exit_code != 0:
|
||||
print(f"[FAIL] Migrationen fehlgeschlagen (Exit {exit_code})")
|
||||
sys.exit(exit_code)
|
||||
|
||||
allowed_origins = [
|
||||
origin.strip()
|
||||
for origin in os.getenv("ALLOWED_ORIGINS", "http://localhost:3097").split(",")
|
||||
if origin.strip()
|
||||
]
|
||||
|
||||
app = FastAPI(
|
||||
title="Jinkendo Kairo",
|
||||
version=APP_VERSION,
|
||||
docs_url="/api/docs" if os.getenv("ENVIRONMENT", "development") != "production" else None,
|
||||
redoc_url=None,
|
||||
)
|
||||
|
||||
app.add_middleware(
|
||||
CORSMiddleware,
|
||||
allow_origins=allowed_origins,
|
||||
allow_credentials=True,
|
||||
allow_methods=["*"],
|
||||
allow_headers=["*"],
|
||||
)
|
||||
|
||||
|
||||
@app.get("/api/health")
|
||||
def api_health():
|
||||
db_status = "ok"
|
||||
try:
|
||||
if not check_db():
|
||||
db_status = "error"
|
||||
except Exception:
|
||||
db_status = "error"
|
||||
|
||||
status = "ok" if db_status == "ok" else "degraded"
|
||||
return {
|
||||
"status": status,
|
||||
"app": APP_NAME,
|
||||
"db": db_status,
|
||||
"version": APP_VERSION,
|
||||
"schema": DB_SCHEMA_VERSION,
|
||||
}
|
||||
|
||||
|
||||
@app.get("/api/version")
|
||||
def api_version():
|
||||
return {
|
||||
"app": APP_NAME,
|
||||
"version": APP_VERSION,
|
||||
"schema": DB_SCHEMA_VERSION,
|
||||
}
|
||||
@@ -0,0 +1,12 @@
|
||||
-- AP0.1: minimale Schema-Vorbereitung (keine Tenant/User/Actor-Fachlogik)
|
||||
|
||||
CREATE TABLE IF NOT EXISTS kairo_app_meta (
|
||||
id SERIAL PRIMARY KEY,
|
||||
key VARCHAR(128) UNIQUE NOT NULL,
|
||||
value TEXT NOT NULL,
|
||||
updated_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
|
||||
);
|
||||
|
||||
INSERT INTO kairo_app_meta (key, value)
|
||||
VALUES ('schema_phase', 'ap0.1')
|
||||
ON CONFLICT (key) DO NOTHING;
|
||||
@@ -0,0 +1,3 @@
|
||||
-r requirements.txt
|
||||
pytest==8.3.4
|
||||
httpx==0.27.2
|
||||
@@ -0,0 +1,5 @@
|
||||
fastapi==0.111.0
|
||||
uvicorn[standard]==0.29.0
|
||||
psycopg2-binary==2.9.9
|
||||
sqlparse>=0.5.0
|
||||
pydantic==2.7.1
|
||||
@@ -0,0 +1,198 @@
|
||||
#!/usr/bin/env python3
|
||||
"""Apply numbered SQL migrations with schema_migrations tracking."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import os
|
||||
import re
|
||||
import shutil
|
||||
import subprocess
|
||||
import sys
|
||||
import time
|
||||
from typing import List, Tuple
|
||||
|
||||
import psycopg2
|
||||
import sqlparse
|
||||
|
||||
from db import db_params, get_connection
|
||||
|
||||
_LEADING_DIGITS = re.compile(r"^(\d+)")
|
||||
|
||||
|
||||
def init_migrations_table(conn) -> None:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
CREATE TABLE IF NOT EXISTS schema_migrations (
|
||||
id SERIAL PRIMARY KEY,
|
||||
migration VARCHAR(255) UNIQUE NOT NULL,
|
||||
executed_at TIMESTAMP DEFAULT NOW()
|
||||
)
|
||||
"""
|
||||
)
|
||||
conn.commit()
|
||||
|
||||
|
||||
def _migration_sort_key(stem: str) -> Tuple[int, str]:
|
||||
match = _LEADING_DIGITS.match(stem)
|
||||
return (int(match.group(1)) if match else 0, stem)
|
||||
|
||||
|
||||
def migration_files(migrations_dir: str) -> List[Tuple[str, str]]:
|
||||
rows: List[Tuple[str, str]] = []
|
||||
for filename in os.listdir(migrations_dir):
|
||||
if not filename.endswith(".sql") or not filename[0].isdigit():
|
||||
continue
|
||||
stem = filename[:-4]
|
||||
rows.append((stem, os.path.join(migrations_dir, filename)))
|
||||
rows.sort(key=lambda item: _migration_sort_key(item[0]))
|
||||
return rows
|
||||
|
||||
|
||||
def executed_migrations(conn) -> set[str]:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute("SELECT migration FROM schema_migrations")
|
||||
return {row[0] for row in cur.fetchall()}
|
||||
|
||||
|
||||
def pending_migrations(conn, migrations_dir: str) -> List[Tuple[str, str]]:
|
||||
done = executed_migrations(conn)
|
||||
return [(name, path) for name, path in migration_files(migrations_dir) if name not in done]
|
||||
|
||||
|
||||
def _split_statements(sql_text: str) -> List[str]:
|
||||
parts = sqlparse.split(sql_text.strip())
|
||||
return [part.strip() for part in parts if part and part.strip()]
|
||||
|
||||
|
||||
def _run_with_psql(filepath: str) -> tuple[bool, str]:
|
||||
psql = shutil.which("psql")
|
||||
if not psql:
|
||||
return False, ""
|
||||
|
||||
p = db_params()
|
||||
env = os.environ.copy()
|
||||
env["PGPASSWORD"] = str(p["password"])
|
||||
cmd = [
|
||||
psql,
|
||||
"-h",
|
||||
p["host"],
|
||||
"-p",
|
||||
str(p["port"]),
|
||||
"-U",
|
||||
p["user"],
|
||||
"-d",
|
||||
p["dbname"],
|
||||
"-v",
|
||||
"ON_ERROR_STOP=1",
|
||||
"-1",
|
||||
"-f",
|
||||
filepath,
|
||||
]
|
||||
proc = subprocess.run(cmd, env=env, capture_output=True, text=True, timeout=7200)
|
||||
if proc.returncode != 0:
|
||||
tail = ((proc.stderr or "") + "\n" + (proc.stdout or "")).strip()
|
||||
return False, tail[:8000] or f"exit {proc.returncode}"
|
||||
return True, (proc.stdout or "").strip()
|
||||
|
||||
|
||||
def _record_migration(conn, migration_name: str) -> None:
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
INSERT INTO schema_migrations (migration)
|
||||
VALUES (%s)
|
||||
ON CONFLICT (migration) DO NOTHING
|
||||
""",
|
||||
(migration_name,),
|
||||
)
|
||||
|
||||
|
||||
def run_migration(conn, migration_name: str, filepath: str) -> bool:
|
||||
print(f"Running migration: {migration_name}")
|
||||
try:
|
||||
if shutil.which("psql"):
|
||||
ok, diag = _run_with_psql(filepath)
|
||||
if not ok:
|
||||
print(f" [FAIL] psql:\n{diag or '(kein Output)'}")
|
||||
conn.rollback()
|
||||
return False
|
||||
else:
|
||||
with open(filepath, "r", encoding="utf-8") as handle:
|
||||
body = handle.read()
|
||||
statements = _split_statements(body)
|
||||
with conn.cursor() as cur:
|
||||
for stmt in statements:
|
||||
cur.execute(stmt)
|
||||
|
||||
_record_migration(conn, migration_name)
|
||||
conn.commit()
|
||||
print(f" [OK] {migration_name}")
|
||||
return True
|
||||
except Exception as exc:
|
||||
conn.rollback()
|
||||
print(f" [FAIL] {migration_name}: {exc}")
|
||||
return False
|
||||
|
||||
|
||||
def connect_with_retry(max_retries: int = 30):
|
||||
p = db_params()
|
||||
for attempt in range(max_retries):
|
||||
try:
|
||||
conn = get_connection()
|
||||
conn.autocommit = False
|
||||
print(f"[OK] Connected to database: {p['dbname']}")
|
||||
return conn
|
||||
except psycopg2.OperationalError:
|
||||
if attempt >= max_retries - 1:
|
||||
raise
|
||||
print(f"Waiting for database... ({attempt + 1}/{max_retries})")
|
||||
time.sleep(2)
|
||||
|
||||
|
||||
def migrations_directory() -> str:
|
||||
docker_path = "/app/migrations"
|
||||
if os.path.isdir(docker_path):
|
||||
return docker_path
|
||||
return os.path.join(os.path.dirname(os.path.abspath(__file__)), "migrations")
|
||||
|
||||
|
||||
def main() -> int:
|
||||
print("=" * 60)
|
||||
print("Jinkendo Kairo — Database Migrations")
|
||||
print("=" * 60)
|
||||
|
||||
migrations_dir = migrations_directory()
|
||||
if not os.path.isdir(migrations_dir):
|
||||
print(f"[FAIL] migrations directory missing: {migrations_dir}")
|
||||
return 1
|
||||
|
||||
try:
|
||||
conn = connect_with_retry()
|
||||
init_migrations_table(conn)
|
||||
pending = pending_migrations(conn, migrations_dir)
|
||||
|
||||
if not pending:
|
||||
print("[OK] Keine ausstehenden Migrationen.")
|
||||
conn.close()
|
||||
return 0
|
||||
|
||||
print(f"{len(pending)} ausstehende Migration(en):")
|
||||
for name, _ in pending:
|
||||
print(f" - {name}")
|
||||
|
||||
for migration_name, filepath in pending:
|
||||
if not run_migration(conn, migration_name, filepath):
|
||||
conn.close()
|
||||
return 1
|
||||
|
||||
conn.close()
|
||||
print("[OK] Migrationen abgeschlossen.")
|
||||
return 0
|
||||
except Exception as exc:
|
||||
print(f"[FAIL] {exc}")
|
||||
return 1
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
sys.exit(main())
|
||||
@@ -0,0 +1,30 @@
|
||||
import os
|
||||
|
||||
import pytest
|
||||
from fastapi.testclient import TestClient
|
||||
|
||||
|
||||
@pytest.fixture()
|
||||
def client(monkeypatch):
|
||||
monkeypatch.setenv("SKIP_DB_MIGRATE", "1")
|
||||
import importlib
|
||||
|
||||
import main as main_module
|
||||
|
||||
importlib.reload(main_module)
|
||||
return TestClient(main_module.app)
|
||||
|
||||
|
||||
def test_app_importable():
|
||||
import main
|
||||
|
||||
assert main.app is not None
|
||||
|
||||
|
||||
def test_health_endpoint(client):
|
||||
response = client.get("/api/health")
|
||||
assert response.status_code == 200
|
||||
payload = response.json()
|
||||
assert payload["app"] == "jinkendo-kairo"
|
||||
assert payload["status"] in {"ok", "degraded"}
|
||||
assert payload["db"] in {"ok", "error"}
|
||||
@@ -0,0 +1,57 @@
|
||||
"""Migration runner tests (require PostgreSQL)."""
|
||||
|
||||
import os
|
||||
from pathlib import Path
|
||||
|
||||
import psycopg2
|
||||
import pytest
|
||||
|
||||
import run_migrations
|
||||
|
||||
|
||||
def _db_available() -> bool:
|
||||
try:
|
||||
conn = psycopg2.connect(
|
||||
host=os.getenv("DB_HOST", "localhost"),
|
||||
port=os.getenv("DB_PORT", "5432"),
|
||||
dbname=os.getenv("DB_NAME", "kairo_dev"),
|
||||
user=os.getenv("DB_USER", "kairo_dev"),
|
||||
password=os.getenv("DB_PASSWORD", "dev_password"),
|
||||
)
|
||||
conn.close()
|
||||
return True
|
||||
except psycopg2.OperationalError:
|
||||
return False
|
||||
|
||||
|
||||
pytestmark = pytest.mark.skipif(not _db_available(), reason="PostgreSQL nicht erreichbar")
|
||||
|
||||
|
||||
def test_migration_runner_finds_migrations():
|
||||
migrations_dir = run_migrations.migrations_directory()
|
||||
files = run_migrations.migration_files(migrations_dir)
|
||||
names = [name for name, _ in files]
|
||||
assert "001_init_core" in names
|
||||
|
||||
|
||||
def test_migration_runner_is_idempotent():
|
||||
assert run_migrations.main() == 0
|
||||
assert run_migrations.main() == 0
|
||||
|
||||
conn = run_migrations.connect_with_retry(max_retries=5)
|
||||
executed = run_migrations.executed_migrations(conn)
|
||||
conn.close()
|
||||
assert "001_init_core" in executed
|
||||
|
||||
|
||||
def test_core_table_exists():
|
||||
conn = run_migrations.connect_with_retry(max_retries=5)
|
||||
with conn.cursor() as cur:
|
||||
cur.execute(
|
||||
"""
|
||||
SELECT COUNT(*) FROM information_schema.tables
|
||||
WHERE table_schema = 'public' AND table_name = 'kairo_app_meta'
|
||||
"""
|
||||
)
|
||||
assert cur.fetchone()[0] == 1
|
||||
conn.close()
|
||||
@@ -0,0 +1,3 @@
|
||||
APP_VERSION = "0.1.0-ap0.1"
|
||||
DB_SCHEMA_VERSION = "001"
|
||||
APP_NAME = "jinkendo-kairo"
|
||||
Reference in new issue
Block a user