-
Notifications
You must be signed in to change notification settings - Fork 60
fastapi-sqlalchemy-pg-catalog: minimal repro sample for keploy/integrations#193 #102
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AkashKumar7902
wants to merge
10
commits into
main
Choose a base branch
from
add-fastapi-sqlalchemy-pg-catalog
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
61a61e6
fastapi-sqlalchemy-pg-catalog: minimal repro sample for keploy/integr…
AkashKumar7902 4becdde
fastapi-sqlalchemy-pg-catalog: tighten flow.sh + init.sql per Copilot…
AkashKumar7902 ec3174e
fastapi-sqlalchemy-pg-catalog: parameterize README + SQL_ECHO env knob
AkashKumar7902 3203a0a
fastapi-sqlalchemy-pg-catalog/app: clearer DATABASE_URL error + async…
AkashKumar7902 4316715
fastapi-sqlalchemy-pg-catalog: clarify simple-Query semantics on para…
AkashKumar7902 226009f
fastapi-sqlalchemy-pg-catalog/app: drop redundant future=True on crea…
AkashKumar7902 6e97dd3
fastapi-sqlalchemy-pg-catalog/app: dispose engine pool on lifespan sh…
AkashKumar7902 bd9cfc0
fastapi-sqlalchemy-pg-catalog/app: wrap create_all in the lifespan tr…
AkashKumar7902 7ae4d92
fastapi-sqlalchemy-pg-catalog/init.sql: clarify when NOT EXISTS actua…
AkashKumar7902 3ab1ea3
fastapi-sqlalchemy-pg-catalog/init.sql: drop NOT EXISTS — script only…
AkashKumar7902 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| # fastapi-sqlalchemy-pg-catalog | ||
|
|
||
| Minimal FastAPI + SQLAlchemy 2.x + psycopg2 + Postgres 13 sample that | ||
| reproduces the Postgres v3 dispatcher's simple-query `ClassCatalog` | ||
| asymmetry (keploy/integrations#193). | ||
|
|
||
| ## What the bug looks like | ||
|
|
||
| At app boot, SQLAlchemy's `Base.metadata.create_all(engine)` issues a | ||
| `pg_catalog.pg_class` probe per declared table to decide whether to | ||
| skip `CREATE TABLE`. With psycopg2 + parameter-less SQL the probe | ||
| goes through the **simple-query** protocol path. | ||
|
|
||
| In `pkg/postgres/v3/replayer/dispatcher/dispatcher.go`: | ||
|
|
||
| * The **extended-query** path (`runEngineForPortal`, `case | ||
| match.ClassCatalog`) consults the recorded transactional mock first | ||
| and only falls back to the synthetic `Engines.Catalog.Execute` on | ||
| miss. | ||
| * The **simple-query** path (`dispatchBySQLHash`, `case | ||
| match.ClassCatalog`) goes straight to the synthetic engine — even | ||
| though a recorded `type: query` mock with `class: CATALOG` and the | ||
| correct rows is sitting in `mocks.yaml`. | ||
|
|
||
| With no `type: catalog` snapshot present, the synthetic engine | ||
| answers `rows: 0, cc: "SELECT 0"`. SQLAlchemy reads zero rows as | ||
| "table missing", issues `CREATE TABLE project ...`, and the | ||
| transactional engine misses (because the recording never captured a | ||
| CREATE TABLE — at record time the table already existed). The app | ||
| worker dies with `psycopg2.DatabaseError: keploy-pg-v3: no recorded | ||
| invocation matched`, every HTTP testcase that follows fails with | ||
| connection-reset. | ||
|
|
||
| ## Reproducing locally | ||
|
|
||
| ```bash | ||
| cd fastapi-sqlalchemy-pg-catalog | ||
| docker compose build | ||
|
|
||
| # Baseline (no keploy) — should pass | ||
| docker compose up -d | ||
| bash flow.sh | ||
| docker compose down -v | ||
|
|
||
| # Record | ||
| # Both keploy invocations below pass `--container-name "${APP_CONTAINER:-pg-catalog-repro-app}"` | ||
| # so they track whatever the compose file is rendering for the app | ||
| # service. If you've overridden APP_CONTAINER (e.g. to isolate | ||
| # concurrent runs), the same export reaches both keploy and compose. | ||
| ( bash flow.sh > flow-record.log 2>&1 ) & | ||
| sudo -E keploy record \ | ||
| -c "docker compose -f docker-compose.yml up" \ | ||
| --container-name "${APP_CONTAINER:-pg-catalog-repro-app}" \ | ||
| --cmd-type docker-compose \ | ||
| --record-timer 60s | ||
|
|
||
| # Replay (pre-fix: FAILS with "no recorded invocation matched" on CREATE TABLE) | ||
| sudo -E keploy test \ | ||
| -c "docker compose -f docker-compose.yml up" \ | ||
| --container-name "${APP_CONTAINER:-pg-catalog-repro-app}" \ | ||
| --cmd-type docker-compose \ | ||
| --api-timeout 120 --delay 15 | ||
| ``` | ||
|
|
||
| ## Layout | ||
|
|
||
| | File | Purpose | | ||
| |-----------------------------|---------------------------------------------------------------------------| | ||
| | `app/main.py` | FastAPI app with one declarative `Project` model + lifespan create_all | | ||
| | `app/Dockerfile` | Python 3.12-slim + requirements | | ||
| | `app/requirements.txt` | fastapi, uvicorn, sqlalchemy 2.0.36, psycopg2-binary 2.9.10 | | ||
| | `docker-compose.yml` | postgres:13.22-alpine + app, app published at host port 8123 | | ||
| | `init.sql` | Pre-creates the `project` table so record-time create_all is a no-op | | ||
| | `flow.sh` | Drives `GET /health` and `GET /projects` against the app | | ||
|
AkashKumar7902 marked this conversation as resolved.
|
||
|
|
||
| ## Compose env knobs | ||
|
|
||
| Set these to isolate concurrent runs (the CI lane drives a 3-cell | ||
| matrix on one Docker daemon and overrides each): | ||
|
|
||
| | Env var | Default | Purpose | | ||
| |------------------|-------------------------|------------------------------------------| | ||
| | `APP_CONTAINER` | `pg-catalog-repro-app` | App container name (keploy `--container-name`) | | ||
| | `DB_CONTAINER` | `pg-catalog-repro-db` | Postgres container name | | ||
| | `APP_HOST_PORT` | `8123` | Host-side port mapped to app's 8000 | | ||
| | `COMPOSE_NET` | `reprnet` | Docker network name | | ||
|
AkashKumar7902 marked this conversation as resolved.
|
||
|
|
||
| ## Used by | ||
|
|
||
| * `keploy/integrations` Woodpecker lane | ||
| `.woodpecker/sqlalchemy-pg-catalog-postgres.yml` | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| FROM python:3.12-slim | ||
|
|
||
| WORKDIR /app | ||
|
|
||
| COPY requirements.txt . | ||
| RUN pip install --no-cache-dir -r requirements.txt | ||
|
|
||
| COPY main.py . | ||
|
|
||
| EXPOSE 8000 | ||
|
|
||
| CMD ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--log-level", "info"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| """ | ||
| Minimal FastAPI + SQLAlchemy + psycopg2 app that exercises the Postgres | ||
| v3 dispatcher's simple-query ClassCatalog branch via SQLAlchemy's | ||
| ``Base.metadata.create_all`` table-existence probe. | ||
|
|
||
| Boot sequence: | ||
| 1. SQLAlchemy creates an engine over psycopg2 (simple-query for | ||
| parameter-less SQL). | ||
|
AkashKumar7902 marked this conversation as resolved.
Outdated
|
||
| 2. ``Base.metadata.create_all(engine)`` issues one | ||
| ``SELECT pg_catalog.pg_class.relname ...`` probe per declared table | ||
| to decide whether each ``CREATE TABLE`` should be skipped. | ||
| 3. FastAPI starts serving requests. | ||
|
|
||
| The probe is what hits the dispatcher's ``case match.ClassCatalog`` | ||
| branch in ``pkg/postgres/v3/replayer/dispatcher/dispatcher.go`` | ||
| (simple-query path, ``dispatchBySQLHash``). | ||
| """ | ||
|
|
||
| import logging | ||
| import os | ||
| import sys | ||
| from contextlib import asynccontextmanager | ||
|
|
||
| from fastapi import FastAPI | ||
| from sqlalchemy import Column, Integer, String, create_engine, select | ||
| from sqlalchemy.orm import Session, declarative_base | ||
|
|
||
| logging.basicConfig( | ||
| level=logging.INFO, | ||
| stream=sys.stdout, | ||
| format="%(asctime)s %(levelname)s %(name)s %(message)s", | ||
| ) | ||
| log = logging.getLogger("repro") | ||
|
|
||
| DATABASE_URL = os.environ["DATABASE_URL"] | ||
|
AkashKumar7902 marked this conversation as resolved.
Outdated
|
||
| # SQL echo is INTENTIONALLY on by default — this is a sample for | ||
| # demonstrating the dispatcher's simple-Query catalog path, and seeing | ||
| # the actual SQLAlchemy queries (pg_catalog.version, pg_class probe, | ||
| # CREATE TABLE on miss) in the app log is the load-bearing observation | ||
| # that lets a reader correlate the keploy agent log with what the app | ||
| # is doing. The trade-off: SQLAlchemy logs every statement at INFO, | ||
| # which is verbose in normal operation. Override SQL_ECHO=0 to quiet | ||
| # it down for unrelated investigations. | ||
| SQL_ECHO = os.environ.get("SQL_ECHO", "1") != "0" | ||
|
|
||
| Base = declarative_base() | ||
|
|
||
|
|
||
| class Project(Base): | ||
| __tablename__ = "project" | ||
|
|
||
| id = Column(Integer, primary_key=True) | ||
| name = Column(String(100), nullable=False) | ||
|
|
||
|
|
||
| engine = create_engine(DATABASE_URL, echo=SQL_ECHO, future=True) | ||
|
AkashKumar7902 marked this conversation as resolved.
Outdated
|
||
|
|
||
|
AkashKumar7902 marked this conversation as resolved.
|
||
|
|
||
| @asynccontextmanager | ||
| async def lifespan(_: FastAPI): | ||
| log.info("startup: running Base.metadata.create_all (pg_class probe expected)") | ||
| Base.metadata.create_all(engine) | ||
| log.info("startup: create_all complete") | ||
|
AkashKumar7902 marked this conversation as resolved.
Outdated
|
||
| yield | ||
|
AkashKumar7902 marked this conversation as resolved.
Outdated
|
||
|
|
||
|
|
||
| app = FastAPI(lifespan=lifespan) | ||
|
|
||
|
|
||
| @app.get("/health") | ||
| def health(): | ||
| return {"ok": True} | ||
|
|
||
|
|
||
| @app.get("/projects") | ||
| def list_projects(): | ||
| with Session(engine) as s: | ||
| rows = s.execute(select(Project)).scalars().all() | ||
| return [{"id": r.id, "name": r.name} for r in rows] | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| fastapi==0.115.0 | ||
| uvicorn==0.30.6 | ||
| sqlalchemy==2.0.36 | ||
| psycopg2-binary==2.9.10 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| services: | ||
| postgres: | ||
| image: postgres:13.22-alpine | ||
| container_name: ${DB_CONTAINER:-pg-catalog-repro-db} | ||
| environment: | ||
| POSTGRES_PASSWORD: postgres | ||
| POSTGRES_DB: testdb | ||
| volumes: | ||
| - ./init.sql:/docker-entrypoint-initdb.d/init.sql:ro | ||
| networks: | ||
| - reprnet | ||
| healthcheck: | ||
| test: ["CMD-SHELL", "pg_isready -U postgres -d testdb"] | ||
| interval: 2s | ||
| timeout: 2s | ||
| retries: 30 | ||
|
|
||
| app: | ||
| build: ./app | ||
| container_name: ${APP_CONTAINER:-pg-catalog-repro-app} | ||
| environment: | ||
| DATABASE_URL: postgresql+psycopg2://postgres:postgres@postgres:5432/testdb | ||
| depends_on: | ||
| postgres: | ||
| condition: service_healthy | ||
| ports: | ||
| - "${APP_HOST_PORT:-8123}:8000" | ||
| networks: | ||
| - reprnet | ||
|
|
||
| networks: | ||
| reprnet: | ||
| name: ${COMPOSE_NET:-reprnet} | ||
| driver: bridge |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| #!/usr/bin/env bash | ||
| # Drives traffic during keploy record. Hits both endpoints. | ||
| set -Eeuo pipefail | ||
|
|
||
| APP_HOST_PORT="${APP_HOST_PORT:-8123}" | ||
| APP_URL="${APP_URL:-http://localhost:${APP_HOST_PORT}}" | ||
| READY_TIMEOUT_S="${READY_TIMEOUT_S:-60}" | ||
|
|
||
| echo "[flow] waiting for app at $APP_URL (ceiling ${READY_TIMEOUT_S}s) ..." | ||
| ready=0 | ||
| for i in $(seq 1 "$READY_TIMEOUT_S"); do | ||
| if curl -fsS --max-time 1 "$APP_URL/health" > /dev/null 2>&1; then | ||
| echo "[flow] app ready after ${i}s" | ||
| ready=1 | ||
| break | ||
| fi | ||
| sleep 1 | ||
| done | ||
|
|
||
|
AkashKumar7902 marked this conversation as resolved.
|
||
| if [ "$ready" -ne 1 ]; then | ||
| echo "[flow] ERROR: app never became ready at $APP_URL/health within ${READY_TIMEOUT_S}s" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| echo "[flow] GET /health" | ||
| curl -fsS "$APP_URL/health" | ||
| echo | ||
|
|
||
| echo "[flow] GET /projects" | ||
| curl -fsS "$APP_URL/projects" | ||
| echo | ||
|
|
||
| echo "[flow] done" | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| -- Pre-create the `project` table so SQLAlchemy's create_all() sees it | ||
| -- exists at record time and skips CREATE TABLE. This is what the bug | ||
| -- (keploy/integrations#193) requires: at record time the pg_class | ||
| -- probe answers "table exists", so CREATE TABLE is never sent and | ||
| -- never recorded. At replay time, if the simple-query dispatcher path | ||
| -- skips the recorded mock, the synthetic catalog engine returns zero | ||
| -- rows, SQLAlchemy concludes "table missing", and issues an | ||
| -- unrecorded CREATE TABLE -- which then misses the transactional | ||
| -- engine, raises a DatabaseError, and kills app boot. | ||
| CREATE TABLE IF NOT EXISTS project ( | ||
| id SERIAL PRIMARY KEY, | ||
| name VARCHAR(100) NOT NULL | ||
| ); | ||
|
|
||
| -- Idempotent seed. `ON CONFLICT DO NOTHING` would only help with a | ||
| -- UNIQUE/EXCLUSION constraint on name, which the SQLAlchemy model | ||
| -- doesn't declare; use NOT EXISTS so re-running this script against | ||
| -- an existing volume doesn't duplicate the row. | ||
|
AkashKumar7902 marked this conversation as resolved.
Outdated
|
||
| INSERT INTO project (name) | ||
| SELECT 'seed' | ||
| WHERE NOT EXISTS (SELECT 1 FROM project WHERE name = 'seed'); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.