new DB fixed

.github/workflows/ci.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
         with: { python-version: "3.12", cache: pip }
-      - run: pip install -r requirements-dev.txt
+      - run: pip install -r requirements.txt
       - run: ruff check app tests
       - run: pytest -q
 

README.md

@@ -71,7 +71,7 @@ docker compose up --build
 Without Docker (one API process does everything):
 
 ```bash
-cd backend && python -m venv .venv && .venv/Scripts/pip install -r requirements-dev.txt
+cd backend && python -m venv .venv && .venv/Scripts/pip install -r requirements.txt
 alembic upgrade head && uvicorn app.main:app --reload     # SQLite at backend/notestack.db
 cd frontend && npm install && npm run dev
 cd renderer && npm install && npm start                    # only needed for videos, quote cards, carousels

backend/app/config.py

@@ -20,6 +20,7 @@ class Settings(BaseSettings):
 
     # Local default is a SQLite file (relative to the working directory, normally backend/).
     # Prod and docker-compose use Postgres: postgresql+psycopg://user:pass@host:5432/db
+    # (plain postgres:// and postgresql:// URLs are rewritten to use psycopg, see below)
     database_url: str = "sqlite:///./notestack.db"
 
     # Worker (Postgres backed queue, see app/worker.py)
@@ -128,6 +129,18 @@ class Settings(BaseSettings):
         """RUN_WORKER_IN_API= (blank, as in .env.example) means "decide from ENV", not a parse error."""
         return None if isinstance(value, str) and not value.strip() else value
 
+    @field_validator("database_url", mode="before")
+    @classmethod
+    def _use_psycopg_driver(cls, value):
+        """Accept plain postgres:// or postgresql:// URLs (as Neon, Heroku etc. hand out) and
+        point them at psycopg 3, the only Postgres driver installed. Query params pass through."""
+        if isinstance(value, str):
+            value = value.strip()
+            for prefix in ("postgres://", "postgresql://"):
+                if value.startswith(prefix):
+                    return "postgresql+psycopg://" + value[len(prefix):]
+        return value
+
     @property
     def worker_in_api(self) -> bool:
         return self.env == "development" if self.run_worker_in_api is None else self.run_worker_in_api

backend/app/main.py

@@ -29,6 +29,18 @@ from app.services.storage import storage as store
 log = logging.getLogger("notestack")
 
 
+def _drop_color_message(record: logging.LogRecord) -> bool:
+    """litellm (via dspy) adds a secret redaction filter to uvicorn.error that formats the message
+    and clears record.args. uvicorn's colored formatter then swaps in its color_message template
+    and prints it with no args ("Uvicorn running on %s://%s:%d"). Without the template it prints
+    the already formatted, redacted message."""
+    record.__dict__.pop("color_message", None)
+    return True
+
+
+logging.getLogger("uvicorn.error").addFilter(_drop_color_message)
+
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     logging.basicConfig(level=logging.INFO)

backend/requirements-dev.txt

@@ -1,3 +0,0 @@
--r requirements.txt
-pytest==8.*
-ruff==0.8.*

backend/requirements.txt

@@ -18,3 +18,7 @@ feedparser==6.*
 beautifulsoup4==4.*
 pypdf==5.*
 stripe==13.*
+
+# Dev tools (tests, lint)
+pytest==8.*
+ruff==0.8.*

docker-compose.yml

@@ -62,6 +62,7 @@ services:
     working_dir: /app
     command: sh -c "npm install && npx vite --host 0.0.0.0"
     environment:
+      # The browser calls /api on :5173 and Vite proxies it to the api service (in-network name).
       VITE_API_PROXY: http://api:8000
       VITE_GOOGLE_CLIENT_ID: ${GOOGLE_CLIENT_ID:-}
     volumes: ["./frontend:/app", "/app/node_modules"]

frontend/package-lock.json

@@ -13,6 +13,7 @@
         "react-router-dom": "^6.28.0"
       },
       "devDependencies": {
+        "@types/node": "^20.19.43",
         "@types/react": "^18.3.12",
         "@types/react-dom": "^18.3.1",
         "@vitejs/plugin-react": "^4.3.4",
@@ -1178,6 +1179,16 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/node": {
+      "version": "20.19.43",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.43.tgz",
+      "integrity": "sha512-6oYBAi5ikg4Pl+kGsoYtawUMBT2zZMCvPNF7pVLnHZfd1zf38DRiWn/gT01RYCdUqkv7Fhr+C9ot4/tb+2sVvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
     "node_modules/@types/prop-types": {
       "version": "15.7.15",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
@@ -1690,6 +1701,13 @@
         "node": ">=14.17"
       }
     },
+    "node_modules/undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/update-browserslist-db": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.3.3.tgz",

frontend/package.json

@@ -16,6 +16,7 @@
     "react-router-dom": "^6.28.0"
   },
   "devDependencies": {
+    "@types/node": "^20.19.43",
     "@types/react": "^18.3.12",
     "@types/react-dom": "^18.3.1",
     "@vitejs/plugin-react": "^4.3.4",

frontend/tsconfig.app.json

@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.app.tsbuildinfo",
+    "target": "ES2022",
+    "lib": [
+      "ES2022",
+      "DOM",
+      "DOM.Iterable"
+    ],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "jsx": "react-jsx",
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "skipLibCheck": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "types": [
+      "vite/client"
+    ]
+  },
+  "include": [
+    "src"
+  ]
+}

frontend/tsconfig.json

@@ -1,17 +1,11 @@
 {
-  "compilerOptions": {
-    "target": "ES2022",
-    "lib": ["ES2022", "DOM", "DOM.Iterable"],
-    "module": "ESNext",
-    "moduleResolution": "bundler",
-    "jsx": "react-jsx",
-    "strict": true,
-    "noUnusedLocals": true,
-    "noUnusedParameters": true,
-    "skipLibCheck": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "types": ["vite/client"]
-  },
-  "include": ["src"]
+  "files": [],
+  "references": [
+    {
+      "path": "./tsconfig.app.json"
+    },
+    {
+      "path": "./tsconfig.node.json"
+    }
+  ]
 }

frontend/tsconfig.node.json

@@ -0,0 +1,18 @@
+{
+  "compilerOptions": {
+    "tsBuildInfoFile": "./node_modules/.tmp/tsconfig.node.tsbuildinfo",
+    "target": "ES2022",
+    "lib": ["ES2023"],
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "jsx": "react-jsx",
+    "strict": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
+    "skipLibCheck": true,
+    "isolatedModules": true,
+    "noEmit": true,
+    "types": ["node"]
+  },
+  "include": ["vite.config.ts", "seo"]
+}

frontend/vite.config.ts

@@ -1,26 +1,38 @@
-import { defineConfig } from "vite";
+import { defineConfig, loadEnv } from "vite";
 import react from "@vitejs/plugin-react";
+import { fileURLToPath } from "node:url";
 import { prerenderPlugin } from "./seo/prerender";
 import { sitemapPlugin } from "./seo/sitemap";
 
-// Public origin for sitemap.xml and robots.txt. Set SITE_URL in the deploy environment.
-const SITE_URL = process.env.SITE_URL ?? "https://notestack.ai";
+// frontend/ itself: .env, .env.local, .env.[mode] here configure the app.
+const ENV_DIR = fileURLToPath(new URL(".", import.meta.url));
 
-export default defineConfig({
-  plugins: [
-    react(),
-    sitemapPlugin(SITE_URL),
-    // Static HTML per public route for crawlers that do not run JavaScript. Must run after site-url fills index.html.
-    prerenderPlugin(SITE_URL),
-    // Link preview tags need absolute URLs: fill %SITE_URL% in index.html.
-    { name: "site-url", transformIndexHtml: (html) => html.replaceAll("%SITE_URL%", SITE_URL.replace(/\/$/, "")) },
-  ],
-  // Read the shared root .env. Only these prefixes reach the browser; the Google client ID is
-  // public by design, so it can be shared with the backend under its plain name.
-  envDir: "..",
-  envPrefix: ["VITE_", "GOOGLE_CLIENT_ID"],
-  server: {
-    port: 5173,
-    proxy: { "/api": process.env.VITE_API_PROXY ?? "http://localhost:8000" },
-  },
+export default defineConfig(({ mode }) => {
+  // Config-only settings may come from frontend/.env too; real environment variables still win
+  // (docker-compose, Cloudflare Pages). Prefix "" loads everything, but none of it reaches the browser.
+  const env = loadEnv(mode, ENV_DIR, "");
+
+  // Public origin for sitemap.xml and robots.txt. Set SITE_URL in the deploy environment.
+  const SITE_URL = env.SITE_URL || "https://notestack.ai";
+
+  return {
+    plugins: [
+      react(),
+      sitemapPlugin(SITE_URL),
+      // Static HTML per public route for crawlers that do not run JavaScript. Must run after site-url fills index.html.
+      prerenderPlugin(SITE_URL),
+      // Link preview tags need absolute URLs: fill %SITE_URL% in index.html.
+      { name: "site-url", transformIndexHtml: (html) => html.replaceAll("%SITE_URL%", SITE_URL.replace(/\/$/, "")) },
+    ],
+    // Only these prefixes reach the browser; the Google client ID is public by design, so the
+    // backend's plain name is accepted as well as VITE_GOOGLE_CLIENT_ID.
+    envDir: ENV_DIR,
+    envPrefix: ["VITE_", "GOOGLE_CLIENT_ID"],
+    server: {
+      port: 5173,
+      // In dev the app calls /api on this origin (VITE_API_URL unset) and the backend is reached
+      // through this proxy: frontend/.env locally, http://api:8000 under docker-compose.
+      proxy: { "/api": env.VITE_API_PROXY || "http://localhost:8000" },
+    },
+  };
 });