Add comprehensive tests for ReadableStream error handling

- Test safe content reading with ReadableStream detection
- Test emergency refund scenarios for fund loss prevention
- Test retry logic for refund token creation
- Test CoinOS + nonkycai specific integration scenarios
- Test various ReadableStream object representations
- Test error handling edge cases and Unicode issues

Related to #195

.env.example

@@ -37,7 +37,3 @@ UPSTREAM_API_KEY=your-upstream-api-key
 # BASE_URL=https://openrouter.ai/api/v1
 # MODELS_PATH=models.json
 # SOURCE=
-
-# UI Configuration (for Next.js frontend)
-# These variables are prefixed with NEXT_PUBLIC_ to be accessible in the browser
-# NEXT_PUBLIC_API_URL=http://127.0.0.1:8000

.github/workflows/test.yml

@@ -7,7 +7,7 @@ on:
     branches: ["*"] # Run on PRs to all branches
 
 jobs:
-  backend-test:
+  test:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -51,29 +51,3 @@ jobs:
             pytest.xml
             .coverage
           retention-days: 30
-
-  ui-build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: '18'
-          cache: 'npm'
-          cache-dependency-path: ui/package-lock.json
-
-      - name: Install UI dependencies
-        working-directory: ./ui
-        run: npm ci
-
-      - name: Run UI linting
-        working-directory: ./ui
-        run: npm run lint
-
-      - name: Run UI build
-        working-directory: ./ui
-        run: npm run build

.gitignore

@@ -8,13 +8,10 @@ wallet.sqlite3
 build/
 dist/
 *.egg
-.mypy_cache/**
 
 # Development 
 .notes
 .*keys.db
-*.db-shm
-*.db-wal
 .*wallet.sqlite3
 *models.json
 .cashu
@@ -36,5 +33,3 @@ logs/*
 # deployment
 proof_backups
 
-*.todo
-ui_out

.python-version

@@ -1 +0,0 @@
-3.11

Makefile

@@ -16,7 +16,7 @@ else
     ALEMBIC := alembic
 endif
 
-.PHONY: help setup test test-unit test-integration test-integration-docker test-all test-fast test-performance clean docker-up docker-down lint format type-check dev-setup check-deps db-upgrade db-downgrade db-current db-history db-migrate db-revision db-heads db-clean ui-build ui-build-docker ui-dev
+.PHONY: help setup test test-unit test-integration test-integration-docker test-all test-fast test-performance clean docker-up docker-down lint format type-check dev-setup check-deps db-upgrade db-downgrade db-current db-history db-migrate db-revision db-heads db-clean
 
 # Default target
 help:
@@ -38,12 +38,6 @@ help:
 	@echo "  make check-deps         - Check system dependencies"
 	@echo "  make setup              - First-time project setup"
 	@echo ""
-	@echo "UI targets:"
-	@echo "  make ui-build           - Build UI for production (static export)"
-	@echo "  make ui-build-docker    - Build UI using Docker (no Node.js needed)"
-	@echo "  make ui-dev             - Start UI development server"
-	@echo ""
-	@echo "Docker UI build requires only Docker, no local Node.js installation needed."
 	@echo "Database migration shortcuts:"
 	@echo "  make create-migration   - Auto-generate new migration"
 	@echo "  make db-upgrade         - Apply all pending migrations"
@@ -267,19 +261,3 @@ docs-deploy:
 docs-install:
 	@echo "📚 Installing documentation dependencies..."
 	pip install -r docs/requirements.txt
-
-# UI build
-ui-build:
-	@echo "🎨 Building UI for static deployment..."
-	./scripts/build-ui.sh
-
-ui-build-docker:
-	@echo "🐳 Building UI using Docker (no Node.js installation required)..."
-	@echo "Building UI with environment variables from .env..."
-	docker build -f ui/Dockerfile.build -t routstr-ui-build --build-arg NEXT_PUBLIC_API_URL=$(NEXT_PUBLIC_API_URL) --build-arg NEXT_PUBLIC_ADMIN_API_KEY=$(NEXT_PUBLIC_ADMIN_API_KEY) .
-	docker run --rm -v $(PWD)/ui_out:/output routstr-ui-build cp -r /ui_out /output/
-	@echo "✅ UI build complete! Static files available in ui_out/"
-
-ui-dev:
-	@echo "🎨 Starting UI development server..."
-	cd ui && (command -v pnpm >/dev/null 2>&1 && pnpm run dev || npm run dev)

README.md

@@ -99,7 +99,6 @@ The most common settings are shown below. See `.env.example` for the full list.
 - `NPUB` – Nostr public key of the proxy
 - `HTTP_URL` – Public-facing URL of the proxy
 - `ONION_URL` – Tor hidden service URL of the proxy
-- `NEXT_PUBLIC_API_URL` - UI Configuration for Next.js frontend (proxy URL, default: 'http://127.0.0.1:8000' )
 
 ## Database Migrations
 
@@ -144,41 +143,9 @@ make db-migrate
 make db-upgrade
 ```
 
-## Admin UI
-
-Routstr includes a modern Next.js admin dashboard that's served directly from the Python backend as static files - no separate Node.js server required.
-
-### Building the UI
-
-```bash
-make ui-build
-```
-
-This compiles the Next.js application into static HTML, CSS, and JavaScript files in `ui/out/`.
-
-### Accessing the Dashboard
-
-Once built, the UI is automatically served by the FastAPI backend:
-
-- **Dashboard**: `http://localhost:8000/`
-- **Login**: `http://localhost:8000/login`
-- **Models Management**: `http://localhost:8000/model
-- **Providers Management**: `http://localhost:8000/providers`
-- **Settings**: `http://localhost:8000/settings`
-
-The dashboard provides:
-
-- Real-time wallet balance monitoring
-- Model pricing configuration
-- Upstream provider management
-- Transaction history
-- System settings
-
-**Authentication**: Use the `ADMIN_PASSWORD` environment variable to access the dashboard.
-
 ## Withdrawing Balance
 
-Go to the admin dashboard at `http://localhost:8000/` and login with your `ADMIN_PASSWORD` to withdraw your balance as a Cashu token.
+Go to `https://<your.routstr.proxy>/admin/` (NOTE: be sure to add the '/' at the end), enter the `ADMIN_PASSWORD` you set above and withdraw your balance as a Cashu token.
 
 ## Example Client
 

compose.yml

@@ -1,27 +1,10 @@
 services:
-  ui:
-    env_file:
-      - .env
-    build:
-      context: ./ui
-      dockerfile: Dockerfile.build
-      args:
-        NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL:-http://127.0.0.1:8000}
-        NEXT_PUBLIC_ADMIN_API_KEY: ${NEXT_PUBLIC_ADMIN_API_KEY:-}
-    volumes:
-      - ./ui_out:/output
-    command:
-      ["sh", "-c", "mkdir -p /output && cp -r /app/built/. /output/ && echo 'UI build copied to mounted volume' && ls -la /output/ && echo 'UI built and ready' && tail -f /dev/null"]
-
   routstr:
     build: .
-    depends_on:
-      - ui
     volumes:
       - .:/app
       - ./logs:/app/logs
       - tor-data:/var/lib/tor:ro
-      - ./ui_out:/app/ui_out:ro
     env_file:
       - .env
     environment:

docs/api/overview.md

@@ -347,7 +347,7 @@ GET /health
 Response:
 {
   "status": "healthy",
-  "version": "0.2.0",
+  "version": "0.1.3",
   "timestamp": "2024-01-01T00:00:00Z",
   "checks": {
     "database": "ok",

docs/contributing/code-structure.md

@@ -348,7 +348,7 @@ Project metadata and dependencies:
 ```toml
 [project]
 name = "routstr"
-version = "0.2.0"
+version = "0.1.3"
 dependencies = [
     "fastapi[standard]>=0.115",
     "sqlmodel>=0.0.24",

docs/getting-started/quickstart.md

@@ -67,7 +67,7 @@ You should see:
 {
   "name": "ARoutstrNode",
   "description": "A Routstr Node",
-  "version": "0.2.0",
+  "version": "0.1.3",
   "npub": "",
   "mints": ["https://mint.minibits.cash/Bitcoin"],
   "models": {...}

docs/getting-started/ui-configuration.md

@@ -1,53 +0,0 @@
-# UI Configuration
-
-This guide explains how to configure the Routstr UI for different environments.
-
-## Environment Variables
-
-The UI uses Next.js environment variables to configure API endpoints and authentication.
-
-### Centralized Configuration
-
-This project uses a centralized configuration approach with a single `.env` file in the project root. This file contains both backend and frontend configuration variables.
-
-Create or update your `.env` file in the project root:
-
-```bash
-# .env (in project root)
-
-# UI Configuration (NEXT_PUBLIC_ variables are exposed to the browser)
-NEXT_PUBLIC_API_URL=http://127.0.0.1:8000
-```
-
-### Development vs Production
-
-The same `.env` file is used for both development and production. Simply change the values:
-
-**Development:**
-
-```bash
-NEXT_PUBLIC_API_URL=http://127.0.0.1:8000
-```
-
-**Production:**
-
-```bash
-NEXT_PUBLIC_API_URL=https://api.yourroutstr.com
-```
-
-## Building the UI
-
-The build process automatically reads configuration from the root `.env` file:
-
-```bash
-# From the project root
-make ui-build
-# or
-./scripts/build-ui.sh
-```
-
-The build script will automatically:
-
-- Load `NEXT_PUBLIC_*` variables from the root `.env` file
-- Use them during the Next.js build process
-- Display warnings if the `.env` file is missing

docs/user-guide/admin-dashboard.md

@@ -1,216 +1,329 @@
 # Admin Dashboard
 
-The Routstr admin dashboard is a modern web interface for managing your node, monitoring wallet balances, configuring AI models and providers, and handling Bitcoin Lightning payments through Cashu eCash.
+The Routstr admin dashboard provides a web interface for managing your node, viewing balances, and handling withdrawals.
 
 ## Accessing the Dashboard
 
+### URL Format
+
+The admin dashboard is available at:
+
+```
+https://api.routstr.com/admin/
+```
+
+> **Important**: Always include the trailing slash (`/`) in the URL.
+
 ### Authentication
 
-The dashboard is protected by password authentication:
+The dashboard is protected by a password set in the `ADMIN_PASSWORD` environment variable.
 
-1. Navigate to `/admin/` in your browser
+1. Navigate to `/admin/`
 2. Enter the admin password
-3. Optional: Configure custom base URL if not pre-configured
-4. Click "Login"
+3. Click "Login"
 
-The interface supports both environment-configured URLs and manual URL entry for deployment flexibility.
+The password is stored as a secure cookie for the session.
 
 ## Dashboard Overview
 
-The main dashboard consists of four primary sections accessible through a collapsible sidebar:
+### Main Interface
 
-- **Dashboard** - Wallet balance monitoring and fund management
-- **Models** - AI model management and testing
-- **Providers** - Upstream provider configuration
-- **Settings** - Node configuration and admin preferences
+The dashboard displays:
 
-### Navigation
+- **Node Information**
+  - Node name and description
+  - Version number
+  - Public URLs (HTTP and Onion)
+  - Supported Cashu mints
 
-## Dashboard Page
+- **Statistics**
+  - Total API keys
+  - Active keys
+  - Total balance across all keys
+  - Recent activity
 
-### Wallet Balance Management
+- **API Key List**
+  - All keys with balances
+  - Usage statistics
+  - Management options
 
-#### Balance Display Options
+## Features
 
-Switch between display units using the toggle buttons:
+### Viewing API Keys
 
-- **msat** - Millisatoshis (highest precision)
-- **sat** - Satoshis (standard Bitcoin unit)
-- **usd** - US Dollar equivalent (when exchange rate available)
+The main table shows all API keys with:
 
-#### Balance Overview
+| Column | Description |
+|--------|-------------|
+| API Key | Masked key (first/last 4 chars) |
+| Balance | Current balance in sats |
+| Created | Creation timestamp |
+| Last Used | Most recent API call |
+| Total Spent | Lifetime usage |
+| Status | Active/Expired/Disabled |
 
-The dashboard displays three key metrics:
+### Searching and Filtering
 
-- **Your Balance (Total)** - Available funds for node operator
-- **Total Wallet** - Combined balance across all Cashu mints
-- **User Balance** - Funds held for API key holders
+- **Search**: Find keys by partial match
+- **Sort**: Click column headers to sort
+- **Filter**: Show only active/expired keys
+- **Export**: Download data as CSV
 
-#### Detailed Balance Breakdown
+### Key Details
 
-View balances by mint with the following information:
+Click on any key to view:
 
-| Column      | Description                           |
-| ----------- | ------------------------------------- |
-| Mint / Unit | Cashu mint URL and currency unit      |
-| Wallet      | Total funds in this mint              |
-| Users       | Funds belonging to API key holders    |
-| Owner       | Your available funds (Wallet - Users) |
+- Full API key (masked by default)
+- Complete transaction history
+- Usage graphs
+- Metadata (name, expiry, refund address)
 
-### Temporary Balances
+## Balance Management
 
-Monitor API key activity with:
+### Viewing Balances
 
-- **Summary Cards** - Total balance, total spent, total requests
-- **Search Functionality** - Filter by key hash or refund address
-- **Detailed Table** - Individual key balances with expiry times
-- **Auto-refresh** - Updates every 60 seconds
+Balances are displayed in multiple units:
 
-### Fund Management
+- **Sats**: Standard satoshi units
+- **mSats**: Millisatoshis (internal precision)
+- **BTC**: Bitcoin decimal format
+- **USD**: Approximate USD value
 
-#### Withdrawing Funds
+### Balance History
 
-To withdraw your available balance:
+View balance changes over time:
 
-1. Click the **Withdraw** button
-2. Select which mint to withdraw from
-3. Specify the amount (or withdraw full balance)
-4. Click **Generate Token**
-5. Copy the generated eCash token
-6. Import the token into your Cashu wallet
+```
+Time         | Type      | Amount  | Balance | Description
+-------------|-----------|---------|---------|-------------
+12:34:56     | Deposit   | +10,000 | 10,000  | Token redemption
+12:35:12     | Usage     | -154    | 9,846   | gpt-3.5-turbo call
+12:36:45     | Usage     | -210    | 9,636   | gpt-4 call
+```
 
-#### Real-time Updates
+## Withdrawals
 
-- Balances refresh automatically every 30 seconds
-- Manual refresh option available
-- Live Bitcoin/USD exchange rate integration
-- Error handling for mint connectivity issues
+### Manual Withdrawal
 
-## Models Management Page
+To withdraw funds from an API key:
 
-### Model Organization
+1. Click "Withdraw" next to the key
+2. Optionally specify amount (default: full balance)
+3. Select target Cashu mint
+4. Click "Generate Token"
+5. Copy the eCash token
+6. Redeem in your Cashu wallet
 
-Models are organized by provider groups with tabs:
+### Bulk Operations
 
-- **All Models** - Combined view of all available models
-- **Provider-specific tabs** - Individual providers (OpenRouter, Azure, etc.)
-- Badge indicators showing active/total model counts
+For multiple withdrawals:
 
-### Model Management Features
+1. Select keys using checkboxes
+2. Click "Bulk Actions" → "Withdraw"
+3. Tokens are generated for each key
+4. Download all tokens as text file
 
-#### Individual Model Operations
+### Automatic Withdrawals
 
-For each model you can:
+If configured with `RECEIVE_LN_ADDRESS`:
 
-- **Toggle Enable/Disable** - Control model availability
-- **View Details** - Context length, pricing, description
-- **Edit Configuration** - Model-specific settings
-- **Status Indicators** - Green badges for enabled, gray for disabled
+- Balances above threshold auto-convert to Lightning
+- Sent to configured Lightning address
+- View payout history in dashboard
 
-#### Bulk Operations
+## Node Configuration
 
-- **Select All/Deselect All** - Quick selection controls
-- **Bulk Enable/Disable** - Mass model management
-- **Bulk Delete** - Remove model overrides
-- **Provider-level Actions** - Apply settings to all models in a provider
+### Viewing Settings
 
-#### Model Information Display
+Current node configuration is displayed:
 
-- **Model Types** - Text, embedding, image, audio, multimodal indicators
-- **Pricing Information** - Per-million-token costs for input/output
-- **Context Length** - Maximum tokens supported
-- **API Key Status** - Whether credentials are configured
-- **Free Model Indicators** - No-cost models clearly marked
+- Upstream provider URL
+- Enabled features
+- Pricing model
+- Fee structure
 
-## Providers Management Page
+### Models and Pricing
 
-### Upstream Provider Configuration
+View supported models and their pricing:
 
-Manage AI provider connections and credentials:
+| Model | Input $/1K | Output $/1K | Sats/1K |
+|-------|------------|-------------|---------|
+| gpt-3.5-turbo | $0.0015 | $0.002 | 3/4 |
+| gpt-4 | $0.03 | $0.06 | 60/120 |
+| dall-e-3 | - | - | 1000/image |
 
-#### Provider Types Supported
+### Updating Configuration
 
-- **OpenRouter** - Multi-model aggregator
-- **Azure OpenAI** - Microsoft's OpenAI service
-- **OpenAI** - Direct OpenAI integration
-- **Custom Providers** - Any OpenAI-compatible API
+> **Note**: Configuration changes require node restart.
 
-#### Adding New Providers
+To update settings:
 
-1. Click **Add Provider**
-2. Select **Provider Type** from dropdown
-3. Enter **Base URL** (auto-populated for known providers)
-4. Add **API Key** for authentication
-5. Set **API Version** (required for Azure)
-6. Toggle **Enabled** status
-7. Click **Create**
+1. Modify environment variables
+2. Restart the node
+3. Verify changes in dashboard
 
-#### Provider Management
+## Analytics
 
-**Provider Cards Display:**
+### Usage Statistics
 
-- Provider type and status (Enabled/Disabled)
-- Base URL configuration
-- Action buttons (Models, Edit, Delete)
+View comprehensive usage data:
 
-**Available Actions:**
+- **Requests per Day**: Line graph
+- **Token Usage**: Stacked bar chart
+- **Model Distribution**: Pie chart
+- **Cost Analysis**: Breakdown by model
 
-- **Edit** - Modify provider configuration
-- **Delete** - Remove provider (with confirmation)
-- **View Models** - Expand model discovery interface
-- **Enable/Disable** - Toggle provider availability
+### Performance Metrics
 
-#### Model Discovery
+Monitor node performance:
 
-Each provider shows two types of models:
+- Average response time
+- Request success rate
+- Upstream API latency
+- Cache hit ratio
 
-**Provided Models Tab:**
+### Export Data
 
-- Auto-discovered from provider's catalog
-- Read-only model information
-- Real-time availability updates
+Export analytics data:
 
-**Custom Models Tab:**
+1. Select date range
+2. Choose metrics
+3. Click "Export"
+4. Download as CSV/JSON
 
-- Manually configured model overrides
-- Extend or override provider catalog
-- Individual enable/disable controls
+## Security Features
 
-## Settings Page
+### Access Control
 
-### Node Configuration
+- Password protection
+- Session timeout (configurable)
+- IP allowlisting (optional)
+- Audit logging
 
-Configure core node settings and preferences:
+### Security Log
 
-#### Basic Information
+View security events:
 
-- **Node Name** - Identifier for your node
-- **Node Description** - Descriptive text for your service
-- **HTTP URL** - Public HTTP endpoint
-- **Onion URL** - Tor hidden service address
+```
+2024-01-15 12:34:56 | Login Success | IP: 192.168.1.1
+2024-01-15 12:35:12 | Withdrawal | Key: sk-****abcd | Amount: 5000
+2024-01-15 12:40:00 | Session Timeout | IP: 192.168.1.1
+```
 
-#### Nostr Integration
+### Best Practices
 
-- **Public Key (npub)** - Your Nostr public identity
-- **Private Key (nsec)** - Nostr private key with show/hide toggle
-- **Nostr Relays** - Configure relays for provider announcements
+1. **Strong Password**: Use a long, random password
+2. **HTTPS Only**: Always access via HTTPS
+3. **Regular Monitoring**: Check logs frequently
+4. **Limited Access**: Restrict dashboard access
 
-#### Cashu Mint Management
+## Troubleshooting
 
-- **Add Mint URLs** - Configure multiple Cashu mint endpoints
-- **Remove Mints** - Delete unused mint configurations
-- **Mint Validation** - Verify mint endpoint connectivity
+### Cannot Access Dashboard
 
-#### Settings Features
+**Issue**: 404 Not Found
 
-- **Real-time Save** - Changes apply immediately
-- **Validation** - Form validation with error feedback
-- **Secure Fields** - Password masking with reveal toggles
-- **Reload Functionality** - Refresh configuration from server
+- Ensure trailing slash: `/admin/`
+- Check if admin routes are enabled
+
+**Issue**: Unauthorized
+
+- Verify `ADMIN_PASSWORD` is set
+- Clear browser cookies
+- Try incognito/private mode
+
+### Display Issues
+
+**Issue**: Broken Layout
+
+- Clear browser cache
+- Disable ad blockers
+- Try different browser
+
+**Issue**: Missing Data
+
+- Check database connectivity
+- Verify node is running
+- Review error logs
+
+### Withdrawal Problems
+
+**Issue**: Token Generation Fails
+
+- Check mint connectivity
+- Verify sufficient balance
+- Try different mint
+
+**Issue**: Invalid Token
+
+- Ensure complete token copy
+- Check token hasn't expired
+- Verify mint compatibility
+
+## Advanced Features
+
+### Custom Branding
+
+Customize dashboard appearance:
+
+```bash
+# Environment variables
+ADMIN_LOGO_URL=https://example.com/logo.png
+ADMIN_THEME_COLOR=#FF6B00
+ADMIN_CUSTOM_CSS=/path/to/custom.css
+```
+
+### API Access
+
+Access admin functions programmatically:
+
+```bash
+# Get node stats
+curl -X GET https://your-node.com/admin/api/stats \
+  -H "X-Admin-Password: your-password"
+
+# Export key data
+curl -X GET https://your-node.com/admin/api/keys \
+  -H "X-Admin-Password: your-password" \
+  -H "Accept: application/json"
+```
+
+### Webhooks
+
+Configure notifications:
+
+```bash
+ADMIN_WEBHOOK_URL=https://example.com/webhook
+ADMIN_WEBHOOK_EVENTS=withdrawal,low_balance,error
+```
+
+## Dashboard Shortcuts
+
+### Keyboard Navigation
+
+- `Ctrl+K`: Quick search
+- `Ctrl+R`: Refresh data
+- `Ctrl+E`: Export current view
+- `Escape`: Close modals
+
+### Quick Actions
+
+- Double-click to copy API key
+- Right-click for context menu
+- Drag to reorder columns
+- Shift-click to select multiple
+
+## Mobile Access
+
+The dashboard is mobile-responsive:
+
+- Touch-optimized controls
+- Swipe navigation
+- Compact view mode
+- Offline capability
 
 ## Next Steps
 
-- [Payment Flow](payment-flow.md) - Understanding Bitcoin payment processing
-- [Using the API](using-api.md) - Making API requests to your node
-- [Models & Pricing](models-pricing.md) - Configuring model pricing and fees
-- [API Reference](../api/overview.md) - Complete API documentation
+- [Models & Pricing](models-pricing.md) - Configure pricing
+- [API Reference](../api/overview.md) - Admin API endpoints
+- [Advanced Configuration](../advanced/custom-pricing.md) - Advanced settings

migrations/versions/a1a1a1a1a1a1_composite_pk_for_models.py

@@ -1,64 +0,0 @@
-"""change models to composite primary key (id, upstream_provider_id)
-
-Revision ID: a1a1a1a1a1a1
-Revises: f7a8b9c0d1e2
-Create Date: 2025-10-20 00:00:00.000000
-"""
-
-from __future__ import annotations
-
-import sqlalchemy as sa
-from alembic import op
-
-revision = "a1a1a1a1a1a1"
-down_revision = "f7a8b9c0d1e2"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    inspector = sa.inspect(conn)
-
-    if "models" in inspector.get_table_names():
-        op.drop_table("models")
-
-    op.create_table(
-        "models",
-        sa.Column("id", sa.String(), nullable=False),
-        sa.Column("upstream_provider_id", sa.Integer(), nullable=False),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("created", sa.Integer(), nullable=False),
-        sa.Column("description", sa.Text(), nullable=False),
-        sa.Column("context_length", sa.Integer(), nullable=False),
-        sa.Column("architecture", sa.Text(), nullable=False),
-        sa.Column("pricing", sa.Text(), nullable=False),
-        sa.Column("sats_pricing", sa.Text(), nullable=True),
-        sa.Column("per_request_limits", sa.Text(), nullable=True),
-        sa.Column("top_provider", sa.Text(), nullable=True),
-        sa.Column("enabled", sa.Boolean(), nullable=False, server_default="1"),
-        sa.PrimaryKeyConstraint("id", "upstream_provider_id"),
-        sa.ForeignKeyConstraint(
-            ["upstream_provider_id"], ["upstream_providers.id"], ondelete="CASCADE"
-        ),
-    )
-
-
-def downgrade() -> None:
-    op.drop_table("models")
-    op.create_table(
-        "models",
-        sa.Column("id", sa.String(), primary_key=True, nullable=False),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("created", sa.Integer(), nullable=False),
-        sa.Column("description", sa.Text(), nullable=False),
-        sa.Column("context_length", sa.Integer(), nullable=False),
-        sa.Column("architecture", sa.Text(), nullable=False),
-        sa.Column("pricing", sa.Text(), nullable=False),
-        sa.Column("sats_pricing", sa.Text(), nullable=True),
-        sa.Column("per_request_limits", sa.Text(), nullable=True),
-        sa.Column("top_provider", sa.Text(), nullable=True),
-        sa.Column("enabled", sa.Boolean(), nullable=False, server_default="1"),
-        sa.Column("upstream_provider_id", sa.Integer(), nullable=True),
-        sa.ForeignKeyConstraint(["upstream_provider_id"], ["upstream_providers.id"]),
-    )

migrations/versions/d1e2f3a4b5c6_create_upstream_providers_table.py

@@ -1,45 +0,0 @@
-"""create upstream_providers table
-
-Revision ID: d1e2f3a4b5c6
-Revises: c0ffee123456
-Create Date: 2025-10-09 00:00:00.000000
-"""
-
-from __future__ import annotations
-
-import sqlalchemy as sa
-from alembic import op
-
-revision = "d1e2f3a4b5c6"
-down_revision = "c0ffee123456"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    conn = op.get_bind()
-    inspector = sa.inspect(conn)
-
-    if "upstream_providers" not in inspector.get_table_names():
-        op.create_table(
-            "upstream_providers",
-            sa.Column(
-                "id", sa.Integer(), primary_key=True, nullable=False, autoincrement=True
-            ),
-            sa.Column("provider_type", sa.String(), nullable=False),
-            sa.Column("base_url", sa.String(), nullable=False, unique=True),
-            sa.Column("api_key", sa.String(), nullable=False),
-            sa.Column("api_version", sa.String(), nullable=True),
-            sa.Column("enabled", sa.Boolean(), nullable=False, default=True),
-        )
-        op.create_index(
-            "ix_upstream_providers_base_url",
-            "upstream_providers",
-            ["base_url"],
-            unique=True,
-        )
-
-
-def downgrade() -> None:
-    op.drop_index("ix_upstream_providers_base_url", "upstream_providers")
-    op.drop_table("upstream_providers")

migrations/versions/e1f2a3b4c5d6_add_upstream_provider_to_models.py

@@ -1,53 +0,0 @@
-"""add upstream_provider and enabled to models
-
-Revision ID: e1f2a3b4c5d6
-Revises: d1e2f3a4b5c6
-Create Date: 2025-10-13 00:00:00.000000
-"""
-
-from __future__ import annotations
-
-import sqlalchemy as sa
-from alembic import op
-
-revision = "e1f2a3b4c5d6"
-down_revision = "d1e2f3a4b5c6"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.drop_table("models")
-    op.create_table(
-        "models",
-        sa.Column("id", sa.String(), primary_key=True, nullable=False),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("created", sa.Integer(), nullable=False),
-        sa.Column("description", sa.Text(), nullable=False),
-        sa.Column("context_length", sa.Integer(), nullable=False),
-        sa.Column("architecture", sa.Text(), nullable=False),
-        sa.Column("pricing", sa.Text(), nullable=False),
-        sa.Column("sats_pricing", sa.Text(), nullable=True),
-        sa.Column("per_request_limits", sa.Text(), nullable=True),
-        sa.Column("top_provider", sa.Text(), nullable=True),
-        sa.Column("enabled", sa.Boolean(), nullable=False, server_default="1"),
-        sa.Column("upstream_provider_id", sa.Integer(), nullable=True),
-        sa.ForeignKeyConstraint(["upstream_provider_id"], ["upstream_providers.id"]),
-    )
-
-
-def downgrade() -> None:
-    op.drop_table("models")
-    op.create_table(
-        "models",
-        sa.Column("id", sa.String(), primary_key=True, nullable=False),
-        sa.Column("name", sa.String(), nullable=False),
-        sa.Column("created", sa.Integer(), nullable=False),
-        sa.Column("description", sa.Text(), nullable=False),
-        sa.Column("context_length", sa.Integer(), nullable=False),
-        sa.Column("architecture", sa.Text(), nullable=False),
-        sa.Column("pricing", sa.Text(), nullable=False),
-        sa.Column("sats_pricing", sa.Text(), nullable=True),
-        sa.Column("per_request_limits", sa.Text(), nullable=True),
-        sa.Column("top_provider", sa.Text(), nullable=True),
-    )

migrations/versions/f7a8b9c0d1e2_add_fees_to_upstream_providers.py

@@ -1,27 +0,0 @@
-"""add provider_fee to upstream_providers
-
-Revision ID: f7a8b9c0d1e2
-Revises: e1f2a3b4c5d6
-Create Date: 2025-10-13 00:00:00.000000
-"""
-
-from __future__ import annotations
-
-import sqlalchemy as sa
-from alembic import op
-
-revision = "f7a8b9c0d1e2"
-down_revision = "e1f2a3b4c5d6"
-branch_labels = None
-depends_on = None
-
-
-def upgrade() -> None:
-    op.add_column(
-        "upstream_providers",
-        sa.Column("provider_fee", sa.Float(), nullable=False, server_default="1.01"),
-    )
-
-
-def downgrade() -> None:
-    op.drop_column("upstream_providers", "provider_fee")

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "routstr"
-version = "0.2.0c"
+version = "0.1.3"
 description = "Payment proxy for your LLM endpoint using cashu and nostr."
 readme = "README.md"
 requires-python = ">=3.11"
@@ -19,7 +19,6 @@ dependencies = [
     "websockets>=12.0",
     "nostr>=0.0.2",
     "mdurl==0.1.2",
-    "pillow>=10",
 ]
 
 [dependency-groups]

routstr/algorithm.py

@@ -1,300 +0,0 @@
-"""Model prioritization algorithm for selecting cheapest upstream providers."""
-
-from typing import TYPE_CHECKING
-
-from .core.logging import get_logger
-
-if TYPE_CHECKING:
-    from .payment.models import Model
-    from .upstream import BaseUpstreamProvider
-
-logger = get_logger(__name__)
-
-
-def calculate_model_cost_score(model: "Model") -> float:
-    """Calculate a representative cost score for a model.
-
-    This score is used to compare models when multiple providers offer the same model.
-    Lower scores indicate cheaper models.
-
-    The score is calculated as a weighted average of:
-    - Input token cost (weighted by typical input usage)
-    - Output token cost (weighted by typical output usage)
-    - Fixed request cost
-
-    Args:
-        model: Model instance with pricing information
-
-    Returns:
-        Float representing the cost score. Lower is better.
-    """
-    pricing = model.pricing
-
-    # Weight costs by typical usage patterns
-    # Assume average request: 1000 input tokens, 500 output tokens
-    TYPICAL_INPUT_TOKENS = 1000.0
-    TYPICAL_OUTPUT_TOKENS = 500.0
-
-    # Calculate weighted cost in USD
-    input_cost = pricing.prompt * (TYPICAL_INPUT_TOKENS / 1000.0)
-    output_cost = pricing.completion * (TYPICAL_OUTPUT_TOKENS / 1000.0)
-    request_cost = pricing.request
-
-    # Include additional costs if present
-    image_cost = (
-        getattr(pricing, "image", 0.0) * 0.1
-    )  # Weight lower as not every request uses images
-    web_search_cost = getattr(pricing, "web_search", 0.0) * 0.1
-    reasoning_cost = getattr(pricing, "internal_reasoning", 0.0) * 0.2
-
-    total_cost = (
-        input_cost
-        + output_cost
-        + request_cost
-        + image_cost
-        + web_search_cost
-        + reasoning_cost
-    )
-
-    return total_cost
-
-
-def get_provider_penalty(provider: "BaseUpstreamProvider") -> float:
-    """Calculate a penalty multiplier for certain providers.
-
-    This allows applying policy-based adjustments beyond pure cost.
-    For example, preferring certain providers for reliability or features.
-
-    Args:
-        provider: UpstreamProvider instance
-
-    Returns:
-        Float multiplier to apply to cost (1.0 = no penalty, >1.0 = penalize)
-    """
-    # Default: no penalty
-    penalty = 1.0
-
-    # Check if this is OpenRouter (can be identified by base URL)
-    base_url = getattr(provider, "base_url", "")
-    if "openrouter.ai" in base_url.lower():
-        # Small penalty for OpenRouter to prefer other providers when costs are very close
-        # This maintains the original behavior of preferring non-OpenRouter providers
-        penalty = 1.001  # 0.1% penalty
-
-    return penalty
-
-
-def should_prefer_model(
-    candidate_model: "Model",
-    candidate_provider: "BaseUpstreamProvider",
-    current_model: "Model",
-    current_provider: "BaseUpstreamProvider",
-    alias: str,
-) -> bool:
-    """Determine if candidate model should replace current model for an alias.
-
-    This is the core decision function for model prioritization. It considers:
-    1. Alias matching quality (exact match vs. canonical slug match)
-    2. Model cost (lower is better)
-    3. Provider penalties (e.g., slight preference against OpenRouter)
-
-    Args:
-        candidate_model: The new model being considered
-        candidate_provider: Provider offering the candidate model
-        current_model: The currently selected model for this alias
-        current_provider: Provider offering the current model
-        alias: The model alias being mapped
-
-    Returns:
-        True if candidate should replace current, False otherwise
-    """
-
-    def get_base_model_id(model_id: str) -> str:
-        """Get base model ID by removing provider prefix."""
-        return model_id.split("/", 1)[1] if "/" in model_id else model_id
-
-    def alias_priority(model: "Model") -> int:
-        """Rank how strong the mapping of alias->model is.
-
-        Highest priority when alias exactly equals the model ID without provider prefix.
-        Next when alias equals canonical slug without prefix. Otherwise lowest.
-        """
-        model_base = get_base_model_id(model.id)
-        if model_base == alias:
-            return 3
-        if model.canonical_slug:
-            canonical_base = get_base_model_id(model.canonical_slug)
-            if canonical_base == alias:
-                return 2
-        return 1
-
-    candidate_alias_priority = alias_priority(candidate_model)
-    current_alias_priority = alias_priority(current_model)
-
-    # If candidate has better alias match, prefer it regardless of cost
-    if candidate_alias_priority > current_alias_priority:
-        return True
-
-    # If current has better alias match, keep it regardless of cost
-    if current_alias_priority > candidate_alias_priority:
-        return False
-
-    # Same alias priority - compare costs
-    candidate_cost = calculate_model_cost_score(candidate_model)
-    current_cost = calculate_model_cost_score(current_model)
-
-    # Apply provider penalties
-    candidate_adjusted = candidate_cost * get_provider_penalty(candidate_provider)
-    current_adjusted = current_cost * get_provider_penalty(current_provider)
-
-    # Prefer lower adjusted cost
-    should_replace = candidate_adjusted < current_adjusted
-
-    # Log provider changes when candidate wins
-    if should_replace:
-        candidate_provider_name = getattr(
-            candidate_provider, "upstream_name", "unknown"
-        )
-        current_provider_name = getattr(current_provider, "upstream_name", "unknown")
-        logger.debug(
-            f"Model selection for alias '{alias}': choosing {candidate_provider_name} "
-            f"(cost: ${candidate_adjusted:.6f}) over {current_provider_name} "
-            f"(cost: ${current_adjusted:.6f})"
-        )
-
-    return should_replace
-
-
-def create_model_mappings(
-    upstreams: list["BaseUpstreamProvider"],
-    overrides_by_id: dict[str, tuple],
-    disabled_model_ids: set[str],
-) -> tuple[dict[str, "Model"], dict[str, "BaseUpstreamProvider"], dict[str, "Model"]]:
-    """Create optimal model mappings based on cost and provider preferences.
-
-    This is the main entry point for the algorithm. It processes all upstream providers
-    and creates three mappings based on cost optimization:
-
-    1. model_instances: alias -> Model (all model aliases mapped to their Model objects)
-    2. provider_map: alias -> UpstreamProvider (which provider to use for each alias)
-    3. unique_models: base_id -> Model (unique models without provider prefixes)
-
-    The algorithm:
-    - Processes non-OpenRouter providers first (they're typically cheaper)
-    - Then processes OpenRouter models (they can still win if cheaper)
-    - For each model alias, uses should_prefer_model() to select the best provider
-
-    Args:
-        upstreams: List of all upstream provider instances
-        overrides_by_id: Dict of model overrides from database {model_id: (ModelRow, fee)}
-        disabled_model_ids: Set of model IDs that should be excluded
-
-    Returns:
-        Tuple of (model_instances, provider_map, unique_models)
-    """
-    from .payment.models import _row_to_model
-    from .upstream.helpers import resolve_model_alias
-
-    model_instances: dict[str, "Model"] = {}
-    provider_map: dict[str, "BaseUpstreamProvider"] = {}
-    unique_models: dict[str, "Model"] = {}
-
-    # Separate OpenRouter from other providers
-    openrouter: "BaseUpstreamProvider" | None = None
-    other_upstreams: list["BaseUpstreamProvider"] = []
-
-    for upstream in upstreams:
-        base_url = getattr(upstream, "base_url", "")
-        if base_url == "https://openrouter.ai/api/v1":
-            openrouter = upstream
-        else:
-            other_upstreams.append(upstream)
-
-    def get_base_model_id(model_id: str) -> str:
-        """Get base model ID by removing provider prefix."""
-        return model_id.split("/", 1)[1] if "/" in model_id else model_id
-
-    def _maybe_set_alias(
-        alias: str, model: "Model", provider: "BaseUpstreamProvider"
-    ) -> None:
-        """Set alias to model/provider if not set or if new model is preferred."""
-        existing_model = model_instances.get(alias)
-        if not existing_model:
-            # No existing mapping, set it
-            model_instances[alias] = model
-            provider_map[alias] = provider
-        else:
-            # Check if candidate should replace existing
-            existing_provider = provider_map[alias]
-            if should_prefer_model(
-                model, provider, existing_model, existing_provider, alias
-            ):
-                model_instances[alias] = model
-                provider_map[alias] = provider
-
-    def process_provider_models(
-        upstream: "BaseUpstreamProvider", is_openrouter: bool = False
-    ) -> None:
-        """Process all models from a given provider."""
-        upstream_prefix = getattr(upstream, "upstream_name", None)
-
-        for model in upstream.get_cached_models():
-            if not model.enabled or model.id in disabled_model_ids:
-                continue
-
-            # Apply overrides if present
-            if model.id in overrides_by_id:
-                override_row, provider_fee = overrides_by_id[model.id]
-                model_to_use = _row_to_model(
-                    override_row, apply_provider_fee=True, provider_fee=provider_fee
-                )
-            else:
-                model_to_use = model
-
-            # Add to unique models
-            base_id = get_base_model_id(model_to_use.id)
-            if not is_openrouter or base_id not in unique_models:
-                unique_model = model_to_use.copy(update={"id": base_id})
-                unique_models[base_id] = unique_model
-
-            # Get all aliases for this model
-            aliases = resolve_model_alias(
-                model_to_use.id,
-                model_to_use.canonical_slug,
-                alias_ids=model_to_use.alias_ids,
-            )
-
-            # Add prefixed alias if applicable
-            if upstream_prefix and "/" not in model_to_use.id:
-                prefixed_id = f"{upstream_prefix}/{model_to_use.id}"
-                if prefixed_id not in aliases:
-                    aliases.append(prefixed_id)
-
-            # Try to set each alias
-            for alias in aliases:
-                _maybe_set_alias(alias, model_to_use, upstream)
-
-    # Process non-OpenRouter providers first (they're typically cheaper)
-    for upstream in other_upstreams:
-        process_provider_models(upstream, is_openrouter=False)
-
-    # Process OpenRouter last - models only win if they're cheaper or better matched
-    if openrouter:
-        process_provider_models(openrouter, is_openrouter=True)
-
-    # Log provider distribution
-    provider_counts: dict[str, int] = {}
-    for provider in provider_map.values():
-        provider_name = getattr(provider, "upstream_name", "unknown")
-        provider_counts[provider_name] = provider_counts.get(provider_name, 0) + 1
-
-    logger.debug(
-        "Created model mappings",
-        extra={
-            "unique_model_count": len(unique_models),
-            "total_alias_count": len(model_instances),
-            "provider_distribution": provider_counts,
-        },
-    )
-
-    return model_instances, provider_map, unique_models

routstr/auth.py

@@ -3,7 +3,6 @@ import math
 from typing import Optional
 
 from fastapi import HTTPException
-from sqlalchemy.exc import IntegrityError
 from sqlmodel import col, update
 
 from .core import get_logger
@@ -178,25 +177,7 @@ async def validate_bearer_key(
                 refund_mint_url=refund_mint_url,
             )
             session.add(new_key)
-
-            try:
-                await session.flush()
-            except IntegrityError:
-                await session.rollback()
-                logger.info(
-                    "Concurrent key creation detected, fetching existing key",
-                    extra={"key_hash": hashed_key[:8] + "..."},
-                )
-                existing_key = await session.get(ApiKey, hashed_key)
-                if not existing_key:
-                    raise Exception("Failed to fetch existing key after IntegrityError")
-
-                if key_expiry_time is not None:
-                    existing_key.key_expiry_time = key_expiry_time
-                if refund_address is not None:
-                    existing_key.refund_address = refund_address
-
-                return existing_key
+            await session.flush()
 
             logger.debug(
                 "New key created, starting token redemption",

routstr/balance.py

@@ -8,15 +8,12 @@ from pydantic import BaseModel
 
 from .auth import validate_bearer_key
 from .core.db import ApiKey, AsyncSession, get_session
-from .core.logging import get_logger
 from .core.settings import settings
-from .wallet import credit_balance, recieve_token, send_to_lnurl, send_token
+from .wallet import credit_balance, send_to_lnurl, send_token
 
 router = APIRouter()
 balance_router = APIRouter(prefix="/v1/balance")
 
-logger = get_logger(__name__)
-
 
 async def get_key_from_header(
     authorization: Annotated[str, Header(...)],
@@ -155,19 +152,14 @@ async def refund_wallet_endpoint(
     key: ApiKey = await validate_bearer_key(bearer_value, session)
     remaining_balance_msats: int = key.balance
 
-    if key.refund_currency == "sat":
-        remaining_balance = remaining_balance_msats // 1000
-    else:
-        remaining_balance = remaining_balance_msats
-
-    if remaining_balance_msats > 0 and remaining_balance <= 0:
-        raise HTTPException(status_code=400, detail="Balance too small to refund")
-    elif remaining_balance <= 0:
+    if remaining_balance_msats <= 0:
         raise HTTPException(status_code=400, detail="No balance to refund")
 
     # Perform refund operation first, before modifying balance
     try:
         if key.refund_address:
+            if key.refund_currency == "sat":
+                remaining_balance = remaining_balance_msats // 1000
             from .core.settings import settings as global_settings
 
             await send_to_lnurl(
@@ -178,9 +170,14 @@ async def refund_wallet_endpoint(
             )
             result = {"recipient": key.refund_address}
         else:
+            refund_amount = (
+                remaining_balance_msats // 1000
+                if key.refund_currency == "sat"
+                else remaining_balance_msats
+            )
             refund_currency = key.refund_currency or "sat"
             token = await send_token(
-                remaining_balance, refund_currency, key.refund_mint_url
+                refund_amount, refund_currency, key.refund_mint_url
             )
             result = {"token": token}
 
@@ -213,19 +210,6 @@ async def refund_wallet_endpoint(
     return result
 
 
-@router.post("/donate")
-async def donate(token: str, ref: str | None = None) -> str:
-    try:
-        amount, unit, _ = await recieve_token(token)
-        if ref:
-            logger.info(
-                "donation received", extra={"ref": ref, "amount": amount, "unit": unit}
-            )
-        return "Thanks!"
-    except Exception:
-        return "Invalid token."
-
-
 @router.api_route(
     "/{path:path}",
     methods=["GET", "POST", "PUT", "DELETE"],

routstr/core/db.py

@@ -5,7 +5,7 @@ from typing import AsyncGenerator
 from alembic import command
 from alembic.config import Config
 from sqlalchemy.ext.asyncio.engine import create_async_engine
-from sqlmodel import Field, Relationship, SQLModel, func, select
+from sqlmodel import Field, SQLModel, func, select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from .logging import get_logger
@@ -55,9 +55,6 @@ class ApiKey(SQLModel, table=True):  # type: ignore
 class ModelRow(SQLModel, table=True):  # type: ignore
     __tablename__ = "models"
     id: str = Field(primary_key=True)
-    upstream_provider_id: int = Field(
-        primary_key=True, foreign_key="upstream_providers.id", ondelete="CASCADE"
-    )
     name: str = Field()
     created: int = Field()
     description: str = Field()
@@ -67,29 +64,6 @@ class ModelRow(SQLModel, table=True):  # type: ignore
     sats_pricing: str | None = Field(default=None)
     per_request_limits: str | None = Field(default=None)
     top_provider: str | None = Field(default=None)
-    enabled: bool = Field(default=True, description="Whether this model is enabled")
-    upstream_provider: "UpstreamProviderRow" = Relationship(back_populates="models")
-
-
-class UpstreamProviderRow(SQLModel, table=True):  # type: ignore
-    __tablename__ = "upstream_providers"
-    id: int | None = Field(default=None, primary_key=True)
-    provider_type: str = Field(
-        description="Provider type: custom, openai, anthropic, azure, openrouter, etc."
-    )
-    base_url: str = Field(unique=True, description="Base URL of the upstream API")
-    api_key: str = Field(description="API key for the upstream provider")
-    api_version: str | None = Field(
-        default=None, description="API version for Azure OpenAI"
-    )
-    enabled: bool = Field(default=True, description="Whether this provider is enabled")
-    provider_fee: float = Field(
-        default=1.01, description="Provider fee multiplier (default 1%)"
-    )
-    models: list["ModelRow"] = Relationship(
-        back_populates="upstream_provider",
-        sa_relationship_kwargs={"cascade": "all, delete-orphan"},
-    )
 
 
 async def balances_for_mint_and_unit(
@@ -105,8 +79,6 @@ async def balances_for_mint_and_unit(
 async def init_db() -> None:
     """Initializes the database and creates tables if they don't exist."""
     async with engine.begin() as conn:
-        if DATABASE_URL.startswith("sqlite"):
-            await conn.exec_driver_sql("PRAGMA journal_mode=WAL")
         await conn.run_sync(SQLModel.metadata.create_all)
 
 

routstr/core/main.py

@@ -1,25 +1,22 @@
 import asyncio
-import os
 from contextlib import asynccontextmanager
-from pathlib import Path
 from typing import AsyncGenerator
 
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from fastapi.responses import FileResponse, RedirectResponse
-from fastapi.staticfiles import StaticFiles
+from fastapi.responses import RedirectResponse
 from starlette.exceptions import HTTPException
 
 from ..balance import balance_router, deprecated_wallet_router
 from ..discovery import providers_cache_refresher, providers_router
 from ..nip91 import announce_provider
 from ..payment.models import (
-    cleanup_enabled_models_periodically,
+    ensure_models_bootstrapped,
     models_router,
+    refresh_models_periodically,
     update_sats_pricing,
 )
-from ..payment.price import update_prices_periodically
-from ..proxy import initialize_upstreams, proxy_router, refresh_model_maps_periodically
+from ..proxy import proxy_router
 from ..wallet import periodic_payout
 from .admin import admin_router
 from .db import create_session, init_db, run_migrations
@@ -33,24 +30,18 @@ from .settings import settings as global_settings
 setup_logging()
 logger = get_logger(__name__)
 
-if os.getenv("VERSION_SUFFIX") is not None:
-    __version__ = f"0.2.0c-{os.getenv('VERSION_SUFFIX')}"
-else:
-    __version__ = "0.2.0c"
+__version__ = "0.1.3"
 
 
 @asynccontextmanager
 async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
     logger.info("Application startup initiated", extra={"version": __version__})
 
-    btc_price_task = None
     pricing_task = None
     payout_task = None
     nip91_task = None
     providers_task = None
     models_refresh_task = None
-    models_cleanup_task = None
-    model_maps_refresh_task = None
 
     try:
         # Run database migrations on startup
@@ -74,23 +65,10 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
         except Exception:
             pass
 
-        # await ensure_models_bootstrapped()
-
-        from ..payment.price import _update_prices
-        from ..proxy import get_upstreams
-        from ..upstream.helpers import refresh_upstreams_models_periodically
-
-        await _update_prices()
-        await initialize_upstreams()
-
-        btc_price_task = asyncio.create_task(update_prices_periodically())
+        await ensure_models_bootstrapped()
         pricing_task = asyncio.create_task(update_sats_pricing())
         if global_settings.models_refresh_interval_seconds > 0:
-            models_refresh_task = asyncio.create_task(
-                refresh_upstreams_models_periodically(get_upstreams())
-            )
-        models_cleanup_task = asyncio.create_task(cleanup_enabled_models_periodically())
-        model_maps_refresh_task = asyncio.create_task(refresh_model_maps_periodically())
+            models_refresh_task = asyncio.create_task(refresh_models_periodically())
         payout_task = asyncio.create_task(periodic_payout())
         nip91_task = asyncio.create_task(announce_provider())
         providers_task = asyncio.create_task(providers_cache_refresher())
@@ -106,8 +84,6 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
     finally:
         logger.info("Application shutdown initiated")
 
-        if btc_price_task is not None:
-            btc_price_task.cancel()
         if pricing_task is not None:
             pricing_task.cancel()
         if payout_task is not None:
@@ -118,15 +94,9 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
             providers_task.cancel()
         if models_refresh_task is not None:
             models_refresh_task.cancel()
-        if models_cleanup_task is not None:
-            models_cleanup_task.cancel()
-        if model_maps_refresh_task is not None:
-            model_maps_refresh_task.cancel()
 
         try:
             tasks_to_wait = []
-            if btc_price_task is not None:
-                tasks_to_wait.append(btc_price_task)
             if pricing_task is not None:
                 tasks_to_wait.append(pricing_task)
             if payout_task is not None:
@@ -137,10 +107,6 @@ async def lifespan(_: FastAPI) -> AsyncGenerator[None, None]:
                 tasks_to_wait.append(providers_task)
             if models_refresh_task is not None:
                 tasks_to_wait.append(models_refresh_task)
-            if models_cleanup_task is not None:
-                tasks_to_wait.append(models_cleanup_task)
-            if model_maps_refresh_task is not None:
-                tasks_to_wait.append(model_maps_refresh_task)
 
             if tasks_to_wait:
                 await asyncio.gather(*tasks_to_wait, return_exceptions=True)
@@ -172,6 +138,7 @@ app.add_exception_handler(HTTPException, http_exception_handler)  # type: ignore
 app.add_exception_handler(Exception, general_exception_handler)
 
 
+@app.get("/", include_in_schema=False)
 @app.get("/v1/info")
 async def info() -> dict:
     return {
@@ -186,121 +153,9 @@ async def info() -> dict:
     }
 
 
-@app.get("/v1/providers")
-async def providers() -> RedirectResponse:
-    return RedirectResponse("/v1/providers/")
-
-
-UI_DIST_PATH = Path(__file__).parent.parent.parent / "ui_out"
-
-if UI_DIST_PATH.exists() and UI_DIST_PATH.is_dir():
-    logger.info(f"Serving static UI from {UI_DIST_PATH}")
-
-    app.mount(
-        "/_next",
-        StaticFiles(directory=UI_DIST_PATH / "_next", check_dir=True),
-        name="next-static",
-    )
-
-    @app.get("/", include_in_schema=False)
-    async def serve_root_ui() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "index.html")
-
-    # Add explicit route for /index.txt to redirect to /
-    @app.get("/index.txt", include_in_schema=False)
-    async def redirect_index_txt() -> RedirectResponse:
-        return RedirectResponse("/")
-
-    @app.get("/admin")
-    async def admin_redirect() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "index.html")
-
-    @app.get("/dashboard", include_in_schema=False)
-    async def serve_dashboard_ui() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "index.html")
-
-    @app.get("/login", include_in_schema=False)
-    async def serve_login_ui() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "login" / "index.html")
-
-    # Add explicit route for /login/index.txt to redirect to /login
-    @app.get("/login/index.txt", include_in_schema=False)
-    async def redirect_login_index_txt() -> RedirectResponse:
-        return RedirectResponse("/login")
-
-    @app.get("/model", include_in_schema=False)
-    async def serve_models_ui() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "model" / "index.html")
-
-    # Add explicit route for /model/index.txt to redirect to /model
-    @app.get("/model/index.txt", include_in_schema=False)
-    async def redirect_model_index_txt() -> RedirectResponse:
-        return RedirectResponse("/model")
-
-    @app.get("/providers", include_in_schema=False)
-    async def serve_providers_ui() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "providers" / "index.html")
-
-    # Add explicit route for /providers/index.txt to redirect to /providers
-    @app.get("/providers/index.txt", include_in_schema=False)
-    async def redirect_providers_index_txt() -> RedirectResponse:
-        return RedirectResponse("/providers")
-
-    @app.get("/settings", include_in_schema=False)
-    async def serve_settings_ui() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "settings" / "index.html")
-
-    # Add explicit route for /settings/index.txt to redirect to /settings
-    @app.get("/settings/index.txt", include_in_schema=False)
-    async def redirect_settings_index_txt() -> RedirectResponse:
-        return RedirectResponse("/settings")
-
-    @app.get("/transactions", include_in_schema=False)
-    async def serve_transactions_ui() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "transactions" / "index.html")
-
-    # Add explicit route for /transactions/index.txt to redirect to /transactions
-    @app.get("/transactions/index.txt", include_in_schema=False)
-    async def redirect_transactions_index_txt() -> RedirectResponse:
-        return RedirectResponse("/transactions")
-
-    @app.get("/unauthorized", include_in_schema=False)
-    async def serve_unauthorized_ui() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "unauthorized" / "index.html")
-
-    # Add explicit route for /unauthorized/index.txt to redirect to /unauthorized
-    @app.get("/unauthorized/index.txt", include_in_schema=False)
-    async def redirect_unauthorized_index_txt() -> RedirectResponse:
-        return RedirectResponse("/unauthorized")
-
-    @app.get("/favicon.ico", include_in_schema=False)
-    async def serve_favicon() -> FileResponse:
-        icon_path = UI_DIST_PATH / "icon.ico"
-        if icon_path.exists():
-            return FileResponse(icon_path)
-        return FileResponse(UI_DIST_PATH / "favicon.ico")
-
-    @app.get("/icon.ico", include_in_schema=False)
-    async def serve_icon() -> FileResponse:
-        return FileResponse(UI_DIST_PATH / "icon.ico")
-
-    app.mount(
-        "/static", StaticFiles(directory=UI_DIST_PATH, check_dir=True), name="ui-static"
-    )
-else:
-    logger.warning(
-        f"UI dist directory not found at {UI_DIST_PATH}, skipping static file serving"
-    )
-
-    @app.get("/", include_in_schema=False)
-    async def root_fallback() -> dict:
-        return {
-            "name": global_settings.name,
-            "description": global_settings.description,
-            "version": __version__,
-            "status": "running",
-            "ui": "not available",
-        }
+@app.get("/admin")
+async def admin_redirect() -> RedirectResponse:
+    return RedirectResponse("/admin/")
 
 
 app.include_router(models_router)

routstr/core/settings.py

@@ -39,7 +39,6 @@ class Settings(BaseSettings):
     cashu_mints: list[str] = Field(default_factory=list, env="CASHU_MINTS")
     receive_ln_address: str = Field(default="", env="RECEIVE_LN_ADDRESS")
     primary_mint: str = Field(default="", env="PRIMARY_MINT_URL")
-    primary_mint_unit: str = Field(default="sat", env="PRIMARY_MINT_UNIT")
 
     # Pricing
     # Default behavior: derive pricing from MODELS
@@ -65,7 +64,7 @@ class Settings(BaseSettings):
         default=120, env="PRICING_REFRESH_INTERVAL_SECONDS"
     )
     models_refresh_interval_seconds: int = Field(
-        default=360, env="MODELS_REFRESH_INTERVAL_SECONDS"
+        default=0, env="MODELS_REFRESH_INTERVAL_SECONDS"
     )
     enable_pricing_refresh: bool = Field(default=True, env="ENABLE_PRICING_REFRESH")
     enable_models_refresh: bool = Field(default=True, env="ENABLE_MODELS_REFRESH")
@@ -235,7 +234,7 @@ class SettingsService:
 
             merged_dict: dict[str, Any] = dict(env_resolved.dict())
             merged_dict.update(
-                {k: v for k, v in db_json.items() if v not in (None, "", [], {})}
+                {k: v for k, v in db_json.items() if v not in (None, "")}
             )
 
             # Ensure primary_mint is consistent with cashu_mints if not explicitly set

routstr/payment/cost_caculation.py

@@ -1,9 +1,12 @@
+import json
 import math
 
 from pydantic.v1 import BaseModel
+from sqlmodel import select
+from sqlmodel.ext.asyncio.session import AsyncSession
 
 from ..core import get_logger
-from ..core.db import AsyncSession
+from ..core.db import ModelRow
 from ..core.settings import settings
 
 logger = get_logger(__name__)
@@ -25,8 +28,8 @@ class CostDataError(BaseModel):
     code: str
 
 
-async def calculate_cost(  # todo: can be sync
-    response_data: dict, max_cost: int, session: AsyncSession
+async def calculate_cost(
+    response_data: dict, max_cost: int, session: AsyncSession | None = None
 ) -> CostData | MaxCostData | CostDataError:
     """
     Calculate the cost of an API request based on token usage.
@@ -71,18 +74,18 @@ async def calculate_cost(  # todo: can be sync
         float(settings.fixed_per_1k_output_tokens) * 1000.0
     )
 
-    if not settings.fixed_pricing:
+    if not settings.fixed_pricing and session is not None:
         response_model = response_data.get("model", "")
         logger.debug(
             "Using model-based pricing",
             extra={"model": response_model},
         )
 
-        from ..proxy import get_model_instance
-
-        model_obj = get_model_instance(response_model)
-
-        if not model_obj:
+        result = await session.exec(select(ModelRow.id))  # type: ignore
+        available_ids = [
+            row[0] if isinstance(row, tuple) else row for row in result.all()
+        ]
+        if response_model not in available_ids:
             logger.error(
                 "Invalid model in response",
                 extra={"response_model": response_model},
@@ -92,7 +95,8 @@ async def calculate_cost(  # todo: can be sync
                 code="model_not_found",
             )
 
-        if not model_obj.sats_pricing:
+        row = await session.get(ModelRow, response_model)
+        if row is None or not row.sats_pricing:
             logger.error(
                 "Model pricing not defined",
                 extra={"model": response_model, "model_id": response_model},
@@ -102,8 +106,9 @@ async def calculate_cost(  # todo: can be sync
             )
 
         try:
-            mspp = float(model_obj.sats_pricing.prompt)
-            mspc = float(model_obj.sats_pricing.completion)
+            sats_pricing = json.loads(row.sats_pricing)
+            mspp = float(sats_pricing.get("prompt", 0))
+            mspc = float(sats_pricing.get("completion", 0))
         except Exception:
             return CostDataError(message="Invalid pricing data", code="pricing_invalid")
 

routstr/payment/helpers.py

@@ -1,18 +1,17 @@
-import base64
 import json
 import math
-from io import BytesIO
-from typing import Any
+from typing import Mapping
 
-import httpx
 from fastapi import HTTPException, Response
 from fastapi.requests import Request
-from PIL import Image
+from sqlmodel import select
 from sqlmodel.ext.asyncio.session import AsyncSession
 
 from ..core import get_logger
+from ..core.db import ModelRow
 from ..core.settings import settings
 from ..wallet import deserialize_token_from_string
+from .models import Pricing
 
 logger = get_logger(__name__)
 
@@ -86,19 +85,19 @@ def check_token_balance(headers: dict, body: dict, max_cost_for_model: int) -> N
 
 
 async def get_max_cost_for_model(
-    model: str,
-    session: AsyncSession,
-    model_obj: Any | None = None,
+    model: str, session: AsyncSession | None = None
 ) -> int:
-    """Get the maximum cost for a specific model from providers with overrides."""
+    """Get the maximum cost for a specific model."""
     logger.debug(
         "Getting max cost for model",
         extra={
             "model": model,
             "fixed_pricing": settings.fixed_pricing,
+            "has_models": True,
         },
     )
 
+    # Fixed pricing: always use fixed_cost_per_request
     if settings.fixed_pricing:
         default_cost_msats = settings.fixed_cost_per_request * 1000
         logger.debug(
@@ -107,40 +106,43 @@ async def get_max_cost_for_model(
         )
         return max(settings.min_request_msat, default_cost_msats)
 
-    if not model_obj:
-        from ..proxy import get_model_instance
-
-        model_obj = get_model_instance(model)
-
-    if not model_obj:
+    if session is None:
+        # Without a DB session, we can't resolve model pricing; fall back to fixed cost
         fallback_msats = settings.fixed_cost_per_request * 1000
         logger.warning(
-            "Model not found in providers or overrides",
+            "No DB session provided for model pricing; using fixed cost",
+            extra={"requested_model": model, "using_default_cost": fallback_msats},
+        )
+        return max(settings.min_request_msat, fallback_msats)
+
+    result = await session.exec(select(ModelRow.id))  # type: ignore
+    available_ids = [row[0] if isinstance(row, tuple) else row for row in result.all()]
+    if model not in available_ids:
+        # If no models or unknown model, fall back to fixed cost if provided, else minimal default
+        fallback_msats = settings.fixed_cost_per_request * 1000
+        logger.warning(
+            "Model not found in available models",
             extra={
                 "requested_model": model,
+                "available_models": available_ids,
                 "using_default_cost": fallback_msats,
             },
         )
         return max(settings.min_request_msat, fallback_msats)
 
-    if model_obj.sats_pricing:
+    row = await session.get(ModelRow, model)
+    if row and row.sats_pricing:
         try:
-            max_cost = (
-                model_obj.sats_pricing.max_cost
-                * 1000
-                * (1 - settings.tolerance_percentage / 100)
-            )
+            sats = Pricing(**json.loads(row.sats_pricing))  # type: ignore
+            max_cost = sats.max_cost * 1000 * (1 - settings.tolerance_percentage / 100)
             logger.debug(
                 "Found model-specific max cost",
                 extra={"model": model, "max_cost_msats": max_cost},
             )
             calculated_msats = int(max_cost)
             return max(settings.min_request_msat, calculated_msats)
-        except Exception as e:
-            logger.error(
-                "Error calculating max cost from model pricing",
-                extra={"model": model, "error": str(e)},
-            )
+        except Exception:
+            pass
 
     logger.warning(
         "Model pricing not found, using fixed cost",
@@ -153,17 +155,14 @@ async def get_max_cost_for_model(
 
 
 async def calculate_discounted_max_cost(
-    max_cost_for_model: int,
-    body: dict,
-    model_obj: Any | None = None,
+    max_cost_for_model: int, body: dict, session: AsyncSession | None = None
 ) -> int:
     """Calculate the discounted max cost for a request using model pricing when available."""
-    if settings.fixed_pricing:
+    if settings.fixed_pricing or session is None:
         return max_cost_for_model
 
     model = body.get("model", "unknown")
-
-    model_pricing = model_obj.sats_pricing if model_obj else None
+    model_pricing = await get_model_cost_info(model, session=session)
     if not model_pricing:
         return max_cost_for_model
 
@@ -176,23 +175,13 @@ async def calculate_discounted_max_cost(
 
     if messages := body.get("messages"):
         prompt_tokens = estimate_tokens(messages)
-
-        image_tokens = await estimate_image_tokens_in_messages(messages)
-        if image_tokens > 0:
-            logger.debug(
-                "Found images in request",
-                extra={
-                    "model": model,
-                    "image_tokens": image_tokens,
-                },
-            )
-            prompt_tokens += image_tokens
-
         estimated_prompt_delta_sats = (
             max_prompt_allowed_sats - prompt_tokens * model_pricing.prompt
         )
-        if estimated_prompt_delta_sats > 0:
+        if estimated_prompt_delta_sats >= 0:
             adjusted = adjusted - math.floor(estimated_prompt_delta_sats * 1000)
+        else:
+            adjusted = adjusted + math.ceil(-estimated_prompt_delta_sats * 1000)
 
     max_tokens_raw = body.get("max_tokens", None)
     if max_tokens_raw is not None:
@@ -207,8 +196,10 @@ async def calculate_discounted_max_cost(
             estimated_completion_delta_sats = (
                 max_completion_allowed_sats - max_tokens_int * model_pricing.completion
             )
-            if estimated_completion_delta_sats > 0:
+            if estimated_completion_delta_sats >= 0:
                 adjusted = adjusted - math.floor(estimated_completion_delta_sats * 1000)
+            else:
+                adjusted = adjusted + math.ceil(-estimated_completion_delta_sats * 1000)
 
     logger.debug(
         "Discounted max cost computed",
@@ -224,171 +215,23 @@ async def calculate_discounted_max_cost(
 
 
 def estimate_tokens(messages: list) -> int:
-    """Estimate tokens for text content, excluding image_url fields."""
-    total = 0
-    for msg in messages:
-        if isinstance(msg, dict):
-            content = msg.get("content")
-            if isinstance(content, str):
-                total += len(content)
-            elif isinstance(content, list):
-                total += sum(
-                    len(item.get("text", ""))
-                    for item in content
-                    if isinstance(item, dict) and item.get("type") == "text"
-                )
-    return total // 3
+    return len(str(messages)) // 3
 
 
-def _get_image_dimensions(image_data: bytes) -> tuple[int, int]:
-    """Extract image dimensions from image bytes."""
-    try:
-        img = Image.open(BytesIO(image_data))
-        return img.size
-    except Exception as e:
-        logger.warning(
-            "Failed to get image dimensions, using default",
-            extra={"error": str(e)},
-        )
-        return (512, 512)
-
-
-async def _fetch_image_from_url(url: str) -> bytes | None:
-    """Fetch image from URL."""
-    try:
-        async with httpx.AsyncClient(timeout=10.0) as client:
-            response = await client.get(url)
-            response.raise_for_status()
-            return response.content
-    except Exception as e:
-        logger.warning(
-            "Failed to fetch image from URL",
-            extra={"error": str(e), "url": url[:100]},
-        )
+async def get_model_cost_info(
+    model_id: str, session: AsyncSession | None = None
+) -> Pricing | None:
+    if not model_id or model_id == "unknown":
         return None
-
-
-def _calculate_image_tokens(width: int, height: int, detail: str = "auto") -> int:
-    """Calculate image tokens based on OpenAI's vision pricing.
-
-    For low detail: 85 tokens
-    For high detail/auto: 85 base tokens + 170 tokens per 512px tile
-    """
-    if detail == "low":
-        return 85
-
-    if width > 2048 or height > 2048:
-        aspect_ratio = width / height
-        if width > height:
-            width = 2048
-            height = int(width / aspect_ratio)
-        else:
-            height = 2048
-            width = int(height * aspect_ratio)
-
-    if width > 768 or height > 768:
-        aspect_ratio = width / height
-        if width > height:
-            width = 768
-            height = int(width / aspect_ratio)
-        else:
-            height = 768
-            width = int(height * aspect_ratio)
-
-    tiles_width = (width + 511) // 512
-    tiles_height = (height + 511) // 512
-    num_tiles = tiles_width * tiles_height
-
-    return 85 + (170 * num_tiles)
-
-
-async def estimate_image_tokens_in_messages(messages: list) -> int:
-    """Estimate total tokens for all images in messages.
-
-    Supports both base64 encoded images and image URLs.
-    """
-    total_image_tokens = 0
-
-    for message in messages:
-        if not isinstance(message, dict):
-            continue
-
-        content = message.get("content")
-        if not content:
-            continue
-
-        if isinstance(content, str):
-            continue
-
-        if not isinstance(content, list):
-            continue
-
-        for content_item in content:
-            if not isinstance(content_item, dict):
-                continue
-
-            content_type = content_item.get("type")
-            if content_type not in ("image_url", "input_image"):
-                continue
-
-            image_url_data = content_item.get("image_url")
-            if not image_url_data:
-                continue
-
-            if isinstance(image_url_data, str):
-                url = image_url_data
-                detail = "auto"
-            elif isinstance(image_url_data, dict):
-                url = image_url_data.get("url", "")
-                detail = image_url_data.get("detail", "auto")
-            else:
-                continue
-
-            if not url:
-                continue
-
-            if url.startswith("data:image/"):
-                try:
-                    header, base64_data = url.split(",", 1)
-                    image_bytes = base64.b64decode(base64_data)
-                    width, height = _get_image_dimensions(image_bytes)
-                    tokens = _calculate_image_tokens(width, height, detail)
-                    total_image_tokens += tokens
-                    logger.debug(
-                        "Calculated tokens for base64 image",
-                        extra={
-                            "width": width,
-                            "height": height,
-                            "detail": detail,
-                            "tokens": tokens,
-                        },
-                    )
-                except Exception as e:
-                    logger.warning(
-                        "Failed to process base64 image",
-                        extra={"error": str(e)},
-                    )
-                    total_image_tokens += 85
-            else:
-                image_bytes_or_none = await _fetch_image_from_url(url)
-                if image_bytes_or_none:
-                    width, height = _get_image_dimensions(image_bytes_or_none)
-                    tokens = _calculate_image_tokens(width, height, detail)
-                    total_image_tokens += tokens
-                    logger.debug(
-                        "Calculated tokens for URL image",
-                        extra={
-                            "url": url[:100],
-                            "width": width,
-                            "height": height,
-                            "detail": detail,
-                            "tokens": tokens,
-                        },
-                    )
-                else:
-                    total_image_tokens += 85
-
-    return total_image_tokens
+    if session is None:
+        return None
+    row = await session.get(ModelRow, model_id)
+    if row and row.sats_pricing:
+        try:
+            return Pricing(**json.loads(row.sats_pricing))  # type: ignore
+        except Exception:
+            return None
+    return None
 
 
 def create_error_response(
@@ -414,3 +257,61 @@ def create_error_response(
         media_type="application/json",
         headers={"X-Cashu": token} if token else {},
     )
+
+
+def prepare_upstream_headers(request_headers: dict) -> dict:
+    """Prepare headers for upstream request, removing sensitive/problematic ones."""
+    upstream_api_key = settings.upstream_api_key
+    logger.debug(
+        "Preparing upstream headers",
+        extra={
+            "original_headers_count": len(request_headers),
+            "has_upstream_api_key": bool(upstream_api_key),
+        },
+    )
+
+    headers = dict(request_headers)
+
+    # Remove headers that shouldn't be forwarded
+    removed_headers = []
+    for header in [
+        "host",
+        "content-length",
+        "refund-lnurl",
+        "key-expiry-time",
+        "x-cashu",
+    ]:
+        if headers.pop(header, None) is not None:
+            removed_headers.append(header)
+
+    # Handle authorization
+    if upstream_api_key:
+        headers["Authorization"] = f"Bearer {upstream_api_key}"
+        if headers.pop("authorization", None) is not None:
+            removed_headers.append("authorization (replaced with upstream key)")
+    else:
+        for auth_header in ["Authorization", "authorization"]:
+            if headers.pop(auth_header, None) is not None:
+                removed_headers.append(auth_header)
+
+    logger.debug(
+        "Headers prepared for upstream",
+        extra={
+            "final_headers_count": len(headers),
+            "removed_headers": removed_headers,
+            "added_upstream_auth": bool(upstream_api_key),
+        },
+    )
+
+    return headers
+
+
+def prepare_upstream_params(
+    path: str, query_params: Mapping[str, str] | None
+) -> dict[str, str]:
+    """Prepare query params for upstream request, optionally adding api-version for chat/completions."""
+    params: dict[str, str] = dict(query_params or {})
+    chat_api_version = settings.chat_completions_api_version
+    if path.endswith("chat/completions") and chat_api_version:
+        params["api-version"] = chat_api_version
+    return params

routstr/payment/lnurl.py

@@ -230,11 +230,7 @@ async def get_lnurl_invoice(
 
 
 async def raw_send_to_lnurl(
-    wallet: Wallet,
-    proofs: list[Proof],
-    lnurl: str,
-    unit: str,
-    amount: int | None = None,
+    wallet: Wallet, proofs: list[Proof], lnurl: str, unit: str
 ) -> int:
     """Send funds to an LNURL address.
 
@@ -259,11 +255,6 @@ async def raw_send_to_lnurl(
         paid = await wallet.send_to_lnurl("user@getalby.com", 50, unit="usd")
     """
     total_balance = sum(proof.amount for proof in proofs)
-    if amount and total_balance < amount:
-        raise ValueError("Amount to send is higher than available proofs.")
-    else:
-        assert isinstance(amount, int)
-        total_balance = amount
     lnurl_data = await get_lnurl_data(lnurl)
 
     if unit == "sat":
@@ -294,10 +285,6 @@ async def raw_send_to_lnurl(
     melt_quote_resp = await wallet.melt_quote(
         invoice=bolt11_invoice, amount_msat=final_amount
     )
-
-    if amount:
-        proofs, _ = await wallet.select_to_send(proofs, amount, set_reserved=True)
-
     _ = await wallet.melt(
         proofs=proofs,
         invoice=bolt11_invoice,

routstr/payment/models.py

@@ -4,7 +4,6 @@ import random
 from pathlib import Path
 from urllib.request import urlopen
 
-import httpx
 from fastapi import APIRouter, Depends
 from pydantic.v1 import BaseModel
 from sqlmodel import select
@@ -13,7 +12,7 @@ from sqlmodel.ext.asyncio.session import AsyncSession
 from ..core.db import ModelRow, create_session, get_session
 from ..core.logging import get_logger
 from ..core.settings import settings
-from .price import sats_usd_price
+from .price import sats_usd_ask_price
 
 logger = get_logger(__name__)
 
@@ -57,13 +56,6 @@ class Model(BaseModel):
     sats_pricing: Pricing | None = None
     per_request_limits: dict | None = None
     top_provider: TopProvider | None = None
-    enabled: bool = True
-    upstream_provider_id: int | None = None
-    canonical_slug: str | None = None
-    alias_ids: list[str] | None = None
-
-    def __hash__(self) -> int:
-        return hash(self.id)
 
 
 def fetch_openrouter_models(source_filter: str | None = None) -> list[dict]:
@@ -91,9 +83,6 @@ def fetch_openrouter_models(source_filter: str | None = None) -> list[dict]:
                     "(free)" in model.get("name", "")
                     or model_id == "openrouter/auto"
                     or model_id == "google/gemini-2.5-pro-exp-03-25"
-                    or model_id == "opengvlab/internvl3-78b"
-                    or model_id == "openrouter/sonoma-dusk-alpha"
-                    or model_id == "openrouter/sonoma-sky-alpha"
                 ):
                     continue
 
@@ -105,55 +94,6 @@ def fetch_openrouter_models(source_filter: str | None = None) -> list[dict]:
         return []
 
 
-async def async_fetch_openrouter_models(source_filter: str | None = None) -> list[dict]:
-    """Asynchronously fetch model information from OpenRouter API."""
-    base_url = "https://openrouter.ai/api/v1"
-
-    try:
-        async with httpx.AsyncClient() as client:
-            response = await client.get(f"{base_url}/models", timeout=30)
-            response.raise_for_status()
-            data = response.json()
-
-            models_data: list[dict] = []
-            for model in data.get("data", []):
-                model_id = model.get("id", "")
-
-                if source_filter:
-                    source_prefix = f"{source_filter}/"
-                    if not model_id.startswith(source_prefix):
-                        continue
-
-                    model = dict(model)
-                    model["id"] = model_id[len(source_prefix) :]
-                    model_id = model["id"]
-
-                if (
-                    "(free)" in model.get("name", "")
-                    or model_id == "openrouter/auto"
-                    or model_id == "google/gemini-2.5-pro-exp-03-25"
-                    or model_id == "opengvlab/internvl3-78b"
-                    or model_id == "openrouter/sonoma-dusk-alpha"
-                    or model_id == "openrouter/sonoma-sky-alpha"
-                ):
-                    continue
-
-                models_data.append(model)
-
-            return models_data
-    except Exception as e:
-        logger.error(f"Error (async) fetching models from OpenRouter API: {e}")
-        return []
-
-
-def is_openrouter_upstream() -> bool:
-    try:
-        base = (settings.upstream_base_url or "").strip().rstrip("/")
-    except Exception:
-        return False
-    return base.lower() == "https://openrouter.ai/api/v1"
-
-
 def load_models() -> list[Model]:
     """Load model definitions from a JSON file or auto-generate from OpenRouter API.
 
@@ -179,13 +119,7 @@ def load_models() -> list[Model]:
             logger.error(f"Error loading models from {models_path}: {e}")
             # Fall through to auto-generation
 
-    # Only auto-generate from OpenRouter when upstream is OpenRouter
-    if not is_openrouter_upstream():
-        logger.info(
-            "Skipping auto-generation from OpenRouter because upstream_base_url is not https://openrouter.ai/api/v1"
-        )
-        return []
-
+    # Auto-generate models from OpenRouter API
     logger.info("Auto-generating models from OpenRouter API")
     try:
         source_filter = settings.source or None
@@ -202,58 +136,45 @@ def load_models() -> list[Model]:
     return [Model(**model) for model in models_data]  # type: ignore
 
 
-def _row_to_model(
-    row: ModelRow, apply_provider_fee: bool = False, provider_fee: float = 1.01
-) -> Model:
+def _row_to_model(row: ModelRow) -> Model:
     architecture = json.loads(row.architecture)
     pricing = json.loads(row.pricing)
+    sats_pricing = json.loads(row.sats_pricing) if row.sats_pricing else None
     per_request_limits = (
         json.loads(row.per_request_limits) if row.per_request_limits else None
     )
-    top_provider_dict = json.loads(row.top_provider) if row.top_provider else None
+    top_provider = json.loads(row.top_provider) if row.top_provider else None
 
-    if apply_provider_fee and isinstance(pricing, dict):
-        pricing = {k: float(v) * provider_fee for k, v in pricing.items()}
+    # Enforce minimum per-request fee on free/zero-priced models in API output
+    try:
+        if isinstance(pricing, dict):
+            if float(pricing.get("request", 0.0)) <= 0.0:
+                pricing["request"] = max(pricing.get("request", 0.0), 0.0)
+        if isinstance(sats_pricing, dict):
+            if float(sats_pricing.get("request", 0.0)) <= 0.0:
+                # Convert min_request_msat to sats for sats_pricing fields that are in sats
+                sats_min = max(1, int(settings.min_request_msat)) / 1000.0
+                sats_pricing["request"] = max(
+                    sats_pricing.get("request", 0.0), sats_min
+                )
+    except Exception:
+        pass
 
-    if isinstance(pricing, dict) and float(pricing.get("request", 0.0)) <= 0.0:
-        pricing["request"] = max(pricing.get("request", 0.0), 0.0)
-
-    parsed_pricing = Pricing.parse_obj(pricing)
-    model = Model(
+    return Model(
         id=row.id,
         name=row.name,
         created=row.created,
         description=row.description,
         context_length=row.context_length,
         architecture=Architecture.parse_obj(architecture),
-        pricing=parsed_pricing,
-        sats_pricing=None,
+        pricing=Pricing.parse_obj(pricing),
+        sats_pricing=Pricing.parse_obj(sats_pricing) if sats_pricing else None,
         per_request_limits=per_request_limits,
-        top_provider=TopProvider.parse_obj(top_provider_dict)
-        if top_provider_dict
-        else None,
-        enabled=row.enabled,
-        upstream_provider_id=row.upstream_provider_id,
-        canonical_slug=getattr(row, "canonical_slug", None),
+        top_provider=TopProvider.parse_obj(top_provider) if top_provider else None,
     )
 
-    if apply_provider_fee:
-        (
-            parsed_pricing.max_prompt_cost,
-            parsed_pricing.max_completion_cost,
-            parsed_pricing.max_cost,
-        ) = _calculate_usd_max_costs(model)
 
-    try:
-        sats_to_usd = sats_usd_price()
-        model = _update_model_sats_pricing(model, sats_to_usd)
-    except Exception as e:
-        logger.warning(f"Could not calculate sats pricing: {e}")
-
-    return model
-
-
-def _model_to_row_payload(model: Model) -> dict[str, str | int | bool | None]:
+def _model_to_row_payload(model: Model) -> dict[str, str | int | None]:
     return {
         "id": model.id,
         "name": model.name,
@@ -271,163 +192,29 @@ def _model_to_row_payload(model: Model) -> dict[str, str | int | bool | None]:
         "top_provider": json.dumps(model.top_provider.dict())
         if model.top_provider is not None
         else None,
-        "enabled": model.enabled,
-        "upstream_provider_id": model.upstream_provider_id,
     }
 
 
-async def list_models(
-    session: AsyncSession,
-    upstream_id: int,
-    include_disabled: bool = False,
-) -> list[Model]:
-    from sqlmodel import select
-
-    from ..core.db import UpstreamProviderRow
-
-    query = select(ModelRow)
-    if upstream_id is not None:
-        query = query.where(ModelRow.upstream_provider_id == upstream_id)
-    if not include_disabled:
-        query = query.where(ModelRow.enabled)
-
-    rows = (await session.exec(query)).all()  # type: ignore
-    provider_result = await session.exec(select(UpstreamProviderRow))
-    providers_by_id = {p.id: p for p in provider_result.all()}
-    return [
-        _row_to_model(
-            r,
-            apply_provider_fee=True,
-            provider_fee=providers_by_id[r.upstream_provider_id].provider_fee
-            if r.upstream_provider_id in providers_by_id
-            else 1.01,
-        )
-        for r in rows
-    ]
+async def list_models(session: AsyncSession | None = None) -> list[Model]:
+    if session is not None:
+        result = await session.exec(select(ModelRow))  # type: ignore
+        rows = result.all()
+        return [_row_to_model(r) for r in rows]
+    async with create_session() as s:
+        result = await s.exec(select(ModelRow))  # type: ignore
+        rows = result.all()
+        return [_row_to_model(r) for r in rows]
 
 
 async def get_model_by_id(
-    model_id: str, provider_id: int, session: AsyncSession
+    model_id: str, session: AsyncSession | None = None
 ) -> Model | None:
-    from ..core.db import UpstreamProviderRow
-
-    row = await session.get(ModelRow, (model_id, provider_id))
-    if not row or not row.enabled:
-        return None
-    provider = await session.get(UpstreamProviderRow, provider_id)
-    provider_fee = provider.provider_fee if provider else 1.01
-    return _row_to_model(row, apply_provider_fee=True, provider_fee=provider_fee)
-
-
-def _calculate_usd_max_costs(model: Model) -> tuple[float, float, float]:
-    """Calculate max costs in USD based on model context/token limits.
-
-    Args:
-        model: Model object
-
-    Returns:
-        Tuple of (max_prompt_cost, max_completion_cost, max_cost) in USD
-    """
-    min_req_msat = max(1, int(getattr(settings, "min_request_msat", 1)))
-    min_req_usd = float(min_req_msat) / 1_000_000.0
-
-    prompt_price = model.pricing.prompt
-    completion_price = model.pricing.completion
-
-    if model.top_provider and (
-        model.top_provider.context_length or model.top_provider.max_completion_tokens
-    ):
-        if (cl := model.top_provider.context_length) and (
-            mct := model.top_provider.max_completion_tokens
-        ):
-            if cl <= mct:
-                return (
-                    cl * prompt_price,
-                    cl * completion_price,
-                    cl * max(completion_price, prompt_price),
-                )
-            return (
-                cl * prompt_price,
-                mct * completion_price,
-                (cl - mct) * prompt_price + mct * completion_price,
-            )
-        elif cl := model.top_provider.context_length:
-            return (
-                cl * prompt_price,
-                cl * completion_price,
-                cl * max(completion_price, prompt_price),
-            )
-        elif mct := model.top_provider.max_completion_tokens:
-            return (
-                mct * prompt_price,
-                mct * completion_price,
-                mct * completion_price,
-            )
-    elif model.context_length:
-        return (
-            model.context_length * prompt_price,
-            model.context_length * completion_price,
-            model.context_length * max(completion_price, prompt_price),
-        )
-
-    p = prompt_price * 1_000_000
-    c = completion_price * 32_000
-    r = model.pricing.request * 100_000
-    i = model.pricing.image * 100
-    w = model.pricing.web_search * 1000
-    ir = model.pricing.internal_reasoning * 100
-    return (p, c, max(p + c + r + i + w + ir, min_req_usd))
-
-
-def _update_model_sats_pricing(model: Model, sats_to_usd: float) -> Model:
-    """Update a model's sats_pricing based on USD pricing and exchange rate.
-
-    Args:
-        model: Model object to update
-        sats_to_usd: Current sats to USD exchange rate
-
-    Returns:
-        Updated Model object with new sats_pricing
-    """
-    try:
-        min_req_msat = max(1, int(getattr(settings, "min_request_msat", 1)))
-        min_req_sats = float(min_req_msat) / 1000.0
-
-        sats = Pricing.parse_obj(
-            {k: v / sats_to_usd for k, v in model.pricing.dict().items()}
-        )
-
-        if sats.request <= 0.0:
-            sats.request = min_req_sats
-        if (sats.max_cost or 0.0) < min_req_sats:
-            sats.max_cost = min_req_sats
-
-        return Model(
-            id=model.id,
-            name=model.name,
-            created=model.created,
-            description=model.description,
-            context_length=model.context_length,
-            architecture=model.architecture,
-            pricing=model.pricing,
-            sats_pricing=sats,
-            per_request_limits=model.per_request_limits,
-            top_provider=model.top_provider,
-            enabled=model.enabled,
-            upstream_provider_id=model.upstream_provider_id,
-            canonical_slug=model.canonical_slug,
-            alias_ids=model.alias_ids,
-        )
-    except Exception as e:
-        logger.error(
-            "Failed to update sats pricing for model",
-            extra={
-                "model_id": model.id,
-                "error": str(e),
-                "error_type": type(e).__name__,
-            },
-        )
-        return model
+    if session is not None:
+        row = await session.get(ModelRow, model_id)
+        return _row_to_model(row) if row else None
+    async with create_session() as s:
+        row = await s.get(ModelRow, model_id)
+        return _row_to_model(row) if row else None
 
 
 async def ensure_models_bootstrapped() -> None:
@@ -453,7 +240,7 @@ async def ensure_models_bootstrapped() -> None:
             except Exception as e:
                 logger.error(f"Error loading models from {models_path}: {e}")
 
-        if not models_to_insert and is_openrouter_upstream():
+        if not models_to_insert:
             logger.info("Bootstrapping models from OpenRouter API")
             source_filter = None
             try:
@@ -462,10 +249,6 @@ async def ensure_models_bootstrapped() -> None:
             except Exception:
                 pass
             models_to_insert = fetch_openrouter_models(source_filter=source_filter)
-        elif not models_to_insert:
-            logger.info(
-                "No models.json found and upstream is not OpenRouter; skipping bootstrap"
-            )
 
         for m in models_to_insert:
             try:
@@ -481,167 +264,121 @@ async def ensure_models_bootstrapped() -> None:
         await s.commit()
 
 
-async def _update_sats_pricing_once() -> None:
-    """Update sats pricing once for all provider models (in-memory only)."""
-    from ..proxy import get_upstreams
-
-    upstreams = get_upstreams()
-    sats_to_usd = sats_usd_price()
-
-    updated_count = 0
-    for upstream in upstreams:
-        updated_models = [
-            _update_model_sats_pricing(m, sats_to_usd)
-            for m in upstream.get_cached_models()
-        ]
-        upstream._models_cache = updated_models
-        upstream._models_by_id = {m.id: m for m in updated_models}
-        updated_count += len(updated_models)
-
-    if updated_count > 0:
-        logger.info("Updated sats pricing", extra={"models_updated": updated_count})
-
-
 async def update_sats_pricing() -> None:
-    """Periodically update sats pricing for all provider models and database overrides."""
-    try:
-        if not settings.enable_pricing_refresh:
-            return
-    except Exception:
-        pass
-
-    await _update_sats_pricing_once()
-
     while True:
-        try:
-            interval = getattr(settings, "pricing_refresh_interval_seconds", 120)
-            jitter = max(0.0, float(interval) * 0.1)
-            await asyncio.sleep(interval + random.uniform(0, jitter))
-        except asyncio.CancelledError:
-            break
-
         try:
             try:
                 if not settings.enable_pricing_refresh:
                     return
             except Exception:
                 pass
+            sats_to_usd = await sats_usd_ask_price()
+            async with create_session() as s:
+                result = await s.exec(select(ModelRow))  # type: ignore
+                rows = result.all()
+                changed = 0
+                for row in rows:
+                    try:
+                        pricing = Pricing.parse_obj(json.loads(row.pricing))
+                        top_provider = (
+                            TopProvider.parse_obj(json.loads(row.top_provider))
+                            if row.top_provider
+                            else None
+                        )
+                        sats = Pricing.parse_obj(
+                            {k: v / sats_to_usd for k, v in pricing.dict().items()}
+                        )
+                        # Enforce minimum per-request charge floor in sats
+                        try:
+                            min_req_msat = max(
+                                1, int(getattr(settings, "min_request_msat", 1))
+                            )
+                        except Exception:
+                            min_req_msat = 1
+                        min_req_sats = float(min_req_msat) / 1000.0
+                        if sats.request <= 0.0:
+                            sats.request = min_req_sats
+                        mspp = sats.prompt
+                        mspc = sats.completion
+                        if top_provider and (
+                            top_provider.context_length
+                            or top_provider.max_completion_tokens
+                        ):
+                            if (cl := top_provider.context_length) and (
+                                mct := top_provider.max_completion_tokens
+                            ):
+                                max_prompt_cost = (cl - mct) * mspp
+                                max_completion_cost = mct * mspc
+                                sats.max_prompt_cost = max_prompt_cost
+                                sats.max_completion_cost = max_completion_cost
+                                sats.max_cost = max_prompt_cost + max_completion_cost
+                            elif cl := top_provider.context_length:
+                                max_prompt_cost = cl * 0.8 * mspp
+                                max_completion_cost = cl * 0.2 * mspc
+                                sats.max_prompt_cost = max_prompt_cost
+                                sats.max_completion_cost = max_completion_cost
+                                sats.max_cost = max_prompt_cost + max_completion_cost
+                            elif mct := top_provider.max_completion_tokens:
+                                max_prompt_cost = mct * 4 * mspp
+                                max_completion_cost = mct * mspc
+                                sats.max_prompt_cost = max_prompt_cost
+                                sats.max_completion_cost = max_completion_cost
+                                sats.max_cost = max_prompt_cost + max_completion_cost
+                            else:
+                                max_prompt_cost = 1_000_000 * mspp
+                                max_completion_cost = 32_000 * mspc
+                                sats.max_prompt_cost = max_prompt_cost
+                                sats.max_completion_cost = max_completion_cost
+                                sats.max_cost = max_prompt_cost + max_completion_cost
+                        elif row.context_length:
+                            max_prompt_cost = mspp * row.context_length * 0.8
+                            max_completion_cost = mspc * row.context_length * 0.2
+                            sats.max_prompt_cost = max_prompt_cost
+                            sats.max_completion_cost = max_completion_cost
+                            sats.max_cost = max_prompt_cost + max_completion_cost
+                        else:
+                            p = mspp * 1_000_000
+                            c = mspc * 32_000
+                            r = sats.request * 100_000
+                            i = sats.image * 100
+                            w = sats.web_search * 1000
+                            ir = sats.internal_reasoning * 100
+                            sats.max_prompt_cost = p
+                            sats.max_completion_cost = c
+                            sats.max_cost = p + c + r + i + w + ir
 
-            await _update_sats_pricing_once()
+                        # Ensure overall minimum per-request total cost floor
+                        if (sats.max_cost or 0.0) < min_req_sats:
+                            sats.max_cost = min_req_sats
+
+                        new_json = json.dumps(sats.dict())
+                        if row.sats_pricing != new_json:
+                            row.sats_pricing = new_json
+                            s.add(row)
+                            changed += 1
+                    except Exception as per_row_error:
+                        logger.error(
+                            "Failed to update pricing for model",
+                            extra={
+                                "model_id": row.id,
+                                "error": str(per_row_error),
+                                "error_type": type(per_row_error).__name__,
+                            },
+                        )
+                if changed:
+                    await s.commit()
         except asyncio.CancelledError:
             break
         except Exception as e:
             logger.error(f"Error updating sats pricing: {e}")
-
-
-async def cleanup_enabled_models_periodically() -> None:
-    """Background task to clean up enabled models that match upstream pricing.
-
-    When model is enabled (enabled=True), remove it from DB if it matches upstream pricing.
-    Keep it in DB only if pricing differs from upstream or if it's disabled.
-    """
-    interval = getattr(
-        settings, "models_cleanup_interval_seconds", 300
-    )  # 5 minutes default
-    if not interval or interval <= 0:
-        return
-
-    while True:
-        try:
-            await _cleanup_enabled_models_once()
-        except asyncio.CancelledError:
-            break
-        except Exception as e:
-            logger.error(
-                "Error during enabled models cleanup",
-                extra={"error": str(e), "error_type": type(e).__name__},
-            )
-
         try:
+            interval = getattr(settings, "pricing_refresh_interval_seconds", 120)
             jitter = max(0.0, float(interval) * 0.1)
             await asyncio.sleep(interval + random.uniform(0, jitter))
         except asyncio.CancelledError:
             break
 
 
-async def _cleanup_enabled_models_once() -> None:
-    """Clean up enabled models that match upstream pricing."""
-    from ..proxy import get_upstreams
-
-    async with create_session() as session:
-        # Get all enabled models from DB
-        result = await session.exec(
-            select(ModelRow).where(
-                ModelRow.enabled,  # Only enabled models
-            )
-        )
-        db_models = result.all()
-
-        if not db_models:
-            return
-
-        upstreams = get_upstreams()
-        models_to_remove = []
-
-        for db_model in db_models:
-            # Find corresponding upstream model
-            upstream_model = None
-            for upstream in upstreams:
-                upstream_model = upstream.get_cached_model_by_id(db_model.id)
-                if upstream_model:
-                    break
-
-            if not upstream_model:
-                continue
-
-            # Compare pricing to see if they match
-            db_pricing = json.loads(db_model.pricing)
-            upstream_pricing = upstream_model.pricing.dict()
-
-            # Check if pricing matches (with small tolerance for float comparison)
-            pricing_matches = _pricing_matches(db_pricing, upstream_pricing)
-
-            if pricing_matches:
-                models_to_remove.append(db_model)
-                logger.info(
-                    f"Removing enabled model {db_model.id} - matches upstream pricing",
-                    extra={"model_id": db_model.id},
-                )
-
-        # Remove models that match upstream pricing
-        for model in models_to_remove:
-            await session.delete(model)
-
-        if models_to_remove:
-            await session.commit()
-            logger.info(
-                f"Cleaned up {len(models_to_remove)} enabled models that match upstream pricing"
-            )
-
-
-def _pricing_matches(
-    db_pricing: dict, upstream_pricing: dict, tolerance: float = 0.0
-) -> bool:
-    """Check if pricing dictionaries match within tolerance."""
-    keys_to_compare = [
-        "prompt",
-        "completion",
-        "request",
-        "image",
-        "web_search",
-        "internal_reasoning",
-    ]
-
-    for key in keys_to_compare:
-        db_val = int(float(db_pricing.get(key, 0.0)) * 1000000)
-        upstream_val = int(float(upstream_pricing.get(key, 0.0)) * 1000000)
-
-        if abs(db_val - upstream_val) > tolerance:
-            return False
-
-    return True
-
-
 async def refresh_models_periodically() -> None:
     """Background task: periodically fetch OpenRouter models and insert new ones.
 
@@ -653,11 +390,6 @@ async def refresh_models_periodically() -> None:
     if not interval or interval <= 0:
         return
 
-    # Only refresh from OpenRouter when upstream is OpenRouter
-    if not is_openrouter_upstream():
-        logger.info("Skipping models refresh: upstream_base_url is not OpenRouter")
-        return
-
     while True:
         try:
             try:
@@ -715,8 +447,5 @@ async def refresh_models_periodically() -> None:
 @models_router.get("/v1/models")
 @models_router.get("/models", include_in_schema=False)
 async def models(session: AsyncSession = Depends(get_session)) -> dict:
-    """Get all available models from all providers with database overrides applied."""
-    from ..proxy import get_unique_models
-
-    items = get_unique_models()
+    items = await list_models(session)
     return {"data": items}

routstr/payment/price.py

@@ -1,5 +1,4 @@
 import asyncio
-import random
 
 import httpx
 
@@ -8,11 +7,12 @@ from ..core.settings import settings
 
 logger = get_logger(__name__)
 
-BTC_USD_PRICE: float | None = None
-SATS_USD_PRICE: float | None = None
+
+def _fees() -> tuple[float, float]:
+    return settings.exchange_fee, settings.upstream_provider_fee
 
 
-async def _kraken_btc_usd(client: httpx.AsyncClient) -> float | None:
+async def kraken_btc_usd(client: httpx.AsyncClient) -> float | None:
     """Fetch BTC/USD price from Kraken API."""
     api = "https://api.kraken.com/0/public/Ticker?pair=XBTUSD"
     try:
@@ -33,7 +33,7 @@ async def _kraken_btc_usd(client: httpx.AsyncClient) -> float | None:
         return None
 
 
-async def _coinbase_btc_usd(client: httpx.AsyncClient) -> float | None:
+async def coinbase_btc_usd(client: httpx.AsyncClient) -> float | None:
     """Fetch BTC/USD price from Coinbase API."""
     api = "https://api.coinbase.com/v2/prices/BTC-USD/spot"
     try:
@@ -54,7 +54,7 @@ async def _coinbase_btc_usd(client: httpx.AsyncClient) -> float | None:
         return None
 
 
-async def _binance_btc_usdt(client: httpx.AsyncClient) -> float | None:
+async def binance_btc_usdt(client: httpx.AsyncClient) -> float | None:
     """Fetch BTC/USDT price from Binance API."""
     api = "https://api.binance.com/api/v3/ticker/price?symbol=BTCUSDT"
     try:
@@ -75,20 +75,28 @@ async def _binance_btc_usdt(client: httpx.AsyncClient) -> float | None:
         return None
 
 
-async def _fetch_btc_usd_price() -> float:
-    """Fetch the lowest BTC/USD price from multiple exchanges."""
+async def btc_usd_ask_price() -> float:
+    """Get the lowest BTC/USD price from multiple exchanges with fee adjustment."""
+
     async with httpx.AsyncClient(timeout=30.0) as client:
         try:
             prices = await asyncio.gather(
-                _kraken_btc_usd(client),
-                _coinbase_btc_usd(client),
-                _binance_btc_usdt(client),
+                kraken_btc_usd(client),
+                coinbase_btc_usd(client),
+                binance_btc_usdt(client),
             )
+
             valid_prices = [price for price in prices if price is not None]
+
             if not valid_prices:
                 logger.error("No valid BTC prices obtained from any exchange")
                 raise ValueError("Unable to fetch BTC price from any exchange")
-            return min(valid_prices)
+
+            min_price = min(valid_prices)
+            exchange_fee, provider_fee = _fees()
+            final_price = min_price / (exchange_fee * provider_fee)
+            return final_price
+
         except Exception as e:
             logger.error(
                 "Error in BTC price aggregation",
@@ -97,66 +105,18 @@ async def _fetch_btc_usd_price() -> float:
             raise
 
 
-async def _update_prices() -> None:
-    """Update global BTC and SATS price variables."""
-    global BTC_USD_PRICE, SATS_USD_PRICE
+async def sats_usd_ask_price() -> float:
+    """Get the USD price per satoshi."""
+
     try:
-        btc_price = await _fetch_btc_usd_price()
+        btc_price = await btc_usd_ask_price()
+        sats_price = btc_price / 100_000_000
+
+        return sats_price
+
     except Exception as e:
-        logger.warning(
-            "Skipping price update; unable to fetch BTC price",
+        logger.error(
+            "Error calculating satoshi price",
             extra={"error": str(e), "error_type": type(e).__name__},
         )
-        return
-    BTC_USD_PRICE = btc_price
-    SATS_USD_PRICE = btc_price / 100_000_000
-    logger.info(
-        "Updated BTC/USD price",
-        extra={"btc_usd": btc_price, "sats_usd": SATS_USD_PRICE},
-    )
-
-
-def btc_usd_price() -> float:
-    """Get the current BTC/USD price."""
-    if BTC_USD_PRICE is None:
-        raise ValueError("BTC price not initialized")
-    return BTC_USD_PRICE
-
-
-def sats_usd_price() -> float:
-    """Get the current USD price per satoshi."""
-    if SATS_USD_PRICE is None:
-        raise ValueError("SATS price not initialized")
-    return SATS_USD_PRICE
-
-
-async def update_prices_periodically() -> None:
-    """Background task to periodically update BTC and SATS prices."""
-    try:
-        if not settings.enable_pricing_refresh:
-            return
-    except Exception:
-        pass
-
-    await _update_prices()
-
-    while True:
-        try:
-            interval = getattr(settings, "pricing_refresh_interval_seconds", 120)
-            jitter = max(0.0, float(interval) * 0.1)
-            await asyncio.sleep(interval + random.uniform(0, jitter))
-        except asyncio.CancelledError:
-            break
-
-        try:
-            if not settings.enable_pricing_refresh:
-                return
-        except Exception:
-            pass
-
-        try:
-            await _update_prices()
-        except asyncio.CancelledError:
-            break
-        except Exception as e:
-            logger.error(f"Error updating BTC/SATS prices: {e}")
+        raise

routstr/payment/x_cashu.py

@@ -0,0 +1,819 @@
+import json
+import traceback
+from typing import AsyncGenerator
+
+import httpx
+from fastapi import BackgroundTasks, HTTPException, Request
+from fastapi.responses import Response, StreamingResponse
+
+from ..core import get_logger
+from ..core.db import create_session
+from ..core.settings import settings
+from ..wallet import recieve_token, send_token
+from .cost_caculation import CostData, CostDataError, MaxCostData, calculate_cost
+from .helpers import (
+    create_error_response,
+    prepare_upstream_headers,
+    prepare_upstream_params,
+)
+
+logger = get_logger(__name__)
+
+
+async def x_cashu_handler(
+    request: Request, x_cashu_token: str, path: str, max_cost_for_model: int
+) -> Response | StreamingResponse:
+    """Handle X-Cashu token payment requests."""
+    logger.info(
+        "Processing X-Cashu payment request",
+        extra={
+            "path": path,
+            "method": request.method,
+            "token_preview": x_cashu_token[:20] + "..."
+            if len(x_cashu_token) > 20
+            else x_cashu_token,
+        },
+    )
+
+    try:
+        headers = dict(request.headers)
+        amount, unit, mint = await recieve_token(x_cashu_token)
+        headers = prepare_upstream_headers(dict(request.headers))
+
+        logger.info(
+            "X-Cashu token redeemed successfully",
+            extra={"amount": amount, "unit": unit, "path": path, "mint": mint},
+        )
+
+        return await forward_to_upstream(
+            request, path, headers, amount, unit, max_cost_for_model
+        )
+    except Exception as e:
+        error_message = str(e)
+        logger.error(
+            "X-Cashu payment request failed",
+            extra={
+                "error": error_message,
+                "error_type": type(e).__name__,
+                "path": path,
+                "method": request.method,
+            },
+        )
+
+        # Handle specific CASHU errors with appropriate HTTP status codes
+        if "already spent" in error_message.lower():
+            return create_error_response(
+                "token_already_spent",
+                "The provided CASHU token has already been spent",
+                400,
+                request=request,
+                token=x_cashu_token,
+            )
+
+        if "invalid token" in error_message.lower():
+            return create_error_response(
+                "invalid_token",
+                "The provided CASHU token is invalid",
+                400,
+                request=request,
+                token=x_cashu_token,
+            )
+
+        if "mint error" in error_message.lower():
+            return create_error_response(
+                "mint_error",
+                f"CASHU mint error: {error_message}",
+                422,
+                request=request,
+                token=x_cashu_token,
+            )
+
+        # Generic error for other cases
+        return create_error_response(
+            "cashu_error",
+            f"CASHU token processing failed: {error_message}",
+            400,
+            request=request,
+            token=x_cashu_token,
+        )
+
+
+async def forward_to_upstream(
+    request: Request,
+    path: str,
+    headers: dict,
+    amount: int,
+    unit: str,
+    max_cost_for_model: int,
+) -> Response | StreamingResponse:
+    """Forward request to upstream and handle the response."""
+    if path.startswith("v1/"):
+        path = path.replace("v1/", "")
+
+    url = f"{settings.upstream_base_url}/{path}"
+
+    logger.debug(
+        "Forwarding request to upstream",
+        extra={
+            "url": url,
+            "method": request.method,
+            "path": path,
+            "amount": amount,
+            "unit": unit,
+        },
+    )
+
+    async with httpx.AsyncClient(
+        transport=httpx.AsyncHTTPTransport(retries=1),
+        timeout=None,
+    ) as client:
+        try:
+            response = await client.send(
+                client.build_request(
+                    request.method,
+                    url,
+                    headers=headers,
+                    content=request.stream(),
+                    params=prepare_upstream_params(path, request.query_params),
+                ),
+                stream=True,
+            )
+
+            logger.debug(
+                "Received upstream response",
+                extra={
+                    "status_code": response.status_code,
+                    "path": path,
+                    "response_headers": dict(response.headers),
+                },
+            )
+
+            if response.status_code != 200:
+                logger.warning(
+                    "Upstream request failed, processing refund",
+                    extra={
+                        "status_code": response.status_code,
+                        "path": path,
+                        "amount": amount,
+                        "unit": unit,
+                    },
+                )
+
+                refund_token = await send_refund(amount - 60, unit)
+
+                logger.info(
+                    "Refund processed for failed upstream request",
+                    extra={
+                        "status_code": response.status_code,
+                        "refund_amount": amount,
+                        "unit": unit,
+                        "refund_token_preview": refund_token[:20] + "..."
+                        if len(refund_token) > 20
+                        else refund_token,
+                    },
+                )
+
+                error_response = Response(
+                    content=json.dumps(
+                        {
+                            "error": {
+                                "message": "Error forwarding request to upstream",
+                                "type": "upstream_error",
+                                "code": response.status_code,
+                                "refund_token": refund_token,
+                            }
+                        }
+                    ),
+                    status_code=response.status_code,
+                    media_type="application/json",
+                )
+                error_response.headers["X-Cashu"] = refund_token
+                return error_response
+
+            if path.endswith("chat/completions"):
+                logger.debug(
+                    "Processing chat completion response",
+                    extra={"path": path, "amount": amount, "unit": unit},
+                )
+
+                result = await handle_x_cashu_chat_completion(
+                    response, amount, unit, max_cost_for_model
+                )
+                background_tasks = BackgroundTasks()
+                background_tasks.add_task(response.aclose)
+                result.background = background_tasks
+                return result
+
+            background_tasks = BackgroundTasks()
+            background_tasks.add_task(response.aclose)
+            background_tasks.add_task(client.aclose)
+
+            logger.debug(
+                "Streaming non-chat response",
+                extra={"path": path, "status_code": response.status_code},
+            )
+
+            return StreamingResponse(
+                response.aiter_bytes(),
+                status_code=response.status_code,
+                headers=dict(response.headers),
+                background=background_tasks,
+            )
+        except Exception as exc:
+            tb = traceback.format_exc()
+            logger.error(
+                "Unexpected error in upstream forwarding",
+                extra={
+                    "error": str(exc),
+                    "error_type": type(exc).__name__,
+                    "method": request.method,
+                    "url": url,
+                    "path": path,
+                    "query_params": dict(request.query_params),
+                    "traceback": tb,
+                },
+            )
+            return create_error_response(
+                "internal_error",
+                "An unexpected server error occurred",
+                500,
+                request=request,
+            )
+
+
+async def safe_read_response_content(response: httpx.Response) -> tuple[str | None, bool]:
+    """
+    Safely read response content, handling ReadableStream objects and other edge cases.
+    
+    Returns:
+        tuple: (content_str, is_readable_stream_error)
+    """
+    try:
+        content = await response.aread()
+        
+        # Handle bytes content
+        if isinstance(content, bytes):
+            content_str = content.decode("utf-8", errors="replace")
+        else:
+            content_str = str(content)
+        
+        # Check for ReadableStream object error
+        if content_str.strip() == "[object ReadableStream]" or "ReadableStream" in content_str:
+            logger.warning(
+                "Detected ReadableStream object in response content",
+                extra={
+                    "content_preview": content_str[:100],
+                    "content_type": response.headers.get("content-type", "unknown"),
+                    "status_code": response.status_code,
+                },
+            )
+            return None, True
+        
+        return content_str, False
+        
+    except Exception as e:
+        logger.error(
+            "Error reading response content",
+            extra={
+                "error": str(e),
+                "error_type": type(e).__name__,
+                "content_type": response.headers.get("content-type", "unknown"),
+                "status_code": response.status_code,
+            },
+        )
+        return None, False
+
+
+async def handle_x_cashu_chat_completion(
+    response: httpx.Response, amount: int, unit: str, max_cost_for_model: int
+) -> StreamingResponse | Response:
+    """Handle both streaming and non-streaming chat completion responses with token-based pricing."""
+    logger.debug(
+        "Handling chat completion response",
+        extra={"amount": amount, "unit": unit, "status_code": response.status_code},
+    )
+
+    try:
+        content_str, is_readable_stream_error = await safe_read_response_content(response)
+        
+        # If we encountered a ReadableStream error, fall back to streaming the response
+        if is_readable_stream_error or content_str is None:
+            logger.warning(
+                "ReadableStream error detected, falling back to streaming response with emergency refund",
+                extra={
+                    "amount": amount,
+                    "unit": unit,
+                    "is_readable_stream_error": is_readable_stream_error,
+                },
+            )
+            
+            # Issue emergency refund to prevent fund loss
+            try:
+                emergency_refund_amount = amount - 60  # Small deduction for processing
+                refund_token = await send_refund(emergency_refund_amount, unit)
+                
+                logger.info(
+                    "Emergency refund issued due to ReadableStream error",
+                    extra={
+                        "original_amount": amount,
+                        "refund_amount": emergency_refund_amount,
+                        "unit": unit,
+                        "refund_token_preview": refund_token[:20] + "..."
+                        if len(refund_token) > 20
+                        else refund_token,
+                    },
+                )
+                
+                # Create a streaming response with refund header
+                response_headers = dict(response.headers)
+                response_headers["X-Cashu"] = refund_token
+                
+                return StreamingResponse(
+                    response.aiter_bytes(),
+                    status_code=response.status_code,
+                    headers=response_headers,
+                )
+                
+            except Exception as refund_error:
+                logger.error(
+                    "Failed to issue emergency refund for ReadableStream error",
+                    extra={
+                        "error": str(refund_error),
+                        "error_type": type(refund_error).__name__,
+                        "amount": amount,
+                        "unit": unit,
+                    },
+                )
+                
+                # Return error response to prevent fund loss
+                return Response(
+                    content=json.dumps({
+                        "error": {
+                            "message": "ReadableStream error encountered and refund failed. Please contact support.",
+                            "type": "stream_processing_error",
+                            "code": "readable_stream_error",
+                            "original_amount": amount,
+                            "unit": unit,
+                        }
+                    }),
+                    status_code=500,
+                    media_type="application/json",
+                )
+
+        # Determine if this is a streaming response
+        is_streaming = content_str.startswith("data:") or "data:" in content_str
+
+        logger.debug(
+            "Chat completion response analysis",
+            extra={
+                "is_streaming": is_streaming,
+                "content_length": len(content_str),
+                "amount": amount,
+                "unit": unit,
+            },
+        )
+
+        if is_streaming:
+            return await handle_streaming_response(
+                content_str, response, amount, unit, max_cost_for_model
+            )
+        else:
+            return await handle_non_streaming_response(
+                content_str, response, amount, unit, max_cost_for_model
+            )
+
+    except Exception as e:
+        logger.error(
+            "Error processing chat completion response",
+            extra={
+                "error": str(e),
+                "error_type": type(e).__name__,
+                "amount": amount,
+                "unit": unit,
+            },
+        )
+        
+        # Issue emergency refund to prevent fund loss
+        try:
+            emergency_refund_amount = amount - 60  # Small deduction for processing
+            refund_token = await send_refund(emergency_refund_amount, unit)
+            
+            logger.info(
+                "Emergency refund issued due to processing error",
+                extra={
+                    "original_amount": amount,
+                    "refund_amount": emergency_refund_amount,
+                    "unit": unit,
+                    "error": str(e),
+                },
+            )
+            
+            # Return the original response with refund header
+            response_headers = dict(response.headers)
+            response_headers["X-Cashu"] = refund_token
+            
+            return StreamingResponse(
+                response.aiter_bytes(),
+                status_code=response.status_code,
+                headers=response_headers,
+            )
+            
+        except Exception as refund_error:
+            logger.error(
+                "Failed to issue emergency refund for processing error",
+                extra={
+                    "original_error": str(e),
+                    "refund_error": str(refund_error),
+                    "amount": amount,
+                    "unit": unit,
+                },
+            )
+            
+            # Return error response to prevent fund loss
+            return Response(
+                content=json.dumps({
+                    "error": {
+                        "message": "Response processing failed and refund failed. Please contact support.",
+                        "type": "processing_error",
+                        "code": "response_processing_failed",
+                        "original_amount": amount,
+                        "unit": unit,
+                        "original_error": str(e),
+                    }
+                }),
+                status_code=500,
+                media_type="application/json",
+            )
+
+
+async def handle_streaming_response(
+    content_str: str,
+    response: httpx.Response,
+    amount: int,
+    unit: str,
+    max_cost_for_model: int,
+) -> StreamingResponse:
+    """Handle Server-Sent Events (SSE) streaming response."""
+    logger.debug(
+        "Processing streaming response",
+        extra={
+            "amount": amount,
+            "unit": unit,
+            "content_lines": len(content_str.strip().split("\n")),
+        },
+    )
+
+    # Initialize response headers early so they can be modified during processing
+    response_headers = dict(response.headers)
+    if "transfer-encoding" in response_headers:
+        del response_headers["transfer-encoding"]
+    if "content-encoding" in response_headers:
+        del response_headers["content-encoding"]
+
+    # For streaming responses, we'll extract the final usage data
+    # and calculate cost based on that
+    usage_data = None
+    model = None
+
+    # Parse SSE format to extract usage information
+    lines = content_str.strip().split("\n")
+    for line in lines:
+        if line.startswith("data: "):
+            try:
+                data_json = json.loads(line[6:])  # Remove 'data: ' prefix
+                # Look for usage information in the final chunks
+                if "usage" in data_json:
+                    usage_data = data_json["usage"]
+                    model = data_json.get("model")
+                elif "model" in data_json and not model:
+                    model = data_json["model"]
+            except json.JSONDecodeError:
+                continue
+
+    response_headers = dict(response.headers)
+    # If we found usage data, calculate cost and refund
+    if usage_data and model:
+        logger.debug(
+            "Found usage data in streaming response",
+            extra={
+                "model": model,
+                "usage_data": usage_data,
+                "amount": amount,
+                "unit": unit,
+            },
+        )
+
+        response_data = {"usage": usage_data, "model": model}
+        try:
+            cost_data = await get_cost(response_data, max_cost_for_model)
+            if cost_data:
+                if unit == "msat":
+                    refund_amount = amount - cost_data.total_msats
+                elif unit == "sat":
+                    refund_amount = amount - (cost_data.total_msats + 999) // 1000
+                else:
+                    raise ValueError(f"Invalid unit: {unit}")
+
+                if refund_amount > 0:
+                    logger.info(
+                        "Processing refund for streaming response",
+                        extra={
+                            "original_amount": amount,
+                            "cost_msats": cost_data.total_msats,
+                            "refund_amount": refund_amount,
+                            "unit": unit,
+                            "model": model,
+                        },
+                    )
+
+                    refund_token = await send_refund(refund_amount, unit)
+                    response_headers["X-Cashu"] = refund_token
+
+                    logger.info(
+                        "Refund processed for streaming response",
+                        extra={
+                            "refund_amount": refund_amount,
+                            "unit": unit,
+                            "refund_token_preview": refund_token[:20] + "..."
+                            if len(refund_token) > 20
+                            else refund_token,
+                        },
+                    )
+                else:
+                    logger.debug(
+                        "No refund needed for streaming response",
+                        extra={
+                            "amount": amount,
+                            "cost_msats": cost_data.total_msats,
+                            "model": model,
+                        },
+                    )
+        except Exception as e:
+            logger.error(
+                "Error calculating cost for streaming response",
+                extra={
+                    "error": str(e),
+                    "error_type": type(e).__name__,
+                    "model": model,
+                    "amount": amount,
+                    "unit": unit,
+                },
+            )
+
+    async def generate() -> AsyncGenerator[bytes, None]:
+        for line in lines:
+            yield (line + "\n").encode("utf-8")
+
+    return StreamingResponse(
+        generate(),
+        status_code=response.status_code,
+        headers=response_headers,
+        media_type="text/plain",
+    )
+
+
+async def handle_non_streaming_response(
+    content_str: str,
+    response: httpx.Response,
+    amount: int,
+    unit: str,
+    max_cost_for_model: int,
+) -> Response:
+    """Handle regular JSON response."""
+    logger.debug(
+        "Processing non-streaming response",
+        extra={"amount": amount, "unit": unit, "content_length": len(content_str)},
+    )
+
+    try:
+        response_json = json.loads(content_str)
+
+        cost_data = await get_cost(response_json, max_cost_for_model)
+
+        if not cost_data:
+            logger.error(
+                "Failed to calculate cost for response",
+                extra={
+                    "amount": amount,
+                    "unit": unit,
+                    "response_model": response_json.get("model", "unknown"),
+                },
+            )
+            return Response(
+                content=json.dumps(
+                    {
+                        "error": {
+                            "message": "Error forwarding request to upstream",
+                            "type": "upstream_error",
+                            "code": response.status_code,
+                        }
+                    }
+                ),
+                status_code=response.status_code,
+                media_type="application/json",
+            )
+
+        response_headers = dict(response.headers)
+        if "transfer-encoding" in response_headers:
+            del response_headers["transfer-encoding"]
+        if "content-encoding" in response_headers:
+            del response_headers["content-encoding"]
+
+        if unit == "msat":
+            refund_amount = amount - cost_data.total_msats
+        elif unit == "sat":
+            refund_amount = amount - (cost_data.total_msats + 999) // 1000
+        else:
+            raise ValueError(f"Invalid unit: {unit}")
+
+        logger.info(
+            "Processing non-streaming response cost calculation",
+            extra={
+                "original_amount": amount,
+                "cost_msats": cost_data.total_msats,
+                "refund_amount": refund_amount,
+                "unit": unit,
+                "model": response_json.get("model", "unknown"),
+            },
+        )
+
+        if refund_amount > 0:
+            refund_token = await send_refund(refund_amount, unit)
+            response_headers["X-Cashu"] = refund_token
+
+            logger.info(
+                "Refund processed for non-streaming response",
+                extra={
+                    "refund_amount": refund_amount,
+                    "unit": unit,
+                    "refund_token_preview": refund_token[:20] + "..."
+                    if len(refund_token) > 20
+                    else refund_token,
+                },
+            )
+
+        return Response(
+            content=content_str,
+            status_code=response.status_code,
+            headers=response_headers,
+            media_type="application/json",
+        )
+    except json.JSONDecodeError as e:
+        logger.error(
+            "Failed to parse JSON from upstream response",
+            extra={
+                "error": str(e),
+                "content_preview": content_str[:200] + "..."
+                if len(content_str) > 200
+                else content_str,
+                "amount": amount,
+                "unit": unit,
+            },
+        )
+
+        # Emergency refund with small deduction for processing
+        emergency_refund = amount - 60
+        refund_token = await send_token(emergency_refund, unit=unit)
+        response_headers = dict(response.headers)
+        response_headers["X-Cashu"] = refund_token
+
+        logger.warning(
+            "Emergency refund issued due to JSON parse error",
+            extra={
+                "original_amount": amount,
+                "refund_amount": emergency_refund,
+                "deduction": 60,
+            },
+        )
+
+        # Return original content if JSON parsing fails
+        return Response(
+            content=content_str,
+            status_code=response.status_code,
+            headers=response_headers,
+            media_type="application/json",
+        )
+
+
+async def get_cost(
+    response_data: dict, max_cost_for_model: int
+) -> MaxCostData | CostData | None:
+    """
+    Adjusts the payment based on token usage in the response.
+    This is called after the initial payment and the upstream request is complete.
+    Returns cost data to be included in the response.
+    """
+    model = response_data.get("model", None)
+    logger.debug(
+        "Calculating cost for response",
+        extra={"model": model, "has_usage": "usage" in response_data},
+    )
+
+    async with create_session() as session:
+        match await calculate_cost(response_data, max_cost_for_model, session):
+            case MaxCostData() as cost:
+                logger.debug(
+                    "Using max cost pricing",
+                    extra={"model": model, "max_cost_msats": cost.total_msats},
+                )
+                return cost
+            case CostData() as cost:
+                logger.debug(
+                    "Using token-based pricing",
+                    extra={
+                        "model": model,
+                        "total_cost_msats": cost.total_msats,
+                        "input_msats": cost.input_msats,
+                        "output_msats": cost.output_msats,
+                    },
+                )
+                return cost
+            case CostDataError() as error:
+                logger.error(
+                    "Cost calculation error",
+                    extra={
+                        "model": model,
+                        "error_message": error.message,
+                        "error_code": error.code,
+                    },
+                )
+                raise HTTPException(
+                    status_code=400,
+                    detail={
+                        "error": {
+                            "message": error.message,
+                            "type": "invalid_request_error",
+                            "code": error.code,
+                        }
+                    },
+                )
+    return None
+
+
+async def send_refund(amount: int, unit: str, mint: str | None = None) -> str:
+    """Send a refund using Cashu tokens."""
+    logger.debug(
+        "Creating refund token", extra={"amount": amount, "unit": unit, "mint": mint}
+    )
+
+    max_retries = 3
+    last_exception = None
+
+    for attempt in range(max_retries):
+        try:
+            refund_token = await send_token(amount, unit=unit, mint_url=mint)
+
+            logger.info(
+                "Refund token created successfully",
+                extra={
+                    "amount": amount,
+                    "unit": unit,
+                    "mint": mint,
+                    "attempt": attempt + 1,
+                    "token_preview": refund_token[:20] + "..."
+                    if len(refund_token) > 20
+                    else refund_token,
+                },
+            )
+
+            return refund_token
+        except Exception as e:
+            last_exception = e
+            if attempt < max_retries - 1:
+                logger.warning(
+                    "Refund token creation failed, retrying",
+                    extra={
+                        "error": str(e),
+                        "error_type": type(e).__name__,
+                        "attempt": attempt + 1,
+                        "max_retries": max_retries,
+                        "amount": amount,
+                        "unit": unit,
+                        "mint": mint,
+                    },
+                )
+            else:
+                logger.error(
+                    "Failed to create refund token after all retries",
+                    extra={
+                        "error": str(e),
+                        "error_type": type(e).__name__,
+                        "attempt": attempt + 1,
+                        "max_retries": max_retries,
+                        "amount": amount,
+                        "unit": unit,
+                        "mint": mint,
+                    },
+                )
+
+    # If we get here, all retries failed
+    raise HTTPException(
+        status_code=401,
+        detail={
+            "error": {
+                "message": f"failed to create refund after {max_retries} attempts: {str(last_exception)}",
+                "type": "invalid_request_error",
+                "code": "send_token_failed",
+            }
+        },
+    )

routstr/proxy.py

@@ -1,139 +1,510 @@
 import json
-from typing import Any
+import re
+import traceback
+from typing import AsyncGenerator
 
-from fastapi import APIRouter, Depends, HTTPException, Request
+import httpx
+from fastapi import APIRouter, BackgroundTasks, Depends, HTTPException, Request
 from fastapi.responses import Response, StreamingResponse
-from sqlmodel import select
 
-from .algorithm import create_model_mappings
-from .auth import pay_for_request, revert_pay_for_request, validate_bearer_key
-from .core import get_logger
-from .core.db import (
-    ApiKey,
-    AsyncSession,
-    ModelRow,
-    UpstreamProviderRow,
-    create_session,
-    get_session,
+from .auth import (
+    adjust_payment_for_tokens,
+    pay_for_request,
+    revert_pay_for_request,
+    validate_bearer_key,
 )
+from .core import get_logger
+from .core.db import ApiKey, AsyncSession, create_session, get_session
+from .core.settings import settings
 from .payment.helpers import (
     calculate_discounted_max_cost,
     check_token_balance,
     create_error_response,
     get_max_cost_for_model,
+    prepare_upstream_headers,
+    prepare_upstream_params,
 )
-from .payment.models import Model
-from .upstream import BaseUpstreamProvider
-from .upstream.helpers import init_upstreams
+from .payment.x_cashu import x_cashu_handler
 
 logger = get_logger(__name__)
 proxy_router = APIRouter()
 
-_upstreams: list[BaseUpstreamProvider] = []
-_model_instances: dict[str, Model] = {}  # All aliases -> Model
-_provider_map: dict[str, BaseUpstreamProvider] = {}  # All aliases -> Provider
-_unique_models: dict[str, Model] = {}  # Unique model.id -> Model (no duplicates)
 
-
-async def initialize_upstreams() -> None:
-    """Initialize upstream providers from database during application startup."""
-    global _upstreams
-    _upstreams = await init_upstreams()
-    logger.info(f"Initialized {len(_upstreams)} upstream providers")
-    await refresh_model_maps()
-
-
-async def reinitialize_upstreams() -> None:
-    """Re-initialize upstream providers from database (called after admin changes)."""
-    global _upstreams
-    _upstreams = await init_upstreams()
+async def handle_streaming_chat_completion(
+    response: httpx.Response, key: ApiKey, max_cost_for_model: int
+) -> StreamingResponse:
+    """Handle streaming chat completion responses with token-based pricing."""
     logger.info(
-        "Re-initialized upstream providers from admin action",
-        extra={"provider_count": len(_upstreams)},
+        "Processing streaming chat completion",
+        extra={
+            "key_hash": key.hashed_key[:8] + "...",
+            "key_balance": key.balance,
+            "response_status": response.status_code,
+        },
     )
-    await refresh_model_maps()
 
+    async def stream_with_cost(max_cost_for_model: int) -> AsyncGenerator[bytes, None]:
+        stored_chunks: list[bytes] = []
+        usage_finalized: bool = False
+        last_model_seen: str | None = None
 
-def get_upstreams() -> list[BaseUpstreamProvider]:
-    """Get the initialized upstream providers.
+        async def finalize_without_usage() -> bytes | None:
+            nonlocal usage_finalized
+            if usage_finalized:
+                return None
+            async with create_session() as new_session:
+                fresh_key = await new_session.get(key.__class__, key.hashed_key)
+                if not fresh_key:
+                    return None
+                try:
+                    fallback: dict = {
+                        "model": last_model_seen or "unknown",
+                        "usage": None,
+                    }
+                    cost_data = await adjust_payment_for_tokens(
+                        fresh_key, fallback, new_session, max_cost_for_model
+                    )
+                    usage_finalized = True
+                    logger.info(
+                        "Finalized streaming payment without explicit usage",
+                        extra={
+                            "key_hash": key.hashed_key[:8] + "...",
+                            "cost_data": cost_data,
+                            "balance_after_adjustment": fresh_key.balance,
+                        },
+                    )
+                    return f"data: {json.dumps({'cost': cost_data})}\n\n".encode()
+                except Exception as cost_error:
+                    logger.error(
+                        "Error finalizing payment without usage",
+                        extra={
+                            "error": str(cost_error),
+                            "error_type": type(cost_error).__name__,
+                            "key_hash": key.hashed_key[:8] + "...",
+                        },
+                    )
+                    return None
 
-    Returns:
-        List of upstream provider instances
-    """
-    return _upstreams
+        try:
+            async for chunk in response.aiter_bytes():
+                stored_chunks.append(chunk)
+                # Opportunistically capture model id
+                try:
+                    for part in re.split(b"data: ", chunk):
+                        if not part or part.strip() in (b"[DONE]", b""):
+                            continue
+                        try:
+                            obj = json.loads(part)
+                            if isinstance(obj, dict) and obj.get("model"):
+                                last_model_seen = str(obj.get("model"))
+                        except json.JSONDecodeError:
+                            pass
+                except Exception:
+                    pass
 
+                yield chunk
 
-def get_model_instance(model_id: str) -> Model | None:
-    """Get Model instance by ID from global cache."""
-    return _model_instances.get(model_id)
-
-
-def get_provider_for_model(model_id: str) -> BaseUpstreamProvider | None:
-    """Get UpstreamProvider for model ID from global cache."""
-    return _provider_map.get(model_id)
-
-
-def get_unique_models() -> list[Model]:
-    """Get list of unique models (no duplicates from aliases)."""
-    return list(_unique_models.values())
-
-
-async def refresh_model_maps() -> None:
-    """Refresh global model and provider maps using the cost-based algorithm."""
-    global _model_instances, _provider_map, _unique_models
-
-    # Gather database overrides and disabled models
-    async with create_session() as session:
-        result = await session.exec(select(ModelRow).where(ModelRow.enabled))
-        override_rows = result.all()
-
-        provider_result = await session.exec(select(UpstreamProviderRow))
-        providers_by_id = {p.id: p for p in provider_result.all()}
-
-        overrides_by_id: dict[str, tuple[ModelRow, float]] = {
-            row.id: (
-                row,
-                providers_by_id[row.upstream_provider_id].provider_fee
-                if row.upstream_provider_id in providers_by_id
-                else 1.01,
+            logger.debug(
+                "Streaming completed, analyzing usage data",
+                extra={
+                    "key_hash": key.hashed_key[:8] + "...",
+                    "chunks_count": len(stored_chunks),
+                },
             )
-            for row in override_rows
-            if row.upstream_provider_id is not None
+
+            # Process stored chunks to find usage data from the tail
+            for i in range(len(stored_chunks) - 1, -1, -1):
+                chunk = stored_chunks[i]
+                if not chunk:
+                    continue
+                try:
+                    events = re.split(b"data: ", chunk)
+                    for event_data in events:
+                        if not event_data or event_data.strip() in (b"[DONE]", b""):
+                            continue
+                        try:
+                            data = json.loads(event_data)
+                            if isinstance(data, dict) and data.get("model"):
+                                last_model_seen = str(data.get("model"))
+                            if isinstance(data, dict) and isinstance(
+                                data.get("usage"), dict
+                            ):
+                                async with create_session() as new_session:
+                                    fresh_key = await new_session.get(
+                                        key.__class__, key.hashed_key
+                                    )
+                                    if fresh_key:
+                                        try:
+                                            cost_data = await adjust_payment_for_tokens(
+                                                fresh_key,
+                                                data,
+                                                new_session,
+                                                max_cost_for_model,
+                                            )
+                                            usage_finalized = True
+                                            logger.info(
+                                                "Token adjustment completed for streaming",
+                                                extra={
+                                                    "key_hash": key.hashed_key[:8]
+                                                    + "...",
+                                                    "cost_data": cost_data,
+                                                    "balance_after_adjustment": fresh_key.balance,
+                                                },
+                                            )
+                                            yield f"data: {json.dumps({'cost': cost_data})}\n\n".encode()
+                                        except Exception as cost_error:
+                                            logger.error(
+                                                "Error adjusting payment for streaming tokens",
+                                                extra={
+                                                    "error": str(cost_error),
+                                                    "error_type": type(
+                                                        cost_error
+                                                    ).__name__,
+                                                    "key_hash": key.hashed_key[:8]
+                                                    + "...",
+                                                },
+                                            )
+                                break
+                        except json.JSONDecodeError:
+                            continue
+                except Exception as e:
+                    logger.error(
+                        "Error processing streaming response chunk",
+                        extra={
+                            "error": str(e),
+                            "error_type": type(e).__name__,
+                            "key_hash": key.hashed_key[:8] + "...",
+                        },
+                    )
+
+            # If we reach here without finding usage, finalize with max-cost
+            if not usage_finalized:
+                maybe_cost_event = await finalize_without_usage()
+                if maybe_cost_event is not None:
+                    yield maybe_cost_event
+
+        except Exception as stream_error:
+            # On stream interruption, still finalize reservation with max-cost
+            logger.warning(
+                "Streaming interrupted; finalizing without usage",
+                extra={
+                    "error": str(stream_error),
+                    "error_type": type(stream_error).__name__,
+                    "key_hash": key.hashed_key[:8] + "...",
+                },
+            )
+            await finalize_without_usage()
+            raise
+
+    return StreamingResponse(
+        stream_with_cost(max_cost_for_model),
+        status_code=response.status_code,
+        headers=dict(response.headers),
+    )
+
+
+async def handle_non_streaming_chat_completion(
+    response: httpx.Response,
+    key: ApiKey,
+    session: AsyncSession,
+    deducted_max_cost: int,
+) -> Response:
+    """Handle non-streaming chat completion responses with token-based pricing."""
+    logger.info(
+        "Processing non-streaming chat completion",
+        extra={
+            "key_hash": key.hashed_key[:8] + "...",
+            "key_balance": key.balance,
+            "response_status": response.status_code,
+        },
+    )
+
+    try:
+        content = await response.aread()
+        response_json = json.loads(content)
+
+        logger.debug(
+            "Parsed response JSON",
+            extra={
+                "key_hash": key.hashed_key[:8] + "...",
+                "model": response_json.get("model", "unknown"),
+                "has_usage": "usage" in response_json,
+            },
+        )
+
+        cost_data = await adjust_payment_for_tokens(
+            key, response_json, session, deducted_max_cost
+        )
+        response_json["cost"] = cost_data
+
+        logger.info(
+            "Token adjustment completed for non-streaming",
+            extra={
+                "key_hash": key.hashed_key[:8] + "...",
+                "cost_data": cost_data,
+                "model": response_json.get("model", "unknown"),
+                "balance_after_adjustment": key.balance,
+            },
+        )
+
+        # Keep only standard headers that are safe to pass through
+        allowed_headers = {
+            "content-type",
+            "cache-control",
+            "date",
+            "vary",
+            "access-control-allow-origin",
+            "access-control-allow-methods",
+            "access-control-allow-headers",
+            "access-control-allow-credentials",
+            "access-control-expose-headers",
+            "access-control-max-age",
         }
 
-        disabled_result = await session.exec(
-            select(ModelRow.id).where(ModelRow.enabled == False)  # noqa: E712
-        )
-        disabled_model_ids = {row for row in disabled_result.all()}
+        response_headers = {
+            k: v for k, v in response.headers.items() if k.lower() in allowed_headers
+        }
 
-    _model_instances, _provider_map, _unique_models = create_model_mappings(
-        upstreams=_upstreams,
-        overrides_by_id=overrides_by_id,
-        disabled_model_ids=disabled_model_ids,
+        return Response(
+            content=json.dumps(response_json).encode(),
+            status_code=response.status_code,
+            headers=response_headers,
+            media_type="application/json",
+        )
+    except json.JSONDecodeError as e:
+        logger.error(
+            "Failed to parse JSON from upstream response",
+            extra={
+                "error": str(e),
+                "key_hash": key.hashed_key[:8] + "...",
+                "content_preview": content[:200].decode(errors="ignore")
+                if content
+                else "empty",
+            },
+        )
+        raise
+    except Exception as e:
+        logger.error(
+            "Error processing non-streaming chat completion",
+            extra={
+                "error": str(e),
+                "error_type": type(e).__name__,
+                "key_hash": key.hashed_key[:8] + "...",
+            },
+        )
+        raise
+
+
+async def forward_to_upstream(
+    request: Request,
+    path: str,
+    headers: dict,
+    request_body: bytes | None,
+    key: ApiKey,
+    max_cost_for_model: int,
+    session: AsyncSession,
+) -> Response | StreamingResponse:
+    """Forward request to upstream and handle the response."""
+    if path.startswith("v1/"):
+        path = path.replace("v1/", "")
+
+    url = f"{settings.upstream_base_url}/{path}"
+
+    logger.info(
+        "Forwarding request to upstream",
+        extra={
+            "url": url,
+            "method": request.method,
+            "path": path,
+            "key_hash": key.hashed_key[:8] + "...",
+            "key_balance": key.balance,
+            "has_request_body": request_body is not None,
+        },
     )
 
+    client = httpx.AsyncClient(
+        transport=httpx.AsyncHTTPTransport(retries=1),
+        timeout=None,  # No timeout - requests can take as long as needed
+    )
 
-async def refresh_model_maps_periodically() -> None:
-    """Background task to refresh model maps every minute."""
-    import asyncio
-
-    while True:
-        try:
-            await asyncio.sleep(60)
-            await refresh_model_maps()
-        except asyncio.CancelledError:
-            break
-        except Exception as e:
-            logger.error(
-                "Error refreshing model maps",
-                extra={"error": str(e), "error_type": type(e).__name__},
+    try:
+        # Use the pre-read body if available, otherwise stream
+        if request_body is not None:
+            response = await client.send(
+                client.build_request(
+                    request.method,
+                    url,
+                    headers=headers,
+                    content=request_body,
+                    params=prepare_upstream_params(path, request.query_params),
+                ),
+                stream=True,
             )
+        else:
+            response = await client.send(
+                client.build_request(
+                    request.method,
+                    url,
+                    headers=headers,
+                    content=request.stream(),
+                    params=prepare_upstream_params(path, request.query_params),
+                ),
+                stream=True,
+            )
+
+        logger.info(
+            "Received upstream response",
+            extra={
+                "status_code": response.status_code,
+                "path": path,
+                "key_hash": key.hashed_key[:8] + "...",
+                "content_type": response.headers.get("content-type", "unknown"),
+            },
+        )
+
+        # For chat completions, we need to handle token-based pricing
+        if path.endswith("chat/completions"):
+            # Check if client requested streaming
+            client_wants_streaming = False
+            if request_body:
+                try:
+                    request_data = json.loads(request_body)
+                    client_wants_streaming = request_data.get("stream", False)
+                    logger.debug(
+                        "Chat completion request analysis",
+                        extra={
+                            "client_wants_streaming": client_wants_streaming,
+                            "model": request_data.get("model", "unknown"),
+                            "key_hash": key.hashed_key[:8] + "...",
+                        },
+                    )
+                except json.JSONDecodeError:
+                    logger.warning(
+                        "Failed to parse request body JSON for streaming detection"
+                    )
+
+            # Handle both streaming and non-streaming responses
+            content_type = response.headers.get("content-type", "")
+            upstream_is_streaming = "text/event-stream" in content_type
+            is_streaming = client_wants_streaming and upstream_is_streaming
+
+            logger.debug(
+                "Response type analysis",
+                extra={
+                    "is_streaming": is_streaming,
+                    "client_wants_streaming": client_wants_streaming,
+                    "upstream_is_streaming": upstream_is_streaming,
+                    "content_type": content_type,
+                    "key_hash": key.hashed_key[:8] + "...",
+                },
+            )
+
+            if is_streaming and response.status_code == 200:
+                # Process streaming response and extract cost from the last chunk
+                result = await handle_streaming_chat_completion(
+                    response, key, max_cost_for_model
+                )
+                background_tasks = BackgroundTasks()
+                background_tasks.add_task(response.aclose)
+                background_tasks.add_task(client.aclose)
+                result.background = background_tasks
+                return result
+
+            elif response.status_code == 200:
+                # Handle non-streaming response
+                try:
+                    return await handle_non_streaming_chat_completion(
+                        response, key, session, max_cost_for_model
+                    )
+                finally:
+                    await response.aclose()
+                    await client.aclose()
+
+        # For all other responses, stream the response
+        background_tasks = BackgroundTasks()
+        background_tasks.add_task(response.aclose)
+        background_tasks.add_task(client.aclose)
+
+        logger.debug(
+            "Streaming non-chat response",
+            extra={
+                "path": path,
+                "status_code": response.status_code,
+                "key_hash": key.hashed_key[:8] + "...",
+            },
+        )
+
+        return StreamingResponse(
+            response.aiter_bytes(),
+            status_code=response.status_code,
+            headers=dict(response.headers),
+            background=background_tasks,
+        )
+
+    except httpx.RequestError as exc:
+        await client.aclose()
+        error_type = type(exc).__name__
+        error_details = str(exc)
+
+        logger.error(
+            "HTTP request error to upstream",
+            extra={
+                "error_type": error_type,
+                "error_details": error_details,
+                "method": request.method,
+                "url": url,
+                "path": path,
+                "query_params": dict(request.query_params),
+                "key_hash": key.hashed_key[:8] + "...",
+            },
+        )
+
+        # Provide more specific error messages based on the error type
+        if isinstance(exc, httpx.ConnectError):
+            error_message = "Unable to connect to upstream service"
+        elif isinstance(exc, httpx.TimeoutException):
+            error_message = "Upstream service request timed out"
+        elif isinstance(exc, httpx.NetworkError):
+            error_message = "Network error while connecting to upstream service"
+        else:
+            error_message = f"Error connecting to upstream service: {error_type}"
+
+        return create_error_response(
+            "upstream_error", error_message, 502, request=request
+        )
+
+    except Exception as exc:
+        await client.aclose()
+        tb = traceback.format_exc()
+
+        logger.error(
+            "Unexpected error in upstream forwarding",
+            extra={
+                "error": str(exc),
+                "error_type": type(exc).__name__,
+                "method": request.method,
+                "url": url,
+                "path": path,
+                "query_params": dict(request.query_params),
+                "key_hash": key.hashed_key[:8] + "...",
+                "traceback": tb,
+            },
+        )
+
+        return create_error_response(
+            "internal_error",
+            "An unexpected server error occurred",
+            500,
+            request=request,
+        )
 
 
 @proxy_router.api_route("/{path:path}", methods=["GET", "POST"], response_model=None)
 async def proxy(
     request: Request, path: str, session: AsyncSession = Depends(get_session)
 ) -> Response | StreamingResponse:
+    """Main proxy endpoint handler."""
+    request_body = await request.body()
     headers = dict(request.headers)
 
     if "x-cashu" not in headers and "authorization" not in headers.keys():
@@ -141,7 +512,7 @@ async def proxy(
             "unauthorized", "Unauthorized", 401, request=request
         )
 
-    logger.info(  # TODO: move to middleware, async
+    logger.info(
         "Received proxy request",
         extra={
             "method": request.method,
@@ -151,73 +522,124 @@ async def proxy(
         },
     )
 
-    request_body = await request.body()
-    request_body_dict = parse_request_body_json(request_body, path)
+    # Parse JSON body if present, handle empty/invalid JSON
+    request_body_dict = {}
+    if request_body:
+        try:
+            request_body_dict = json.loads(request_body)
+            logger.debug(
+                "Request body parsed",
+                extra={
+                    "path": path,
+                    "body_keys": list(request_body_dict.keys()),
+                    "model": request_body_dict.get("model", "not_specified"),
+                },
+            )
+        except json.JSONDecodeError as e:
+            logger.error(
+                "Invalid JSON in request body",
+                extra={
+                    "error": str(e),
+                    "path": path,
+                    "body_preview": request_body[:200].decode(errors="ignore")
+                    if request_body
+                    else "empty",
+                },
+            )
+            return Response(
+                content=json.dumps(
+                    {"error": {"type": "invalid_request_error", "code": "invalid_json"}}
+                ),
+                status_code=400,
+                media_type="application/json",
+            )
 
-    model_id = request_body_dict.get("model", "unknown")
-
-    model_obj = get_model_instance(model_id)
-    if not model_obj:
-        return create_error_response(
-            "invalid_model", f"Model '{model_id}' not found", 400, request=request
-        )
-
-    upstream = get_provider_for_model(model_id)
-    if not upstream:
-        return create_error_response(
-            "invalid_model",
-            f"No provider found for model '{model_id}'",
-            400,
-            request=request,
-        )
-
-    _max_cost_for_model = await get_max_cost_for_model(
-        model=model_id, session=session, model_obj=model_obj
-    )
+    model = request_body_dict.get("model", "unknown")
+    _max_cost_for_model = await get_max_cost_for_model(model=model, session=session)
     max_cost_for_model = await calculate_discounted_max_cost(
-        _max_cost_for_model, request_body_dict, model_obj=model_obj
+        _max_cost_for_model, request_body_dict, session
     )
     check_token_balance(headers, request_body_dict, max_cost_for_model)
 
+    # Handle authentication
     if x_cashu := headers.get("x-cashu", None):
-        return await upstream.handle_x_cashu(
-            request, x_cashu, path, max_cost_for_model, model_obj
+        logger.info(
+            "Processing X-Cashu payment",
+            extra={
+                "path": path,
+                "token_preview": x_cashu[:20] + "..." if len(x_cashu) > 20 else x_cashu,
+            },
         )
+        return await x_cashu_handler(request, x_cashu, path, max_cost_for_model)
 
     elif auth := headers.get("authorization", None):
+        logger.debug(
+            "Processing bearer token authentication",
+            extra={
+                "path": path,
+                "token_preview": auth[:20] + "..." if len(auth) > 20 else auth,
+            },
+        )
         key = await get_bearer_token_key(headers, path, session, auth)
 
     else:
         if request.method not in ["GET"]:
-            raise HTTPException(
+            logger.warning(
+                "Unauthorized request - no authentication provided",
+                extra={"method": request.method, "path": path},
+            )
+            return Response(
+                content=json.dumps({"detail": "Unauthorized"}),
                 status_code=401,
-                detail={
-                    "error": {"type": "invalid_request_error", "code": "unauthorized"}
-                },
+                media_type="application/json",
             )
 
         logger.debug("Processing unauthenticated GET request", extra={"path": path})
         # TODO: why is this needed? can we remove it?
-        headers = upstream.prepare_headers(dict(request.headers))
-        return await upstream.forward_get_request(request, path, headers)
+        headers = prepare_upstream_headers(dict(request.headers))
+        return await forward_get_to_upstream(request, path, headers)
 
     # Only pay for request if we have request body data (for completions endpoints)
     if request_body_dict:
-        await pay_for_request(key, max_cost_for_model, session)
+        logger.info(
+            "Processing payment for request",
+            extra={
+                "path": path,
+                "key_hash": key.hashed_key[:8] + "...",
+                "key_balance_before": key.balance,
+                "model": request_body_dict.get("model", "unknown"),
+            },
+        )
+
+        try:
+            await pay_for_request(key, max_cost_for_model, session)
+            logger.info(
+                "Payment processed successfully",
+                extra={
+                    "path": path,
+                    "key_hash": key.hashed_key[:8] + "...",
+                    "key_balance_after": key.balance,
+                    "model": request_body_dict.get("model", "unknown"),
+                },
+            )
+        except Exception as e:
+            logger.error(
+                "Payment processing failed",
+                extra={
+                    "error": str(e),
+                    "error_type": type(e).__name__,
+                    "path": path,
+                    "key_hash": key.hashed_key[:8] + "...",
+                },
+            )
+            raise
 
     # Prepare headers for upstream
-    headers = upstream.prepare_headers(dict(request.headers))
+    headers = prepare_upstream_headers(dict(request.headers))
 
     # Forward to upstream and handle response
-    response = await upstream.forward_request(
-        request,
-        path,
-        headers,
-        request_body,
-        key,
-        max_cost_for_model,
-        session,
-        model_obj,
+    response = await forward_to_upstream(
+        request, path, headers, request_body, key, max_cost_for_model, session
     )
 
     if response.status_code != 200:
@@ -233,10 +655,18 @@ async def proxy(
                 "upstream_headers": response.headers
                 if hasattr(response, "headers")
                 else None,
+                "upstream_response": response.body
+                if hasattr(response, "body")
+                else None,
             },
         )
-        # Return the mapped error response generated earlier rather than masking with 502
-        return response
+        request_id = (
+            request.state.request_id if hasattr(request.state, "request_id") else None
+        )
+        raise HTTPException(
+            status_code=502,
+            detail=f"Upstream request failed, please contact support with request id: {request_id}",
+        )
 
     return response
 
@@ -321,47 +751,64 @@ async def get_bearer_token_key(
         raise
 
 
-def parse_request_body_json(request_body: bytes, path: str) -> dict[str, Any]:
-    request_body_dict = {}
-    if request_body:
+async def forward_get_to_upstream(
+    request: Request,
+    path: str,
+    headers: dict,
+) -> Response | StreamingResponse:
+    """Forward request to upstream and handle the response."""
+    if path.startswith("v1/"):
+        path = path.replace("v1/", "")
+
+    url = f"{settings.upstream_base_url}/{path}"
+
+    logger.info(
+        "Forwarding GET request to upstream",
+        extra={"url": url, "method": request.method, "path": path},
+    )
+
+    async with httpx.AsyncClient(
+        transport=httpx.AsyncHTTPTransport(retries=1),
+        timeout=None,
+    ) as client:
         try:
-            request_body_dict = json.loads(request_body)
-
-            if "max_tokens" in request_body_dict:
-                max_tokens_value = request_body_dict["max_tokens"]
-
-                if isinstance(max_tokens_value, int):
-                    pass
-                else:
-                    raise HTTPException(
-                        status_code=400,
-                        detail={"error": "max_tokens must be an integer"},
-                    )
-
-            logger.debug(
-                "Request body parsed",
-                extra={
-                    "path": path,
-                    "body_keys": list(request_body_dict.keys()),
-                    "model": request_body_dict.get("model", "not_specified"),
-                },
+            response = await client.send(
+                client.build_request(
+                    request.method,
+                    url,
+                    headers=headers,
+                    content=request.stream(),
+                    params=prepare_upstream_params(path, request.query_params),
+                ),
             )
-        except json.JSONDecodeError as e:
+
+            logger.info(
+                "GET request forwarded successfully",
+                extra={"path": path, "status_code": response.status_code},
+            )
+
+            return StreamingResponse(
+                response.aiter_bytes(),
+                status_code=response.status_code,
+                headers=dict(response.headers),
+            )
+        except Exception as exc:
+            tb = traceback.format_exc()
             logger.error(
-                "Invalid JSON in request body",
+                "Error forwarding GET request",
                 extra={
-                    "error": str(e),
+                    "error": str(exc),
+                    "error_type": type(exc).__name__,
+                    "method": request.method,
+                    "url": url,
                     "path": path,
-                    "body_preview": request_body[:200].decode(errors="ignore")
-                    if request_body
-                    else "empty",
+                    "query_params": dict(request.query_params),
+                    "traceback": tb,
                 },
             )
-            raise HTTPException(
-                status_code=400,
-                detail={
-                    "error": {"type": "invalid_request_error", "code": "invalid_json"}
-                },
+            return create_error_response(
+                "internal_error",
+                "An unexpected server error occurred",
+                500,
+                request=request,
             )
-
-    return request_body_dict

routstr/upstream/__init__.py

@@ -1,31 +0,0 @@
-from .anthropic import AnthropicUpstreamProvider
-from .azure import AzureUpstreamProvider
-from .base import BaseUpstreamProvider
-from .fireworks import FireworksUpstreamProvider
-from .generic import GenericUpstreamProvider
-from .groq import GroqUpstreamProvider
-from .ollama import OllamaUpstreamProvider
-from .openai import OpenAIUpstreamProvider
-from .openrouter import OpenRouterUpstreamProvider
-from .perplexity import PerplexityUpstreamProvider
-from .xai import XAIUpstreamProvider
-
-upstream_provider_classes: list[type[BaseUpstreamProvider]] = [
-    AnthropicUpstreamProvider,
-    AzureUpstreamProvider,
-    FireworksUpstreamProvider,
-    GenericUpstreamProvider,
-    GroqUpstreamProvider,
-    OllamaUpstreamProvider,
-    OpenAIUpstreamProvider,
-    OpenRouterUpstreamProvider,
-    PerplexityUpstreamProvider,
-    XAIUpstreamProvider,
-]
-"""List of all upstream classes"""
-
-__all__ = [
-    "BaseUpstreamProvider",
-    *[cls.__name__ for cls in upstream_provider_classes],
-    "upstream_provider_classes",
-]

routstr/upstream/anthropic.py

@@ -1,70 +0,0 @@
-from typing import TYPE_CHECKING
-
-from ..payment.models import Model, async_fetch_openrouter_models
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import UpstreamProviderRow
-
-
-class AnthropicUpstreamProvider(BaseUpstreamProvider):
-    """Upstream provider specifically configured for Anthropic API."""
-
-    provider_type = "anthropic"
-    default_base_url = "https://api.anthropic.com/v1"
-    platform_url = "https://console.anthropic.com/settings/keys"
-
-    def __init__(self, api_key: str, provider_fee: float = 1.01):
-        super().__init__(
-            base_url=self.default_base_url,
-            api_key=api_key,
-            provider_fee=provider_fee,
-        )
-
-    @classmethod
-    def from_db_row(
-        cls, provider_row: "UpstreamProviderRow"
-    ) -> "AnthropicUpstreamProvider":
-        return cls(
-            api_key=provider_row.api_key,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "Anthropic",
-            "default_base_url": cls.default_base_url,
-            "fixed_base_url": True,
-            "platform_url": cls.platform_url,
-        }
-
-    def transform_model_name(self, model_id: str) -> str:
-        """Strip 'anthropic/' prefix for Anthropic API compatibility and transform model names."""
-        if model_id.startswith("anthropic/"):
-            model_id = model_id[len("anthropic/") :]
-        fixed_transforms = {
-            "claude-haiku-4.5": "claude-haiku-4-5-20251001",
-            "claude-sonnet-4.5": "claude-sonnet-4-5-20250929",
-            "claude-opus-4.1": "claude-opus-4-1-20250805",
-            "claude-opus-4": "claude-opus-4-20250514",
-            "claude-sonnet-4": "claude-sonnet-4-20250514",
-            "claude-3.5-haiku": "claude-3-5-haiku-20241022",
-            "claude-3-haiku": "claude-3-haiku-20240307",
-            "claude-haiku-4-5": "claude-haiku-4-5-20251001",
-            "claude-sonnet-4-5": "claude-sonnet-4-5-20250929",
-            "claude-opus-4-1": "claude-opus-4-1-20250805",
-            "claude-3-5-haiku": "claude-3-5-haiku-20241022",
-        }
-        if model_id in fixed_transforms:
-            model_id = fixed_transforms[model_id]
-        return model_id
-
-    async def fetch_models(self) -> list[Model]:
-        """Fetch Anthropic models from OpenRouter API filtered by anthropic source."""
-        models_data = await async_fetch_openrouter_models(source_filter="anthropic")
-        models = [Model(**model) for model in models_data]  # type: ignore
-        for model in models:
-            model.alias_ids = [self.transform_model_name(model.id)]
-        return models

routstr/upstream/azure.py

@@ -1,76 +0,0 @@
-from typing import TYPE_CHECKING, Mapping
-
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import UpstreamProviderRow
-
-
-class AzureUpstreamProvider(BaseUpstreamProvider):
-    """Upstream provider specifically configured for Azure OpenAI Service."""
-
-    provider_type = "azure"
-    default_base_url = None
-    platform_url = "https://portal.azure.com/"
-
-    def __init__(
-        self,
-        base_url: str,
-        api_key: str,
-        api_version: str,
-        provider_fee: float = 1.01,
-    ):
-        """Initialize Azure provider with API key and version.
-
-        Args:
-            base_url: Azure OpenAI endpoint base URL
-            api_key: Azure OpenAI API key for authentication
-            api_version: Azure OpenAI API version (e.g., "2024-02-15-preview")
-            provider_fee: Provider fee multiplier (default 1.01 for 1% fee)
-        """
-        super().__init__(
-            base_url=base_url,
-            api_key=api_key,
-            provider_fee=provider_fee,
-        )
-        self.api_version = api_version
-
-    @classmethod
-    def from_db_row(
-        cls, provider_row: "UpstreamProviderRow"
-    ) -> "AzureUpstreamProvider | None":
-        if not provider_row.api_version:
-            return None
-        return cls(
-            base_url=provider_row.base_url,
-            api_key=provider_row.api_key,
-            api_version=provider_row.api_version,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "Azure OpenAI",
-            "default_base_url": "",
-            "fixed_base_url": False,
-            "platform_url": cls.platform_url,
-        }
-
-    def prepare_params(
-        self, path: str, query_params: Mapping[str, str] | None
-    ) -> Mapping[str, str]:
-        """Prepare query parameters for Azure OpenAI, adding API version.
-
-        Args:
-            path: Request path
-            query_params: Original query parameters from the client
-
-        Returns:
-            Query parameters dict with Azure API version added for chat completions
-        """
-        params = dict(query_params or {})
-        if path.endswith("chat/completions"):
-            params["api-version"] = self.api_version
-        return params

routstr/upstream/fireworks.py

@@ -1,42 +0,0 @@
-from typing import TYPE_CHECKING
-
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import UpstreamProviderRow
-
-
-class FireworksUpstreamProvider(BaseUpstreamProvider):
-    """Upstream provider specifically configured for Fireworks.ai API."""
-
-    provider_type = "fireworks"
-    default_base_url = "https://api.fireworks.ai/inference/v1"
-    platform_url = "https://app.fireworks.ai/settings/users/api-keys"
-
-    def __init__(self, api_key: str, provider_fee: float = 1.01):
-        super().__init__(
-            base_url=self.default_base_url, api_key=api_key, provider_fee=provider_fee
-        )
-
-    @classmethod
-    def from_db_row(
-        cls, provider_row: "UpstreamProviderRow"
-    ) -> "FireworksUpstreamProvider":
-        return cls(
-            api_key=provider_row.api_key,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "Fireworks",
-            "default_base_url": cls.default_base_url,
-            "fixed_base_url": True,
-            "platform_url": cls.platform_url,
-        }
-
-    def transform_model_name(self, model_id: str) -> str:
-        """Strip 'fireworks/' prefix for Fireworks API compatibility."""
-        return model_id.split("/")[-1]

routstr/upstream/generic.py

@@ -1,186 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import httpx
-
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import UpstreamProviderRow
-    from ..payment.models import Model
-
-from ..core.logging import get_logger
-
-logger = get_logger(__name__)
-
-
-class GenericUpstreamProvider(BaseUpstreamProvider):
-    """Generic upstream provider that can fetch models from any OpenAI-compatible API."""
-
-    provider_type = "generic"
-    default_base_url = "http://localhost:8888"
-    platform_url = None
-
-    def __init__(
-        self,
-        base_url: str,
-        api_key: str = "",
-        provider_fee: float = 1.01,
-        upstream_name: str | None = None,
-    ):
-        """Initialize generic provider.
-
-        Args:
-            base_url: Base URL of the upstream API endpoint
-            api_key: Optional API key for authentication
-            provider_fee: Provider fee multiplier (default 1.01 for 1% fee)
-            upstream_name: Optional name for the upstream provider
-        """
-        self.upstream_name = upstream_name or "generic"
-        super().__init__(
-            base_url=base_url,
-            api_key=api_key,
-            provider_fee=provider_fee,
-        )
-
-    @classmethod
-    def from_db_row(
-        cls, provider_row: "UpstreamProviderRow"
-    ) -> "GenericUpstreamProvider":
-        return cls(
-            base_url=provider_row.base_url,
-            api_key=provider_row.api_key,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "Generic",
-            "default_base_url": cls.default_base_url,
-            "fixed_base_url": False,
-            "platform_url": cls.platform_url,
-        }
-
-    async def fetch_models(self) -> list[Model]:
-        """Fetch models from upstream API using /models endpoint."""
-        from ..payment.models import Architecture, Model, Pricing, TopProvider
-
-        try:
-            async with httpx.AsyncClient(timeout=30.0) as client:
-                headers = {}
-                if self.api_key:
-                    headers["Authorization"] = f"Bearer {self.api_key}"
-
-                response = await client.get(f"{self.base_url}/models", headers=headers)
-                response.raise_for_status()
-                data = response.json()
-
-                models_list = []
-                for model_data in data.get("data", []):
-                    model_id = model_data.get("id", "")
-                    if not model_id:
-                        continue
-
-                    model_name = model_data.get("name", model_id)
-                    created = model_data.get("created", 0)
-                    owned_by = model_data.get("owned_by", "unknown")
-                    model_spec = model_data.get("model_spec", {})
-
-                    context_length = 4096
-                    if model_spec.get("availableContextTokens"):
-                        context_length = model_spec["availableContextTokens"]
-                    elif any(
-                        pattern in model_id.lower() for pattern in ["32k", "32000"]
-                    ):
-                        context_length = 32768
-                    elif any(
-                        pattern in model_id.lower() for pattern in ["16k", "16000"]
-                    ):
-                        context_length = 16384
-                    elif any(pattern in model_id.lower() for pattern in ["8k", "8000"]):
-                        context_length = 8192
-                    elif "gpt-4" in model_id.lower():
-                        context_length = 8192
-                    elif "claude" in model_id.lower():
-                        context_length = 200000
-
-                    pricing_info = model_spec.get("pricing", {})
-                    input_pricing = pricing_info.get("input", {})
-                    output_pricing = pricing_info.get("output", {})
-
-                    prompt_price = input_pricing.get("usd", 0.001) / 1000000
-                    completion_price = output_pricing.get("usd", 0.001) / 1000000
-
-                    capabilities = model_spec.get("capabilities", {})
-                    input_modalities = ["text"]
-                    output_modalities = ["text"]
-
-                    if capabilities.get("supportsVision", False):
-                        input_modalities.append("image")
-
-                    modality = "text"
-                    if capabilities.get("supportsVision", False):
-                        modality = "text->text"
-
-                    spec_name = model_spec.get("name", model_name)
-                    description = f"{spec_name}"
-                    if owned_by != "unknown":
-                        description += f" via {owned_by}"
-
-                    models_list.append(
-                        Model(
-                            id=model_id,
-                            name=spec_name,
-                            created=created,
-                            description=description,
-                            context_length=context_length,
-                            architecture=Architecture(
-                                modality=modality,
-                                input_modalities=input_modalities,
-                                output_modalities=output_modalities,
-                                tokenizer="unknown",
-                                instruct_type=None,
-                            ),
-                            pricing=Pricing(
-                                prompt=prompt_price,
-                                completion=completion_price,
-                                request=0.0,
-                                image=0.0,
-                                web_search=0.0,
-                                internal_reasoning=0.0,
-                                max_prompt_cost=0.001,
-                                max_completion_cost=0.001,
-                                max_cost=0.001,
-                            ),
-                            sats_pricing=None,
-                            per_request_limits=None,
-                            top_provider=TopProvider(
-                                context_length=context_length,
-                                max_completion_tokens=context_length // 2,
-                                is_moderated=False,
-                            ),
-                            enabled=True,
-                            upstream_provider_id=None,
-                            canonical_slug=None,
-                        )
-                    )
-
-                logger.info(
-                    f"Fetched {len(models_list)} models from {self.upstream_name}",
-                    extra={"model_count": len(models_list), "base_url": self.base_url},
-                )
-                return models_list
-
-        except Exception as e:
-            logger.error(
-                f"Failed to fetch models from {self.upstream_name} API: {e}",
-                extra={
-                    "error": str(e),
-                    "error_type": type(e).__name__,
-                    "base_url": self.base_url,
-                },
-            )
-            return []

routstr/upstream/groq.py

@@ -1,40 +0,0 @@
-from typing import TYPE_CHECKING
-
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import UpstreamProviderRow
-
-
-class GroqUpstreamProvider(BaseUpstreamProvider):
-    """Upstream provider specifically configured for Groq API."""
-
-    provider_type = "groq"
-    default_base_url = "https://api.groq.com/openai/v1"
-    platform_url = "https://console.groq.com/keys"
-
-    def __init__(self, api_key: str, provider_fee: float = 1.01):
-        super().__init__(
-            base_url=self.default_base_url, api_key=api_key, provider_fee=provider_fee
-        )
-
-    @classmethod
-    def from_db_row(cls, provider_row: "UpstreamProviderRow") -> "GroqUpstreamProvider":
-        return cls(
-            api_key=provider_row.api_key,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "Groq",
-            "default_base_url": cls.default_base_url,
-            "fixed_base_url": True,
-            "platform_url": cls.platform_url,
-        }
-
-    def transform_model_name(self, model_id: str) -> str:
-        """Strip 'groq/' prefix for Groq API compatibility."""
-        return model_id.removeprefix("groq/")

routstr/upstream/helpers.py

@@ -1,373 +0,0 @@
-from __future__ import annotations
-
-import os
-import re
-from typing import TYPE_CHECKING
-
-if TYPE_CHECKING:
-    from ..core.settings import Settings
-
-
-from ..core import get_logger
-from ..core.db import AsyncSession, ModelRow, UpstreamProviderRow, create_session
-from ..payment.models import Model
-from .base import BaseUpstreamProvider
-
-logger = get_logger(__name__)
-
-
-def resolve_model_alias(
-    model_id: str, canonical_slug: str | None = None, alias_ids: list[str] | None = None
-) -> list[str]:
-    """Resolve model ID to all possible aliases.
-
-    Returns list of aliases including canonical slug and variations without provider prefix.
-
-    Args:
-        model_id: Model identifier (e.g., "gpt-5-mini" or "openai/gpt-5-mini")
-        canonical_slug: Optional canonical slug from provider (e.g., "openai/gpt-5-pro-2025-10-06")
-
-    Returns:
-        List of possible model ID aliases
-    """
-    aliases = [model_id]
-
-    base_model = model_id
-    if "/" in model_id:
-        without_prefix = model_id.split("/", 1)[1]
-        aliases.append(without_prefix)
-        base_model = without_prefix
-
-    date_pattern = re.compile(r"-\d{4}-\d{2}-\d{2}$")
-    if date_pattern.search(base_model):
-        base_without_date = date_pattern.sub("", base_model)
-        if base_without_date not in aliases:
-            aliases.append(base_without_date)
-        if "/" in model_id:
-            prefix = model_id.split("/", 1)[0]
-            prefixed_without_date = f"{prefix}/{base_without_date}"
-            if prefixed_without_date not in aliases:
-                aliases.append(prefixed_without_date)
-
-    if canonical_slug and canonical_slug not in aliases:
-        aliases.append(canonical_slug)
-        if "/" in canonical_slug:
-            canonical_without_prefix = canonical_slug.split("/", 1)[1]
-            if canonical_without_prefix not in aliases:
-                aliases.append(canonical_without_prefix)
-            if date_pattern.search(canonical_without_prefix):
-                canonical_base = date_pattern.sub("", canonical_without_prefix)
-                if canonical_base not in aliases:
-                    aliases.append(canonical_base)
-
-    if alias_ids:
-        aliases.extend(alias_ids)
-
-    return aliases
-
-
-async def get_all_models_with_overrides(
-    upstreams: list[BaseUpstreamProvider],
-) -> list[Model]:
-    """Get all models from all providers with database overrides applied.
-
-    Models in the database with upstream_provider_id set are treated as overrides
-    that replace the provider's model with the same ID.
-
-    Args:
-        upstreams: List of upstream provider instances
-
-    Returns:
-        List of Model objects with overrides applied
-    """
-    from sqlmodel import select
-
-    from ..payment.models import _row_to_model
-
-    async with create_session() as session:
-        result = await session.exec(select(ModelRow).where(ModelRow.enabled))
-        override_rows = result.all()
-
-        provider_result = await session.exec(select(UpstreamProviderRow))
-        providers_by_id = {p.id: p for p in provider_result.all()}
-
-        overrides_by_id: dict[str, tuple[ModelRow, float]] = {
-            row.id: (
-                row,
-                providers_by_id[row.upstream_provider_id].provider_fee
-                if row.upstream_provider_id in providers_by_id
-                else 1.01,
-            )
-            for row in override_rows
-            if row.upstream_provider_id is not None
-        }
-
-    all_models: dict[str, Model] = {}
-
-    for upstream in upstreams:
-        for model in upstream.get_cached_models():
-            if model.id in overrides_by_id:
-                override_row, provider_fee = overrides_by_id[model.id]
-                all_models[model.id] = _row_to_model(
-                    override_row, apply_provider_fee=True, provider_fee=provider_fee
-                )
-            elif model.enabled:
-                all_models[model.id] = model
-
-    return list(all_models.values())
-
-
-async def refresh_upstreams_models_periodically(
-    upstreams: list[BaseUpstreamProvider],
-) -> None:
-    """Background task to periodically refresh models cache for all providers.
-
-    Args:
-        upstreams: List of upstream provider instances
-    """
-    import asyncio
-    import random
-
-    from ..core.settings import settings
-
-    interval = getattr(settings, "models_refresh_interval_seconds", 0)
-    if not interval or interval <= 0:
-        logger.info("Provider models refresh disabled (interval <= 0)")
-        return
-
-    while True:
-        try:
-            for upstream in upstreams:
-                try:
-                    await upstream.refresh_models_cache()
-                except Exception as e:
-                    logger.error(
-                        f"Error refreshing models for {upstream.base_url}",
-                        extra={"error": str(e), "error_type": type(e).__name__},
-                    )
-        except asyncio.CancelledError:
-            break
-        except Exception as e:
-            logger.error(
-                "Error in provider models refresh loop",
-                extra={"error": str(e), "error_type": type(e).__name__},
-            )
-
-        try:
-            jitter = max(0.0, float(interval) * 0.1)
-            await asyncio.sleep(interval + random.uniform(0, jitter))
-        except asyncio.CancelledError:
-            break
-
-
-async def init_upstreams() -> list[BaseUpstreamProvider]:
-    """Initialize upstream providers from database.
-
-    Seeds database with providers from settings if empty, then loads and instantiates
-    provider instances from database records, and refreshes their models cache.
-    """
-    from sqlmodel import select
-
-    from ..core.settings import settings
-
-    async with create_session() as session:
-        result = await session.exec(select(UpstreamProviderRow))
-        existing_providers = result.all()
-
-        if not existing_providers:
-            logger.info(
-                "No upstream providers found in database, seeding from settings"
-            )
-            await _seed_providers_from_settings(session, settings)
-            await session.commit()
-            result = await session.exec(select(UpstreamProviderRow))
-            existing_providers = result.all()
-
-        upstreams: list[BaseUpstreamProvider] = []
-        for provider_row in existing_providers:
-            if not provider_row.enabled:
-                logger.debug(f"Skipping disabled provider: {provider_row.base_url}")
-                continue
-
-            provider = _instantiate_provider(provider_row)
-            if provider:
-                await provider.refresh_models_cache()
-                upstreams.append(provider)
-                logger.info(
-                    f"Initialized {provider_row.provider_type} provider",
-                    extra={
-                        "base_url": provider_row.base_url,
-                        "models_cached": len(provider.get_cached_models()),
-                    },
-                )
-
-        return upstreams
-
-
-async def _seed_providers_from_settings(
-    session: AsyncSession, settings: "Settings"
-) -> None:
-    """Seed database with upstream providers from environment variables.
-
-    Args:
-        session: Database session
-    """
-    from sqlmodel import select
-
-    from . import upstream_provider_classes
-
-    providers_to_add: list[UpstreamProviderRow] = []
-    seeded_base_urls: set[str] = set()
-
-    provider_classes_by_type = {
-        cls.provider_type: cls
-        for cls in upstream_provider_classes  # type: ignore[attr-defined]
-    }
-
-    env_mappings: list[tuple[str, str, str | None, str | None]] = [
-        ("OPENAI_API_KEY", "openai", None, None),
-        ("ANTHROPIC_API_KEY", "anthropic", None, None),
-        ("OPENROUTER_API_KEY", "openrouter", None, None),
-        ("GROQ_API_KEY", "groq", None, None),
-        ("PERPLEXITY_API_KEY", "perplexity", None, None),
-        ("FIREWORKS_API_KEY", "fireworks", None, None),
-        ("XAI_API_KEY", "xai", None, None),
-    ]
-
-    for env_key, provider_type, _, _ in env_mappings:
-        api_key = os.environ.get(env_key)
-        if api_key and provider_type in provider_classes_by_type:
-            provider_class = provider_classes_by_type[provider_type]
-            if provider_class.default_base_url:  # type: ignore[attr-defined]
-                base_url = provider_class.default_base_url  # type: ignore[attr-defined]
-                result = await session.exec(
-                    select(UpstreamProviderRow).where(
-                        UpstreamProviderRow.base_url == base_url
-                    )
-                )
-                if not result.first():
-                    providers_to_add.append(
-                        UpstreamProviderRow(
-                            provider_type=provider_type,
-                            base_url=base_url,
-                            api_key=api_key,
-                            enabled=True,
-                        )
-                    )
-                    seeded_base_urls.add(base_url)
-
-    ollama_base_url = os.environ.get("OLLAMA_BASE_URL")
-    if ollama_base_url:
-        result = await session.exec(
-            select(UpstreamProviderRow).where(
-                UpstreamProviderRow.base_url == ollama_base_url
-            )
-        )
-        if not result.first():
-            providers_to_add.append(
-                UpstreamProviderRow(
-                    provider_type="ollama",
-                    base_url=ollama_base_url,
-                    api_key=os.environ.get("OLLAMA_API_KEY", ""),
-                    enabled=True,
-                )
-            )
-            seeded_base_urls.add(ollama_base_url)
-
-    if settings.chat_completions_api_version and settings.upstream_base_url:
-        base_url = settings.upstream_base_url
-        if base_url not in seeded_base_urls:
-            result = await session.exec(
-                select(UpstreamProviderRow).where(
-                    UpstreamProviderRow.base_url == base_url
-                )
-            )
-            if not result.first():
-                providers_to_add.append(
-                    UpstreamProviderRow(
-                        provider_type="azure",
-                        base_url=base_url,
-                        api_key=settings.upstream_api_key,
-                        api_version=settings.chat_completions_api_version,
-                        enabled=True,
-                    )
-                )
-                seeded_base_urls.add(base_url)
-
-    if settings.upstream_base_url and settings.upstream_api_key:
-        base_url = settings.upstream_base_url
-        if base_url not in seeded_base_urls:
-            result = await session.exec(
-                select(UpstreamProviderRow).where(
-                    UpstreamProviderRow.base_url == base_url
-                )
-            )
-            if not result.first():
-                providers_to_add.append(
-                    UpstreamProviderRow(
-                        provider_type="custom",
-                        base_url=base_url,
-                        api_key=settings.upstream_api_key,
-                        enabled=True,
-                    )
-                )
-                seeded_base_urls.add(base_url)
-
-    for provider in providers_to_add:
-        session.add(provider)
-        logger.info(
-            f"Seeding {provider.provider_type} provider",  # type: ignore[str-format]
-            extra={"base_url": provider.base_url},
-        )
-
-
-def _instantiate_provider(
-    provider_row: UpstreamProviderRow,
-) -> BaseUpstreamProvider | None:
-    """Instantiate an UpstreamProvider from a database row.
-
-    Args:
-        provider_row: Database row containing provider configuration
-
-    Returns:
-        Instantiated provider or None if provider type is unknown
-    """
-    from . import upstream_provider_classes
-
-    try:
-        provider_classes_by_type = {
-            cls.provider_type: cls
-            for cls in upstream_provider_classes  # type: ignore[attr-defined]
-        }
-
-        provider_class = provider_classes_by_type.get(provider_row.provider_type)
-
-        if provider_class:
-            provider = provider_class.from_db_row(provider_row)  # type: ignore[attr-defined]
-            if provider is None:
-                logger.error(
-                    f"Failed to instantiate {provider_row.provider_type} provider",
-                    extra={"base_url": provider_row.base_url},
-                )
-            return provider
-
-        if provider_row.provider_type == "custom":
-            return BaseUpstreamProvider(
-                provider_row.base_url, provider_row.api_key, provider_row.provider_fee
-            )
-
-        logger.error(
-            f"Unknown provider type: {provider_row.provider_type}",
-            extra={"base_url": provider_row.base_url},
-        )
-        return None
-    except Exception as e:
-        logger.error(
-            f"Failed to instantiate provider: {e}",
-            extra={
-                "provider_type": provider_row.provider_type,
-                "base_url": provider_row.base_url,
-                "error": str(e),
-            },
-        )
-        return None

routstr/upstream/ollama.py

@@ -1,297 +0,0 @@
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-import httpx
-from fastapi import Request
-from fastapi.responses import Response, StreamingResponse
-
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import ApiKey, AsyncSession, UpstreamProviderRow
-    from ..payment.models import Model
-
-from ..core.logging import get_logger
-
-logger = get_logger(__name__)
-
-
-class OllamaUpstreamProvider(BaseUpstreamProvider):
-    """Upstream provider specifically configured for Ollama API."""
-
-    provider_type = "ollama"
-    default_base_url = "http://localhost:11434"
-    platform_url = None
-
-    def __init__(
-        self,
-        base_url: str = "http://localhost:11434",
-        api_key: str = "",
-        provider_fee: float = 1.01,
-    ):
-        """Initialize Ollama provider.
-
-        Args:
-            base_url: Ollama API base URL (default http://localhost:11434)
-            api_key: Optional API key (Ollama typically doesn't require one)
-            provider_fee: Provider fee multiplier (default 1.01 for 1% fee)
-        """
-        super().__init__(
-            base_url=base_url,
-            api_key=api_key,
-            provider_fee=provider_fee,
-        )
-
-    @classmethod
-    def from_db_row(
-        cls, provider_row: "UpstreamProviderRow"
-    ) -> "OllamaUpstreamProvider":
-        return cls(
-            base_url=provider_row.base_url,
-            api_key=provider_row.api_key,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "Ollama",
-            "default_base_url": cls.default_base_url,
-            "fixed_base_url": False,
-            "platform_url": cls.platform_url,
-        }
-
-    def transform_model_name(self, model_id: str) -> str:
-        """Strip 'ollama/' prefix for Ollama API compatibility."""
-        return model_id.removeprefix("ollama/")
-
-    async def forward_request(
-        self,
-        request: Request,
-        path: str,
-        headers: dict,
-        request_body: bytes | None,
-        key: ApiKey,
-        max_cost_for_model: int,
-        session: AsyncSession,
-        model_obj: Model,
-    ) -> Response | StreamingResponse:
-        """Override to use OpenAI-compatible endpoint for proxy requests."""
-        if path.startswith("v1/"):
-            path = path.replace("v1/", "")
-
-        original_base_url = self.base_url
-        self.base_url = f"{self.base_url}/v1"
-
-        try:
-            result = await super().forward_request(
-                request,
-                path,
-                headers,
-                request_body,
-                key,
-                max_cost_for_model,
-                session,
-                model_obj,
-            )
-            return result
-        finally:
-            self.base_url = original_base_url
-
-    async def fetch_models(self) -> list[Model]:
-        """Fetch models from Ollama API using /api/tags endpoint."""
-        from ..payment.models import Architecture, Model, Pricing, TopProvider
-
-        try:
-            async with httpx.AsyncClient(timeout=30.0) as client:
-                response = await client.get(f"{self.base_url}/api/tags")
-                response.raise_for_status()
-                data = response.json()
-
-                models_list = []
-                for model_data in data.get("models", []):
-                    model_name = model_data.get("name", "")
-                    if not model_name:
-                        continue
-
-                    details = model_data.get("details", {})
-                    parameter_size = details.get("parameter_size", "")
-
-                    context_length = 4096
-                    if (
-                        "70b" in parameter_size.lower()
-                        or "72b" in parameter_size.lower()
-                    ):
-                        context_length = 8192
-                    elif "13b" in parameter_size.lower():
-                        context_length = 4096
-                    elif "7b" in parameter_size.lower():
-                        context_length = 4096
-                    elif "3b" in parameter_size.lower():
-                        context_length = 2048
-                    elif "1b" in parameter_size.lower():
-                        context_length = 2048
-
-                    model_family = details.get("family", "unknown")
-                    model_format = details.get("format", "unknown")
-
-                    description = f"Ollama {model_family} model"
-                    if parameter_size:
-                        description += f" ({parameter_size})"
-
-                    models_list.append(
-                        Model(
-                            id=model_name,
-                            name=model_name.replace(":", " "),
-                            created=0,
-                            description=description,
-                            context_length=context_length,
-                            architecture=Architecture(
-                                modality="text",
-                                input_modalities=["text"],
-                                output_modalities=["text"],
-                                tokenizer=model_format,
-                                instruct_type=None,
-                            ),
-                            pricing=Pricing(
-                                prompt=0.000003,
-                                completion=0.000003,
-                                request=0.0,
-                                image=0.0,
-                                web_search=0.0,
-                                internal_reasoning=0.0,
-                                max_prompt_cost=0.001,
-                                max_completion_cost=0.001,
-                                max_cost=0.001,
-                            ),
-                            sats_pricing=None,
-                            per_request_limits=None,
-                            top_provider=TopProvider(
-                                context_length=context_length,
-                                max_completion_tokens=context_length // 2,
-                                is_moderated=False,
-                            ),
-                            enabled=True,
-                            upstream_provider_id=None,
-                            canonical_slug=None,
-                        )
-                    )
-
-                logger.info(
-                    f"Fetched {len(models_list)} models from Ollama",
-                    extra={"model_count": len(models_list), "base_url": self.base_url},
-                )
-                return models_list
-
-        except Exception as e:
-            logger.error(
-                f"Failed to fetch models from Ollama API: {e}",
-                extra={
-                    "error": str(e),
-                    "error_type": type(e).__name__,
-                    "base_url": self.base_url,
-                },
-            )
-            return []
-
-    async def refresh_models_cache(self) -> None:
-        """Refresh the in-memory models cache from upstream API."""
-        try:
-            from ..payment.models import _update_model_sats_pricing
-            from ..payment.price import sats_usd_price
-
-            models = await self.fetch_models()
-            models_with_fees = [self._apply_provider_fee_to_model(m) for m in models]
-
-            try:
-                sats_to_usd = sats_usd_price()
-                self._models_cache = [
-                    _update_model_sats_pricing(m, sats_to_usd) for m in models_with_fees
-                ]
-            except Exception:
-                self._models_cache = models_with_fees
-
-            self._models_by_id = {m.id: m for m in self._models_cache}
-            logger.info(
-                f"Refreshed models cache for {self.base_url}",
-                extra={"model_count": len(models)},
-            )
-        except Exception as e:
-            logger.error(
-                f"Failed to refresh models cache for {self.base_url}",
-                extra={"error": str(e), "error_type": type(e).__name__},
-            )
-
-    def get_cached_models(self) -> list[Model]:
-        """Get cached models for this provider.
-
-        Returns:
-            List of cached Model objects
-        """
-        return self._models_cache
-
-    def get_cached_model_by_id(self, model_id: str) -> Model | None:
-        """Get a specific cached model by ID.
-
-        Args:
-            model_id: Model identifier
-
-        Returns:
-            Model object or None if not found
-        """
-        return self._models_by_id.get(model_id)
-
-    def _apply_provider_fee_to_model(self, model: Model) -> Model:
-        """Apply provider fee to model's USD pricing and calculate max costs.
-
-        Args:
-            model: Model object to update
-
-        Returns:
-            Model with provider fee applied to pricing and max costs calculated
-        """
-        from ..payment.models import Model, Pricing, _calculate_usd_max_costs
-
-        adjusted_pricing = Pricing.parse_obj(
-            {k: v * self.provider_fee for k, v in model.pricing.dict().items()}
-        )
-
-        temp_model = Model(
-            id=model.id,
-            name=model.name,
-            created=model.created,
-            description=model.description,
-            context_length=model.context_length,
-            architecture=model.architecture,
-            pricing=adjusted_pricing,
-            sats_pricing=None,
-            per_request_limits=model.per_request_limits,
-            top_provider=model.top_provider,
-            enabled=model.enabled,
-            upstream_provider_id=model.upstream_provider_id,
-            canonical_slug=model.canonical_slug,
-        )
-
-        (
-            adjusted_pricing.max_prompt_cost,
-            adjusted_pricing.max_completion_cost,
-            adjusted_pricing.max_cost,
-        ) = _calculate_usd_max_costs(temp_model)
-
-        return Model(
-            id=model.id,
-            name=model.name,
-            created=model.created,
-            description=model.description,
-            context_length=model.context_length,
-            architecture=model.architecture,
-            pricing=adjusted_pricing,
-            sats_pricing=model.sats_pricing,
-            per_request_limits=model.per_request_limits,
-            top_provider=model.top_provider,
-            enabled=model.enabled,
-            upstream_provider_id=model.upstream_provider_id,
-            canonical_slug=model.canonical_slug,
-        )

routstr/upstream/openai.py

@@ -1,48 +0,0 @@
-from typing import TYPE_CHECKING
-
-from ..payment.models import Model, async_fetch_openrouter_models
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import UpstreamProviderRow
-
-
-class OpenAIUpstreamProvider(BaseUpstreamProvider):
-    """Upstream provider specifically configured for OpenAI API."""
-
-    provider_type = "openai"
-    default_base_url = "https://api.openai.com/v1"
-    platform_url = "https://platform.openai.com/api-keys"
-
-    def __init__(self, api_key: str, provider_fee: float = 1.01):
-        super().__init__(
-            base_url=self.default_base_url, api_key=api_key, provider_fee=provider_fee
-        )
-
-    @classmethod
-    def from_db_row(
-        cls, provider_row: "UpstreamProviderRow"
-    ) -> "OpenAIUpstreamProvider":
-        return cls(
-            api_key=provider_row.api_key,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "OpenAI",
-            "default_base_url": cls.default_base_url,
-            "fixed_base_url": True,
-            "platform_url": cls.platform_url,
-        }
-
-    def transform_model_name(self, model_id: str) -> str:
-        """Strip 'openai/' prefix for OpenAI API compatibility."""
-        return model_id.removeprefix("openai/")
-
-    async def fetch_models(self) -> list[Model]:
-        """Fetch OpenAI models from OpenRouter API filtered by openai source."""
-        models_data = await async_fetch_openrouter_models(source_filter="openai")
-        return [Model(**model) for model in models_data]  # type: ignore

routstr/upstream/openrouter.py

@@ -1,50 +0,0 @@
-from typing import TYPE_CHECKING
-
-from ..payment.models import Model, async_fetch_openrouter_models
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import UpstreamProviderRow
-
-
-class OpenRouterUpstreamProvider(BaseUpstreamProvider):
-    """Upstream provider specifically configured for OpenRouter API."""
-
-    provider_type = "openrouter"
-    default_base_url = "https://openrouter.ai/api/v1"
-    platform_url = "https://openrouter.ai/settings/keys"
-
-    def __init__(self, api_key: str, provider_fee: float = 1.06):
-        """Initialize OpenRouter provider with API key.
-
-        Args:
-            api_key: OpenRouter API key for authentication
-            provider_fee: Provider fee multiplier (default 1.06 for 6% fee)
-        """
-        super().__init__(
-            base_url=self.default_base_url, api_key=api_key, provider_fee=provider_fee
-        )
-
-    @classmethod
-    def from_db_row(
-        cls, provider_row: "UpstreamProviderRow"
-    ) -> "OpenRouterUpstreamProvider":
-        return cls(
-            api_key=provider_row.api_key,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "OpenRouter",
-            "default_base_url": cls.default_base_url,
-            "fixed_base_url": True,
-            "platform_url": cls.platform_url,
-        }
-
-    async def fetch_models(self) -> list[Model]:
-        """Fetch all OpenRouter models."""
-        models_data = await async_fetch_openrouter_models()
-        return [Model(**model) for model in models_data]  # type: ignore

routstr/upstream/perplexity.py

@@ -1,50 +0,0 @@
-from typing import TYPE_CHECKING
-
-from ..payment.models import Model, async_fetch_openrouter_models
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import UpstreamProviderRow
-
-
-class PerplexityUpstreamProvider(BaseUpstreamProvider):
-    """Upstream provider specifically configured for Perplexity API."""
-
-    provider_type = "perplexity"
-    default_base_url = "https://api.perplexity.ai/"
-    platform_url = "https://www.perplexity.ai/account/api/keys"
-
-    def __init__(self, api_key: str, provider_fee: float = 1.01):
-        super().__init__(
-            base_url=self.default_base_url,
-            api_key=api_key,
-            provider_fee=provider_fee,
-        )
-
-    @classmethod
-    def from_db_row(
-        cls, provider_row: "UpstreamProviderRow"
-    ) -> "PerplexityUpstreamProvider":
-        return cls(
-            api_key=provider_row.api_key,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "Perplexity",
-            "default_base_url": cls.default_base_url,
-            "fixed_base_url": True,
-            "platform_url": cls.platform_url,
-        }
-
-    def transform_model_name(self, model_id: str) -> str:
-        """Strip 'perplexity/' prefix for Perplexity API compatibility."""
-        return model_id.removeprefix("perplexity/")
-
-    async def fetch_models(self) -> list[Model]:
-        """Fetch Perplexity models from OpenRouter API filtered by perplexity source."""
-        models_data = await async_fetch_openrouter_models(source_filter="perplexity")
-        return [Model(**model) for model in models_data]  # type: ignore

routstr/upstream/xai.py

@@ -1,46 +0,0 @@
-from typing import TYPE_CHECKING
-
-from ..payment.models import Model, async_fetch_openrouter_models
-from .base import BaseUpstreamProvider
-
-if TYPE_CHECKING:
-    from ..core.db import UpstreamProviderRow
-
-
-class XAIUpstreamProvider(BaseUpstreamProvider):
-    """Upstream provider specifically configured for XAI API."""
-
-    provider_type = "x-ai"
-    default_base_url = "https://api.x.ai/v1"
-    platform_url = "https://console.x.ai/"
-
-    def __init__(self, api_key: str, provider_fee: float = 1.01):
-        super().__init__(
-            base_url=self.default_base_url, api_key=api_key, provider_fee=provider_fee
-        )
-
-    @classmethod
-    def from_db_row(cls, provider_row: "UpstreamProviderRow") -> "XAIUpstreamProvider":
-        return cls(
-            api_key=provider_row.api_key,
-            provider_fee=provider_row.provider_fee,
-        )
-
-    @classmethod
-    def get_provider_metadata(cls) -> dict[str, object]:
-        return {
-            "id": cls.provider_type,
-            "name": "xAI",
-            "default_base_url": cls.default_base_url,
-            "fixed_base_url": True,
-            "platform_url": cls.platform_url,
-        }
-
-    def transform_model_name(self, model_id: str) -> str:
-        """Strip 'xai/' prefix for XAI API compatibility."""
-        return model_id.removeprefix("x-ai/")
-
-    async def fetch_models(self) -> list[Model]:
-        """Fetch XAI models from OpenRouter API filtered by xai source."""
-        models_data = await async_fetch_openrouter_models(source_filter="x-ai")
-        return [Model(**model) for model in models_data]  # type: ignore

routstr/wallet.py

@@ -5,7 +5,6 @@ from typing import TypedDict
 from cashu.core.base import Proof, Token
 from cashu.wallet.helpers import deserialize_token_from_string
 from cashu.wallet.wallet import Wallet
-from sqlmodel import col, update
 
 from .core import db, get_logger
 from .core.settings import settings
@@ -83,12 +82,9 @@ async def swap_to_primary_mint(
         raise ValueError("Invalid unit")
     estimated_fee_sat = math.ceil(max(amount_msat // 1000 * 0.01, 2))
     amount_msat_after_fee = amount_msat - estimated_fee_sat * 1000
-    primary_wallet = await get_wallet(settings.primary_mint, settings.primary_mint_unit)
+    primary_wallet = await get_wallet(settings.primary_mint, "sat")
 
-    if settings.primary_mint_unit == "sat":
-        minted_amount = int(amount_msat_after_fee // 1000)
-    else:
-        minted_amount = int(amount_msat_after_fee)
+    minted_amount = int(amount_msat_after_fee // 1000)
     mint_quote = await primary_wallet.request_mint(minted_amount)
 
     melt_quote = await token_wallet.melt_quote(mint_quote.request)
@@ -100,7 +96,7 @@ async def swap_to_primary_mint(
     )
     _ = await primary_wallet.mint(minted_amount, quote_id=mint_quote.quote)
 
-    return int(minted_amount), settings.primary_mint_unit, settings.primary_mint
+    return int(minted_amount), "sat", settings.primary_mint
 
 
 async def credit_balance(
@@ -128,17 +124,9 @@ async def credit_balance(
             "credit_balance: Updating balance",
             extra={"old_balance": key.balance, "credit_amount": amount},
         )
-
-        # Use atomic SQL UPDATE to prevent race conditions during concurrent topups
-        stmt = (
-            update(db.ApiKey)
-            .where(col(db.ApiKey.hashed_key) == key.hashed_key)
-            .values(balance=(db.ApiKey.balance) + amount)
-        )
-        await session.exec(stmt)  # type: ignore[call-overload]
+        key.balance += amount
+        session.add(key)
         await session.commit()
-        await session.refresh(key)
-
         logger.info(
             "credit_balance: Balance updated successfully",
             extra={"new_balance": key.balance},
@@ -164,7 +152,9 @@ async def get_wallet(mint_url: str, unit: str = "sat", load: bool = True) -> Wal
     global _wallets
     id = f"{mint_url}_{unit}"
     if id not in _wallets:
-        _wallets[id] = await Wallet.with_db(mint_url, db=".wallet", unit=unit)
+        _wallets[id] = await Wallet.with_db(
+            mint_url, db=".wallet", unit=unit
+        )
 
     if load:
         await _wallets[id].load_mint()
@@ -309,7 +299,7 @@ async def periodic_payout() -> None:
         logger.error("RECEIVE_LN_ADDRESS is not set, skipping payout")
         return
     while True:
-        await asyncio.sleep(60 * 15)
+        await asyncio.sleep(60 * 5)
         try:
             async with db.create_session() as session:
                 for mint_url in settings.cashu_mints:
@@ -329,11 +319,7 @@ async def periodic_payout() -> None:
                         min_amount = 210 if unit == "sat" else 210000
                         if available_balance > min_amount:
                             amount_received = await raw_send_to_lnurl(
-                                wallet,
-                                proofs,
-                                settings.receive_ln_address,
-                                unit,
-                                amount=available_balance,
+                                wallet, proofs, settings.receive_ln_address, unit
                             )
                             logger.info(
                                 "Payout sent successfully",

scripts/build-ui.sh

@@ -1,73 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-PROJECT_ROOT="$(cd "$SCRIPT_DIR/.." && pwd)"
-UI_DIR="$PROJECT_ROOT/ui"
-
-echo "Building Routstr UI for static deployment..."
-echo "UI directory: $UI_DIR"
-
-if [ ! -d "$UI_DIR" ]; then
-    echo "Error: UI directory not found at $UI_DIR"
-    exit 1
-fi
-
-cd "$UI_DIR"
-
-echo "Installing dependencies..."
-if command -v pnpm &> /dev/null; then
-    pnpm install
-elif command -v npm &> /dev/null; then
-    npm install
-else
-    echo "Error: Neither pnpm nor npm found. Please install Node.js and npm."
-    exit 1
-fi
-
-# Check for root .env file (centralized configuration)
-ROOT_ENV_FILE="$PROJECT_ROOT/.env"
-UI_ENV_FILE="$UI_DIR/.env.local"
-
-if [ -f "$ROOT_ENV_FILE" ]; then
-    echo "Loading environment variables from $ROOT_ENV_FILE"
-    # Extract NEXT_PUBLIC_ variables and create .env.local for Next.js
-    grep '^NEXT_PUBLIC_' "$ROOT_ENV_FILE" > "$UI_ENV_FILE"
-    echo "Created $UI_ENV_FILE with UI configuration"
-else
-    echo "Warning: .env file not found in project root. Using default configuration."
-    echo "Create a .env file based on .env.example for proper configuration."
-    # Create empty .env.local to avoid issues
-    > "$UI_ENV_FILE"
-fi
-
-echo "Building static export..."
-if command -v pnpm &> /dev/null; then
-    pnpm run build
-else
-    npm run build
-fi
-
-rm -rf ../ui_out
-mkdir -p ../ui_out
-mv out/* ../ui_out
-
-# Clean up the temporary .env.local file
-if [ -f "$UI_ENV_FILE" ]; then
-    rm "$UI_ENV_FILE"
-    echo "Cleaned up temporary $UI_ENV_FILE"
-fi
-
-echo ""
-echo "✓ UI build complete!"
-echo "Static files generated at: $UI_DIR/out"
-echo ""
-echo "To serve the UI from the Python backend:"
-echo "  1. Configure NEXT_PUBLIC_API_URL in the root .env file"
-echo "  2. For development: Set NEXT_PUBLIC_API_URL=http://127.0.0.1:8000 or leave empty for relative paths"
-echo "  3. For production: Set NEXT_PUBLIC_API_URL=https://your-production-api.com"
-echo "  4. Start the backend: uvicorn routstr.core.main:app --host 0.0.0.0 --port 8000"
-echo "  5. Access the UI at: http://localhost:8000"
-echo ""
-

testing-clients/chat-completions-tester.html

@@ -1,780 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Routstr Chat Completions Tester</title>
-        <style>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            min-height: 100vh;
-            padding: 20px;
-            color: #333;
-        }
-
-        .container {
-            max-width: 1200px;
-            margin: 0 auto;
-        }
-
-        h1 {
-            color: white;
-            text-align: center;
-            margin-bottom: 10px;
-            font-size: 2.5rem;
-            text-shadow: 2px 2px 4px rgba(0,0,0,0.2);
-        }
-
-        .subtitle {
-            color: rgba(255,255,255,0.9);
-            text-align: center;
-            margin-bottom: 30px;
-            font-size: 1rem;
-        }
-
-        .card {
-            background: rgba(255,255,255,0.95);
-            padding: 25px;
-            border-radius: 10px;
-            margin-bottom: 20px;
-            box-shadow: 0 4px 6px rgba(0,0,0,0.1);
-        }
-
-        .card h2 {
-            margin-bottom: 20px;
-            color: #667eea;
-            font-size: 1.5rem;
-            border-bottom: 2px solid #667eea;
-            padding-bottom: 10px;
-        }
-
-        .form-group {
-            margin-bottom: 20px;
-        }
-
-        .form-group label {
-            display: block;
-            margin-bottom: 8px;
-            font-weight: 600;
-            color: #555;
-            font-size: 0.95rem;
-        }
-
-        .form-group input,
-        .form-group textarea,
-        .form-group select {
-            width: 100%;
-            padding: 12px;
-            border: 2px solid #e5e7eb;
-            border-radius: 8px;
-            font-size: 0.95rem;
-            transition: border-color 0.3s;
-            font-family: inherit;
-        }
-
-        .form-group input:focus,
-        .form-group textarea:focus,
-        .form-group select:focus {
-            outline: none;
-            border-color: #667eea;
-        }
-
-        .form-group textarea {
-            resize: vertical;
-            min-height: 100px;
-            font-family: 'Monaco', 'Courier New', monospace;
-        }
-
-        .form-group small {
-            display: block;
-            margin-top: 5px;
-            color: #6b7280;
-            font-size: 0.85rem;
-        }
-
-        .form-row {
-            display: grid;
-            grid-template-columns: 1fr 1fr;
-            gap: 20px;
-        }
-
-        .btn {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            color: white;
-            border: none;
-            padding: 14px 28px;
-            border-radius: 8px;
-            font-size: 1rem;
-            font-weight: 600;
-            cursor: pointer;
-            transition: transform 0.2s, box-shadow 0.2s;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-            width: 100%;
-        }
-
-        .btn:hover {
-            transform: translateY(-2px);
-            box-shadow: 0 4px 8px rgba(0,0,0,0.2);
-        }
-
-        .btn:active {
-            transform: translateY(0);
-        }
-
-        .btn:disabled {
-            opacity: 0.6;
-            cursor: not-allowed;
-            transform: none;
-        }
-
-        .btn-secondary {
-            background: linear-gradient(135deg, #10b981 0%, #059669 100%);
-        }
-
-        .response-container {
-            margin-top: 20px;
-        }
-
-        .response-header {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: 10px;
-        }
-
-        .response-status {
-            padding: 6px 12px;
-            border-radius: 6px;
-            font-weight: 600;
-            font-size: 0.9rem;
-        }
-
-        .response-status.success {
-            background: #d1fae5;
-            color: #065f46;
-        }
-
-        .response-status.error {
-            background: #fee2e2;
-            color: #991b1b;
-        }
-
-        .response-body {
-            background: #1e1e1e;
-            color: #d4d4d4;
-            padding: 20px;
-            border-radius: 8px;
-            overflow-x: auto;
-            font-family: 'Monaco', 'Courier New', monospace;
-            font-size: 0.9rem;
-            line-height: 1.6;
-            max-height: 600px;
-            overflow-y: auto;
-        }
-
-        .response-body pre {
-            margin: 0;
-            white-space: pre-wrap;
-            word-wrap: break-word;
-        }
-
-        .copy-btn {
-            background: #374151;
-            color: white;
-            border: none;
-            padding: 8px 16px;
-            border-radius: 6px;
-            font-size: 0.85rem;
-            cursor: pointer;
-            transition: background 0.2s;
-        }
-
-        .copy-btn:hover {
-            background: #4b5563;
-        }
-
-        .loading {
-            display: none;
-            text-align: center;
-            padding: 20px;
-        }
-
-        .loading.active {
-            display: block;
-        }
-
-        .spinner {
-            border: 3px solid #f3f4f6;
-            border-top: 3px solid #667eea;
-            border-radius: 50%;
-            width: 40px;
-            height: 40px;
-            animation: spin 1s linear infinite;
-            margin: 0 auto;
-        }
-
-        @keyframes spin {
-            0% { transform: rotate(0deg); }
-            100% { transform: rotate(360deg); }
-        }
-
-        .message-list {
-            margin-bottom: 20px;
-        }
-
-        .message-item {
-            background: #f9fafb;
-            padding: 15px;
-            border-radius: 8px;
-            margin-bottom: 10px;
-            border-left: 4px solid #667eea;
-        }
-
-        .message-item.system {
-            border-left-color: #10b981;
-        }
-
-        .message-item.user {
-            border-left-color: #667eea;
-        }
-
-        .message-item.assistant {
-            border-left-color: #f59e0b;
-        }
-
-        .message-header {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: 8px;
-        }
-
-        .message-role {
-            font-weight: 600;
-            text-transform: capitalize;
-            color: #374151;
-        }
-
-        .message-content {
-            color: #1f2937;
-            white-space: pre-wrap;
-        }
-
-        .remove-message-btn {
-            background: #ef4444;
-            color: white;
-            border: none;
-            padding: 4px 12px;
-            border-radius: 4px;
-            font-size: 0.8rem;
-            cursor: pointer;
-        }
-
-        .add-message-btn {
-            background: #10b981;
-            color: white;
-            border: none;
-            padding: 10px 20px;
-            border-radius: 6px;
-            font-size: 0.9rem;
-            cursor: pointer;
-            margin-top: 10px;
-        }
-
-        .add-message-btn:hover {
-            background: #059669;
-        }
-
-        .curl-preview {
-            background: #1e1e1e;
-            color: #d4d4d4;
-            padding: 15px;
-            border-radius: 8px;
-            font-family: 'Monaco', 'Courier New', monospace;
-            font-size: 0.85rem;
-            overflow-x: auto;
-            margin-top: 10px;
-        }
-
-        .curl-preview pre {
-            margin: 0;
-            white-space: pre-wrap;
-            word-wrap: break-word;
-        }
-
-        .tabs {
-            display: flex;
-            gap: 10px;
-            margin-bottom: 20px;
-            border-bottom: 2px solid #e5e7eb;
-        }
-
-        .tab {
-            padding: 10px 20px;
-            background: none;
-            border: none;
-            cursor: pointer;
-            font-weight: 600;
-            color: #6b7280;
-            border-bottom: 2px solid transparent;
-            margin-bottom: -2px;
-            transition: all 0.3s;
-        }
-
-        .tab:hover {
-            color: #667eea;
-        }
-
-        .tab.active {
-            color: #667eea;
-            border-bottom-color: #667eea;
-        }
-
-        .tab-content {
-            display: none;
-        }
-
-        .tab-content.active {
-            display: block;
-        }
-
-        .preset-container {
-            margin-bottom: 20px;
-        }
-
-        .preset-btn {
-            display: inline-block;
-            margin: 5px;
-            padding: 8px 16px;
-            background: #f3f4f6;
-            border: 2px solid #e5e7eb;
-            border-radius: 6px;
-            cursor: pointer;
-            transition: all 0.3s;
-            font-size: 0.9rem;
-        }
-
-        .preset-btn:hover {
-            background: #e5e7eb;
-            border-color: #667eea;
-        }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <h1>🚀 Chat Completions Tester</h1>
-            <p class="subtitle">Test your /v1/chat/completions endpoint with Cashu authentication</p>
-            <div class="card">
-                <h2>Configuration</h2>
-                <div class="preset-container">
-                    <strong>Quick Presets:</strong>
-                    <button class="preset-btn" onclick="loadPreset('local')">Local Dev</button>
-                    <button class="preset-btn" onclick="loadPreset('production')">Production</button>
-                    <button class="preset-btn" onclick="loadPreset('example')">Example Token</button>
-                </div>
-                <div class="form-group">
-                    <label for="endpoint">API Endpoint</label>
-                    <input
-                        type="text"
-                        id="endpoint"
-                        placeholder="http://localhost:8000/v1/chat/completions"
-                        value="http://localhost:8000/v1/chat/completions"
-                    >
-                    <small>The full URL to the chat completions endpoint</small>
-                </div>
-                <div class="form-group">
-                    <label for="authToken">Authorization Token</label>
-                    <textarea id="authToken" rows="4" placeholder="cashuBo2FteCJodHRwczovL21pbnQubWluaWJpdHMuY2FzaC9CaXRjb2luYXVjc2F0YXSBomFpSABQBVDwSUFGYXCBpGFhBGFzeEBj..."></textarea>
-                    <small>Cashu token (without "Bearer " prefix - will be added automatically)</small>
-                </div>
-            </div>
-            <div class="card">
-                <h2>Request Parameters</h2>
-                <div class="tabs">
-                    <button class="tab active" onclick="switchTab('basic')">Basic</button>
-                    <button class="tab" onclick="switchTab('advanced')">Advanced</button>
-                    <button class="tab" onclick="switchTab('curl')">cURL Preview</button>
-                </div>
-                <div id="basic-tab" class="tab-content active">
-                    <div class="form-group">
-                        <label for="model">Model</label>
-                        <input
-                            type="text"
-                            id="model"
-                            placeholder="gpt-4o-mini"
-                            value="gpt-4o-mini"
-                        >
-                        <small>Model identifier (e.g., gpt-4o-mini, claude-3-haiku-20240307)</small>
-                    </div>
-                    <div class="form-group">
-                        <label>Messages</label>
-                        <div class="message-list" id="messageList"></div>
-                        <button class="add-message-btn" onclick="addMessage()">+ Add Message</button>
-                    </div>
-                    <div class="form-row">
-                        <div class="form-group">
-                            <label for="maxTokens">Max Tokens</label>
-                            <input
-                                type="number"
-                                id="maxTokens"
-                                placeholder="16"
-                                value="16"
-                                min="1"
-                            >
-                            <small>Maximum tokens to generate</small>
-                        </div>
-                        <div class="form-group">
-                            <label for="temperature">Temperature</label>
-                            <input
-                                type="number"
-                                id="temperature"
-                                placeholder="1.0"
-                                value="1.0"
-                                min="0"
-                                max="2"
-                                step="0.1"
-                            >
-                            <small>Sampling temperature (0-2)</small>
-                        </div>
-                    </div>
-                </div>
-                <div id="advanced-tab" class="tab-content">
-                    <div class="form-row">
-                        <div class="form-group">
-                            <label for="topP">Top P</label>
-                            <input
-                                type="number"
-                                id="topP"
-                                placeholder="1.0"
-                                value="1.0"
-                                min="0"
-                                max="1"
-                                step="0.1"
-                            >
-                            <small>Nucleus sampling parameter</small>
-                        </div>
-                        <div class="form-group">
-                            <label for="topK">Top K</label>
-                            <input
-                                type="number"
-                                id="topK"
-                                placeholder=""
-                                value=""
-                                min="0"
-                            >
-                            <small>Optional: Top-k sampling parameter</small>
-                        </div>
-                    </div>
-                    <div class="form-row">
-                        <div class="form-group">
-                            <label for="frequencyPenalty">Frequency Penalty</label>
-                            <input
-                                type="number"
-                                id="frequencyPenalty"
-                                placeholder="0"
-                                value="0"
-                                min="-2"
-                                max="2"
-                                step="0.1"
-                            >
-                            <small>Penalize repeated tokens (-2 to 2)</small>
-                        </div>
-                        <div class="form-group">
-                            <label for="presencePenalty">Presence Penalty</label>
-                            <input
-                                type="number"
-                                id="presencePenalty"
-                                placeholder="0"
-                                value="0"
-                                min="-2"
-                                max="2"
-                                step="0.1"
-                            >
-                            <small>Penalize new topics (-2 to 2)</small>
-                        </div>
-                    </div>
-                    <div class="form-group">
-                        <label for="stream">Stream Response</label>
-                        <select id="stream">
-                            <option value="false">No (default)</option>
-                            <option value="true">Yes (SSE streaming)</option>
-                        </select>
-                        <small>Enable Server-Sent Events streaming</small>
-                    </div>
-                    <div class="form-group">
-                        <label for="stop">Stop Sequences</label>
-                        <input type="text" id="stop" placeholder='["\\n", "user:"]'>
-                        <small>JSON array of stop sequences</small>
-                    </div>
-                </div>
-                <div id="curl-tab" class="tab-content">
-                    <div class="curl-preview">
-                        <pre id="curlPreview">Click "Send Request" to generate cURL command</pre>
-                    </div>
-                    <button class="copy-btn" onclick="copyCurl()" style="margin-top: 10px;">Copy cURL Command</button>
-                </div>
-                <button class="btn" onclick="sendRequest()" id="sendBtn">Send Request</button>
-            </div>
-            <div class="card" id="responseCard" style="display: none;">
-                <div class="response-header">
-                    <h2>Response</h2>
-                    <div>
-                        <span class="response-status" id="responseStatus"></span>
-                        <button class="copy-btn" onclick="copyResponse()" style="margin-left: 10px;">Copy Response</button>
-                    </div>
-                </div>
-                <div class="loading" id="loading">
-                    <div class="spinner"></div>
-                    <p style="margin-top: 10px; color: #6b7280;">Sending request...</p>
-                </div>
-                <div class="response-body" id="responseBody"></div>
-            </div>
-        </div>
-        <script>
-            let messages = [];
-
-            function switchTab(tabName) {
-                document.querySelectorAll('.tab').forEach(tab => tab.classList.remove('active'));
-                document.querySelectorAll('.tab-content').forEach(content => content.classList.remove('active'));
-                
-                document.querySelector(`[onclick="switchTab('${tabName}')"]`).classList.add('active');
-                document.getElementById(`${tabName}-tab`).classList.add('active');
-
-                if (tabName === 'curl') {
-                    updateCurlPreview();
-                }
-            }
-
-            function loadPreset(preset) {
-                switch(preset) {
-                    case 'local':
-                        document.getElementById('endpoint').value = 'http://localhost:8000/v1/chat/completions';
-                        break;
-                    case 'production':
-                        document.getElementById('endpoint').value = 'https://your-production-url.com/v1/chat/completions';
-                        break;
-                    case 'example':
-                        document.getElementById('authToken').value = 'cashuBo2FteCJodHRwczovL21pbnQubWluaWJpdHMuY2FzaC9CaXRjb2luYXVjc2F0YXSBomFpSABQBVDwSUFGYXCBpGFhBGFzeEBjMDg1NDgzZDA3Njk0MDkwZDJmMGRkOTg5NmYxMGZmZDk2Y2Q5ODNhZWNlOGYyMmQ0ZmVlMmNhZGZhMGQzMDAyYWNYIQNcxP6wwsZ7_-dY45f-tXt-01xrgjNEVzZczbOmXb77iWFko2FlWCC45YfoOF48khLnTWNG3M-siukLc9I4zAV5awIZnNjbzWFzWCBwYixTGifYTMKSMq5fQEa7OiPqHOihIqYilqQZm60JsmFyWCCXLpDK8gxEPaP4X-QPBzAx3gVdXp-0FiSm3APNIxCA_A';
-                        break;
-                }
-            }
-
-            function addMessage(role = 'user', content = '') {
-                const message = { role, content };
-                messages.push(message);
-                renderMessages();
-            }
-
-            function removeMessage(index) {
-                messages.splice(index, 1);
-                renderMessages();
-            }
-
-            function renderMessages() {
-                const messageList = document.getElementById('messageList');
-                
-                if (messages.length === 0) {
-                    messageList.innerHTML = '<p style="color: #6b7280; padding: 10px;">No messages yet. Click "Add Message" to start.</p>';
-                    return;
-                }
-
-                messageList.innerHTML = messages.map((msg, index) => `
-                    <div class="message-item ${msg.role}">
-                        <div class="message-header">
-                            <select onchange="updateMessageRole(${index}, this.value)" style="border: 1px solid #e5e7eb; padding: 4px 8px; border-radius: 4px;">
-                                <option value="system" ${msg.role === 'system' ? 'selected' : ''}>System</option>
-                                <option value="user" ${msg.role === 'user' ? 'selected' : ''}>User</option>
-                                <option value="assistant" ${msg.role === 'assistant' ? 'selected' : ''}>Assistant</option>
-                            </select>
-                            <button class="remove-message-btn" onclick="removeMessage(${index})">Remove</button>
-                        </div>
-                        <textarea class="message-content" onchange="updateMessageContent(${index}, this.value)" style="width: 100%; min-height: 60px; border: 1px solid #e5e7eb; border-radius: 4px; padding: 8px; font-family: inherit;">${msg.content}</textarea>
-                    </div>
-                `).join('');
-            }
-
-            function updateMessageRole(index, role) {
-                messages[index].role = role;
-                renderMessages();
-            }
-
-            function updateMessageContent(index, content) {
-                messages[index].content = content;
-            }
-
-            function buildRequestBody() {
-                const body = {
-                    model: document.getElementById('model').value,
-                    messages: messages.filter(msg => msg.content.trim() !== '')
-                };
-
-                const maxTokens = parseInt(document.getElementById('maxTokens').value, 10);
-                if (!isNaN(maxTokens) && maxTokens > 0) {
-                    body.max_tokens = maxTokens;
-                }
-
-                const temperature = parseFloat(document.getElementById('temperature').value);
-                if (!isNaN(temperature)) body.temperature = temperature;
-
-                const topP = parseFloat(document.getElementById('topP').value);
-                if (!isNaN(topP)) body.top_p = topP;
-
-                const topK = parseInt(document.getElementById('topK').value, 10);
-                if (!isNaN(topK) && topK > 0) body.top_k = topK;
-
-                const frequencyPenalty = parseFloat(document.getElementById('frequencyPenalty').value);
-                if (!isNaN(frequencyPenalty) && frequencyPenalty !== 0) body.frequency_penalty = frequencyPenalty;
-
-                const presencePenalty = parseFloat(document.getElementById('presencePenalty').value);
-                if (!isNaN(presencePenalty) && presencePenalty !== 0) body.presence_penalty = presencePenalty;
-
-                const stream = document.getElementById('stream').value === 'true';
-                if (stream) body.stream = true;
-
-                const stop = document.getElementById('stop').value.trim();
-                if (stop) {
-                    try {
-                        body.stop = JSON.parse(stop);
-                    } catch (e) {
-                        console.warn('Invalid stop sequences JSON');
-                    }
-                }
-
-                return body;
-            }
-
-            function updateCurlPreview() {
-                const endpoint = document.getElementById('endpoint').value;
-                const token = document.getElementById('authToken').value.trim();
-                const body = buildRequestBody();
-
-                const curlCommand = `curl -i -X POST ${endpoint} \\
-  -H "Content-Type: application/json" \\
-  -H "Authorization: Bearer ${token}" \\
-  -d '${JSON.stringify(body, null, 2)}'`;
-
-                document.getElementById('curlPreview').textContent = curlCommand;
-            }
-
-            async function sendRequest() {
-                const endpoint = document.getElementById('endpoint').value.trim();
-                const token = document.getElementById('authToken').value.trim();
-
-                if (!endpoint) {
-                    alert('Please enter an API endpoint');
-                    return;
-                }
-
-                if (!token) {
-                    alert('Please enter an authorization token');
-                    return;
-                }
-
-                if (messages.length === 0 || messages.every(m => m.content.trim() === '')) {
-                    alert('Please add at least one message');
-                    return;
-                }
-
-                const body = buildRequestBody();
-                updateCurlPreview();
-
-                const responseCard = document.getElementById('responseCard');
-                const loading = document.getElementById('loading');
-                const responseBody = document.getElementById('responseBody');
-                const responseStatus = document.getElementById('responseStatus');
-                const sendBtn = document.getElementById('sendBtn');
-
-                responseCard.style.display = 'block';
-                loading.classList.add('active');
-                responseBody.innerHTML = '';
-                sendBtn.disabled = true;
-
-                const stream = document.getElementById('stream').value === 'true';
-
-                try {
-                    const response = await fetch(endpoint, {
-                        method: 'POST',
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'Authorization': `Bearer ${token}`
-                        },
-                        body: JSON.stringify(body)
-                    });
-
-                    loading.classList.remove('active');
-
-                    const statusCode = response.status;
-                    const statusText = response.statusText;
-
-                    if (response.ok) {
-                        responseStatus.textContent = `${statusCode} ${statusText}`;
-                        responseStatus.className = 'response-status success';
-                    } else {
-                        responseStatus.textContent = `${statusCode} ${statusText}`;
-                        responseStatus.className = 'response-status error';
-                    }
-
-                    if (stream && response.ok) {
-                        responseBody.innerHTML = '<pre>Streaming response:\n\n</pre>';
-                        const reader = response.body.getReader();
-                        const decoder = new TextDecoder();
-                        
-                        while (true) {
-                            const {done, value} = await reader.read();
-                            if (done) break;
-                            
-                            const chunk = decoder.decode(value);
-                            responseBody.querySelector('pre').textContent += chunk;
-                        }
-                    } else {
-                        const responseData = await response.text();
-                        
-                        try {
-                            const jsonData = JSON.parse(responseData);
-                            responseBody.innerHTML = `<pre>${JSON.stringify(jsonData, null, 2)}</pre>`;
-                        } catch (e) {
-                            responseBody.innerHTML = `<pre>${responseData}</pre>`;
-                        }
-                    }
-                } catch (error) {
-                    loading.classList.remove('active');
-                    responseStatus.textContent = 'Error';
-                    responseStatus.className = 'response-status error';
-                    responseBody.innerHTML = `<pre>Error: ${error.message}</pre>`;
-                } finally {
-                    sendBtn.disabled = false;
-                }
-            }
-
-            function copyResponse() {
-                const responseText = document.getElementById('responseBody').innerText;
-                navigator.clipboard.writeText(responseText).then(() => {
-                    const btn = event.target;
-                    const originalText = btn.textContent;
-                    btn.textContent = 'Copied!';
-                    setTimeout(() => btn.textContent = originalText, 2000);
-                });
-            }
-
-            function copyCurl() {
-                updateCurlPreview();
-                const curlText = document.getElementById('curlPreview').textContent;
-                navigator.clipboard.writeText(curlText).then(() => {
-                    const btn = event.target;
-                    const originalText = btn.textContent;
-                    btn.textContent = 'Copied!';
-                    setTimeout(() => btn.textContent = originalText, 2000);
-                });
-            }
-
-            addMessage('user', 'what is cashubtc');
-        </script>
-    </body>
-</html>

testing-clients/models-dashboard.html

@@ -1,903 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="UTF-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0">
-        <title>Routstr Models Dashboard</title>
-        <script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.min.js"></script>
-        <style>
-        * {
-            margin: 0;
-            padding: 0;
-            box-sizing: border-box;
-        }
-
-        body {
-            font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            min-height: 100vh;
-            padding: 20px;
-            color: #333;
-        }
-
-        .container {
-            max-width: 1400px;
-            margin: 0 auto;
-        }
-
-        h1 {
-            color: white;
-            text-align: center;
-            margin-bottom: 10px;
-            font-size: 2.5rem;
-            text-shadow: 2px 2px 4px rgba(0,0,0,0.2);
-        }
-
-        .subtitle {
-            color: rgba(255,255,255,0.9);
-            text-align: center;
-            margin-bottom: 30px;
-            font-size: 1rem;
-        }
-
-        .status {
-            background: rgba(255,255,255,0.95);
-            padding: 15px;
-            border-radius: 10px;
-            margin-bottom: 20px;
-            box-shadow: 0 4px 6px rgba(0,0,0,0.1);
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-        }
-
-        .status-item {
-            display: flex;
-            align-items: center;
-            gap: 10px;
-        }
-
-        .status-indicator {
-            width: 12px;
-            height: 12px;
-            border-radius: 50%;
-            background: #10b981;
-            animation: pulse 2s infinite;
-        }
-
-        @keyframes pulse {
-            0%, 100% { opacity: 1; }
-            50% { opacity: 0.5; }
-        }
-
-        .add-model-btn {
-            background: linear-gradient(135deg, #10b981 0%, #059669 100%);
-            color: white;
-            border: none;
-            padding: 12px 24px;
-            border-radius: 8px;
-            font-size: 1rem;
-            font-weight: 600;
-            cursor: pointer;
-            display: flex;
-            align-items: center;
-            gap: 8px;
-            transition: transform 0.2s, box-shadow 0.2s;
-            box-shadow: 0 2px 4px rgba(0,0,0,0.1);
-        }
-
-        .add-model-btn:hover {
-            transform: translateY(-2px);
-            box-shadow: 0 4px 8px rgba(0,0,0,0.2);
-        }
-
-        .modal {
-            display: none;
-            position: fixed;
-            z-index: 1000;
-            left: 0;
-            top: 0;
-            width: 100%;
-            height: 100%;
-            background: rgba(0, 0, 0, 0.6);
-            backdrop-filter: blur(4px);
-        }
-
-        .modal.active {
-            display: flex;
-            align-items: center;
-            justify-content: center;
-        }
-
-        .modal-content {
-            background: white;
-            border-radius: 16px;
-            padding: 30px;
-            max-width: 700px;
-            width: 90%;
-            max-height: 80vh;
-            overflow-y: auto;
-            box-shadow: 0 20px 60px rgba(0,0,0,0.3);
-            animation: slideIn 0.3s ease-out;
-        }
-
-        @keyframes slideIn {
-            from {
-                opacity: 0;
-                transform: translateY(-20px);
-            }
-            to {
-                opacity: 1;
-                transform: translateY(0);
-            }
-        }
-
-        .modal-header {
-            display: flex;
-            justify-content: space-between;
-            align-items: center;
-            margin-bottom: 20px;
-            padding-bottom: 15px;
-            border-bottom: 2px solid #f0f0f0;
-        }
-
-        .modal-header h2 {
-            margin: 0;
-            color: #333;
-            font-size: 1.5rem;
-        }
-
-        .close-btn {
-            background: none;
-            border: none;
-            font-size: 2rem;
-            color: #999;
-            cursor: pointer;
-            line-height: 1;
-            padding: 0;
-            width: 32px;
-            height: 32px;
-            display: flex;
-            align-items: center;
-            justify-content: center;
-            border-radius: 50%;
-            transition: all 0.2s;
-        }
-
-        .close-btn:hover {
-            background: #f0f0f0;
-            color: #333;
-        }
-
-        .model-search {
-            width: 100%;
-            padding: 12px;
-            border: 2px solid #e5e7eb;
-            border-radius: 8px;
-            font-size: 1rem;
-            margin-bottom: 20px;
-            transition: border-color 0.2s;
-        }
-
-        .model-search:focus {
-            outline: none;
-            border-color: #667eea;
-        }
-
-        .model-list {
-            display: flex;
-            flex-direction: column;
-            gap: 8px;
-            max-height: 400px;
-            overflow-y: auto;
-        }
-
-        .model-item {
-            display: flex;
-            align-items: center;
-            padding: 12px;
-            border: 2px solid #e5e7eb;
-            border-radius: 8px;
-            cursor: pointer;
-            transition: all 0.2s;
-        }
-
-        .model-item:hover {
-            border-color: #667eea;
-            background: #f9fafb;
-        }
-
-        .model-item.selected {
-            border-color: #667eea;
-            background: linear-gradient(135deg, rgba(102, 126, 234, 0.1) 0%, rgba(118, 75, 162, 0.1) 100%);
-        }
-
-        .model-item input[type="checkbox"] {
-            width: 20px;
-            height: 20px;
-            margin-right: 12px;
-            cursor: pointer;
-            accent-color: #667eea;
-        }
-
-        .model-item-info {
-            flex: 1;
-        }
-
-        .model-item-id {
-            font-weight: 600;
-            color: #333;
-            font-size: 0.9rem;
-            margin-bottom: 2px;
-        }
-
-        .model-item-name {
-            color: #666;
-            font-size: 0.85rem;
-        }
-
-        .modal-actions {
-            margin-top: 20px;
-            display: flex;
-            gap: 12px;
-            justify-content: flex-end;
-            padding-top: 15px;
-            border-top: 2px solid #f0f0f0;
-        }
-
-        .btn {
-            padding: 10px 20px;
-            border: none;
-            border-radius: 8px;
-            font-size: 1rem;
-            font-weight: 600;
-            cursor: pointer;
-            transition: all 0.2s;
-        }
-
-        .btn-primary {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            color: white;
-        }
-
-        .btn-primary:hover {
-            transform: translateY(-1px);
-            box-shadow: 0 4px 8px rgba(102, 126, 234, 0.3);
-        }
-
-        .btn-secondary {
-            background: #e5e7eb;
-            color: #333;
-        }
-
-        .btn-secondary:hover {
-            background: #d1d5db;
-        }
-
-        .empty-state {
-            text-align: center;
-            padding: 60px 20px;
-            color: white;
-        }
-
-        .empty-state h2 {
-            font-size: 1.5rem;
-            margin-bottom: 10px;
-        }
-
-        .empty-state p {
-            font-size: 1rem;
-            opacity: 0.9;
-        }
-
-        .models-grid {
-            display: grid;
-            grid-template-columns: repeat(auto-fit, minmax(500px, 1fr));
-            gap: 20px;
-            margin-top: 20px;
-        }
-
-        .model-card {
-            background: white;
-            border-radius: 12px;
-            padding: 20px;
-            box-shadow: 0 4px 6px rgba(0,0,0,0.1);
-            transition: transform 0.2s, box-shadow 0.2s;
-        }
-
-        .model-card:hover {
-            transform: translateY(-2px);
-            box-shadow: 0 8px 12px rgba(0,0,0,0.15);
-        }
-
-        .model-header {
-            display: flex;
-            justify-content: space-between;
-            align-items: start;
-            margin-bottom: 15px;
-            border-bottom: 2px solid #f0f0f0;
-            padding-bottom: 10px;
-        }
-
-        .model-info {
-            flex: 1;
-        }
-
-        .model-id {
-            font-size: 0.9rem;
-            font-weight: 600;
-            color: #667eea;
-            margin-bottom: 4px;
-        }
-
-        .model-name {
-            font-size: 1.1rem;
-            font-weight: 500;
-            color: #333;
-            margin-bottom: 5px;
-        }
-
-        .model-context {
-            font-size: 0.85rem;
-            color: #666;
-        }
-
-        .pricing-current {
-            background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
-            color: white;
-            padding: 10px;
-            border-radius: 8px;
-            font-size: 0.75rem;
-            text-align: right;
-            min-width: 140px;
-        }
-
-        .pricing-row {
-            display: flex;
-            justify-content: space-between;
-            margin-bottom: 3px;
-        }
-
-        .chart-container {
-            position: relative;
-            height: 200px;
-            margin-top: 15px;
-        }
-
-        .error {
-            background: #fee;
-            color: #c33;
-            padding: 20px;
-            border-radius: 10px;
-            text-align: center;
-            margin: 20px 0;
-        }
-
-        .loading {
-            text-align: center;
-            color: white;
-            font-size: 1.2rem;
-            padding: 40px;
-        }
-
-        @media (max-width: 768px) {
-            .models-grid {
-                grid-template-columns: 1fr;
-            }
-            
-            h1 {
-                font-size: 1.8rem;
-            }
-        }
-        </style>
-    </head>
-    <body>
-        <div class="container">
-            <h1>🚀 Routstr Models Dashboard</h1>
-            <p class="subtitle">Live pricing updates every second</p>
-            <div class="status">
-                <div class="status-item">
-                    <span class="status-indicator"></span>
-                    <span>
-                        Connected to
-                        <strong>localhost:8000</strong>
-                    </span>
-                </div>
-                <div class="status-item">
-                    <span id="lastUpdate">Last update: --:--:--</span>
-                </div>
-                <div class="status-item">
-                    <span id="modelCount">Loading models...</span>
-                </div>
-                <button class="add-model-btn" id="addModelBtn">
-                    <span>➕</span>
-                    <span>Select Models</span>
-                </button>
-            </div>
-            <div id="error" class="error" style="display: none;"></div>
-            <div id="loading" class="loading">Loading models...</div>
-            <div id="emptyState" class="empty-state" style="display: none;">
-                <h2>No models selected</h2>
-                <p>Click "Select Models" button above to choose which models to monitor</p>
-            </div>
-            <div id="modelsGrid" class="models-grid"></div>
-        </div>
-        <div id="modelModal" class="modal">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h2>Select Models to Monitor</h2>
-                    <button class="close-btn" id="closeModal">&times;</button>
-                </div>
-                <input
-                    type="text"
-                    id="modelSearch"
-                    class="model-search"
-                    placeholder="Search models by ID or name..."
-                >
-                <div class="model-list" id="modelList"></div>
-                <div class="modal-actions">
-                    <button class="btn btn-secondary" id="cancelBtn">Cancel</button>
-                    <button class="btn btn-secondary" id="clearAllBtn">Clear All</button>
-                    <button class="btn btn-secondary" id="selectAllBtn">Select All</button>
-                    <button class="btn btn-primary" id="saveBtn">Save Selection</button>
-                </div>
-            </div>
-        </div>
-        <script>
-        const API_URL = 'http://localhost:8000/v1/models';
-        const UPDATE_INTERVAL = 1000;
-        const MAX_DATA_POINTS = 20;
-        const STORAGE_KEY = 'routstr_selected_models';
-
-        const charts = {};
-        const chartData = {};
-        let allModels = [];
-        let selectedModels = new Set(JSON.parse(localStorage.getItem(STORAGE_KEY) || '[]'));
-        let tempSelectedModels = new Set();
-
-        async function fetchModels() {
-            try {
-                const response = await fetch(API_URL);
-                if (!response.ok) {
-                    throw new Error(`HTTP error! status: ${response.status}`);
-                }
-                const data = await response.json();
-                return data.data || [];
-            } catch (error) {
-                console.error('Error fetching models:', error);
-                showError(`Failed to fetch models: ${error.message}`);
-                return null;
-            }
-        }
-
-        function showError(message) {
-            const errorDiv = document.getElementById('error');
-            errorDiv.textContent = message;
-            errorDiv.style.display = 'block';
-            document.getElementById('loading').style.display = 'none';
-        }
-
-        function hideError() {
-            document.getElementById('error').style.display = 'none';
-        }
-
-        function updateStatus(modelCount) {
-            const now = new Date();
-            const timeStr = now.toLocaleTimeString();
-            document.getElementById('lastUpdate').textContent = `Last update: ${timeStr}`;
-            document.getElementById('modelCount').textContent = `${modelCount} models`;
-        }
-
-        function formatNumber(num, decimals = 6) {
-            if (num === 0) return '0';
-            if (num < 0.000001) return num.toExponential(2);
-            return num.toFixed(decimals);
-        }
-
-        function initializeChartData(modelId) {
-            if (!chartData[modelId]) {
-                chartData[modelId] = {
-                    labels: [],
-                    usdPrompt: [],
-                    usdCompletion: [],
-                    satsPrompt: [],
-                    satsCompletion: []
-                };
-            }
-        }
-
-        function updateChartData(modelId, model) {
-            initializeChartData(modelId);
-            
-            const data = chartData[modelId];
-            const now = new Date();
-            const timeLabel = now.toLocaleTimeString();
-
-            data.labels.push(timeLabel);
-            data.usdPrompt.push(model.pricing?.prompt || 0);
-            data.usdCompletion.push(model.pricing?.completion || 0);
-            data.satsPrompt.push(model.sats_pricing?.prompt || 0);
-            data.satsCompletion.push(model.sats_pricing?.completion || 0);
-
-            if (data.labels.length > MAX_DATA_POINTS) {
-                data.labels.shift();
-                data.usdPrompt.shift();
-                data.usdCompletion.shift();
-                data.satsPrompt.shift();
-                data.satsCompletion.shift();
-            }
-
-            if (charts[modelId]) {
-                updateChart(modelId);
-            }
-        }
-
-        function createChart(canvasId, modelId) {
-            const ctx = document.getElementById(canvasId);
-            if (!ctx) return;
-
-            initializeChartData(modelId);
-            const data = chartData[modelId];
-
-            charts[modelId] = new Chart(ctx, {
-                type: 'line',
-                data: {
-                    labels: data.labels,
-                    datasets: [
-                        {
-                            label: 'USD Prompt',
-                            data: data.usdPrompt,
-                            borderColor: '#667eea',
-                            backgroundColor: 'rgba(102, 126, 234, 0.1)',
-                            borderWidth: 2,
-                            tension: 0.4,
-                            yAxisID: 'y'
-                        },
-                        {
-                            label: 'USD Completion',
-                            data: data.usdCompletion,
-                            borderColor: '#764ba2',
-                            backgroundColor: 'rgba(118, 75, 162, 0.1)',
-                            borderWidth: 2,
-                            tension: 0.4,
-                            yAxisID: 'y'
-                        },
-                        {
-                            label: 'Sats Prompt',
-                            data: data.satsPrompt,
-                            borderColor: '#f59e0b',
-                            backgroundColor: 'rgba(245, 158, 11, 0.1)',
-                            borderWidth: 2,
-                            tension: 0.4,
-                            yAxisID: 'y1'
-                        },
-                        {
-                            label: 'Sats Completion',
-                            data: data.satsCompletion,
-                            borderColor: '#ef4444',
-                            backgroundColor: 'rgba(239, 68, 68, 0.1)',
-                            borderWidth: 2,
-                            tension: 0.4,
-                            yAxisID: 'y1'
-                        }
-                    ]
-                },
-                options: {
-                    responsive: true,
-                    maintainAspectRatio: false,
-                    interaction: {
-                        mode: 'index',
-                        intersect: false
-                    },
-                    plugins: {
-                        legend: {
-                            display: true,
-                            position: 'bottom',
-                            labels: {
-                                boxWidth: 12,
-                                font: { size: 10 }
-                            }
-                        },
-                        tooltip: {
-                            backgroundColor: 'rgba(0, 0, 0, 0.8)',
-                            padding: 10,
-                            bodyFont: { size: 11 }
-                        }
-                    },
-                    scales: {
-                        x: {
-                            display: true,
-                            ticks: {
-                                maxRotation: 45,
-                                minRotation: 45,
-                                font: { size: 9 }
-                            }
-                        },
-                        y: {
-                            type: 'linear',
-                            display: true,
-                            position: 'left',
-                            title: {
-                                display: true,
-                                text: 'USD',
-                                font: { size: 10 }
-                            },
-                            ticks: {
-                                font: { size: 9 }
-                            }
-                        },
-                        y1: {
-                            type: 'linear',
-                            display: true,
-                            position: 'right',
-                            title: {
-                                display: true,
-                                text: 'Sats',
-                                font: { size: 10 }
-                            },
-                            ticks: {
-                                font: { size: 9 }
-                            },
-                            grid: {
-                                drawOnChartArea: false
-                            }
-                        }
-                    }
-                }
-            });
-        }
-
-        function updateChart(modelId) {
-            const chart = charts[modelId];
-            const data = chartData[modelId];
-            
-            if (!chart || !data) return;
-
-            chart.data.labels = data.labels;
-            chart.data.datasets[0].data = data.usdPrompt;
-            chart.data.datasets[1].data = data.usdCompletion;
-            chart.data.datasets[2].data = data.satsPrompt;
-            chart.data.datasets[3].data = data.satsCompletion;
-            chart.update('none');
-        }
-
-        function createModelCard(model) {
-            const cardDiv = document.createElement('div');
-            cardDiv.className = 'model-card';
-            cardDiv.id = `model-${model.id.replace(/[^a-z0-9]/gi, '-')}`;
-
-            const canvasId = `chart-${model.id.replace(/[^a-z0-9]/gi, '-')}`;
-
-            const usdPrompt = model.pricing?.prompt || 0;
-            const usdCompletion = model.pricing?.completion || 0;
-            const satsPrompt = model.sats_pricing?.prompt || 0;
-            const satsCompletion = model.sats_pricing?.completion || 0;
-
-            cardDiv.innerHTML = `
-                <div class="model-header">
-                    <div class="model-info">
-                        <div class="model-id">${model.id}</div>
-                        <div class="model-name">${model.name || model.id}</div>
-                        <div class="model-context">Context: ${(model.context_length || 0).toLocaleString()} tokens</div>
-                    </div>
-                    <div class="pricing-current">
-                        <div class="pricing-row">
-                            <span>USD Prompt:</span>
-                            <strong>${formatNumber(usdPrompt)}</strong>
-                        </div>
-                        <div class="pricing-row">
-                            <span>USD Compl:</span>
-                            <strong>${formatNumber(usdCompletion)}</strong>
-                        </div>
-                        <div class="pricing-row" style="margin-top: 5px; padding-top: 5px; border-top: 1px solid rgba(255,255,255,0.3);">
-                            <span>Sats Prompt:</span>
-                            <strong>${formatNumber(satsPrompt, 2)}</strong>
-                        </div>
-                        <div class="pricing-row">
-                            <span>Sats Compl:</span>
-                            <strong>${formatNumber(satsCompletion, 2)}</strong>
-                        </div>
-                    </div>
-                </div>
-                <div class="chart-container">
-                    <canvas id="${canvasId}"></canvas>
-                </div>
-            `;
-
-            return cardDiv;
-        }
-
-        function openModal() {
-            tempSelectedModels = new Set(selectedModels);
-            renderModalList(allModels);
-            document.getElementById('modelModal').classList.add('active');
-        }
-
-        function closeModal() {
-            document.getElementById('modelModal').classList.remove('active');
-            document.getElementById('modelSearch').value = '';
-        }
-
-        function saveSelection() {
-            selectedModels = new Set(tempSelectedModels);
-            localStorage.setItem(STORAGE_KEY, JSON.stringify([...selectedModels]));
-            closeModal();
-            renderDashboard();
-        }
-
-        function renderModalList(models) {
-            const modalList = document.getElementById('modelList');
-            modalList.innerHTML = '';
-
-            const searchTerm = document.getElementById('modelSearch').value.toLowerCase();
-            const filteredModels = models.filter(model => 
-                model.id.toLowerCase().includes(searchTerm) || 
-                (model.name && model.name.toLowerCase().includes(searchTerm))
-            );
-
-            filteredModels.forEach(model => {
-                const isSelected = tempSelectedModels.has(model.id);
-                const itemDiv = document.createElement('div');
-                itemDiv.className = `model-item ${isSelected ? 'selected' : ''}`;
-                itemDiv.innerHTML = `
-                    <input type="checkbox" ${isSelected ? 'checked' : ''} id="check-${model.id.replace(/[^a-z0-9]/gi, '-')}">
-                    <div class="model-item-info">
-                        <div class="model-item-id">${model.id}</div>
-                        <div class="model-item-name">${model.name || 'No name'}</div>
-                    </div>
-                `;
-                
-                itemDiv.addEventListener('click', (e) => {
-                    const checkbox = itemDiv.querySelector('input[type="checkbox"]');
-                    if (e.target !== checkbox) {
-                        checkbox.checked = !checkbox.checked;
-                    }
-                    
-                    if (checkbox.checked) {
-                        tempSelectedModels.add(model.id);
-                        itemDiv.classList.add('selected');
-                    } else {
-                        tempSelectedModels.delete(model.id);
-                        itemDiv.classList.remove('selected');
-                    }
-                });
-                
-                modalList.appendChild(itemDiv);
-            });
-
-            if (filteredModels.length === 0) {
-                modalList.innerHTML = '<div style="padding: 40px; text-align: center; color: #999;">No models found</div>';
-            }
-        }
-
-        function renderDashboard() {
-            const grid = document.getElementById('modelsGrid');
-            const emptyState = document.getElementById('emptyState');
-            
-            if (selectedModels.size === 0) {
-                grid.style.display = 'none';
-                emptyState.style.display = 'block';
-                return;
-            }
-            
-            grid.style.display = 'grid';
-            emptyState.style.display = 'none';
-            
-            const existingCards = Array.from(grid.children);
-            existingCards.forEach(card => {
-                const modelId = card.id.replace('model-', '').replace(/-/g, '/');
-                const actualModelId = allModels.find(m => 
-                    m.id.replace(/[^a-z0-9]/gi, '-') === card.id.replace('model-', '')
-                )?.id;
-                
-                if (actualModelId && !selectedModels.has(actualModelId)) {
-                    if (charts[actualModelId]) {
-                        charts[actualModelId].destroy();
-                        delete charts[actualModelId];
-                    }
-                    card.remove();
-                }
-            });
-        }
-
-        async function updateModels() {
-            const models = await fetchModels();
-            
-            if (!models) {
-                return;
-            }
-
-            allModels = models;
-            hideError();
-            document.getElementById('loading').style.display = 'none';
-            updateStatus(models.length);
-
-            const grid = document.getElementById('modelsGrid');
-            const emptyState = document.getElementById('emptyState');
-
-            if (selectedModels.size === 0) {
-                grid.style.display = 'none';
-                emptyState.style.display = 'block';
-                return;
-            }
-
-            grid.style.display = 'grid';
-            emptyState.style.display = 'none';
-
-            const selectedModelObjects = models.filter(model => selectedModels.has(model.id));
-
-            selectedModelObjects.forEach(model => {
-                const modelId = model.id;
-                const cardId = `model-${modelId.replace(/[^a-z0-9]/gi, '-')}`;
-                const canvasId = `chart-${modelId.replace(/[^a-z0-9]/gi, '-')}`;
-                
-                updateChartData(modelId, model);
-
-                if (!document.getElementById(cardId)) {
-                    const card = createModelCard(model);
-                    grid.appendChild(card);
-                    
-                    setTimeout(() => {
-                        createChart(canvasId, modelId);
-                    }, 100);
-                } else {
-                    const pricingDiv = document.querySelector(`#${cardId} .pricing-current`);
-                    if (pricingDiv) {
-                        const usdPrompt = model.pricing?.prompt || 0;
-                        const usdCompletion = model.pricing?.completion || 0;
-                        const satsPrompt = model.sats_pricing?.prompt || 0;
-                        const satsCompletion = model.sats_pricing?.completion || 0;
-
-                        pricingDiv.innerHTML = `
-                            <div class="pricing-row">
-                                <span>USD Prompt:</span>
-                                <strong>${formatNumber(usdPrompt)}</strong>
-                            </div>
-                            <div class="pricing-row">
-                                <span>USD Compl:</span>
-                                <strong>${formatNumber(usdCompletion)}</strong>
-                            </div>
-                            <div class="pricing-row" style="margin-top: 5px; padding-top: 5px; border-top: 1px solid rgba(255,255,255,0.3);">
-                                <span>Sats Prompt:</span>
-                                <strong>${formatNumber(satsPrompt, 2)}</strong>
-                            </div>
-                            <div class="pricing-row">
-                                <span>Sats Compl:</span>
-                                <strong>${formatNumber(satsCompletion, 2)}</strong>
-                            </div>
-                        `;
-                    }
-                }
-            });
-        }
-
-        document.getElementById('addModelBtn').addEventListener('click', openModal);
-        document.getElementById('closeModal').addEventListener('click', closeModal);
-        document.getElementById('cancelBtn').addEventListener('click', closeModal);
-        document.getElementById('saveBtn').addEventListener('click', saveSelection);
-        
-        document.getElementById('selectAllBtn').addEventListener('click', () => {
-            allModels.forEach(model => tempSelectedModels.add(model.id));
-            renderModalList(allModels);
-        });
-        
-        document.getElementById('clearAllBtn').addEventListener('click', () => {
-            tempSelectedModels.clear();q
-            renderModalList(allModels);
-        });
-        
-        document.getElementById('modelSearch').addEventListener('input', () => {
-            renderModalList(allModels);
-        });
-        
-        document.getElementById('modelModal').addEventListener('click', (e) => {
-            if (e.target.id === 'modelModal') {
-                closeModal();
-            }
-        });
-
-        updateModels();
-        setInterval(updateModels, UPDATE_INTERVAL);
-        </script>
-    </body>
-</html>

tests/integration/conftest.py

@@ -63,8 +63,6 @@ else:
 
 # Set test environment variables before importing the app
 os.environ.update(test_env)
-os.environ.pop("ADMIN_PASSWORD", None)
-
 
 from routstr.core.db import ApiKey, get_session  # noqa: E402
 from routstr.core.main import app, lifespan  # noqa: E402
@@ -512,26 +510,22 @@ async def integration_app(
         from routstr.core.settings import settings as _settings
 
         # Passthrough discounted max cost to avoid dependence on MODELS in tests
-        async def _passthrough_discount(
-            max_cost_for_model: int,
-            body: dict,
-            model_obj: Any = None,
-        ) -> int:
+        def _passthrough_discount(max_cost_for_model: int, body: dict) -> int:
             return max_cost_for_model
 
         with (
             patch("routstr.core.db.engine", integration_engine),
             patch.object(_settings, "cashu_mints", [mint_url]),
+            patch("routstr.auth.credit_balance", testmint_wallet.credit_balance),
             patch("routstr.wallet.credit_balance", testmint_wallet.credit_balance),
+            patch("routstr.balance.credit_balance", testmint_wallet.credit_balance),
             patch("routstr.wallet.send_token", testmint_wallet.send_token),
-            patch("routstr.wallet.send_to_lnurl", testmint_wallet.send_to_lnurl),
+            patch("routstr.balance.send_token", testmint_wallet.send_token),
             patch("routstr.wallet.recieve_token", testmint_wallet.redeem_token),
             patch("routstr.wallet.get_balance", testmint_wallet.get_balance),
-            patch("routstr.balance.send_token", testmint_wallet.send_token),
-            patch("routstr.balance.send_to_lnurl", testmint_wallet.send_to_lnurl),
             patch("websockets.connect") as mock_websockets,
-            patch("routstr.payment.price.btc_usd_price", return_value=50000.0),
-            patch("routstr.payment.price.sats_usd_price", return_value=0.0005),
+            patch("routstr.payment.price.btc_usd_ask_price", return_value=50000.0),
+            patch("routstr.payment.price.sats_usd_ask_price", return_value=0.0005),
             patch(
                 "routstr.payment.helpers.calculate_discounted_max_cost",
                 side_effect=_passthrough_discount,

tests/integration/test_background_tasks.py

@@ -24,8 +24,8 @@ class TestPricingUpdateTask:
         mock_sats_usd = 0.00002  # 1 sat = $0.00002 (BTC at $50,000)
 
         with patch(
-            "routstr.payment.price.sats_usd_price",
-            return_value=mock_sats_usd,
+            "routstr.payment.price.sats_usd_ask_price",
+            AsyncMock(return_value=mock_sats_usd),
         ):
             # Create a test model
             test_model = Model(  # type: ignore[arg-type]
@@ -112,7 +112,7 @@ class TestPricingUpdateTask:
                 raise Exception("Price API error")
             return 0.00002
 
-        with patch("routstr.payment.price.sats_usd_price", mock_price_func):
+        with patch("routstr.payment.price.sats_usd_ask_price", mock_price_func):
             # Test the retry behavior directly
             # First call should fail
             try:
@@ -159,8 +159,8 @@ class TestPricingUpdateTask:
 
         # Initialize pricing once to ensure consistent state
         with patch(
-            "routstr.payment.price.sats_usd_price",
-            return_value=0.00002,
+            "routstr.payment.price.sats_usd_ask_price",
+            AsyncMock(return_value=0.00002),
         ):
             sats_to_usd = 0.00002
             _pdict = {k: v / sats_to_usd for k, v in test_model.pricing.dict().items()}

tests/integration/test_error_handling_edge_cases.py

@@ -48,7 +48,7 @@ class TestNetworkFailureScenarios:
     ) -> None:
         """Test proxy behavior when upstream LLM service is down"""
         # Mock at the routstr level to simulate upstream being down
-        with patch("httpx.AsyncClient") as mock_client_class:
+        with patch("routstr.proxy.httpx.AsyncClient") as mock_client_class:
             # Create a mock client instance
             mock_client = AsyncMock()
             mock_client_class.return_value = mock_client
@@ -70,8 +70,7 @@ class TestNetworkFailureScenarios:
             )
 
             # Should get appropriate error (502 for upstream error)
-            # Note: After refactor, may get 400 if model validation happens first
-            assert response.status_code in [400, 502]
+            assert response.status_code == 502
             # Error detail depends on implementation
 
     @pytest.mark.asyncio
@@ -675,15 +674,14 @@ class TestEdgeCaseCombinations:
 
         responses = await asyncio.gather(*tasks, return_exceptions=True)
 
-        # Some should succeed, others should fail with 402 or 400
-        # Note: After refactor, model validation may happen first (400 instead of 402)
+        # Some should succeed, others should fail with 402
         insufficient_funds_count = sum(  # type: ignore[misc]
             1  # type: ignore[misc]
             for r in responses
-            if not isinstance(r, Exception) and r.status_code in [402, 400]  # type: ignore[union-attr]
+            if not isinstance(r, Exception) and r.status_code == 402  # type: ignore[union-attr]
         )
 
-        # At least one should fail due to insufficient funds or model validation
+        # At least one should fail due to insufficient funds
         assert insufficient_funds_count > 0
 
         # Balance should never go negative

tests/integration/test_general_info_endpoints.py

@@ -28,7 +28,7 @@ async def test_root_endpoint_structure_and_performance(
     responses = []
     for i in range(10):
         start = validator.start_timing("root_endpoint")
-        response = await integration_client.get("/v1/info")
+        response = await integration_client.get("/")
         duration = validator.end_timing("root_endpoint", start)
         responses.append(response)
 
@@ -100,7 +100,7 @@ async def test_root_endpoint_environment_variables(
 ) -> None:
     """Test that root endpoint reflects environment variable configuration"""
 
-    response = await integration_client.get("/v1/info")
+    response = await integration_client.get("/")
     assert response.status_code == 200
 
     data = response.json()
@@ -271,20 +271,88 @@ async def test_models_endpoint_accept_headers(integration_client: AsyncClient) -
 async def test_admin_endpoint_unauthenticated(
     integration_client: AsyncClient, db_snapshot: Any
 ) -> None:
-    """Test GET /admin/ endpoint redirects to /"""
+    """Test GET /admin/ endpoint without authentication"""
+
+    # Capture initial database state
     await db_snapshot.capture()
 
     response = await integration_client.get("/admin/")
 
-    assert response.status_code == 307
-    assert response.headers.get("location") == "/"
+    # Should return 200 with login form (not 401/403)
+    assert response.status_code == 200
+    assert "text/html" in response.headers["content-type"]
 
+    # Response should be HTML
+    html_content = response.text
+    assert "<!DOCTYPE html>" in html_content
+    assert "<html>" in html_content
+
+    # Either shows login form or message about setting ADMIN_PASSWORD
+    if "ADMIN_PASSWORD" in html_content:
+        # When ADMIN_PASSWORD is not set, it shows a message
+        assert "Please set a secure ADMIN_PASSWORD" in html_content
+    else:
+        # When ADMIN_PASSWORD is set, it shows a login form
+        assert "<form" in html_content
+        assert 'type="password"' in html_content
+        assert "password" in html_content.lower()
+        assert "login" in html_content.lower()
+        # Should have JavaScript for form handling
+        assert "<script>" in html_content or "<script " in html_content
+
+    # Verify no database state changes
     diff = await db_snapshot.diff()
     assert len(diff["api_keys"]["added"]) == 0
     assert len(diff["api_keys"]["removed"]) == 0
     assert len(diff["api_keys"]["modified"]) == 0
 
 
+@pytest.mark.integration
+@pytest.mark.asyncio
+async def test_admin_endpoint_html_structure(integration_client: AsyncClient) -> None:
+    """Test admin endpoint returns valid HTML structure"""
+
+    response = await integration_client.get("/admin/")
+    assert response.status_code == 200
+
+    html_content = response.text
+
+    # Validate HTML structure
+    assert html_content.startswith("<!DOCTYPE html>")
+    assert "<html>" in html_content and "</html>" in html_content
+    assert "<head>" in html_content and "</head>" in html_content
+    assert "<body>" in html_content and "</body>" in html_content
+
+    # Should have CSS styling
+    assert "<style>" in html_content or "<link" in html_content
+
+    # Should have admin-related content
+    assert any(word in html_content.lower() for word in ["admin", "password", "login"])
+
+
+@pytest.mark.integration
+@pytest.mark.asyncio
+async def test_admin_endpoint_accept_headers(integration_client: AsyncClient) -> None:
+    """Test admin endpoint always returns HTML regardless of Accept headers"""
+
+    # Test with JSON accept header
+    response = await integration_client.get(
+        "/admin/", headers={"Accept": "application/json"}
+    )
+    assert response.status_code == 200
+    assert "text/html" in response.headers["content-type"]
+
+    # Test with wildcard
+    response = await integration_client.get("/admin/", headers={"Accept": "*/*"})
+    assert response.status_code == 200
+    assert "text/html" in response.headers["content-type"]
+
+    # Test with no accept header
+    response = await integration_client.get("/admin/")
+    assert response.status_code == 200
+    assert "text/html" in response.headers["content-type"]
+
+
 @pytest.mark.integration
 @pytest.mark.asyncio
 async def test_all_info_endpoints_no_database_changes(
@@ -296,7 +364,7 @@ async def test_all_info_endpoints_no_database_changes(
     initial_state = await db_snapshot.capture()
 
     # Make requests to all info endpoints
-    endpoints = ["/v1/info", "/v1/models"]
+    endpoints = ["/", "/v1/models", "/admin/"]
 
     for endpoint in endpoints:
         response = await integration_client.get(endpoint)
@@ -330,11 +398,9 @@ async def test_concurrent_info_endpoint_requests(
 
     # Create concurrent requests to all endpoints
     requests = []
-    for endpoint in ["/", "/v1/models"]:
+    for endpoint in ["/", "/v1/models", "/admin/"]:
         for _ in range(5):  # 5 requests per endpoint
-            # Use /v1/info instead of / for JSON API
-            url = "/v1/info" if endpoint == "/" else endpoint
-            requests.append({"method": "GET", "url": url})
+            requests.append({"method": "GET", "url": endpoint})
 
     # Execute concurrently
     tester = ConcurrencyTester()
@@ -343,10 +409,15 @@ async def test_concurrent_info_endpoint_requests(
     )
 
     # All should succeed
-    assert len(responses) == 10  # 2 endpoints × 5 requests each
+    assert len(responses) == 15  # 3 endpoints × 5 requests each
     for response in responses:
         assert response.status_code == 200
-        assert "application/json" in response.headers["content-type"]
+
+        # Verify content type based on endpoint
+        if "/admin/" in str(response.url):
+            assert "text/html" in response.headers["content-type"]
+        else:
+            assert "application/json" in response.headers["content-type"]
 
 
 @pytest.mark.integration
@@ -359,7 +430,7 @@ async def test_info_endpoints_response_consistency(
     # Test root endpoint consistency
     responses = []
     for _ in range(5):
-        response = await integration_client.get("/v1/info")
+        response = await integration_client.get("/")
         assert response.status_code == 200
         responses.append(response.json())
 

tests/integration/test_proxy_get_endpoints.py

@@ -177,25 +177,19 @@ async def test_proxy_get_unauthorized_access(integration_client: AsyncClient) ->
     )
     assert response.status_code == 401
 
-    # Test 3: POST with invalid API key
-    # Note: After refactor, model validation may happen before auth validation
-    # resulting in 400 (model not found) instead of 401 (unauthorized)
-    # This is documented in test_findings.md as a potential issue
+    # Test 3: POST with invalid API key should return 401
     invalid_headers = {"Authorization": "Bearer invalid-api-key"}
     response = await integration_client.post(
-        "/v1/chat/completions",
-        headers=invalid_headers,
-        json={"model": "gpt-4", "messages": []},
+        "/v1/chat/completions", headers=invalid_headers, json={"test": "data"}
     )
-    assert response.status_code in [400, 401]  # Accept both for now
+    assert response.status_code == 401
 
-    # Test 4: Malformed authorization header for POST
-    # Note: Same validation order issue as Test 3
+    # Test 4: Malformed authorization header for POST returns 401
     malformed_headers = {"Authorization": "NotBearer token"}
     response = await integration_client.post(
         "/v1/chat/completions", headers=malformed_headers, json={"test": "data"}
     )
-    assert response.status_code in [400, 401]  # Accept both for now
+    assert response.status_code == 401  # System treats malformed auth as unauthorized
 
 
 @pytest.mark.integration

tests/integration/test_proxy_post_endpoints.py

@@ -276,10 +276,8 @@ async def test_proxy_post_unauthorized_access(integration_client: AsyncClient) -
     }
 
     # No auth header
-    # Note: After refactor, model validation may happen before auth validation
-    # resulting in 400 (model not found) instead of 401 (unauthorized)
     response = await integration_client.post("/v1/chat/completions", json=test_payload)
-    assert response.status_code in [400, 401]
+    assert response.status_code == 401
 
     # Invalid auth
     response = await integration_client.post(
@@ -287,7 +285,7 @@ async def test_proxy_post_unauthorized_access(integration_client: AsyncClient) -
         json=test_payload,
         headers={"Authorization": "Bearer invalid-key"},
     )
-    assert response.status_code in [400, 401]
+    assert response.status_code == 401
 
 
 @pytest.mark.integration

tests/unit/test_algorithm.py

@@ -1,199 +0,0 @@
-"""Tests for the model prioritization algorithm."""
-
-import os
-from unittest.mock import Mock
-
-# Set required env vars before importing
-os.environ["UPSTREAM_BASE_URL"] = "http://test"
-os.environ["UPSTREAM_API_KEY"] = "test"
-
-from routstr.algorithm import (  # noqa: E402
-    calculate_model_cost_score,
-    get_provider_penalty,
-    should_prefer_model,
-)
-from routstr.payment.models import Architecture, Model, Pricing  # noqa: E402
-
-
-def create_test_model(
-    model_id: str,
-    prompt_price: float = 0.001,
-    completion_price: float = 0.002,
-    request_price: float = 0.0,
-) -> Model:
-    """Helper to create a test model with given pricing."""
-    return Model(
-        id=model_id,
-        name=f"Test {model_id}",
-        created=1234567890,
-        description="Test model",
-        context_length=8192,
-        architecture=Architecture(
-            modality="text",
-            input_modalities=["text"],
-            output_modalities=["text"],
-            tokenizer="gpt",
-            instruct_type=None,
-        ),
-        pricing=Pricing(
-            prompt=prompt_price,
-            completion=completion_price,
-            request=request_price,
-            image=0.0,
-            web_search=0.0,
-            internal_reasoning=0.0,
-        ),
-    )
-
-
-def create_test_provider(name: str, base_url: str = "http://test.com") -> Mock:
-    """Helper to create a test provider mock."""
-    provider = Mock()
-    provider.provider_type = name
-    provider.base_url = base_url
-    return provider
-
-
-def test_calculate_model_cost_score_basic() -> None:
-    """Test basic cost calculation."""
-    model = create_test_model("test-model", prompt_price=0.001, completion_price=0.002)
-    cost = calculate_model_cost_score(model)
-
-    # Expected: (1000 tokens * 0.001) + (500 tokens * 0.002) = 0.001 + 0.001 = 0.002
-    assert cost == 0.002
-
-
-def test_calculate_model_cost_score_with_request_fee() -> None:
-    """Test cost calculation with request fee."""
-    model = create_test_model(
-        "test-model",
-        prompt_price=0.001,
-        completion_price=0.002,
-        request_price=0.0005,
-    )
-    cost = calculate_model_cost_score(model)
-
-    # Expected: 0.001 + 0.001 + 0.0005 = 0.0025
-    assert cost == 0.0025
-
-
-def test_calculate_model_cost_score_expensive_model() -> None:
-    """Test cost calculation for expensive model."""
-    model = create_test_model(
-        "expensive-model", prompt_price=0.03, completion_price=0.06
-    )
-    cost = calculate_model_cost_score(model)
-
-    # Expected: (1000 * 0.03) + (500 * 0.06) = 0.03 + 0.03 = 0.06
-    assert cost == 0.06
-
-
-def test_get_provider_penalty_regular_provider() -> None:
-    """Test penalty for regular provider."""
-    provider = create_test_provider("regular-provider", "http://provider.com")
-    penalty = get_provider_penalty(provider)
-    assert penalty == 1.0
-
-
-def test_get_provider_penalty_openrouter() -> None:
-    """Test penalty for OpenRouter."""
-    provider = create_test_provider("openrouter", "https://openrouter.ai/api/v1")
-    penalty = get_provider_penalty(provider)
-    assert penalty == 1.001
-
-
-def test_should_prefer_model_cheaper_wins() -> None:
-    """Test that cheaper model is preferred."""
-    cheap_model = create_test_model("cheap", prompt_price=0.001, completion_price=0.002)
-    expensive_model = create_test_model(
-        "expensive", prompt_price=0.03, completion_price=0.06
-    )
-
-    provider1 = create_test_provider("provider1")
-    provider2 = create_test_provider("provider2")
-
-    # Cheaper model should win
-    assert should_prefer_model(
-        cheap_model, provider1, expensive_model, provider2, "test-alias"
-    )
-
-    # More expensive model should not win
-    assert not should_prefer_model(
-        expensive_model, provider2, cheap_model, provider1, "test-alias"
-    )
-
-
-def test_should_prefer_model_exact_match_wins() -> None:
-    """Test that exact alias match beats cheaper price."""
-    # Make model IDs match the alias differently
-    exact_match = create_test_model(
-        "test-model", prompt_price=0.03, completion_price=0.06
-    )
-    no_match = create_test_model(
-        "other-model", prompt_price=0.001, completion_price=0.002
-    )
-
-    provider1 = create_test_provider("provider1")
-    provider2 = create_test_provider("provider2")
-
-    # Exact match should win even though it's more expensive
-    assert should_prefer_model(
-        exact_match, provider1, no_match, provider2, "test-model"
-    )
-
-
-def test_should_prefer_model_openrouter_slight_penalty() -> None:
-    """Test that OpenRouter has slight penalty compared to other providers."""
-    model1 = create_test_model("model1", prompt_price=0.001, completion_price=0.002)
-    model2 = create_test_model("model2", prompt_price=0.001, completion_price=0.002)
-
-    regular_provider = create_test_provider("regular", "http://provider.com")
-    openrouter_provider = create_test_provider(
-        "openrouter", "https://openrouter.ai/api/v1"
-    )
-
-    # Regular provider should be preferred over OpenRouter at same cost
-    assert should_prefer_model(
-        model1, regular_provider, model2, openrouter_provider, "test-alias"
-    )
-
-    # OpenRouter should not replace regular provider at same cost
-    assert not should_prefer_model(
-        model2, openrouter_provider, model1, regular_provider, "test-alias"
-    )
-
-
-def test_should_prefer_model_openrouter_can_win_if_cheaper() -> None:
-    """Test that OpenRouter can still win if significantly cheaper."""
-    cheap_model = create_test_model(
-        "cheap", prompt_price=0.0001, completion_price=0.0002
-    )
-    expensive_model = create_test_model(
-        "expensive", prompt_price=0.03, completion_price=0.06
-    )
-
-    regular_provider = create_test_provider("regular", "http://provider.com")
-    openrouter_provider = create_test_provider(
-        "openrouter", "https://openrouter.ai/api/v1"
-    )
-
-    # OpenRouter should win if it's much cheaper (even with penalty)
-    assert should_prefer_model(
-        cheap_model,
-        openrouter_provider,
-        expensive_model,
-        regular_provider,
-        "test-alias",
-    )
-
-
-def test_should_prefer_model_same_cost_first_wins() -> None:
-    """Test that when costs are identical, current model is kept."""
-    model1 = create_test_model("model1", prompt_price=0.001, completion_price=0.002)
-    model2 = create_test_model("model2", prompt_price=0.001, completion_price=0.002)
-
-    provider1 = create_test_provider("provider1")
-    provider2 = create_test_provider("provider2")
-
-    # When costs are equal, should not replace
-    assert not should_prefer_model(model2, provider2, model1, provider1, "test-alias")

tests/unit/test_fee_consistency.py

@@ -1,155 +0,0 @@
-"""Unit tests for model row payload conversion.
-
-This module tests that _model_to_row_payload correctly serializes model data
-for database storage. Pricing is stored as-is without fee application.
-Fees are now applied per-provider when reading from the database.
-
-Key behaviors tested:
-1. Pricing is stored as-is without fee application
-2. All model fields are correctly serialized to JSON
-3. Optional fields are handled correctly (None values)
-4. Pricing structure is preserved
-5. Original model objects are not mutated
-"""
-
-import json
-import os
-
-import pytest
-
-# Set required env vars before importing
-os.environ["UPSTREAM_BASE_URL"] = "http://test"
-os.environ["UPSTREAM_API_KEY"] = "test"
-
-from routstr.payment.models import (  # noqa: E402
-    Architecture,
-    Model,
-    Pricing,
-    _model_to_row_payload,
-)
-
-
-@pytest.fixture
-def base_architecture() -> Architecture:
-    """Provide standard architecture for test models."""
-    return Architecture(
-        modality="text",
-        input_modalities=["text"],
-        output_modalities=["text"],
-        tokenizer="gpt",
-        instruct_type="chat",
-    )
-
-
-@pytest.fixture
-def standard_pricing() -> Pricing:
-    """Provide standard USD pricing with known values for testing."""
-    return Pricing(
-        prompt=0.001,
-        completion=0.002,
-        request=0.01,
-        image=0.05,
-        web_search=0.03,
-        internal_reasoning=0.015,
-        max_prompt_cost=10.0,
-        max_completion_cost=20.0,
-        max_cost=30.0,
-    )
-
-
-@pytest.fixture
-def standard_model(base_architecture: Architecture, standard_pricing: Pricing) -> Model:
-    """Create a standard test model with known pricing."""
-    return Model(
-        id="test-model-standard",
-        name="Test Model Standard",
-        created=1234567890,
-        description="A standard test model",
-        context_length=8192,
-        architecture=base_architecture,
-        pricing=standard_pricing,
-    )
-
-
-def test_pricing_stored_without_fees(standard_model: Model) -> None:
-    """Verify pricing is stored as-is without any fee application."""
-    payload = _model_to_row_payload(standard_model)
-    pricing_str = payload["pricing"]
-    assert isinstance(pricing_str, str)
-    pricing = json.loads(pricing_str)
-
-    assert pricing["prompt"] == pytest.approx(0.001, rel=1e-9)
-    assert pricing["completion"] == pytest.approx(0.002, rel=1e-9)
-    assert pricing["request"] == pytest.approx(0.01, rel=1e-9)
-    assert pricing["image"] == pytest.approx(0.05, rel=1e-9)
-    assert pricing["web_search"] == pytest.approx(0.03, rel=1e-9)
-    assert pricing["internal_reasoning"] == pytest.approx(0.015, rel=1e-9)
-    assert pricing["max_prompt_cost"] == pytest.approx(10.0, rel=1e-9)
-    assert pricing["max_completion_cost"] == pytest.approx(20.0, rel=1e-9)
-    assert pricing["max_cost"] == pytest.approx(30.0, rel=1e-9)
-
-
-def test_zero_value_pricing_fields(base_architecture: Architecture) -> None:
-    """Verify that zero-value pricing fields are stored correctly."""
-    zero_pricing = Pricing(
-        prompt=0.0,
-        completion=0.0,
-        request=0.0,
-        image=0.0,
-        web_search=0.0,
-        internal_reasoning=0.0,
-        max_prompt_cost=0.0,
-        max_completion_cost=0.0,
-        max_cost=0.0,
-    )
-
-    model = Model(
-        id="test-model-zero",
-        name="Test Model Zero",
-        created=1234567890,
-        description="A model with zero pricing",
-        context_length=8192,
-        architecture=base_architecture,
-        pricing=zero_pricing,
-    )
-
-    payload = _model_to_row_payload(model)
-    pricing_str = payload["pricing"]
-    assert isinstance(pricing_str, str)
-    pricing = json.loads(pricing_str)
-
-    assert pricing["prompt"] == pytest.approx(0.0, rel=1e-9)
-    assert pricing["completion"] == pytest.approx(0.0, rel=1e-9)
-    assert pricing["request"] == pytest.approx(0.0, rel=1e-9)
-
-
-def test_payload_structure_unchanged(standard_model: Model) -> None:
-    """Verify that payload structure matches expectations."""
-    payload = _model_to_row_payload(standard_model)
-
-    assert "id" in payload
-    assert "name" in payload
-    assert "created" in payload
-    assert "description" in payload
-    assert "context_length" in payload
-    assert "architecture" in payload
-    assert "pricing" in payload
-    assert "sats_pricing" in payload
-    assert "per_request_limits" in payload
-    assert "top_provider" in payload
-    assert "enabled" in payload
-    assert "upstream_provider_id" in payload
-
-    assert isinstance(payload["architecture"], str)
-    assert isinstance(payload["pricing"], str)
-
-
-def test_original_model_not_mutated(standard_model: Model) -> None:
-    """Verify that the original model object is not mutated."""
-    original_prompt = standard_model.pricing.prompt
-    original_completion = standard_model.pricing.completion
-
-    _model_to_row_payload(standard_model)
-
-    assert standard_model.pricing.prompt == original_prompt
-    assert standard_model.pricing.completion == original_completion

tests/unit/test_image_tokens.py

@@ -1,189 +0,0 @@
-import base64
-from io import BytesIO
-
-import pytest
-from PIL import Image
-
-from routstr.payment.helpers import (
-    _calculate_image_tokens,
-    _get_image_dimensions,
-    estimate_image_tokens_in_messages,
-)
-
-
-def create_test_image(width: int, height: int) -> bytes:
-    """Create a test image with specified dimensions."""
-    img = Image.new("RGB", (width, height), color="red")
-    buffer = BytesIO()
-    img.save(buffer, format="JPEG")
-    return buffer.getvalue()
-
-
-def test_calculate_image_tokens_low_detail() -> None:
-    """Test that low detail images always return 85 tokens."""
-    assert _calculate_image_tokens(100, 100, "low") == 85
-    assert _calculate_image_tokens(1000, 1000, "low") == 85
-    assert _calculate_image_tokens(2048, 2048, "low") == 85
-
-
-def test_calculate_image_tokens_high_detail_small() -> None:
-    """Test token calculation for small images."""
-    tokens = _calculate_image_tokens(512, 512, "high")
-    assert tokens == 85 + 170
-
-
-def test_calculate_image_tokens_high_detail_large() -> None:
-    """Test token calculation for large images that need tiling."""
-    tokens = _calculate_image_tokens(768, 768, "high")
-    assert tokens > 85
-
-
-def test_calculate_image_tokens_auto() -> None:
-    """Test that auto detail behaves like high detail."""
-    width, height = 512, 512
-    auto_tokens = _calculate_image_tokens(width, height, "auto")
-    high_tokens = _calculate_image_tokens(width, height, "high")
-    assert auto_tokens == high_tokens
-
-
-def test_get_image_dimensions() -> None:
-    """Test extracting dimensions from image bytes."""
-    image_bytes = create_test_image(800, 600)
-    width, height = _get_image_dimensions(image_bytes)
-    assert width == 800
-    assert height == 600
-
-
-def test_get_image_dimensions_invalid() -> None:
-    """Test that invalid image data returns default dimensions."""
-    invalid_bytes = b"not an image"
-    width, height = _get_image_dimensions(invalid_bytes)
-    assert width == 512
-    assert height == 512
-
-
-@pytest.mark.asyncio
-async def test_estimate_image_tokens_base64() -> None:
-    """Test estimating tokens for base64 encoded images."""
-    image_bytes = create_test_image(512, 512)
-    base64_image = base64.b64encode(image_bytes).decode("utf-8")
-
-    messages = [
-        {
-            "role": "user",
-            "content": [
-                {"type": "text", "text": "What's in this image?"},
-                {
-                    "type": "image_url",
-                    "image_url": {"url": f"data:image/jpeg;base64,{base64_image}"},
-                },
-            ],
-        }
-    ]
-
-    tokens = await estimate_image_tokens_in_messages(messages)
-    assert tokens > 0
-
-
-@pytest.mark.asyncio
-async def test_estimate_image_tokens_multiple_images() -> None:
-    """Test estimating tokens for multiple images."""
-    image_bytes = create_test_image(512, 512)
-    base64_image = base64.b64encode(image_bytes).decode("utf-8")
-
-    messages = [
-        {
-            "role": "user",
-            "content": [
-                {"type": "text", "text": "Compare these images"},
-                {
-                    "type": "image_url",
-                    "image_url": {"url": f"data:image/jpeg;base64,{base64_image}"},
-                },
-                {
-                    "type": "image_url",
-                    "image_url": {"url": f"data:image/jpeg;base64,{base64_image}"},
-                },
-            ],
-        }
-    ]
-
-    tokens = await estimate_image_tokens_in_messages(messages)
-    assert tokens > 0
-
-
-@pytest.mark.asyncio
-async def test_estimate_image_tokens_with_detail() -> None:
-    """Test that detail parameter affects token calculation."""
-    image_bytes = create_test_image(512, 512)
-    base64_image = base64.b64encode(image_bytes).decode("utf-8")
-
-    messages_low = [
-        {
-            "role": "user",
-            "content": [
-                {
-                    "type": "image_url",
-                    "image_url": {
-                        "url": f"data:image/jpeg;base64,{base64_image}",
-                        "detail": "low",
-                    },
-                },
-            ],
-        }
-    ]
-
-    messages_high = [
-        {
-            "role": "user",
-            "content": [
-                {
-                    "type": "image_url",
-                    "image_url": {
-                        "url": f"data:image/jpeg;base64,{base64_image}",
-                        "detail": "high",
-                    },
-                },
-            ],
-        }
-    ]
-
-    tokens_low = await estimate_image_tokens_in_messages(messages_low)
-    tokens_high = await estimate_image_tokens_in_messages(messages_high)
-
-    assert tokens_low == 85
-    assert tokens_high > tokens_low
-
-
-@pytest.mark.asyncio
-async def test_estimate_image_tokens_no_images() -> None:
-    """Test that messages without images return 0 tokens."""
-    messages = [
-        {"role": "user", "content": "Hello, how are you?"},
-        {"role": "assistant", "content": "I'm doing well, thank you!"},
-    ]
-
-    tokens = await estimate_image_tokens_in_messages(messages)
-    assert tokens == 0
-
-
-@pytest.mark.asyncio
-async def test_estimate_image_tokens_input_image_type() -> None:
-    """Test that input_image type is also supported."""
-    image_bytes = create_test_image(512, 512)
-    base64_image = base64.b64encode(image_bytes).decode("utf-8")
-
-    messages = [
-        {
-            "role": "user",
-            "content": [
-                {
-                    "type": "input_image",
-                    "image_url": f"data:image/jpeg;base64,{base64_image}",
-                },
-            ],
-        }
-    ]
-
-    tokens = await estimate_image_tokens_in_messages(messages)
-    assert tokens > 0

tests/unit/test_payment_helpers.py

@@ -1,5 +1,4 @@
 import os
-from typing import Any
 from unittest.mock import AsyncMock, Mock, patch
 
 # Set required env vars before importing
@@ -11,117 +10,66 @@ from routstr.payment.helpers import get_max_cost_for_model  # noqa: E402
 
 
 async def test_get_max_cost_for_model_known() -> None:
-    from routstr.payment.models import Pricing
-
     # Mock DB session behavior
     mock_session = AsyncMock()
-
-    # Mock upstream provider rows
-    mock_provider_result = Mock()
-    mock_provider_result.all = Mock(return_value=[])
-
-    # Mock model row with proper JSON fields
+    # available ids
+    mock_exec_result = Mock()
+    mock_exec_result.all = Mock(return_value=[("gpt-4",)])
+    mock_session.exec.return_value = mock_exec_result
+    # row with sats_pricing
     row = Mock()
-    row.id = "gpt-4"
-    row.name = "GPT-4"
-    row.created = 1234567890
-    row.description = "Test model"
-    row.context_length = 8192
-    row.architecture = '{"modality": "text", "input_modalities": ["text"], "output_modalities": ["text"], "tokenizer": "gpt", "instruct_type": null}'
-    row.pricing = '{"prompt": 0.0, "completion": 0.0, "request": 0.0, "image": 0.0, "web_search": 0.0, "internal_reasoning": 0.0, "max_cost": 0.0}'
-    row.per_request_limits = None
-    row.top_provider = None
-    row.enabled = True
-    row.upstream_provider_id = 1
-
-    # Mock the exec results to return model row when querying for override
-    def mock_exec(query: Any) -> Any:
-        result = Mock()
-        result.first = Mock(return_value=row)
-        result.all = Mock(return_value=[row])
-        return result
-
-    mock_session.exec = Mock(side_effect=mock_exec)
-
-    # Mock get for UpstreamProviderRow
-    mock_provider = Mock()
-    mock_provider.provider_fee = 1.01
-    mock_session.get = Mock(return_value=mock_provider)
-
-    # Mock the model with sats_pricing
-    mock_pricing = Pricing(
-        prompt=0.0,
-        completion=0.0,
-        request=0.0,
-        image=0.0,
-        web_search=0.0,
-        internal_reasoning=0.0,
-        max_cost=500.0,
+    row.sats_pricing = (
+        "{"  # minimal required fields for Pricing model
+        '"prompt": 0.0, "completion": 0.0, "request": 0.0, '
+        '"image": 0.0, "web_search": 0.0, "internal_reasoning": 0.0, '
+        '"max_cost": 500'
+        "}"
     )
-    mock_model = Mock()
-    mock_model.sats_pricing = mock_pricing
+    mock_session.get.return_value = row
 
     with patch.object(settings, "fixed_pricing", False):
         with patch.object(settings, "tolerance_percentage", 0):
-            cost = await get_max_cost_for_model(
-                "gpt-4", session=mock_session, model_obj=mock_model
-            )
+            cost = await get_max_cost_for_model("gpt-4", session=mock_session)
             assert cost == 500000  # 500 sats * 1000 = msats
 
 
 async def test_get_max_cost_for_model_unknown() -> None:
     mock_session = AsyncMock()
+    mock_exec_result = Mock()
+    mock_exec_result.all = Mock(return_value=[])
+    mock_session.exec.return_value = mock_exec_result
+    mock_session.get.return_value = None
 
-    # Mock the exec results to return no model override
-    async def async_mock_exec(query: Any) -> Any:
-        result = Mock()
-        result.first = Mock(return_value=None)
-        result.all = Mock(return_value=[])
-        return result
-
-    mock_session.exec = AsyncMock(side_effect=async_mock_exec)
-    mock_session.get = AsyncMock(return_value=None)
-
-    # Mock get_upstreams to return empty list
-    with patch("routstr.proxy.get_upstreams", return_value=[]):
-        with patch.object(settings, "fixed_cost_per_request", 100):
-            with patch.object(settings, "tolerance_percentage", 0):
-                cost = await get_max_cost_for_model(
-                    "unknown-model", session=mock_session, model_obj=None
-                )
-                assert cost == 100000
+    with patch.object(settings, "fixed_cost_per_request", 100):
+        with patch.object(settings, "tolerance_percentage", 0):
+            cost = await get_max_cost_for_model("unknown-model", session=mock_session)
+            assert cost == 100000
 
 
 async def test_get_max_cost_for_model_disabled() -> None:
-    mock_session = AsyncMock()
     with patch.object(settings, "fixed_pricing", True):
         with patch.object(settings, "fixed_cost_per_request", 200):
             with patch.object(settings, "tolerance_percentage", 0):
-                cost = await get_max_cost_for_model("any-model", session=mock_session)
+                cost = await get_max_cost_for_model("any-model", session=None)
                 assert cost == 200000
 
 
 async def test_get_max_cost_for_model_tolerance() -> None:
-    from routstr.payment.models import Pricing
-
     mock_session = AsyncMock()
-
-    # Mock the model with sats_pricing
-    mock_pricing = Pricing(
-        prompt=0.0,
-        completion=0.0,
-        request=0.0,
-        image=0.0,
-        web_search=0.0,
-        internal_reasoning=0.0,
-        max_cost=500.0,
+    mock_exec_result = Mock()
+    mock_exec_result.all = Mock(return_value=[("gpt-4",)])
+    mock_session.exec.return_value = mock_exec_result
+    row = Mock()
+    row.sats_pricing = (
+        "{"  # minimal required fields for Pricing model
+        '"prompt": 0.0, "completion": 0.0, "request": 0.0, '
+        '"image": 0.0, "web_search": 0.0, "internal_reasoning": 0.0, '
+        '"max_cost": 500'
+        "}"
     )
-    mock_model = Mock()
-    mock_model.sats_pricing = mock_pricing
+    mock_session.get.return_value = row
 
     with patch.object(settings, "fixed_pricing", False):
         with patch.object(settings, "tolerance_percentage", 10):
-            cost = await get_max_cost_for_model(
-                "gpt-4", session=mock_session, model_obj=mock_model
-            )
+            cost = await get_max_cost_for_model("gpt-4", session=mock_session)
             assert cost == 450000  # 500 sats * 1000 * 0.9 = 450000

tests/unit/test_readable_stream_fix.py

@@ -0,0 +1,272 @@
+import pytest
+import json
+from unittest.mock import AsyncMock, MagicMock, patch
+import httpx
+from fastapi import Request
+from fastapi.responses import StreamingResponse, Response
+
+from routstr.payment.x_cashu import (
+    safe_read_response_content,
+    handle_x_cashu_chat_completion,
+    send_refund,
+)
+
+
+class TestReadableStreamErrorHandling:
+    """Test cases for ReadableStream error handling in CoinOS with nonkycai provider."""
+
+    @pytest.mark.asyncio
+    async def test_safe_read_response_content_with_readable_stream(self):
+        """Test that ReadableStream objects are properly detected and handled."""
+        # Mock response with ReadableStream content
+        mock_response = MagicMock()
+        mock_response.aread = AsyncMock(return_value=b"[object ReadableStream]")
+        mock_response.headers = {"content-type": "text/plain"}
+        mock_response.status_code = 200
+
+        content_str, is_readable_stream_error = await safe_read_response_content(mock_response)
+        
+        assert content_str is None
+        assert is_readable_stream_error is True
+
+    @pytest.mark.asyncio
+    async def test_safe_read_response_content_with_normal_content(self):
+        """Test that normal content is processed correctly."""
+        # Mock response with normal JSON content
+        mock_response = MagicMock()
+        mock_response.aread = AsyncMock(return_value=b'{"message": "Hello, world!"}')
+        mock_response.headers = {"content-type": "application/json"}
+        mock_response.status_code = 200
+
+        content_str, is_readable_stream_error = await safe_read_response_content(mock_response)
+        
+        assert content_str == '{"message": "Hello, world!"}'
+        assert is_readable_stream_error is False
+
+    @pytest.mark.asyncio
+    async def test_safe_read_response_content_with_streaming_data(self):
+        """Test that streaming SSE content is processed correctly."""
+        # Mock response with SSE streaming content
+        sse_content = """data: {"id": "chatcmpl-123", "object": "chat.completion.chunk"}
+
+data: {"id": "chatcmpl-123", "choices": [{"delta": {"content": "Hello"}}]}
+
+data: [DONE]
+"""
+        mock_response = MagicMock()
+        mock_response.aread = AsyncMock(return_value=sse_content.encode())
+        mock_response.headers = {"content-type": "text/event-stream"}
+        mock_response.status_code = 200
+
+        content_str, is_readable_stream_error = await safe_read_response_content(mock_response)
+        
+        assert content_str == sse_content
+        assert is_readable_stream_error is False
+
+    @pytest.mark.asyncio
+    async def test_safe_read_response_content_with_partial_readable_stream(self):
+        """Test detection of ReadableStream in partial content."""
+        # Mock response with content containing ReadableStream
+        mock_response = MagicMock()
+        mock_response.aread = AsyncMock(return_value=b"Error: [object ReadableStream] encountered")
+        mock_response.headers = {"content-type": "text/plain"}
+        mock_response.status_code = 500
+
+        content_str, is_readable_stream_error = await safe_read_response_content(mock_response)
+        
+        assert content_str is None
+        assert is_readable_stream_error is True
+
+    @pytest.mark.asyncio
+    @patch('routstr.payment.x_cashu.send_refund')
+    @patch('routstr.payment.x_cashu.safe_read_response_content')
+    async def test_handle_chat_completion_with_readable_stream_error(
+        self, mock_safe_read, mock_send_refund
+    ):
+        """Test that ReadableStream errors trigger emergency refunds."""
+        # Setup mocks
+        mock_safe_read.return_value = (None, True)  # ReadableStream error
+        mock_send_refund.return_value = "cashuAtest123refund"
+        
+        # Mock response
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.headers = {"content-type": "text/event-stream"}
+        mock_response.aiter_bytes = AsyncMock(return_value=iter([b"data: test"]))
+
+        # Test parameters
+        amount = 1000
+        unit = "sat"
+        max_cost_for_model = 500
+
+        result = await handle_x_cashu_chat_completion(
+            mock_response, amount, unit, max_cost_for_model
+        )
+
+        # Verify emergency refund was called
+        mock_send_refund.assert_called_once_with(940, unit)  # amount - 60
+        
+        # Verify response is StreamingResponse with refund header
+        assert isinstance(result, StreamingResponse)
+        assert result.headers["X-Cashu"] == "cashuAtest123refund"
+
+    @pytest.mark.asyncio
+    @patch('routstr.payment.x_cashu.send_refund')
+    @patch('routstr.payment.x_cashu.safe_read_response_content')
+    async def test_handle_chat_completion_refund_failure(
+        self, mock_safe_read, mock_send_refund
+    ):
+        """Test handling when both ReadableStream error and refund fail."""
+        # Setup mocks
+        mock_safe_read.return_value = (None, True)  # ReadableStream error
+        mock_send_refund.side_effect = Exception("Refund failed")
+        
+        # Mock response
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.headers = {"content-type": "text/event-stream"}
+
+        # Test parameters
+        amount = 1000
+        unit = "sat"
+        max_cost_for_model = 500
+
+        result = await handle_x_cashu_chat_completion(
+            mock_response, amount, unit, max_cost_for_model
+        )
+
+        # Verify error response is returned
+        assert isinstance(result, Response)
+        assert result.status_code == 500
+        
+        # Verify error content
+        content = json.loads(result.body)
+        assert content["error"]["code"] == "readable_stream_error"
+        assert content["error"]["original_amount"] == amount
+        assert content["error"]["unit"] == unit
+
+    @pytest.mark.asyncio
+    @patch('routstr.payment.x_cashu.send_token')
+    async def test_send_refund_with_retries(self, mock_send_token):
+        """Test that send_refund retries on failure."""
+        # Setup mock to fail twice then succeed
+        mock_send_token.side_effect = [
+            Exception("Network error"),
+            Exception("Temporary failure"),
+            "cashuAtest123refund"
+        ]
+
+        result = await send_refund(500, "sat")
+        
+        assert result == "cashuAtest123refund"
+        assert mock_send_token.call_count == 3
+
+    @pytest.mark.asyncio
+    @patch('routstr.payment.x_cashu.send_token')
+    async def test_send_refund_max_retries_exceeded(self, mock_send_token):
+        """Test that send_refund raises HTTPException after max retries."""
+        # Setup mock to always fail
+        mock_send_token.side_effect = Exception("Persistent failure")
+
+        with pytest.raises(Exception) as exc_info:
+            await send_refund(500, "sat")
+        
+        # Verify all retries were attempted
+        assert mock_send_token.call_count == 3
+
+    @pytest.mark.asyncio
+    async def test_safe_read_response_content_with_unicode_errors(self):
+        """Test handling of invalid UTF-8 content."""
+        # Mock response with invalid UTF-8 bytes
+        mock_response = MagicMock()
+        mock_response.aread = AsyncMock(return_value=b'\xff\xfe\x00\x00invalid utf-8')
+        mock_response.headers = {"content-type": "text/plain"}
+        mock_response.status_code = 200
+
+        content_str, is_readable_stream_error = await safe_read_response_content(mock_response)
+        
+        # Should handle invalid UTF-8 gracefully with replacement characters
+        assert content_str is not None
+        assert is_readable_stream_error is False
+        assert "invalid utf-8" in content_str
+
+    @pytest.mark.asyncio
+    async def test_safe_read_response_content_with_exception(self):
+        """Test handling when aread() raises an exception."""
+        # Mock response that raises exception on aread
+        mock_response = MagicMock()
+        mock_response.aread = AsyncMock(side_effect=Exception("Connection lost"))
+        mock_response.headers = {"content-type": "text/plain"}
+        mock_response.status_code = 200
+
+        content_str, is_readable_stream_error = await safe_read_response_content(mock_response)
+        
+        assert content_str is None
+        assert is_readable_stream_error is False
+
+
+class TestCoinOSNonKYCAIIntegration:
+    """Integration tests specifically for CoinOS with nonkycai provider scenarios."""
+
+    @pytest.mark.asyncio
+    @patch('routstr.payment.x_cashu.safe_read_response_content')
+    @patch('routstr.payment.x_cashu.send_refund')
+    async def test_coinos_nonkycai_readable_stream_scenario(
+        self, mock_send_refund, mock_safe_read
+    ):
+        """Test the specific CoinOS + nonkycai ReadableStream scenario."""
+        # Simulate the exact error scenario from the issue
+        mock_safe_read.return_value = (None, True)  # ReadableStream detected
+        mock_send_refund.return_value = "cashuAemergencyrefund123"
+        
+        # Mock response that would come from nonkycai provider
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.headers = {
+            "content-type": "text/event-stream",
+            "cache-control": "no-cache",
+            "connection": "keep-alive"
+        }
+        mock_response.aiter_bytes = AsyncMock(return_value=iter([
+            b"data: [object ReadableStream]\n\n"
+        ]))
+
+        # Simulate CoinOS payment parameters
+        amount = 2100  # 2100 sats
+        unit = "sat"
+        max_cost_for_model = 1000
+
+        result = await handle_x_cashu_chat_completion(
+            mock_response, amount, unit, max_cost_for_model
+        )
+
+        # Verify emergency refund was issued
+        mock_send_refund.assert_called_once_with(2040, unit)  # 2100 - 60
+        
+        # Verify proper response handling
+        assert isinstance(result, StreamingResponse)
+        assert "X-Cashu" in result.headers
+        assert result.headers["X-Cashu"] == "cashuAemergencyrefund123"
+        assert result.status_code == 200
+
+    @pytest.mark.asyncio
+    async def test_readable_stream_detection_variations(self):
+        """Test detection of various ReadableStream object representations."""
+        test_cases = [
+            b"[object ReadableStream]",
+            b"Error: [object ReadableStream] encountered",
+            b"Response contains ReadableStream object",
+            b"ReadableStream processing failed",
+            b'{"error": "ReadableStream not supported"}',
+        ]
+
+        for content in test_cases:
+            mock_response = MagicMock()
+            mock_response.aread = AsyncMock(return_value=content)
+            mock_response.headers = {"content-type": "text/plain"}
+            mock_response.status_code = 200
+
+            content_str, is_readable_stream_error = await safe_read_response_content(mock_response)
+            
+            assert is_readable_stream_error is True, f"Failed to detect ReadableStream in: {content}"
+            assert content_str is None

tests/unit/test_wallet.py

@@ -4,7 +4,6 @@ from unittest.mock import AsyncMock, Mock, patch
 
 import pytest
 
-from routstr.core.db import ApiKey
 from routstr.wallet import credit_balance, get_balance, recieve_token, send_token
 
 
@@ -83,15 +82,8 @@ async def test_credit_balance() -> None:
 
     mock_key = Mock()
     mock_key.balance = 5000000
-    mock_key.hashed_key = "test_hash"
     mock_session = AsyncMock()
 
-    # Mock session.refresh to update the balance (simulates DB reload)
-    async def mock_refresh(key: ApiKey) -> None:
-        key.balance = 6000000
-
-    mock_session.refresh.side_effect = mock_refresh
-
     from routstr.core.settings import settings
 
     with patch.object(settings, "cashu_mints", ["http://mint:3338"]):
@@ -101,11 +93,9 @@ async def test_credit_balance() -> None:
         ):
             amount = await credit_balance(token_str, mock_key, mock_session)
             assert amount == 1000000  # converted to msat
-            assert mock_key.balance == 6000000  # Should be updated after refresh
-            # Verify atomic operations were used
-            assert mock_session.exec.called  # Atomic UPDATE statement
-            assert mock_session.commit.called
-            assert mock_session.refresh.called
+            assert mock_key.balance == 6000000
+            mock_session.add.assert_called_once_with(mock_key)
+            mock_session.commit.assert_called_once()
 
 
 @pytest.mark.asyncio

ui/.eslintrc.json

@@ -1,11 +0,0 @@
-{
-  "extends": [
-    "next",
-    "next/core-web-vitals",
-    "eslint:recommended",
-    "plugin:react/recommended",
-    "plugin:@typescript-eslint/recommended",
-    "prettier"
-  ],
-  "plugins": ["react", "@typescript-eslint"]
-}

ui/.gitignore

@@ -1,44 +0,0 @@
-# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
-
-# dependencies
-/node_modules
-/.pnp
-.pnp.*
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/versions
-
-# testing
-/coverage
-
-# next.js
-/.next/
-/out/
-
-# production
-/build
-
-# misc
-.DS_Store
-*.pem
-
-# debug
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-.pnpm-debug.log*
-
-# env files (can opt-in for committing if needed)
-.env*
-
-# vercel
-.vercel
-
-# typescript
-*.tsbuildinfo
-next-env.d.ts
-
-# favicon conflicts
-/app/favicon.ico

ui/.prettierrc.json

@@ -1,8 +0,0 @@
-{
-  "trailingComma": "es5",
-  "semi": true,
-  "tabWidth": 2,
-  "singleQuote": true,
-  "jsxSingleQuote": true,
-  "plugins": ["prettier-plugin-tailwindcss"]
-}

ui/Dockerfile

@@ -1,38 +0,0 @@
-FROM node:23-alpine AS base
-
-FROM base AS deps
-RUN apk add --no-cache libc6-compat
-WORKDIR /app
-
-COPY package.json yarn.lock* package-lock.json* pnpm-lock.yaml* .npmrc* ./
-RUN npm i
-
-FROM base AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-
-ENV NEXT_TELEMETRY_DISABLED=1
-
-RUN npm run build
-FROM base AS runner
-WORKDIR /app
-
-ENV NODE_ENV=production
-
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-COPY --from=builder /app/public ./public
-
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-
-USER nextjs
-
-EXPOSE 3000
-
-ENV PORT=3000
-
-ENV HOSTNAME="0.0.0.0"
-CMD ["node", "server.js"]

ui/Dockerfile.build

@@ -1,37 +0,0 @@
-FROM node:23-alpine AS base
-
-# Install dependencies only when needed
-FROM base AS deps
-RUN apk add --no-cache libc6-compat
-WORKDIR /app
-
-# Copy package files
-COPY package.json package-lock.json* pnpm-lock.yaml* ./
-RUN npm ci
-
-# Build the UI
-FROM base AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY . .
-
-# Accept build arguments for environment variables
-ARG NEXT_PUBLIC_API_URL
-
-# Create .env.local for Next.js with build arguments
-RUN echo "NEXT_PUBLIC_API_URL=${NEXT_PUBLIC_API_URL}" > .env.local && \
-    echo "Using NEXT_PUBLIC_API_URL: ${NEXT_PUBLIC_API_URL}"
-
-# Set production environment
-ENV NODE_ENV=production
-ENV NEXT_TELEMETRY_DISABLED=1
-
-# Build the application
-RUN npm run build && \
-    echo "UI build completed at $(date)"
-
-# Use the builder stage as the final stage
-FROM node:23-alpine
-WORKDIR /app
-COPY --from=builder /app/out /app/built
-CMD ["sh", "-c", "mkdir -p /output && cp -r /app/built/. /output/ && echo 'UI build copied to mounted volume' && ls -la /output/ && echo 'UI built and ready' && tail -f /dev/null"]

ui/README.md

@@ -1,36 +0,0 @@
-This is a [Next.js](https://nextjs.org) project bootstrapped with [`create-next-app`](https://nextjs.org/docs/app/api-reference/cli/create-next-app).
-
-## Getting Started
-
-First, run the development server:
-
-```bash
-npm run dev
-# or
-yarn dev
-# or
-pnpm dev
-# or
-bun dev
-```
-
-Open [http://localhost:3000](http://localhost:3000) with your browser to see the result.
-
-You can start editing the page by modifying `app/page.tsx`. The page auto-updates as you edit the file.
-
-This project uses [`next/font`](https://nextjs.org/docs/app/building-your-application/optimizing/fonts) to automatically optimize and load [Geist](https://vercel.com/font), a new font family for Vercel.
-
-## Learn More
-
-To learn more about Next.js, take a look at the following resources:
-
-- [Next.js Documentation](https://nextjs.org/docs) - learn about Next.js features and API.
-- [Learn Next.js](https://nextjs.org/learn) - an interactive Next.js tutorial.
-
-You can check out [the Next.js GitHub repository](https://github.com/vercel/next.js) - your feedback and contributions are welcome!
-
-## Deploy on Vercel
-
-The easiest way to deploy your Next.js app is to use the [Vercel Platform](https://vercel.com/new?utm_medium=default-template&filter=next.js&utm_source=create-next-app&utm_campaign=create-next-app-readme) from the creators of Next.js.
-
-Check out our [Next.js deployment documentation](https://nextjs.org/docs/app/building-your-application/deploying) for more details.

ui/app/_register/page.tsx

@@ -1,172 +0,0 @@
-'use client';
-
-import { useAuth } from '@/lib/auth/AuthContext';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-import { useRouter } from 'next/navigation';
-import { useState } from 'react';
-import { toast } from 'sonner';
-import Link from 'next/link';
-import { ArrowUpCircleIcon } from 'lucide-react';
-import { registerUser, SchemaRegisterProps } from '@/lib/api/services/auth';
-
-export default function NostrRegisterPage() {
-  const router = useRouter();
-  const { connectNostr } = useAuth();
-  const [isLoading, setIsLoading] = useState(false);
-  const [formData, setFormData] = useState<SchemaRegisterProps>({
-    npub: '',
-    name: '',
-  });
-
-  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    const { name, value } = e.target;
-    setFormData((prev) => ({ ...prev, [name]: value }));
-  };
-
-  const handleNostrConnect = async () => {
-    setIsLoading(true);
-    try {
-      const publicKey = await connectNostr();
-      if (publicKey) {
-        setFormData((prev) => ({ ...prev, npub: publicKey }));
-        toast.success(
-          'Nostr connected. Please enter your name to complete registration.'
-        );
-      } else {
-        toast.error(
-          'Failed to connect. Please make sure your Nostr extension is installed and enabled.'
-        );
-      }
-    } catch (error) {
-      console.error('Nostr connection error:', error);
-      toast.error('Failed to connect to Nostr. Please try again.');
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  const handleRegister = async (e: React.FormEvent) => {
-    e.preventDefault();
-
-    if (!formData.npub || formData.npub.length < 10) {
-      toast.error('Please enter a valid Nostr public key');
-      return;
-    }
-
-    if (!formData.name) {
-      toast.error('Please enter your name');
-      return;
-    }
-
-    setIsLoading(true);
-    try {
-      // Register the user
-      const result = await registerUser(formData);
-      console.log('Registration successful:', result);
-      toast.success('Account created successfully');
-      router.push('/login');
-    } catch (error) {
-      console.error('Registration error:', error);
-      toast.error('Registration failed. Please try again.');
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  return (
-    <div className='flex min-h-screen items-center justify-center p-4'>
-      <div className='w-full max-w-md'>
-        <div className='flex flex-col gap-6'>
-          <form onSubmit={handleRegister}>
-            <div className='flex flex-col gap-6'>
-              <div className='flex flex-col items-center gap-2'>
-                <Link
-                  href='/'
-                  className='flex flex-col items-center gap-2 font-medium'
-                >
-                  <div className='flex h-8 w-8 items-center justify-center rounded-md'>
-                    <ArrowUpCircleIcon className='size-6' />
-                  </div>
-                  <span className='sr-only'>Routstr</span>
-                </Link>
-                <h1 className='text-xl font-bold'>Create an Account</h1>
-                <div className='text-center text-sm'>
-                  Already have an account?{' '}
-                  <Link href='/login' className='underline underline-offset-4'>
-                    Sign in
-                  </Link>
-                </div>
-              </div>
-              <div className='flex flex-col gap-6'>
-                <div className='grid gap-2'>
-                  <Label htmlFor='npub'>Nostr Public Key (npub)</Label>
-                  <Input
-                    id='npub'
-                    name='npub'
-                    type='text'
-                    placeholder='npub1...'
-                    value={formData.npub}
-                    onChange={handleInputChange}
-                    required
-                  />
-                </div>
-                <div className='grid gap-2'>
-                  <Label htmlFor='name'>Name</Label>
-                  <Input
-                    id='name'
-                    name='name'
-                    type='text'
-                    placeholder='John Doe'
-                    value={formData.name}
-                    onChange={handleInputChange}
-                    required
-                  />
-                </div>
-                <Button type='submit' className='w-full' disabled={isLoading}>
-                  {isLoading ? 'Creating account...' : 'Create Account'}
-                </Button>
-              </div>
-              <div className='after:border-border relative text-center text-sm after:absolute after:inset-0 after:top-1/2 after:z-0 after:flex after:items-center after:border-t'>
-                <span className='bg-background text-muted-foreground relative z-10 px-2'>
-                  Or
-                </span>
-              </div>
-              <div className='grid gap-4'>
-                <Button
-                  variant='outline'
-                  className='w-full'
-                  onClick={handleNostrConnect}
-                  disabled={isLoading}
-                  type='button'
-                >
-                  <svg
-                    className='mr-2 h-4 w-4'
-                    viewBox='0 0 256 256'
-                    xmlns='http://www.w3.org/2000/svg'
-                  >
-                    <path
-                      d='M158.4 28.4c-31.8-31.8-83.1-31.8-114.9 0s-31.8 83.1 0 114.9l57.4 57.4 57.4-57.4c31.8-31.8 31.8-83.1 0-114.9z'
-                      fill='currentColor'
-                    />
-                    <path
-                      d='M215.8 199.3c-31.8-31.8-83.1-31.8-114.9 0L43.6 256l57.4-57.4c31.8-31.8 31.8-83.1 0-114.9L158.4 28.4 101 85.8c-31.8 31.8-31.8 83.1 0 114.9l114.8-1.4z'
-                      fill='currentColor'
-                    />
-                  </svg>
-                  Connect with Nostr Extension
-                </Button>
-              </div>
-            </div>
-          </form>
-          <div className='text-muted-foreground hover:[&_a]:text-primary text-center text-xs text-balance [&_a]:underline [&_a]:underline-offset-4'>
-            By clicking create account, you agree to our{' '}
-            <Link href='#'>Terms of Service</Link> and{' '}
-            <Link href='#'>Privacy Policy</Link>.
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

ui/app/data.json

@@ -1,614 +0,0 @@
-[
-  {
-    "id": 1,
-    "header": "Cover page",
-    "type": "Cover page",
-    "status": "In Process",
-    "target": "18",
-    "limit": "5",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 2,
-    "header": "Table of contents",
-    "type": "Table of contents",
-    "status": "Done",
-    "target": "29",
-    "limit": "24",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 3,
-    "header": "Executive summary",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "10",
-    "limit": "13",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 4,
-    "header": "Technical approach",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "27",
-    "limit": "23",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 5,
-    "header": "Design",
-    "type": "Narrative",
-    "status": "In Process",
-    "target": "2",
-    "limit": "16",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 6,
-    "header": "Capabilities",
-    "type": "Narrative",
-    "status": "In Process",
-    "target": "20",
-    "limit": "8",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 7,
-    "header": "Integration with existing systems",
-    "type": "Narrative",
-    "status": "In Process",
-    "target": "19",
-    "limit": "21",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 8,
-    "header": "Innovation and Advantages",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "25",
-    "limit": "26",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 9,
-    "header": "Overview of EMR's Innovative Solutions",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "7",
-    "limit": "23",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 10,
-    "header": "Advanced Algorithms and Machine Learning",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "30",
-    "limit": "28",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 11,
-    "header": "Adaptive Communication Protocols",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "9",
-    "limit": "31",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 12,
-    "header": "Advantages Over Current Technologies",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "12",
-    "limit": "0",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 13,
-    "header": "Past Performance",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "22",
-    "limit": "33",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 14,
-    "header": "Customer Feedback and Satisfaction Levels",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "15",
-    "limit": "34",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 15,
-    "header": "Implementation Challenges and Solutions",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "3",
-    "limit": "35",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 16,
-    "header": "Security Measures and Data Protection Policies",
-    "type": "Narrative",
-    "status": "In Process",
-    "target": "6",
-    "limit": "36",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 17,
-    "header": "Scalability and Future Proofing",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "4",
-    "limit": "37",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 18,
-    "header": "Cost-Benefit Analysis",
-    "type": "Plain language",
-    "status": "Done",
-    "target": "14",
-    "limit": "38",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 19,
-    "header": "User Training and Onboarding Experience",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "17",
-    "limit": "39",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 20,
-    "header": "Future Development Roadmap",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "11",
-    "limit": "40",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 21,
-    "header": "System Architecture Overview",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "24",
-    "limit": "18",
-    "reviewer": "Maya Johnson"
-  },
-  {
-    "id": 22,
-    "header": "Risk Management Plan",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "15",
-    "limit": "22",
-    "reviewer": "Carlos Rodriguez"
-  },
-  {
-    "id": 23,
-    "header": "Compliance Documentation",
-    "type": "Legal",
-    "status": "In Process",
-    "target": "31",
-    "limit": "27",
-    "reviewer": "Sarah Chen"
-  },
-  {
-    "id": 24,
-    "header": "API Documentation",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "8",
-    "limit": "12",
-    "reviewer": "Raj Patel"
-  },
-  {
-    "id": 25,
-    "header": "User Interface Mockups",
-    "type": "Visual",
-    "status": "In Process",
-    "target": "19",
-    "limit": "25",
-    "reviewer": "Leila Ahmadi"
-  },
-  {
-    "id": 26,
-    "header": "Database Schema",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "22",
-    "limit": "20",
-    "reviewer": "Thomas Wilson"
-  },
-  {
-    "id": 27,
-    "header": "Testing Methodology",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "17",
-    "limit": "14",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 28,
-    "header": "Deployment Strategy",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "26",
-    "limit": "30",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 29,
-    "header": "Budget Breakdown",
-    "type": "Financial",
-    "status": "In Process",
-    "target": "13",
-    "limit": "16",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 30,
-    "header": "Market Analysis",
-    "type": "Research",
-    "status": "Done",
-    "target": "29",
-    "limit": "32",
-    "reviewer": "Sophia Martinez"
-  },
-  {
-    "id": 31,
-    "header": "Competitor Comparison",
-    "type": "Research",
-    "status": "In Process",
-    "target": "21",
-    "limit": "19",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 32,
-    "header": "Maintenance Plan",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "16",
-    "limit": "23",
-    "reviewer": "Alex Thompson"
-  },
-  {
-    "id": 33,
-    "header": "User Personas",
-    "type": "Research",
-    "status": "In Process",
-    "target": "27",
-    "limit": "24",
-    "reviewer": "Nina Patel"
-  },
-  {
-    "id": 34,
-    "header": "Accessibility Compliance",
-    "type": "Legal",
-    "status": "Done",
-    "target": "18",
-    "limit": "21",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 35,
-    "header": "Performance Metrics",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "23",
-    "limit": "26",
-    "reviewer": "David Kim"
-  },
-  {
-    "id": 36,
-    "header": "Disaster Recovery Plan",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "14",
-    "limit": "17",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 37,
-    "header": "Third-party Integrations",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "25",
-    "limit": "28",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 38,
-    "header": "User Feedback Summary",
-    "type": "Research",
-    "status": "Done",
-    "target": "20",
-    "limit": "15",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 39,
-    "header": "Localization Strategy",
-    "type": "Narrative",
-    "status": "In Process",
-    "target": "12",
-    "limit": "19",
-    "reviewer": "Maria Garcia"
-  },
-  {
-    "id": 40,
-    "header": "Mobile Compatibility",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "28",
-    "limit": "31",
-    "reviewer": "James Wilson"
-  },
-  {
-    "id": 41,
-    "header": "Data Migration Plan",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "19",
-    "limit": "22",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 42,
-    "header": "Quality Assurance Protocols",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "30",
-    "limit": "33",
-    "reviewer": "Priya Singh"
-  },
-  {
-    "id": 43,
-    "header": "Stakeholder Analysis",
-    "type": "Research",
-    "status": "In Process",
-    "target": "11",
-    "limit": "14",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 44,
-    "header": "Environmental Impact Assessment",
-    "type": "Research",
-    "status": "Done",
-    "target": "24",
-    "limit": "27",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 45,
-    "header": "Intellectual Property Rights",
-    "type": "Legal",
-    "status": "In Process",
-    "target": "17",
-    "limit": "20",
-    "reviewer": "Sarah Johnson"
-  },
-  {
-    "id": 46,
-    "header": "Customer Support Framework",
-    "type": "Narrative",
-    "status": "Done",
-    "target": "22",
-    "limit": "25",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 47,
-    "header": "Version Control Strategy",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "15",
-    "limit": "18",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 48,
-    "header": "Continuous Integration Pipeline",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "26",
-    "limit": "29",
-    "reviewer": "Michael Chen"
-  },
-  {
-    "id": 49,
-    "header": "Regulatory Compliance",
-    "type": "Legal",
-    "status": "In Process",
-    "target": "13",
-    "limit": "16",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 50,
-    "header": "User Authentication System",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "28",
-    "limit": "31",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 51,
-    "header": "Data Analytics Framework",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "21",
-    "limit": "24",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 52,
-    "header": "Cloud Infrastructure",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "16",
-    "limit": "19",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 53,
-    "header": "Network Security Measures",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "29",
-    "limit": "32",
-    "reviewer": "Lisa Wong"
-  },
-  {
-    "id": 54,
-    "header": "Project Timeline",
-    "type": "Planning",
-    "status": "Done",
-    "target": "14",
-    "limit": "17",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 55,
-    "header": "Resource Allocation",
-    "type": "Planning",
-    "status": "In Process",
-    "target": "27",
-    "limit": "30",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 56,
-    "header": "Team Structure and Roles",
-    "type": "Planning",
-    "status": "Done",
-    "target": "20",
-    "limit": "23",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 57,
-    "header": "Communication Protocols",
-    "type": "Planning",
-    "status": "In Process",
-    "target": "15",
-    "limit": "18",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 58,
-    "header": "Success Metrics",
-    "type": "Planning",
-    "status": "Done",
-    "target": "30",
-    "limit": "33",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 59,
-    "header": "Internationalization Support",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "23",
-    "limit": "26",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 60,
-    "header": "Backup and Recovery Procedures",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "18",
-    "limit": "21",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 61,
-    "header": "Monitoring and Alerting System",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "25",
-    "limit": "28",
-    "reviewer": "Daniel Park"
-  },
-  {
-    "id": 62,
-    "header": "Code Review Guidelines",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "12",
-    "limit": "15",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 63,
-    "header": "Documentation Standards",
-    "type": "Technical content",
-    "status": "In Process",
-    "target": "27",
-    "limit": "30",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 64,
-    "header": "Release Management Process",
-    "type": "Planning",
-    "status": "Done",
-    "target": "22",
-    "limit": "25",
-    "reviewer": "Assign reviewer"
-  },
-  {
-    "id": 65,
-    "header": "Feature Prioritization Matrix",
-    "type": "Planning",
-    "status": "In Process",
-    "target": "19",
-    "limit": "22",
-    "reviewer": "Emma Davis"
-  },
-  {
-    "id": 66,
-    "header": "Technical Debt Assessment",
-    "type": "Technical content",
-    "status": "Done",
-    "target": "24",
-    "limit": "27",
-    "reviewer": "Eddie Lake"
-  },
-  {
-    "id": 67,
-    "header": "Capacity Planning",
-    "type": "Planning",
-    "status": "In Process",
-    "target": "21",
-    "limit": "24",
-    "reviewer": "Jamik Tashpulatov"
-  },
-  {
-    "id": 68,
-    "header": "Service Level Agreements",
-    "type": "Legal",
-    "status": "Done",
-    "target": "26",
-    "limit": "29",
-    "reviewer": "Assign reviewer"
-  }
-]

ui/app/globals.css

@@ -1,136 +0,0 @@
-@import 'tailwindcss';
-@import 'tw-animate-css';
-
-@custom-variant dark (&:is(.dark *));
-
-@theme inline {
-  --color-background: var(--background);
-  --color-foreground: var(--foreground);
-  --font-sans: var(--font-geist-sans);
-  --font-mono: var(--font-geist-mono);
-  --color-sidebar-ring: var(--sidebar-ring);
-  --color-sidebar-border: var(--sidebar-border);
-  --color-sidebar-accent-foreground: var(--sidebar-accent-foreground);
-  --color-sidebar-accent: var(--sidebar-accent);
-  --color-sidebar-primary-foreground: var(--sidebar-primary-foreground);
-  --color-sidebar-primary: var(--sidebar-primary);
-  --color-sidebar-foreground: var(--sidebar-foreground);
-  --color-sidebar: var(--sidebar);
-  --color-chart-5: var(--chart-5);
-  --color-chart-4: var(--chart-4);
-  --color-chart-3: var(--chart-3);
-  --color-chart-2: var(--chart-2);
-  --color-chart-1: var(--chart-1);
-  --color-ring: var(--ring);
-  --color-input: var(--input);
-  --color-border: var(--border);
-  --color-destructive: var(--destructive);
-  --color-accent-foreground: var(--accent-foreground);
-  --color-accent: var(--accent);
-  --color-muted-foreground: var(--muted-foreground);
-  --color-muted: var(--muted);
-  --color-secondary-foreground: var(--secondary-foreground);
-  --color-secondary: var(--secondary);
-  --color-primary-foreground: var(--primary-foreground);
-  --color-primary: var(--primary);
-  --color-popover-foreground: var(--popover-foreground);
-  --color-popover: var(--popover);
-  --color-card-foreground: var(--card-foreground);
-  --color-card: var(--card);
-  --radius-sm: calc(var(--radius) - 4px);
-  --radius-md: calc(var(--radius) - 2px);
-  --radius-lg: var(--radius);
-  --radius-xl: calc(var(--radius) + 4px);
-}
-
-:root {
-  --radius: 0.625rem;
-  --background: oklch(1 0 0);
-  --foreground: oklch(0.147 0.004 49.25);
-  --card: oklch(1 0 0);
-  --card-foreground: oklch(0.147 0.004 49.25);
-  --popover: oklch(1 0 0);
-  --popover-foreground: oklch(0.147 0.004 49.25);
-  --primary: oklch(0.216 0.006 56.043);
-  --primary-foreground: oklch(0.985 0.001 106.423);
-  --secondary: oklch(0.97 0.001 106.424);
-  --secondary-foreground: oklch(0.216 0.006 56.043);
-  --muted: oklch(0.97 0.001 106.424);
-  --muted-foreground: oklch(0.553 0.013 58.071);
-  --accent: oklch(0.97 0.001 106.424);
-  --accent-foreground: oklch(0.216 0.006 56.043);
-  --destructive: oklch(0.577 0.245 27.325);
-  --border: oklch(0.923 0.003 48.717);
-  --input: oklch(0.923 0.003 48.717);
-  --ring: oklch(0.709 0.01 56.259);
-  --chart-1: oklch(0.646 0.222 41.116);
-  --chart-2: oklch(0.6 0.118 184.704);
-  --chart-3: oklch(0.398 0.07 227.392);
-  --chart-4: oklch(0.828 0.189 84.429);
-  --chart-5: oklch(0.769 0.188 70.08);
-  --sidebar: oklch(0.985 0.001 106.423);
-  --sidebar-foreground: oklch(0.147 0.004 49.25);
-  --sidebar-primary: oklch(0.216 0.006 56.043);
-  --sidebar-primary-foreground: oklch(0.985 0.001 106.423);
-  --sidebar-accent: oklch(0.97 0.001 106.424);
-  --sidebar-accent-foreground: oklch(0.216 0.006 56.043);
-  --sidebar-border: oklch(0.923 0.003 48.717);
-  --sidebar-ring: oklch(0.709 0.01 56.259);
-}
-
-.dark {
-  --background: oklch(0.147 0.004 49.25);
-  --foreground: oklch(0.985 0.001 106.423);
-  --card: oklch(0.216 0.006 56.043);
-  --card-foreground: oklch(0.985 0.001 106.423);
-  --popover: oklch(0.216 0.006 56.043);
-  --popover-foreground: oklch(0.985 0.001 106.423);
-  --primary: oklch(0.923 0.003 48.717);
-  --primary-foreground: oklch(0.216 0.006 56.043);
-  --secondary: oklch(0.268 0.007 34.298);
-  --secondary-foreground: oklch(0.985 0.001 106.423);
-  --muted: oklch(0.268 0.007 34.298);
-  --muted-foreground: oklch(0.709 0.01 56.259);
-  --accent: oklch(0.268 0.007 34.298);
-  --accent-foreground: oklch(0.985 0.001 106.423);
-  --destructive: oklch(0.704 0.191 22.216);
-  --border: oklch(1 0 0 / 10%);
-  --input: oklch(1 0 0 / 15%);
-  --ring: oklch(0.553 0.013 58.071);
-  --chart-1: oklch(0.488 0.243 264.376);
-  --chart-2: oklch(0.696 0.17 162.48);
-  --chart-3: oklch(0.769 0.188 70.08);
-  --chart-4: oklch(0.627 0.265 303.9);
-  --chart-5: oklch(0.645 0.246 16.439);
-  --sidebar: oklch(0.216 0.006 56.043);
-  --sidebar-foreground: oklch(0.985 0.001 106.423);
-  --sidebar-primary: oklch(0.488 0.243 264.376);
-  --sidebar-primary-foreground: oklch(0.985 0.001 106.423);
-  --sidebar-accent: oklch(0.268 0.007 34.298);
-  --sidebar-accent-foreground: oklch(0.985 0.001 106.423);
-  --sidebar-border: oklch(1 0 0 / 10%);
-  --sidebar-ring: oklch(0.553 0.013 58.071);
-}
-
-@layer base {
-  * {
-    @apply border-border outline-ring/50;
-  }
-  body {
-    @apply bg-background text-foreground;
-  }
-}
-
-/* Custom animations */
-@keyframes shimmer {
-  0% {
-    transform: translateX(-100%);
-  }
-  100% {
-    transform: translateX(100%);
-  }
-}
-
-.animate-shimmer {
-  animation: shimmer 2s infinite;
-}

ui/app/layout.tsx

@@ -1,45 +0,0 @@
-import type { Metadata } from 'next';
-import { Geist, Geist_Mono } from 'next/font/google';
-import './globals.css';
-import { Providers } from './providers';
-import { SuppressHydrationWarning } from '@/components/suppress-hydration-warning';
-
-const geistSans = Geist({
-  variable: '--font-geist-sans',
-  subsets: ['latin'],
-  preload: false,
-  display: 'swap',
-});
-
-const geistMono = Geist_Mono({
-  variable: '--font-geist-mono',
-  subsets: ['latin'],
-  preload: false,
-  display: 'swap',
-});
-
-export const metadata: Metadata = {
-  title: 'Routstr',
-  description: 'Routstr model management',
-  icons: {
-    icon: '/icon.ico',
-  },
-};
-
-export default function RootLayout({
-  children,
-}: Readonly<{
-  children: React.ReactNode;
-}>) {
-  return (
-    <html lang='en' suppressHydrationWarning>
-      <body
-        className={`${geistSans.variable} ${geistMono.variable} font-sans antialiased`}
-      >
-        <SuppressHydrationWarning>
-          <Providers>{children}</Providers>
-        </SuppressHydrationWarning>
-      </body>
-    </html>
-  );
-}

ui/app/login/page.tsx

@@ -1,128 +0,0 @@
-'use client';
-
-import { useState, useEffect } from 'react';
-import type { ChangeEvent, FormEvent, ReactElement } from 'react';
-import { useRouter } from 'next/navigation';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card';
-import { adminLogin } from '@/lib/api/services/auth';
-import { ConfigurationService } from '@/lib/api/services/configuration';
-import { toast } from 'sonner';
-
-export default function AdminLoginPage(): ReactElement {
-  const router = useRouter();
-  const allowCustomBaseUrl = !ConfigurationService.isEnvBaseUrlConfigured();
-  const [password, setPassword] = useState<string>('');
-  const [baseUrl, setBaseUrl] = useState<string>('');
-  const [isLoading, setIsLoading] = useState<boolean>(false);
-
-  useEffect(() => {
-    if (ConfigurationService.isTokenValid()) {
-      router.push('/');
-    }
-  }, [router]);
-
-  useEffect(() => {
-    if (!allowCustomBaseUrl) {
-      return;
-    }
-
-    const storedBaseUrl = ConfigurationService.getManualBaseUrl();
-    if (storedBaseUrl) {
-      setBaseUrl(storedBaseUrl);
-      return;
-    }
-
-    if (typeof window !== 'undefined') {
-      setBaseUrl(window.location.origin ?? '');
-    }
-  }, [allowCustomBaseUrl]);
-
-  const handleSubmit = async (
-    event: FormEvent<HTMLFormElement>
-  ): Promise<void> => {
-    event.preventDefault();
-
-    if (allowCustomBaseUrl) {
-      const normalizedBaseUrl = baseUrl.trim();
-      if (!normalizedBaseUrl) {
-        toast.error('Please enter the API URL');
-        return;
-      }
-      ConfigurationService.setManualBaseUrl(normalizedBaseUrl);
-    }
-
-    if (!password) {
-      toast.error('Please enter your password');
-      return;
-    }
-
-    setIsLoading(true);
-    try {
-      await adminLogin(password);
-      toast.success('Successfully logged in');
-      router.push('/');
-    } catch (error) {
-      console.error('Login error:', error);
-      toast.error('Invalid password. Please try again.');
-    } finally {
-      setIsLoading(false);
-    }
-  };
-
-  return (
-    <div className='flex min-h-screen items-center justify-center bg-gray-50 p-4'>
-      <Card className='w-full max-w-md'>
-        <CardHeader className='space-y-1'>
-          <CardTitle className='text-center text-2xl font-bold'>
-            Admin Login
-          </CardTitle>
-          <CardDescription className='text-center'>
-            Enter your admin password to access the dashboard
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          <form onSubmit={handleSubmit} className='space-y-4'>
-            {allowCustomBaseUrl && (
-              <div className='space-y-2'>
-                <Input
-                  type='text'
-                  placeholder='API URL (https://api.example.com)'
-                  value={baseUrl}
-                  onChange={(event: ChangeEvent<HTMLInputElement>) =>
-                    setBaseUrl(event.target.value)
-                  }
-                  disabled={isLoading}
-                  required
-                />
-              </div>
-            )}
-            <div className='space-y-2'>
-              <Input
-                type='password'
-                placeholder='Admin Password'
-                value={password}
-                onChange={(event: ChangeEvent<HTMLInputElement>) =>
-                  setPassword(event.target.value)
-                }
-                disabled={isLoading}
-                autoFocus
-                required
-              />
-            </div>
-            <Button type='submit' className='w-full' disabled={isLoading}>
-              {isLoading ? 'Logging in...' : 'Login'}
-            </Button>
-          </form>
-        </CardContent>
-      </Card>
-    </div>
-  );
-}

ui/app/model/page.tsx

@@ -1,271 +0,0 @@
-'use client';
-
-import { ModelSelector } from '@/components/ModelSelector';
-import { ModelTester } from '@/components/ModelTester';
-import { ApiEndpointTester } from '@/components/ApiEndpointTester';
-import { ModelSearchFilter } from '@/components/ModelSearchFilter';
-import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar';
-import { AppSidebar } from '@/components/app-sidebar';
-import { SiteHeader } from '@/components/site-header';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
-import { useQuery } from '@tanstack/react-query';
-import { AdminService } from '@/lib/api/services/admin';
-import { Skeleton } from '@/components/ui/skeleton';
-import { AlertCircle, Users, Globe } from 'lucide-react';
-import { Alert, AlertDescription } from '@/components/ui/alert';
-import { Badge } from '@/components/ui/badge';
-import { useMemo, useState } from 'react';
-import type { Model } from '@/lib/api/schemas/models';
-import { groupAndSortModelsByProvider } from '@/lib/utils/modelSort';
-
-export default function ModelsPage() {
-  const [filteredModels, setFilteredModels] = useState<Model[]>([]);
-
-  const {
-    data: modelsData,
-    isLoading: isLoadingModels,
-    error: modelsError,
-  } = useQuery({
-    queryKey: ['admin-models-with-providers'],
-    queryFn: () => AdminService.getModelsWithProviders(),
-    refetchOnWindowFocus: false,
-  });
-
-  const { models = [], groups = [] } = modelsData || {};
-
-  const groupedModels = useMemo(() => {
-    if (!models) return {};
-    return groupAndSortModelsByProvider(models);
-  }, [models]);
-
-  const groupDataMap = useMemo(() => {
-    return new Map(groups.map((group) => [group.provider, group]));
-  }, [groups]);
-
-  const providerInfo = useMemo(() => {
-    return Object.entries(groupedModels).map(([provider, providerModels]) => {
-      const groupData = groupDataMap.get(provider);
-      const activeModels = providerModels.filter(
-        (m) => m.isEnabled && !m.soft_deleted
-      ).length;
-      const totalModels = providerModels.length;
-
-      return {
-        provider,
-        activeModels,
-        totalModels,
-        groupData,
-        hasGroupUrl: !!groupData?.group_url,
-        hasGroupApiKey: !!groupData?.group_api_key,
-      };
-    });
-  }, [groupedModels, groupDataMap]);
-
-  return (
-    <SidebarProvider>
-      <AppSidebar variant='inset' />
-      <SidebarInset>
-        <SiteHeader />
-        <div className='flex flex-1 flex-col'>
-          <div className='@container/main flex flex-1 flex-col gap-4 p-4 md:gap-8 md:p-8'>
-            <div className='mb-6 flex items-center justify-between'>
-              <h1 className='text-2xl font-bold tracking-tight'>
-                Model Management & API Testing
-              </h1>
-            </div>
-
-            <Tabs defaultValue='manage' className='w-full'>
-              <TabsList className='grid w-full grid-cols-3'>
-                <TabsTrigger value='manage'>Manage Models</TabsTrigger>
-                {/*<TabsTrigger value='test-basic'>Basic Testing</TabsTrigger>
-                <TabsTrigger value='test-api'>API Endpoints</TabsTrigger> */}
-              </TabsList>
-
-              <TabsContent value='manage' className='space-y-4'>
-                <div className='text-muted-foreground text-sm'>
-                  Manage your AI models organized by provider groups. Configure
-                  API keys, and organize models by provider groups.
-                </div>
-
-                {isLoadingModels ? (
-                  <div className='space-y-4'>
-                    <Skeleton className='h-[60px] w-full' />
-                    <Skeleton className='h-[400px] w-full' />
-                  </div>
-                ) : modelsError ? (
-                  <Alert variant='destructive'>
-                    <AlertCircle className='h-4 w-4' />
-                    <AlertDescription>
-                      Failed to load models. Please try refreshing the page.
-                    </AlertDescription>
-                  </Alert>
-                ) : (
-                  <Tabs defaultValue='all' className='w-full'>
-                    <div className='space-y-4'>
-                      {/* Provider Tabs Navigation */}
-                      <div className='overflow-x-auto rounded-lg border p-1'>
-                        <TabsList className='grid w-full max-w-full min-w-max auto-cols-fr grid-flow-col gap-1 sm:gap-2'>
-                          <TabsTrigger
-                            value='all'
-                            className='flex items-center gap-1 text-xs whitespace-nowrap sm:gap-2 sm:text-sm'
-                          >
-                            <Globe className='h-3 w-3 sm:h-4 sm:w-4' />
-                            <span className='hidden sm:inline'>All Models</span>
-                            <span className='sm:hidden'>All</span>
-                            <Badge variant='secondary' className='ml-1 text-xs'>
-                              {models.length}
-                            </Badge>
-                          </TabsTrigger>
-                          {providerInfo.map(
-                            ({ provider, activeModels, totalModels }) => (
-                              <TabsTrigger
-                                key={provider}
-                                value={provider}
-                                className='flex min-w-fit items-center gap-1 text-xs whitespace-nowrap sm:gap-2 sm:text-sm'
-                              >
-                                <Users className='h-3 w-3 sm:h-4 sm:w-4' />
-                                <span className='max-w-20 truncate sm:max-w-none'>
-                                  {provider}
-                                </span>
-                                <div className='flex items-center gap-1'>
-                                  <Badge
-                                    variant='secondary'
-                                    className='ml-1 text-xs'
-                                  >
-                                    {activeModels}/{totalModels}
-                                  </Badge>
-                                </div>
-                              </TabsTrigger>
-                            )
-                          )}
-                        </TabsList>
-                      </div>
-
-                      {/* All Models Tab */}
-                      <TabsContent value='all'>
-                        <div className='space-y-4'>
-                          <div className='text-muted-foreground text-sm'>
-                            Overview of all models across all provider groups.
-                          </div>
-                          <ModelSearchFilter
-                            models={models}
-                            onFilteredModelsChange={setFilteredModels}
-                          />
-                          <ModelSelector
-                            filteredModels={filteredModels}
-                            showDeleteAllButton={true}
-                          />
-                        </div>
-                      </TabsContent>
-
-                      {Object.entries(groupedModels).map(
-                        ([provider, providerModels]) => {
-                          const groupData = groupDataMap.get(provider);
-
-                          return (
-                            <TabsContent key={provider} value={provider}>
-                              <div className='space-y-4'>
-                                <div className='flex items-center justify-between'>
-                                  <div>
-                                    <h3 className='flex items-center gap-2 text-lg font-semibold'>
-                                      <Users className='h-5 w-5' />
-                                      {provider}
-                                    </h3>
-                                    <div className='text-muted-foreground flex items-center gap-4 text-sm'>
-                                      {providerModels.filter(
-                                        (m) => m.soft_deleted
-                                      ).length > 0 && (
-                                        <span className='text-orange-600'>
-                                          {
-                                            providerModels.filter(
-                                              (m) => m.soft_deleted
-                                            ).length
-                                          }{' '}
-                                          disabled
-                                        </span>
-                                      )}
-                                      {groupData?.group_url && (
-                                        <span className='flex items-center gap-1'>
-                                          <Globe className='h-3 w-3' />
-                                          {groupData.group_url}
-                                        </span>
-                                      )}
-                                    </div>
-                                  </div>
-                                </div>
-                                <ModelSelector
-                                  filterProvider={provider}
-                                  groupData={groupData}
-                                  showProviderActions={true}
-                                  showDeleteAllButton={false}
-                                />
-                              </div>
-                            </TabsContent>
-                          );
-                        }
-                      )}
-                    </div>
-                  </Tabs>
-                )}
-              </TabsContent>
-
-              <TabsContent value='test-basic' className='space-y-4'>
-                <div className='text-muted-foreground text-sm'>
-                  Test model credentials and connectivity with basic chat
-                  completion requests through the secure proxy (resolves CORS
-                  and Docker network issues). Models can be tested even without
-                  API keys configured (useful for free models or when
-                  authentication is handled elsewhere).
-                </div>
-
-                {isLoadingModels ? (
-                  <div className='space-y-4'>
-                    <Skeleton className='h-[200px] w-full' />
-                    <Skeleton className='h-[100px] w-full' />
-                  </div>
-                ) : modelsError ? (
-                  <Alert variant='destructive'>
-                    <AlertCircle className='h-4 w-4' />
-                    <AlertDescription>
-                      Failed to load models for testing. Please try refreshing
-                      the page.
-                    </AlertDescription>
-                  </Alert>
-                ) : (
-                  <ModelTester models={models} />
-                )}
-              </TabsContent>
-
-              <TabsContent value='test-api' className='space-y-4'>
-                <div className='text-muted-foreground text-sm'>
-                  Comprehensive testing of all OpenAI API endpoints including
-                  chat completions, embeddings, image generation, audio
-                  synthesis, and model listing through the secure proxy
-                  (resolves CORS and Docker network issues). Models can be
-                  tested with or without API keys configured.
-                </div>
-
-                {isLoadingModels ? (
-                  <div className='space-y-4'>
-                    <Skeleton className='h-[300px] w-full' />
-                    <Skeleton className='h-[200px] w-full' />
-                  </div>
-                ) : modelsError ? (
-                  <Alert variant='destructive'>
-                    <AlertCircle className='h-4 w-4' />
-                    <AlertDescription>
-                      Failed to load models for API testing. Please try
-                      refreshing the page.
-                    </AlertDescription>
-                  </Alert>
-                ) : (
-                  <ApiEndpointTester models={models} />
-                )}
-              </TabsContent>
-            </Tabs>
-          </div>
-        </div>
-      </SidebarInset>
-    </SidebarProvider>
-  );
-}

ui/app/page.tsx

@@ -1,88 +0,0 @@
-'use client';
-
-import { useEffect, useState } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { AppSidebar } from '@/components/app-sidebar';
-import { SiteHeader } from '@/components/site-header';
-import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar';
-import { DetailedWalletBalance } from '@/components/detailed-wallet-balance';
-import { TemporaryBalances } from '@/components/temporary-balances';
-import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group';
-import type { DisplayUnit } from '@/lib/types/units';
-import { fetchBtcUsdPrice, btcToSatsRate } from '@/lib/exchange-rate';
-
-export default function Page() {
-  const [displayUnit, setDisplayUnit] = useState<DisplayUnit>('sat');
-
-  const { data: btcUsdPrice } = useQuery({
-    queryKey: ['btc-usd-price'],
-    queryFn: fetchBtcUsdPrice,
-    refetchInterval: 120_000,
-    staleTime: 60_000,
-  });
-
-  const usdPerSat = btcUsdPrice ? btcToSatsRate(btcUsdPrice) : null;
-
-  useEffect(() => {
-    if (displayUnit === 'usd' && usdPerSat === null) {
-      setDisplayUnit('sat');
-    }
-  }, [displayUnit, usdPerSat]);
-
-  return (
-    <SidebarProvider>
-      <AppSidebar variant='inset' />
-      <SidebarInset className='p-0'>
-        <SiteHeader />
-        <div className='container max-w-6xl px-4 py-8 md:px-6 lg:px-8'>
-          <div className='mb-8 flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between'>
-            <div>
-              <h1 className='text-3xl font-bold tracking-tight'>
-                Admin Dashboard
-              </h1>
-              <p className='text-muted-foreground mt-2'>
-                Monitor and manage wallet balances
-              </p>
-            </div>
-            <div className='flex items-center'>
-              <ToggleGroup
-                type='single'
-                value={displayUnit}
-                onValueChange={(value) => {
-                  if (value) {
-                    setDisplayUnit(value as DisplayUnit);
-                  }
-                }}
-                variant='outline'
-                size='sm'
-              >
-                <ToggleGroupItem value='msat'>mSAT</ToggleGroupItem>
-                <ToggleGroupItem value='sat'>sat</ToggleGroupItem>
-                <ToggleGroupItem value='usd' disabled={!usdPerSat}>
-                  USD
-                </ToggleGroupItem>
-              </ToggleGroup>
-            </div>
-          </div>
-
-          <div className='grid gap-6'>
-            <div className='col-span-full'>
-              <DetailedWalletBalance
-                refreshInterval={30000}
-                displayUnit={displayUnit}
-                usdPerSat={usdPerSat}
-              />
-            </div>
-            <div className='col-span-full'>
-              <TemporaryBalances
-                refreshInterval={60000}
-                displayUnit={displayUnit}
-                usdPerSat={usdPerSat}
-              />
-            </div>
-          </div>
-        </div>
-      </SidebarInset>
-    </SidebarProvider>
-  );
-}

ui/app/providers.tsx

@@ -1,47 +0,0 @@
-'use client';
-
-import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
-import { ReactQueryDevtools } from '@tanstack/react-query-devtools';
-import { useState, type ReactNode } from 'react';
-import { Toaster } from 'sonner';
-import { AuthProvider } from '@/lib/auth/AuthContext';
-import { ProtectedRoute } from '@/lib/auth/ProtectedRoute';
-import { ThemeProvider } from '@/components/theme-provider';
-
-interface ProvidersProps {
-  children: ReactNode;
-}
-
-export function Providers({ children }: ProvidersProps) {
-  const [queryClient] = useState(
-    () =>
-      new QueryClient({
-        defaultOptions: {
-          queries: {
-            staleTime: 1000 * 60 * 5,
-            refetchOnWindowFocus: false,
-            retry: 2,
-          },
-        },
-      })
-  );
-
-  return (
-    <QueryClientProvider client={queryClient}>
-      <ThemeProvider
-        attribute='class'
-        defaultTheme='system'
-        enableSystem
-        disableTransitionOnChange
-      >
-        <AuthProvider>
-          <ProtectedRoute>
-            {children}
-            <Toaster position='top-right' />
-          </ProtectedRoute>
-        </AuthProvider>
-        <ReactQueryDevtools initialIsOpen={false} />
-      </ThemeProvider>
-    </QueryClientProvider>
-  );
-}

ui/app/providers/page.tsx

@@ -1,785 +0,0 @@
-'use client';
-
-import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar';
-import { AppSidebar } from '@/components/app-sidebar';
-import { SiteHeader } from '@/components/site-header';
-import { Button } from '@/components/ui/button';
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card';
-import { Badge } from '@/components/ui/badge';
-import { useQuery, useMutation, useQueryClient } from '@tanstack/react-query';
-import {
-  AdminService,
-  UpstreamProvider,
-  CreateUpstreamProvider,
-  UpdateUpstreamProvider,
-} from '@/lib/api/services/admin';
-import { Skeleton } from '@/components/ui/skeleton';
-import {
-  AlertCircle,
-  Plus,
-  Pencil,
-  Trash2,
-  Server,
-  Database,
-  ChevronDown,
-  ChevronUp,
-} from 'lucide-react';
-import { Alert, AlertDescription } from '@/components/ui/alert';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogFooter,
-  DialogHeader,
-  DialogTitle,
-  DialogTrigger,
-} from '@/components/ui/dialog';
-import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
-import { Switch } from '@/components/ui/switch';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
-import { useState } from 'react';
-import { toast } from 'sonner';
-
-export default function ProvidersPage() {
-  const queryClient = useQueryClient();
-  const [editingProvider, setEditingProvider] =
-    useState<UpstreamProvider | null>(null);
-  const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
-  const [isEditDialogOpen, setIsEditDialogOpen] = useState(false);
-  const [expandedProviders, setExpandedProviders] = useState<Set<number>>(
-    new Set()
-  );
-  const [viewingModels, setViewingModels] = useState<number | null>(null);
-
-  const [formData, setFormData] = useState<CreateUpstreamProvider>({
-    provider_type: 'openrouter',
-    base_url: 'https://openrouter.ai/api/v1',
-    api_key: '',
-    api_version: null,
-    enabled: true,
-  });
-
-  const { data: providerTypes = [] } = useQuery({
-    queryKey: ['provider-types'],
-    queryFn: () => AdminService.getProviderTypes(),
-    refetchOnWindowFocus: false,
-  });
-
-  const {
-    data: providers = [],
-    isLoading,
-    error,
-  } = useQuery({
-    queryKey: ['upstream-providers'],
-    queryFn: () => AdminService.getUpstreamProviders(),
-    refetchOnWindowFocus: false,
-  });
-
-  const { data: providerModels, isLoading: isLoadingModels } = useQuery({
-    queryKey: ['provider-models', viewingModels],
-    queryFn: () =>
-      viewingModels
-        ? AdminService.getProviderModels(viewingModels)
-        : Promise.resolve(null),
-    enabled: !!viewingModels,
-    refetchOnWindowFocus: false,
-  });
-
-  const createMutation = useMutation({
-    mutationFn: (data: CreateUpstreamProvider) =>
-      AdminService.createUpstreamProvider(data),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['upstream-providers'] });
-      setIsCreateDialogOpen(false);
-      toast.success('Provider created successfully');
-      resetForm();
-    },
-    onError: (error: Error) => {
-      toast.error(`Failed to create provider: ${error.message}`);
-    },
-  });
-
-  const updateMutation = useMutation({
-    mutationFn: ({ id, data }: { id: number; data: UpdateUpstreamProvider }) =>
-      AdminService.updateUpstreamProvider(id, data),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['upstream-providers'] });
-      setIsEditDialogOpen(false);
-      setEditingProvider(null);
-      toast.success('Provider updated successfully');
-    },
-    onError: (error: Error) => {
-      toast.error(`Failed to update provider: ${error.message}`);
-    },
-  });
-
-  const deleteMutation = useMutation({
-    mutationFn: (id: number) => AdminService.deleteUpstreamProvider(id),
-    onSuccess: () => {
-      queryClient.invalidateQueries({ queryKey: ['upstream-providers'] });
-      toast.success('Provider deleted successfully');
-    },
-    onError: (error: Error) => {
-      toast.error(`Failed to delete provider: ${error.message}`);
-    },
-  });
-
-  const resetForm = () => {
-    setFormData({
-      provider_type: 'openrouter',
-      base_url: 'https://openrouter.ai/api/v1',
-      api_key: '',
-      api_version: null,
-      enabled: true,
-    });
-  };
-
-  const handleCreate = () => {
-    createMutation.mutate(formData);
-  };
-
-  const handleEdit = (provider: UpstreamProvider) => {
-    setEditingProvider(provider);
-    setFormData({
-      provider_type: provider.provider_type,
-      base_url: provider.base_url,
-      api_key: '',
-      api_version: provider.api_version || null,
-      enabled: provider.enabled,
-    });
-    setIsEditDialogOpen(true);
-  };
-
-  const handleUpdate = () => {
-    if (!editingProvider) return;
-    const updateData: UpdateUpstreamProvider = {
-      provider_type: formData.provider_type,
-      base_url: formData.base_url,
-      api_version: formData.api_version,
-      enabled: formData.enabled,
-    };
-    if (formData.api_key) {
-      updateData.api_key = formData.api_key;
-    }
-    updateMutation.mutate({ id: editingProvider.id, data: updateData });
-  };
-
-  const handleDelete = (id: number) => {
-    if (confirm('Are you sure you want to delete this provider?')) {
-      deleteMutation.mutate(id);
-    }
-  };
-
-  const getDefaultBaseUrl = (type: string) => {
-    const providerType = providerTypes.find((pt) => pt.id === type);
-    return providerType?.default_base_url || '';
-  };
-
-  const hasFixedBaseUrl = (type: string) => {
-    const providerType = providerTypes.find((pt) => pt.id === type);
-    return providerType?.fixed_base_url || false;
-  };
-
-  const getPlatformUrl = (type: string) => {
-    const providerType = providerTypes.find((pt) => pt.id === type);
-    return providerType?.platform_url || null;
-  };
-
-  const toggleProviderExpansion = (providerId: number) => {
-    const newExpanded = new Set(expandedProviders);
-    if (newExpanded.has(providerId)) {
-      newExpanded.delete(providerId);
-    } else {
-      newExpanded.add(providerId);
-    }
-    setExpandedProviders(newExpanded);
-    if (!newExpanded.has(providerId)) {
-      setViewingModels(null);
-    } else {
-      setViewingModels(providerId);
-    }
-  };
-
-  return (
-    <SidebarProvider>
-      <AppSidebar variant='inset' />
-      <SidebarInset>
-        <SiteHeader />
-        <div className='flex flex-1 flex-col'>
-          <div className='@container/main flex flex-1 flex-col gap-4 p-4 md:gap-8 md:p-8'>
-            <div className='mb-6 flex items-center justify-between'>
-              <div>
-                <h1 className='text-2xl font-bold tracking-tight'>
-                  Upstream Providers
-                </h1>
-                <p className='text-muted-foreground mt-2 text-sm'>
-                  Manage your AI provider connections and credentials
-                </p>
-              </div>
-              <Dialog
-                open={isCreateDialogOpen}
-                onOpenChange={setIsCreateDialogOpen}
-              >
-                <DialogTrigger asChild>
-                  <Button className='flex items-center gap-2'>
-                    <Plus className='h-4 w-4' />
-                    Add Provider
-                  </Button>
-                </DialogTrigger>
-                <DialogContent className='sm:max-w-[500px]'>
-                  <DialogHeader>
-                    <DialogTitle>Add Upstream Provider</DialogTitle>
-                    <DialogDescription>
-                      Configure a new AI provider connection
-                    </DialogDescription>
-                  </DialogHeader>
-                  <div className='grid gap-4 py-4'>
-                    <div className='grid gap-2'>
-                      <Label htmlFor='provider_type'>Provider Type</Label>
-                      <Select
-                        value={formData.provider_type}
-                        onValueChange={(value) => {
-                          setFormData({
-                            ...formData,
-                            provider_type: value,
-                            base_url: getDefaultBaseUrl(value),
-                          });
-                        }}
-                      >
-                        <SelectTrigger>
-                          <SelectValue />
-                        </SelectTrigger>
-                        <SelectContent>
-                          {providerTypes.map((type) => (
-                            <SelectItem key={type.id} value={type.id}>
-                              {type.name}
-                            </SelectItem>
-                          ))}
-                        </SelectContent>
-                      </Select>
-                    </div>
-                    <div className='grid gap-2'>
-                      <Label htmlFor='base_url'>Base URL</Label>
-                      <Input
-                        id='base_url'
-                        value={formData.base_url}
-                        onChange={(e) =>
-                          setFormData({ ...formData, base_url: e.target.value })
-                        }
-                        placeholder='https://api.example.com/v1'
-                        disabled={hasFixedBaseUrl(formData.provider_type)}
-                        className={
-                          hasFixedBaseUrl(formData.provider_type)
-                            ? 'cursor-not-allowed opacity-60'
-                            : ''
-                        }
-                      />
-                    </div>
-                    <div className='grid gap-2'>
-                      <div className='flex items-center justify-between'>
-                        <Label htmlFor='api_key'>API Key</Label>
-                        {getPlatformUrl(formData.provider_type) && (
-                          <a
-                            href={getPlatformUrl(formData.provider_type)!}
-                            target='_blank'
-                            rel='noopener noreferrer'
-                            className='text-xs text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300'
-                          >
-                            Get Your API Key Here →
-                          </a>
-                        )}
-                      </div>
-                      <Input
-                        id='api_key'
-                        type='password'
-                        value={formData.api_key}
-                        onChange={(e) =>
-                          setFormData({ ...formData, api_key: e.target.value })
-                        }
-                        placeholder='sk-...'
-                      />
-                    </div>
-                    {formData.provider_type === 'azure' && (
-                      <div className='grid gap-2'>
-                        <Label htmlFor='api_version'>API Version</Label>
-                        <Input
-                          id='api_version'
-                          value={formData.api_version || ''}
-                          onChange={(e) =>
-                            setFormData({
-                              ...formData,
-                              api_version: e.target.value || null,
-                            })
-                          }
-                          placeholder='2024-02-15-preview'
-                        />
-                      </div>
-                    )}
-                    <div className='flex items-center space-x-2'>
-                      <Switch
-                        id='enabled'
-                        checked={formData.enabled}
-                        onCheckedChange={(checked) =>
-                          setFormData({ ...formData, enabled: checked })
-                        }
-                      />
-                      <Label htmlFor='enabled'>Enabled</Label>
-                    </div>
-                  </div>
-                  <DialogFooter>
-                    <Button
-                      variant='outline'
-                      onClick={() => setIsCreateDialogOpen(false)}
-                    >
-                      Cancel
-                    </Button>
-                    <Button
-                      onClick={handleCreate}
-                      disabled={createMutation.isPending}
-                    >
-                      {createMutation.isPending ? 'Creating...' : 'Create'}
-                    </Button>
-                  </DialogFooter>
-                </DialogContent>
-              </Dialog>
-            </div>
-
-            {isLoading ? (
-              <div className='space-y-4'>
-                <Skeleton className='h-[100px] w-full' />
-                <Skeleton className='h-[100px] w-full' />
-              </div>
-            ) : error ? (
-              <Alert variant='destructive'>
-                <AlertCircle className='h-4 w-4' />
-                <AlertDescription>
-                  Failed to load providers. Please try refreshing the page.
-                </AlertDescription>
-              </Alert>
-            ) : providers.length === 0 ? (
-              <Card>
-                <CardContent className='flex flex-col items-center justify-center py-12'>
-                  <Server className='text-muted-foreground mb-4 h-12 w-12' />
-                  <h3 className='mb-2 text-lg font-semibold'>
-                    No providers configured
-                  </h3>
-                  <p className='text-muted-foreground mb-4 text-sm'>
-                    Get started by adding your first upstream provider
-                  </p>
-                  <Button onClick={() => setIsCreateDialogOpen(true)}>
-                    <Plus className='mr-2 h-4 w-4' />
-                    Add Provider
-                  </Button>
-                </CardContent>
-              </Card>
-            ) : (
-              <div className='grid gap-4'>
-                {providers.map((provider) => (
-                  <Card key={provider.id}>
-                    <CardHeader>
-                      <div className='flex flex-col gap-4 sm:flex-row sm:items-start sm:justify-between'>
-                        <div className='min-w-0 flex-1'>
-                          <div className='flex flex-col gap-2 sm:flex-row sm:items-center'>
-                            <CardTitle className='truncate text-lg'>
-                              {provider.provider_type}
-                            </CardTitle>
-                            <Badge
-                              variant={
-                                provider.enabled ? 'default' : 'secondary'
-                              }
-                              className='w-fit sm:ml-2'
-                            >
-                              {provider.enabled ? 'Enabled' : 'Disabled'}
-                            </Badge>
-                          </div>
-                          <CardDescription className='mt-1 break-all'>
-                            {provider.base_url}
-                          </CardDescription>
-                        </div>
-                        <div className='grid grid-cols-3 gap-2 sm:flex sm:flex-nowrap'>
-                          <Button
-                            variant='outline'
-                            size='sm'
-                            onClick={() => toggleProviderExpansion(provider.id)}
-                            className='w-full sm:w-auto'
-                          >
-                            <Database className='mr-1 h-4 w-4' />
-                            <span className='hidden sm:inline'>Models</span>
-                            {expandedProviders.has(provider.id) ? (
-                              <ChevronUp className='ml-1 h-4 w-4' />
-                            ) : (
-                              <ChevronDown className='ml-1 h-4 w-4' />
-                            )}
-                          </Button>
-                          <Button
-                            variant='outline'
-                            size='sm'
-                            onClick={() => handleEdit(provider)}
-                            className='w-full sm:w-auto'
-                          >
-                            <Pencil className='h-4 w-4' />
-                          </Button>
-                          <Button
-                            variant='outline'
-                            size='sm'
-                            onClick={() => handleDelete(provider.id)}
-                            className='w-full sm:w-auto'
-                          >
-                            <Trash2 className='h-4 w-4' />
-                          </Button>
-                        </div>
-                      </div>
-                    </CardHeader>
-                    <CardContent>
-                      <div className='space-y-4'>
-                        <div className='space-y-2'>
-                          {provider.api_version && (
-                            <div className='flex items-center justify-between text-sm'>
-                              <span className='text-muted-foreground'>
-                                API Version:
-                              </span>
-                              <span className='font-mono'>
-                                {provider.api_version}
-                              </span>
-                            </div>
-                          )}
-                        </div>
-
-                        {expandedProviders.has(provider.id) && (
-                          <div className='mt-4 border-t pt-4'>
-                            {isLoadingModels &&
-                            viewingModels === provider.id ? (
-                              <div className='space-y-2'>
-                                <Skeleton className='h-[40px] w-full' />
-                                <Skeleton className='h-[40px] w-full' />
-                              </div>
-                            ) : providerModels &&
-                              viewingModels === provider.id ? (
-                              providerModels.remote_models.length === 0 ? (
-                                // No provided models - show custom models directly without tabs
-                                <div className='space-y-2'>
-                                  {providerModels.db_models.length === 0 ? (
-                                    <div className='text-muted-foreground py-4 text-center text-sm'>
-                                      No models configured. Add custom models to
-                                      use this provider.
-                                    </div>
-                                  ) : (
-                                    <div className='space-y-2'>
-                                      {providerModels.db_models.map((model) => (
-                                        <div
-                                          key={model.id}
-                                          className='hover:bg-accent flex flex-col gap-2 rounded-lg border p-3 transition-colors sm:flex-row sm:items-center sm:justify-between'
-                                        >
-                                          <div className='min-w-0 flex-1'>
-                                            <div className='flex flex-col gap-1 sm:flex-row sm:items-center sm:gap-2'>
-                                              <span className='truncate font-mono text-sm font-medium'>
-                                                {model.id}
-                                              </span>
-                                              <Badge
-                                                variant={
-                                                  model.enabled
-                                                    ? 'default'
-                                                    : 'secondary'
-                                                }
-                                                className='w-fit text-xs'
-                                              >
-                                                {model.enabled
-                                                  ? 'Enabled'
-                                                  : 'Disabled'}
-                                              </Badge>
-                                            </div>
-                                            <div className='text-muted-foreground mt-1 text-xs break-words'>
-                                              {model.description || model.name}
-                                            </div>
-                                          </div>
-                                          <div className='text-muted-foreground text-xs whitespace-nowrap'>
-                                            {model.context_length?.toLocaleString()}{' '}
-                                            tokens
-                                          </div>
-                                        </div>
-                                      ))}
-                                    </div>
-                                  )}
-                                </div>
-                              ) : (
-                                // Has provided models - show tabs
-                                <Tabs
-                                  defaultValue='provided'
-                                  className='w-full'
-                                >
-                                  <TabsList className='grid w-full grid-cols-2'>
-                                    <TabsTrigger
-                                      value='provided'
-                                      className='text-xs sm:text-sm'
-                                    >
-                                      <span className='hidden sm:inline'>
-                                        Provided Models
-                                      </span>
-                                      <span className='sm:hidden'>
-                                        Provided
-                                      </span>
-                                      <Badge
-                                        variant='secondary'
-                                        className='ml-1 text-xs sm:ml-2'
-                                      >
-                                        {providerModels.remote_models.length}
-                                      </Badge>
-                                    </TabsTrigger>
-                                    <TabsTrigger
-                                      value='custom'
-                                      className='text-xs sm:text-sm'
-                                    >
-                                      <span className='hidden sm:inline'>
-                                        Custom Models
-                                      </span>
-                                      <span className='sm:hidden'>Custom</span>
-                                      <Badge
-                                        variant='secondary'
-                                        className='ml-1 text-xs sm:ml-2'
-                                      >
-                                        {providerModels.db_models.length}
-                                      </Badge>
-                                    </TabsTrigger>
-                                  </TabsList>
-                                  <TabsContent
-                                    value='custom'
-                                    className='mt-4 space-y-2'
-                                  >
-                                    {providerModels.db_models.length > 0 && (
-                                      <div className='text-muted-foreground mb-3 text-sm'>
-                                        Custom models override or extend the
-                                        provider&apos;s catalog.
-                                      </div>
-                                    )}
-                                    {providerModels.db_models.length === 0 ? (
-                                      <div className='text-muted-foreground py-4 text-center text-sm'>
-                                        No custom models configured
-                                      </div>
-                                    ) : (
-                                      <div className='space-y-2'>
-                                        {providerModels.db_models.map(
-                                          (model) => (
-                                            <div
-                                              key={model.id}
-                                              className='hover:bg-accent flex flex-col gap-2 rounded-lg border p-3 transition-colors sm:flex-row sm:items-center sm:justify-between'
-                                            >
-                                              <div className='min-w-0 flex-1'>
-                                                <div className='flex flex-col gap-1 sm:flex-row sm:items-center sm:gap-2'>
-                                                  <span className='truncate font-mono text-sm font-medium'>
-                                                    {model.id}
-                                                  </span>
-                                                  <Badge
-                                                    variant={
-                                                      model.enabled
-                                                        ? 'default'
-                                                        : 'secondary'
-                                                    }
-                                                    className='w-fit text-xs'
-                                                  >
-                                                    {model.enabled
-                                                      ? 'Enabled'
-                                                      : 'Disabled'}
-                                                  </Badge>
-                                                </div>
-                                                <div className='text-muted-foreground mt-1 text-xs break-words'>
-                                                  {model.description ||
-                                                    model.name}
-                                                </div>
-                                              </div>
-                                              <div className='text-muted-foreground text-xs whitespace-nowrap'>
-                                                {model.context_length?.toLocaleString()}{' '}
-                                                tokens
-                                              </div>
-                                            </div>
-                                          )
-                                        )}
-                                      </div>
-                                    )}
-                                  </TabsContent>
-                                  <TabsContent
-                                    value='provided'
-                                    className='mt-4 space-y-2'
-                                  >
-                                    {providerModels.remote_models.length >
-                                      0 && (
-                                      <div className='text-muted-foreground mb-3 text-sm'>
-                                        Models automatically discovered from the
-                                        provider&apos;s catalog.
-                                      </div>
-                                    )}
-                                    <div className='space-y-2'>
-                                      {providerModels.remote_models.map(
-                                        (model) => (
-                                          <div
-                                            key={model.id}
-                                            className='hover:bg-accent flex flex-col gap-2 rounded-lg border p-3 transition-colors sm:flex-row sm:items-center sm:justify-between'
-                                          >
-                                            <div className='min-w-0 flex-1'>
-                                              <div className='truncate font-mono text-sm font-medium'>
-                                                {model.id}
-                                              </div>
-                                              <div className='text-muted-foreground mt-1 text-xs break-words'>
-                                                {model.description ||
-                                                  model.name}
-                                              </div>
-                                            </div>
-                                            <div className='text-muted-foreground text-xs whitespace-nowrap'>
-                                              {model.context_length?.toLocaleString()}{' '}
-                                              tokens
-                                            </div>
-                                          </div>
-                                        )
-                                      )}
-                                    </div>
-                                  </TabsContent>
-                                </Tabs>
-                              )
-                            ) : null}
-                          </div>
-                        )}
-                      </div>
-                    </CardContent>
-                  </Card>
-                ))}
-              </div>
-            )}
-          </div>
-        </div>
-
-        <Dialog open={isEditDialogOpen} onOpenChange={setIsEditDialogOpen}>
-          <DialogContent className='sm:max-w-[500px]'>
-            <DialogHeader>
-              <DialogTitle>Edit Upstream Provider</DialogTitle>
-              <DialogDescription>
-                Update provider configuration
-              </DialogDescription>
-            </DialogHeader>
-            <div className='grid gap-4 py-4'>
-              <div className='grid gap-2'>
-                <Label htmlFor='edit_provider_type'>Provider Type</Label>
-                <Select
-                  value={formData.provider_type}
-                  onValueChange={(value) => {
-                    setFormData({
-                      ...formData,
-                      provider_type: value,
-                      base_url: getDefaultBaseUrl(value),
-                    });
-                  }}
-                >
-                  <SelectTrigger>
-                    <SelectValue />
-                  </SelectTrigger>
-                  <SelectContent>
-                    {providerTypes.map((type) => (
-                      <SelectItem key={type.id} value={type.id}>
-                        {type.name}
-                      </SelectItem>
-                    ))}
-                  </SelectContent>
-                </Select>
-              </div>
-              <div className='grid gap-2'>
-                <Label htmlFor='edit_base_url'>Base URL</Label>
-                <Input
-                  id='edit_base_url'
-                  value={formData.base_url}
-                  onChange={(e) =>
-                    setFormData({ ...formData, base_url: e.target.value })
-                  }
-                  placeholder='https://api.example.com/v1'
-                  disabled={hasFixedBaseUrl(formData.provider_type)}
-                  className={
-                    hasFixedBaseUrl(formData.provider_type)
-                      ? 'cursor-not-allowed opacity-60'
-                      : ''
-                  }
-                />
-              </div>
-              <div className='grid gap-2'>
-                <div className='flex items-center justify-between'>
-                  <Label htmlFor='edit_api_key'>
-                    API Key (leave blank to keep current)
-                  </Label>
-                  {getPlatformUrl(formData.provider_type) && (
-                    <a
-                      href={getPlatformUrl(formData.provider_type)!}
-                      target='_blank'
-                      rel='noopener noreferrer'
-                      className='text-xs text-blue-600 hover:text-blue-800 dark:text-blue-400 dark:hover:text-blue-300'
-                    >
-                      Get Your API Key Here →
-                    </a>
-                  )}
-                </div>
-                <Input
-                  id='edit_api_key'
-                  type='password'
-                  value={formData.api_key}
-                  onChange={(e) =>
-                    setFormData({ ...formData, api_key: e.target.value })
-                  }
-                  placeholder='Leave blank to keep current'
-                />
-              </div>
-              {formData.provider_type === 'azure' && (
-                <div className='grid gap-2'>
-                  <Label htmlFor='edit_api_version'>API Version</Label>
-                  <Input
-                    id='edit_api_version'
-                    value={formData.api_version || ''}
-                    onChange={(e) =>
-                      setFormData({
-                        ...formData,
-                        api_version: e.target.value || null,
-                      })
-                    }
-                    placeholder='2024-02-15-preview'
-                  />
-                </div>
-              )}
-              <div className='flex items-center space-x-2'>
-                <Switch
-                  id='edit_enabled'
-                  checked={formData.enabled}
-                  onCheckedChange={(checked) =>
-                    setFormData({ ...formData, enabled: checked })
-                  }
-                />
-                <Label htmlFor='edit_enabled'>Enabled</Label>
-              </div>
-            </div>
-            <DialogFooter>
-              <Button
-                variant='outline'
-                onClick={() => setIsEditDialogOpen(false)}
-              >
-                Cancel
-              </Button>
-              <Button
-                onClick={handleUpdate}
-                disabled={updateMutation.isPending}
-              >
-                {updateMutation.isPending ? 'Updating...' : 'Update'}
-              </Button>
-            </DialogFooter>
-          </DialogContent>
-        </Dialog>
-      </SidebarInset>
-    </SidebarProvider>
-  );
-}

ui/app/settings/page.tsx

@@ -1,40 +0,0 @@
-'use client';
-
-import * as React from 'react';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
-import { ServerConfigSettings } from '@/components/settings/server-config-settings';
-import { AdminSettings } from '@/components/settings/admin-settings';
-import { SiteHeader } from '@/components/site-header';
-import { AppSidebar } from '@/components/app-sidebar';
-import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar';
-import { Toaster } from 'sonner';
-
-export default function SettingsPage() {
-  return (
-    <SidebarProvider>
-      <AppSidebar variant='inset' />
-      <SidebarInset>
-        <SiteHeader />
-        <div className='flex flex-1 flex-col'>
-          <div className='@container/main flex flex-1 flex-col gap-4 p-4 md:gap-8 md:p-8'>
-            <div className='flex items-center'>
-              <h1 className='text-2xl font-bold tracking-tight'>Settings</h1>
-            </div>
-            <Tabs defaultValue='admin' className='w-full'>
-              <TabsList className='mb-4'>
-                <TabsTrigger value='admin'>Admin Settings</TabsTrigger>
-              </TabsList>
-              <TabsContent value='server'>
-                <ServerConfigSettings />
-              </TabsContent>
-              <TabsContent value='admin'>
-                <AdminSettings />
-              </TabsContent>
-            </Tabs>
-          </div>
-        </div>
-      </SidebarInset>
-      <Toaster />
-    </SidebarProvider>
-  );
-}

ui/app/transactions/page.tsx

@@ -1,353 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import { SidebarInset, SidebarProvider } from '@/components/ui/sidebar';
-import { AppSidebar } from '@/components/app-sidebar';
-import { SiteHeader } from '@/components/site-header';
-import { useQuery } from '@tanstack/react-query';
-import { Skeleton } from '@/components/ui/skeleton';
-import {
-  AlertCircle,
-  Copy,
-  RefreshCw,
-  ChevronLeft,
-  ChevronRight,
-} from 'lucide-react';
-import { Alert, AlertDescription } from '@/components/ui/alert';
-import { Button } from '@/components/ui/button';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@/components/ui/table';
-import { Badge } from '@/components/ui/badge';
-import {
-  Tooltip,
-  TooltipContent,
-  TooltipProvider,
-  TooltipTrigger,
-} from '@/components/ui/tooltip';
-import { toast } from 'sonner';
-import { apiClient } from '@/lib/api/client';
-
-interface Transaction {
-  id: string;
-  created_at: string;
-  token: string;
-  amount: string;
-}
-
-interface PaginatedTransactionsResponse {
-  transactions: Transaction[];
-  total: number;
-  page: number;
-  per_page: number;
-  total_pages: number;
-}
-
-const TransactionService = {
-  getAllTransactions: async (): Promise<Transaction[]> => {
-    try {
-      const response = await apiClient.get<Transaction[]>('/api/transactions');
-      return response || [];
-    } catch (error) {
-      console.error('Failed to fetch transactions:', error);
-      throw new Error('Failed to fetch transactions');
-    }
-  },
-
-  getPaginatedTransactions: async (
-    page: number,
-    perPage: number
-  ): Promise<PaginatedTransactionsResponse> => {
-    try {
-      const response = await apiClient.get<PaginatedTransactionsResponse>(
-        `/api/transactions/paginated/${page}/${perPage}`
-      );
-      return response;
-    } catch (error) {
-      console.error('Failed to fetch paginated transactions:', error);
-      throw new Error('Failed to fetch paginated transactions');
-    }
-  },
-
-  getRecentTransactions: async (limit: number): Promise<Transaction[]> => {
-    try {
-      const response = await apiClient.get<Transaction[]>(
-        `/api/transactions/recent/${limit}`
-      );
-      return response || [];
-    } catch (error) {
-      console.error('Failed to fetch recent transactions:', error);
-      throw new Error('Failed to fetch recent transactions');
-    }
-  },
-};
-
-export default function TransactionsPage() {
-  const [currentPage, setCurrentPage] = useState(1);
-  const perPage = 20;
-
-  // Fetch paginated transactions data
-  const {
-    data: paginationData,
-    isLoading,
-    error,
-    refetch,
-  } = useQuery({
-    queryKey: ['transactions', currentPage, perPage],
-    queryFn: () =>
-      TransactionService.getPaginatedTransactions(currentPage, perPage),
-    refetchOnWindowFocus: false,
-    retry: 1,
-    staleTime: 30000, // 30 seconds
-  });
-
-  const transactions = paginationData?.transactions || [];
-  const totalPages = paginationData?.total_pages || 0;
-  const total = paginationData?.total || 0;
-
-  const formatDate = (dateString: string) => {
-    return new Date(dateString).toLocaleString();
-  };
-
-  const formatAmount = (amount: string) => {
-    return `${parseInt(amount).toLocaleString()} msats`;
-  };
-
-  const truncateToken = (token: string) => {
-    if (token.length <= 20) return token;
-    return `${token.slice(0, 10)}...${token.slice(-10)}`;
-  };
-
-  const copyToClipboard = async (text: string) => {
-    try {
-      await navigator.clipboard.writeText(text);
-      toast.success('Token copied to clipboard!');
-    } catch (error) {
-      console.error('Failed to copy to clipboard:', error);
-      toast.error('Failed to copy token');
-    }
-  };
-
-  const goToPage = (page: number) => {
-    if (page >= 1 && page <= totalPages) {
-      setCurrentPage(page);
-    }
-  };
-
-  const goToPrevious = () => {
-    if (currentPage > 1) {
-      setCurrentPage(currentPage - 1);
-    }
-  };
-
-  const goToNext = () => {
-    if (currentPage < totalPages) {
-      setCurrentPage(currentPage + 1);
-    }
-  };
-
-  return (
-    <TooltipProvider>
-      <SidebarProvider>
-        <AppSidebar variant='inset' />
-        <SidebarInset>
-          <SiteHeader />
-          <div className='flex flex-1 flex-col'>
-            <div className='@container/main flex flex-1 flex-col gap-4 p-4 md:gap-8 md:p-8'>
-              <div className='mb-6 flex items-center justify-between'>
-                <div>
-                  <h1 className='text-2xl font-bold tracking-tight'>
-                    Transaction History
-                  </h1>
-                  <p className='text-muted-foreground text-sm'>
-                    View all Cashu token transactions processed by the system
-                  </p>
-                </div>
-                <Button
-                  onClick={() => refetch()}
-                  variant='outline'
-                  size='sm'
-                  disabled={isLoading}
-                >
-                  <RefreshCw
-                    className={`mr-2 h-4 w-4 ${isLoading ? 'animate-spin' : ''}`}
-                  />
-                  Refresh
-                </Button>
-              </div>
-
-              {isLoading ? (
-                <div className='space-y-4'>
-                  {[...Array(5)].map((_, i) => (
-                    <Skeleton key={i} className='h-[120px] w-full' />
-                  ))}
-                </div>
-              ) : error ? (
-                <Alert variant='destructive'>
-                  <AlertCircle className='h-4 w-4' />
-                  <AlertDescription>
-                    Failed to load transactions.{' '}
-                    {error instanceof Error
-                      ? error.message
-                      : 'Please check if the server is running and try refreshing the page.'}
-                  </AlertDescription>
-                </Alert>
-              ) : transactions.length === 0 ? (
-                <div className='py-8 text-center'>
-                  <p className='text-muted-foreground'>
-                    No transactions found.
-                  </p>
-                </div>
-              ) : (
-                <div className='space-y-4'>
-                  <div className='flex items-center justify-between'>
-                    <div className='text-muted-foreground text-sm'>
-                      Showing {(currentPage - 1) * perPage + 1} to{' '}
-                      {Math.min(currentPage * perPage, total)} of {total}{' '}
-                      transactions
-                    </div>
-                    <div className='text-muted-foreground text-sm'>
-                      Page {currentPage} of {totalPages}
-                    </div>
-                  </div>
-
-                  <div className='rounded-md border'>
-                    <Table>
-                      <TableHeader>
-                        <TableRow>
-                          <TableHead className='w-[100px]'>ID</TableHead>
-                          <TableHead>Date & Time</TableHead>
-                          <TableHead>Amount</TableHead>
-                          <TableHead className='w-[400px]'>
-                            Cashu Token
-                          </TableHead>
-                          <TableHead className='w-[60px]'>Actions</TableHead>
-                        </TableRow>
-                      </TableHeader>
-                      <TableBody>
-                        {transactions.map((transaction) => (
-                          <TableRow key={transaction.id}>
-                            <TableCell className='font-mono text-xs'>
-                              {transaction.id.slice(0, 8)}
-                            </TableCell>
-                            <TableCell>
-                              <div className='text-sm'>
-                                {formatDate(transaction.created_at)}
-                              </div>
-                            </TableCell>
-                            <TableCell>
-                              <Badge variant='secondary'>
-                                {formatAmount(transaction.amount)}
-                              </Badge>
-                            </TableCell>
-                            <TableCell>
-                              <div className='flex items-center gap-2'>
-                                <Tooltip>
-                                  <TooltipTrigger asChild>
-                                    <p className='max-w-[300px] cursor-pointer truncate rounded px-1 py-0.5 font-mono text-xs hover:bg-gray-100'>
-                                      {truncateToken(transaction.token)}
-                                    </p>
-                                  </TooltipTrigger>
-                                  <TooltipContent className='max-w-md break-all'>
-                                    <p className='font-mono text-xs'>
-                                      {transaction.token}
-                                    </p>
-                                  </TooltipContent>
-                                </Tooltip>
-                              </div>
-                            </TableCell>
-                            <TableCell>
-                              <Button
-                                variant='ghost'
-                                size='sm'
-                                onClick={() =>
-                                  copyToClipboard(transaction.token)
-                                }
-                                className='h-8 w-8 p-0'
-                              >
-                                <Copy className='h-4 w-4' />
-                              </Button>
-                            </TableCell>
-                          </TableRow>
-                        ))}
-                      </TableBody>
-                    </Table>
-                  </div>
-
-                  {/* Pagination Controls */}
-                  {totalPages > 1 && (
-                    <div className='flex items-center justify-between'>
-                      <div className='text-muted-foreground text-sm'>
-                        Page {currentPage} of {totalPages}
-                      </div>
-                      <div className='flex items-center space-x-2'>
-                        <Button
-                          variant='outline'
-                          size='sm'
-                          onClick={goToPrevious}
-                          disabled={currentPage === 1}
-                        >
-                          <ChevronLeft className='mr-1 h-4 w-4' />
-                          Previous
-                        </Button>
-
-                        {/* Page Numbers */}
-                        <div className='flex items-center space-x-1'>
-                          {Array.from(
-                            { length: Math.min(5, totalPages) },
-                            (_, i) => {
-                              const pageNumber =
-                                currentPage <= 3
-                                  ? i + 1
-                                  : currentPage >= totalPages - 2
-                                    ? totalPages - 4 + i
-                                    : currentPage - 2 + i;
-
-                              if (pageNumber < 1 || pageNumber > totalPages)
-                                return null;
-
-                              return (
-                                <Button
-                                  key={pageNumber}
-                                  variant={
-                                    currentPage === pageNumber
-                                      ? 'default'
-                                      : 'outline'
-                                  }
-                                  size='sm'
-                                  onClick={() => goToPage(pageNumber)}
-                                  className='h-9 w-9 p-0'
-                                >
-                                  {pageNumber}
-                                </Button>
-                              );
-                            }
-                          )}
-                        </div>
-
-                        <Button
-                          variant='outline'
-                          size='sm'
-                          onClick={goToNext}
-                          disabled={currentPage === totalPages}
-                        >
-                          Next
-                          <ChevronRight className='ml-1 h-4 w-4' />
-                        </Button>
-                      </div>
-                    </div>
-                  )}
-                </div>
-              )}
-            </div>
-          </div>
-        </SidebarInset>
-      </SidebarProvider>
-    </TooltipProvider>
-  );
-}

ui/app/unauthorized/page.tsx

@@ -1,32 +0,0 @@
-'use client';
-
-import { Button } from '@/components/ui/button';
-import { useRouter } from 'next/navigation';
-import { ShieldAlertIcon } from 'lucide-react';
-
-export default function UnauthorizedPage() {
-  const router = useRouter();
-
-  return (
-    <div className='bg-background flex min-h-screen flex-col items-center justify-center p-4'>
-      <div className='flex max-w-md flex-col items-center space-y-6 text-center'>
-        <ShieldAlertIcon className='text-destructive h-24 w-24' />
-
-        <h1 className='text-4xl font-bold'>Access Denied</h1>
-
-        <p className='text-muted-foreground text-lg'>
-          You don&apos;t have permission to access this page. Please contact
-          your administrator if you believe this is an error.
-        </p>
-
-        <div className='flex gap-4'>
-          <Button onClick={() => router.push('/')}>Go to Dashboard</Button>
-
-          <Button variant='outline' onClick={() => router.back()}>
-            Go Back
-          </Button>
-        </div>
-      </div>
-    </div>
-  );
-}

ui/components.json

@@ -1,21 +0,0 @@
-{
-  "$schema": "https://ui.shadcn.com/schema.json",
-  "style": "new-york",
-  "rsc": true,
-  "tsx": true,
-  "tailwind": {
-    "config": "",
-    "css": "app/globals.css",
-    "baseColor": "stone",
-    "cssVariables": true,
-    "prefix": ""
-  },
-  "aliases": {
-    "components": "@/components",
-    "utils": "@/lib/utils",
-    "ui": "@/components/ui",
-    "lib": "@/lib",
-    "hooks": "@/hooks"
-  },
-  "iconLibrary": "lucide"
-}

ui/components/AddModelForm.tsx

@@ -1,319 +0,0 @@
-'use client';
-
-import React, { useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { ManualModelSchema, type ManualModel } from '@/lib/api/schemas/models';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
-import {
-  Form,
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@/components/ui/form';
-import { Plus, Loader2 } from 'lucide-react';
-import { toast } from 'sonner';
-
-interface AddModelFormProps {
-  onModelAdd: (model: ManualModel) => void;
-  onCancel?: () => void;
-  isOpen: boolean;
-}
-
-export function AddModelForm({
-  onModelAdd,
-  onCancel,
-  isOpen,
-}: AddModelFormProps) {
-  const [isSubmitting, setIsSubmitting] = useState(false);
-
-  const form = useForm<ManualModel>({
-    resolver: zodResolver(ManualModelSchema) as any, // eslint-disable-line @typescript-eslint/no-explicit-any
-    defaultValues: {
-      name: '',
-      full_name: '',
-      input_cost: 0,
-      output_cost: 0,
-      provider: '',
-      modelType: 'text' as const,
-      description: '',
-      contextLength: undefined,
-    },
-  });
-
-  const onSubmit = async (data: ManualModel) => {
-    setIsSubmitting(true);
-    try {
-      await onModelAdd(data);
-      toast.success('Model added successfully!');
-      form.reset();
-      onCancel?.();
-    } catch (error) {
-      toast.error('Failed to add model. Please try again.');
-      console.error('Error adding model:', error);
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const handleClose = () => {
-    if (!isSubmitting) {
-      form.reset();
-      onCancel?.();
-    }
-  };
-
-  return (
-    <Dialog open={isOpen} onOpenChange={handleClose}>
-      <DialogContent className='max-h-[90vh] overflow-y-auto sm:max-w-[600px]'>
-        <DialogHeader>
-          <DialogTitle className='flex items-center gap-2'>
-            <Plus className='h-5 w-5' />
-            Add New Model
-          </DialogTitle>
-          <DialogDescription>
-            Manually add a new AI model to your collection
-          </DialogDescription>
-        </DialogHeader>
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className='space-y-4'>
-            <div className='grid grid-cols-1 gap-4 sm:grid-cols-2'>
-              <FormField
-                control={form.control}
-                name='name'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Model Name *</FormLabel>
-                    <FormControl>
-                      <Input
-                        placeholder='e.g., GPT-4o'
-                        {...field}
-                        className='w-full'
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      Display name for the model
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name='provider'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Provider *</FormLabel>
-                    <FormControl>
-                      <Input
-                        placeholder='e.g., OpenAI, Anthropic'
-                        {...field}
-                        className='w-full'
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      AI model provider or company
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            </div>
-
-            <div className='grid grid-cols-1 gap-4 sm:grid-cols-2'>
-              <FormField
-                control={form.control}
-                name='input_cost'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Input Cost (per 1M tokens) *</FormLabel>
-                    <FormControl>
-                      <Input
-                        type='number'
-                        step='0.001'
-                        min='0'
-                        placeholder='5.00'
-                        {...field}
-                        value={
-                          field.value ? parseFloat(field.value.toFixed(3)) : ''
-                        }
-                        onChange={(e) => {
-                          const value = parseFloat(e.target.value) || 0;
-                          const rounded = Math.round(value * 1000) / 1000;
-                          field.onChange(rounded);
-                        }}
-                        className='w-full'
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      Cost in USD per 1,000,000 input tokens (max 3 decimals)
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name='output_cost'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Output Cost (per 1M tokens) *</FormLabel>
-                    <FormControl>
-                      <Input
-                        type='number'
-                        step='0.001'
-                        min='0'
-                        placeholder='15.00'
-                        {...field}
-                        value={
-                          field.value ? parseFloat(field.value.toFixed(3)) : ''
-                        }
-                        onChange={(e) => {
-                          const value = parseFloat(e.target.value) || 0;
-                          const rounded = Math.round(value * 1000) / 1000;
-                          field.onChange(rounded);
-                        }}
-                        className='w-full'
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      Cost in USD per 1,000,000 output tokens (max 3 decimals)
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            </div>
-
-            <div className='grid grid-cols-1 gap-4 sm:grid-cols-2'>
-              <FormField
-                control={form.control}
-                name='modelType'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Model Type</FormLabel>
-                    <Select
-                      onValueChange={field.onChange}
-                      defaultValue={field.value}
-                    >
-                      <FormControl>
-                        <SelectTrigger>
-                          <SelectValue placeholder='Select model type' />
-                        </SelectTrigger>
-                      </FormControl>
-                      <SelectContent>
-                        <SelectItem value='text'>Text/Chat</SelectItem>
-                        <SelectItem value='embedding'>Embedding</SelectItem>
-                        <SelectItem value='image'>Image Generation</SelectItem>
-                        <SelectItem value='audio'>Audio</SelectItem>
-                        <SelectItem value='multimodal'>Multimodal</SelectItem>
-                      </SelectContent>
-                    </Select>
-                    <FormDescription>
-                      Type of AI model functionality
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name='contextLength'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Context Length</FormLabel>
-                    <FormControl>
-                      <Input
-                        type='number'
-                        min='0'
-                        placeholder='8192'
-                        value={field.value || ''}
-                        onChange={(e) => {
-                          const val = parseInt(e.target.value);
-                          field.onChange(
-                            isNaN(val) || val === 0 ? undefined : val
-                          );
-                        }}
-                        className='w-full'
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      Maximum context length in tokens (optional, leave empty
-                      for default)
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            </div>
-
-            <FormField
-              control={form.control}
-              name='description'
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Description</FormLabel>
-                  <FormControl>
-                    <Textarea
-                      placeholder='Brief description of the model...'
-                      {...field}
-                      rows={3}
-                      className='w-full'
-                    />
-                  </FormControl>
-                  <FormDescription>
-                    Optional description or notes about the model
-                  </FormDescription>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <div className='flex justify-end gap-2 pt-4'>
-              <Button
-                type='button'
-                variant='outline'
-                onClick={handleClose}
-                disabled={isSubmitting}
-              >
-                Cancel
-              </Button>
-              <Button type='submit' disabled={isSubmitting}>
-                {isSubmitting ? (
-                  <>
-                    <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-                    Adding...
-                  </>
-                ) : (
-                  'Add Model'
-                )}
-              </Button>
-            </div>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-}

ui/components/CollectModelsDialog.tsx

@@ -1,358 +0,0 @@
-'use client';
-
-import React, { useState, useEffect, useCallback } from 'react';
-import { Button } from '@/components/ui/button';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
-import { AdminService, AdminModel } from '@/lib/api/services/admin';
-import { toast } from 'sonner';
-import { Download, AlertCircle, CheckCircle, Loader2 } from 'lucide-react';
-import { Alert, AlertDescription } from '@/components/ui/alert';
-import { Checkbox } from '@/components/ui/checkbox';
-import { ScrollArea } from '@/components/ui/scroll-area';
-import { Badge } from '@/components/ui/badge';
-
-interface CollectModelsDialogProps {
-  isOpen: boolean;
-  onClose: () => void;
-  onSuccess?: () => void;
-}
-
-export function CollectModelsDialog({
-  isOpen,
-  onClose,
-  onSuccess,
-}: CollectModelsDialogProps) {
-  const [selectedProvider, setSelectedProvider] = useState<number | null>(null);
-  const [providers, setProviders] = useState<
-    Array<{ id: number; provider_type: string; base_url: string }>
-  >([]);
-  const [remoteModels, setRemoteModels] = useState<AdminModel[]>([]);
-  const [selectedModels, setSelectedModels] = useState<Set<string>>(new Set());
-  const [isLoadingProviders, setIsLoadingProviders] = useState(false);
-  const [isLoadingModels, setIsLoadingModels] = useState(false);
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [result, setResult] = useState<{
-    added: number;
-    skipped: number;
-    errors: string[];
-  } | null>(null);
-
-  const loadRemoteModels = useCallback(async () => {
-    if (!selectedProvider) return;
-
-    setIsLoadingModels(true);
-    setRemoteModels([]);
-    setSelectedModels(new Set());
-
-    try {
-      const data = await AdminService.getProviderModels(selectedProvider);
-      const dbModelIds = new Set(data.db_models.map((m) => m.id));
-      const availableRemoteModels = data.remote_models.filter(
-        (m: AdminModel) => !dbModelIds.has(m.id)
-      );
-      setRemoteModels(availableRemoteModels);
-    } catch {
-      toast.error('Failed to fetch models from provider');
-    } finally {
-      setIsLoadingModels(false);
-    }
-  }, [selectedProvider]);
-
-  useEffect(() => {
-    if (isOpen) {
-      loadProviders();
-    }
-  }, [isOpen]);
-
-  useEffect(() => {
-    if (selectedProvider) {
-      loadRemoteModels();
-    }
-  }, [selectedProvider, loadRemoteModels]);
-
-  const loadProviders = async () => {
-    setIsLoadingProviders(true);
-    try {
-      const data = await AdminService.getUpstreamProviders();
-      setProviders(data);
-    } catch {
-      toast.error('Failed to load providers');
-    } finally {
-      setIsLoadingProviders(false);
-    }
-  };
-
-  const toggleModel = (modelId: string) => {
-    const newSelected = new Set(selectedModels);
-    if (newSelected.has(modelId)) {
-      newSelected.delete(modelId);
-    } else {
-      newSelected.add(modelId);
-    }
-    setSelectedModels(newSelected);
-  };
-
-  const selectAll = () => {
-    setSelectedModels(new Set(remoteModels.map((m) => m.id)));
-  };
-
-  const deselectAll = () => {
-    setSelectedModels(new Set());
-  };
-
-  const handleCollect = async () => {
-    if (selectedModels.size === 0) {
-      toast.error('Please select at least one model');
-      return;
-    }
-
-    setIsSubmitting(true);
-    let added = 0;
-    let skipped = 0;
-    const errors: string[] = [];
-
-    try {
-      for (const modelId of Array.from(selectedModels)) {
-        const model = remoteModels.find((m) => m.id === modelId);
-        if (!model) continue;
-
-        try {
-          await AdminService.createModel({
-            ...model,
-            upstream_provider_id: selectedProvider,
-            enabled: true,
-            created: Math.floor(Date.now() / 1000),
-          });
-          added++;
-        } catch (err) {
-          const errorMessage =
-            err instanceof Error ? err.message : 'Unknown error';
-          if (errorMessage.includes('already exists')) {
-            skipped++;
-          } else {
-            errors.push(`${modelId}: ${errorMessage}`);
-          }
-        }
-      }
-
-      setResult({ added, skipped, errors });
-
-      if (added > 0) {
-        toast.success(`Successfully added ${added} models`);
-        onSuccess?.();
-      }
-
-      if (errors.length > 0) {
-        toast.warning(`Completed with ${errors.length} errors`);
-      }
-    } catch {
-      toast.error('Failed to collect models');
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const handleClose = () => {
-    if (!isSubmitting) {
-      setSelectedProvider(null);
-      setRemoteModels([]);
-      setSelectedModels(new Set());
-      setResult(null);
-      onClose();
-    }
-  };
-
-  return (
-    <Dialog open={isOpen} onOpenChange={handleClose}>
-      <DialogContent className='max-h-[80vh] sm:max-w-[700px]'>
-        <DialogHeader>
-          <DialogTitle className='flex items-center gap-2'>
-            <Download className='h-5 w-5' />
-            Collect Models from Provider
-          </DialogTitle>
-          <DialogDescription>
-            Fetch models from an upstream provider and add them to your database
-          </DialogDescription>
-        </DialogHeader>
-
-        <div className='space-y-4'>
-          <div className='space-y-2'>
-            <label className='text-sm font-medium'>Select Provider</label>
-            <Select
-              value={selectedProvider?.toString()}
-              onValueChange={(value) => setSelectedProvider(parseInt(value))}
-              disabled={isLoadingProviders}
-            >
-              <SelectTrigger>
-                <SelectValue placeholder='Choose an upstream provider' />
-              </SelectTrigger>
-              <SelectContent>
-                {providers.map((provider) => (
-                  <SelectItem key={provider.id} value={provider.id.toString()}>
-                    {provider.provider_type} - {provider.base_url}
-                  </SelectItem>
-                ))}
-              </SelectContent>
-            </Select>
-          </div>
-
-          {isLoadingModels && (
-            <div className='flex items-center justify-center py-8'>
-              <Loader2 className='h-8 w-8 animate-spin' />
-              <span className='ml-2'>Loading models from provider...</span>
-            </div>
-          )}
-
-          {!isLoadingModels && selectedProvider && remoteModels.length > 0 && (
-            <>
-              <div className='flex items-center justify-between'>
-                <div className='text-sm font-medium'>
-                  {remoteModels.length} models available
-                </div>
-                <div className='flex gap-2'>
-                  <Button
-                    variant='outline'
-                    size='sm'
-                    onClick={selectAll}
-                    disabled={isSubmitting}
-                  >
-                    Select All
-                  </Button>
-                  <Button
-                    variant='outline'
-                    size='sm'
-                    onClick={deselectAll}
-                    disabled={isSubmitting}
-                  >
-                    Deselect All
-                  </Button>
-                </div>
-              </div>
-
-              <ScrollArea className='h-[300px] rounded-md border p-4'>
-                <div className='space-y-2'>
-                  {remoteModels.map((model) => (
-                    <div
-                      key={model.id}
-                      className='hover:bg-accent flex items-start space-x-3 rounded-lg border p-3'
-                    >
-                      <Checkbox
-                        checked={selectedModels.has(model.id)}
-                        onCheckedChange={() => toggleModel(model.id)}
-                        disabled={isSubmitting}
-                      />
-                      <div className='flex-1 space-y-1'>
-                        <div className='font-mono text-sm font-medium'>
-                          {model.id}
-                        </div>
-                        <div className='text-muted-foreground text-xs'>
-                          {model.description || model.name}
-                        </div>
-                        {model.context_length && (
-                          <Badge variant='secondary' className='text-xs'>
-                            {model.context_length.toLocaleString()} tokens
-                          </Badge>
-                        )}
-                      </div>
-                    </div>
-                  ))}
-                </div>
-              </ScrollArea>
-            </>
-          )}
-
-          {!isLoadingModels &&
-            selectedProvider &&
-            remoteModels.length === 0 && (
-              <Alert>
-                <AlertCircle className='h-4 w-4' />
-                <AlertDescription>
-                  No new models available from this provider. All models may
-                  already be in your database.
-                </AlertDescription>
-              </Alert>
-            )}
-
-          {result && (
-            <div className='space-y-2'>
-              <Alert>
-                <CheckCircle className='h-4 w-4' />
-                <AlertDescription>
-                  <strong>Collection Results:</strong>
-                  <br />• {result.added} models added
-                  <br />• {result.skipped} models skipped
-                  {result.errors.length > 0 && (
-                    <>
-                      <br />• {result.errors.length} errors occurred
-                    </>
-                  )}
-                </AlertDescription>
-              </Alert>
-
-              {result.errors.length > 0 && (
-                <Alert variant='destructive'>
-                  <AlertCircle className='h-4 w-4' />
-                  <AlertDescription>
-                    <strong>Errors:</strong>
-                    <ul className='mt-1 list-inside list-disc text-sm'>
-                      {result.errors.slice(0, 3).map((error, index) => (
-                        <li key={index}>{error}</li>
-                      ))}
-                      {result.errors.length > 3 && (
-                        <li>... and {result.errors.length - 3} more errors</li>
-                      )}
-                    </ul>
-                  </AlertDescription>
-                </Alert>
-              )}
-            </div>
-          )}
-
-          <div className='flex justify-end gap-2 pt-4'>
-            <Button
-              variant='outline'
-              onClick={handleClose}
-              disabled={isSubmitting}
-            >
-              {result ? 'Close' : 'Cancel'}
-            </Button>
-            <Button
-              onClick={handleCollect}
-              disabled={
-                isSubmitting ||
-                !selectedProvider ||
-                selectedModels.size === 0 ||
-                isLoadingModels
-              }
-            >
-              {isSubmitting ? (
-                <>
-                  <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-                  Adding Models...
-                </>
-              ) : (
-                <>
-                  <Download className='mr-2 h-4 w-4' />
-                  Add {selectedModels.size} Models
-                </>
-              )}
-            </Button>
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}

ui/components/CostCalculator.tsx

@@ -1,226 +0,0 @@
-'use client';
-
-import React, { useState, useMemo } from 'react';
-import { type Model } from '@/lib/api/schemas/models';
-import {
-  calculateRequestCost,
-  estimateMinimumTokensForCost,
-  formatCost,
-} from '@/lib/services/costValidation';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-
-import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
-import { Info, AlertTriangle, CheckCircle } from 'lucide-react';
-
-interface CostCalculatorProps {
-  model: Model;
-  testInput?: string;
-  onTestInputChange?: (value: string) => void;
-}
-
-export function CostCalculator({ model }: CostCalculatorProps) {
-  const [inputTokens, setInputTokens] = useState<number>(100);
-  const [outputTokens, setOutputTokens] = useState<number>(100);
-
-  // Calculate costs based on current input
-  const costCalculation = useMemo(() => {
-    return calculateRequestCost({
-      inputTokens,
-      outputTokens,
-      model,
-    });
-  }, [inputTokens, outputTokens, model]);
-
-  // Get minimum token estimates
-  const tokenEstimates = useMemo(() => {
-    return estimateMinimumTokensForCost(model);
-  }, [model]);
-
-  const hasMinimumCost = model.min_cost_per_request > 0;
-
-  return (
-    <div className='space-y-6'>
-      {/* Input Controls */}
-      <div className='grid grid-cols-1 gap-4 sm:grid-cols-2'>
-        <div className='space-y-2'>
-          <Label htmlFor='input-tokens'>Input Tokens</Label>
-          <Input
-            id='input-tokens'
-            type='number'
-            min='0'
-            value={inputTokens}
-            onChange={(e) => setInputTokens(parseInt(e.target.value) || 0)}
-            placeholder='100'
-          />
-        </div>
-        <div className='space-y-2'>
-          <Label htmlFor='output-tokens'>Output Tokens</Label>
-          <Input
-            id='output-tokens'
-            type='number'
-            min='0'
-            value={outputTokens}
-            onChange={(e) => setOutputTokens(parseInt(e.target.value) || 0)}
-            placeholder='100'
-          />
-        </div>
-      </div>
-
-      {/* Cost Breakdown */}
-      <div className='rounded-md border p-4'>
-        <h4 className='mb-3 text-sm font-medium'>Cost Breakdown</h4>
-        <div className='space-y-2 text-sm'>
-          <div className='flex justify-between'>
-            <span>Input Cost ({inputTokens.toLocaleString()} tokens):</span>
-            <span className='font-mono'>
-              {formatCost(costCalculation.inputCost)}
-            </span>
-          </div>
-          <div className='flex justify-between'>
-            <span>Output Cost ({outputTokens.toLocaleString()} tokens):</span>
-            <span className='font-mono'>
-              {formatCost(costCalculation.outputCost)}
-            </span>
-          </div>
-          <hr className='my-2' />
-          <div className='flex justify-between'>
-            <span>Base Cost:</span>
-            <span className='font-mono'>
-              {formatCost(costCalculation.baseCost)}
-            </span>
-          </div>
-          <div className='flex justify-between'>
-            <span>Minimum Cost per Request:</span>
-            <span className='font-mono'>
-              {formatCost(costCalculation.minCostPerRequest)}
-            </span>
-          </div>
-          <hr className='my-2' />
-          <div className='flex justify-between font-medium'>
-            <span>Final Cost:</span>
-            <span className='font-mono text-lg'>
-              {formatCost(costCalculation.finalCost)}
-            </span>
-          </div>
-        </div>
-      </div>
-
-      {/* Minimum Cost Alert */}
-      {hasMinimumCost && (
-        <Alert
-          className={
-            costCalculation.isMinimumApplied
-              ? 'border-amber-200 bg-amber-50'
-              : 'border-green-200 bg-green-50'
-          }
-        >
-          {costCalculation.isMinimumApplied ? (
-            <AlertTriangle className='h-4 w-4 text-amber-600' />
-          ) : (
-            <CheckCircle className='h-4 w-4 text-green-600' />
-          )}
-          <AlertTitle>
-            {costCalculation.isMinimumApplied
-              ? 'Minimum Cost Applied'
-              : 'Above Minimum Cost'}
-          </AlertTitle>
-          <AlertDescription>
-            {costCalculation.isMinimumApplied
-              ? `The calculated cost (${formatCost(costCalculation.baseCost)}) is below the minimum, so the minimum cost of ${formatCost(costCalculation.minCostPerRequest)} is applied.`
-              : `The calculated cost (${formatCost(costCalculation.baseCost)}) meets the minimum requirement of ${formatCost(costCalculation.minCostPerRequest)}.`}
-          </AlertDescription>
-        </Alert>
-      )}
-
-      {/* Token Recommendations */}
-      {hasMinimumCost && tokenEstimates.inputTokensOnly > 0 && (
-        <div className='rounded-md border p-4'>
-          <h4 className='mb-3 flex items-center gap-2 text-sm font-medium'>
-            <Info className='h-4 w-4' />
-            Token Recommendations to Meet Minimum Cost
-          </h4>
-          <div className='space-y-2 text-sm'>
-            <div className='flex justify-between'>
-              <span>Input tokens only:</span>
-              <span className='font-mono'>
-                {tokenEstimates.inputTokensOnly.toLocaleString()}
-              </span>
-            </div>
-            {tokenEstimates.outputTokensOnly > 0 && (
-              <div className='flex justify-between'>
-                <span>Output tokens only:</span>
-                <span className='font-mono'>
-                  {tokenEstimates.outputTokensOnly.toLocaleString()}
-                </span>
-              </div>
-            )}
-            <div className='flex justify-between'>
-              <span>Balanced (50/50):</span>
-              <span className='font-mono'>
-                {tokenEstimates.balancedTokens.input.toLocaleString()} in +{' '}
-                {tokenEstimates.balancedTokens.output.toLocaleString()} out
-              </span>
-            </div>
-          </div>
-          <div className='mt-3 flex gap-2'>
-            <Button
-              variant='outline'
-              size='sm'
-              onClick={() => {
-                setInputTokens(tokenEstimates.inputTokensOnly);
-                setOutputTokens(0);
-              }}
-            >
-              Use Input Only
-            </Button>
-            {tokenEstimates.outputTokensOnly > 0 && (
-              <Button
-                variant='outline'
-                size='sm'
-                onClick={() => {
-                  setInputTokens(0);
-                  setOutputTokens(tokenEstimates.outputTokensOnly);
-                }}
-              >
-                Use Output Only
-              </Button>
-            )}
-            <Button
-              variant='outline'
-              size='sm'
-              onClick={() => {
-                setInputTokens(tokenEstimates.balancedTokens.input);
-                setOutputTokens(tokenEstimates.balancedTokens.output);
-              }}
-            >
-              Use Balanced
-            </Button>
-          </div>
-        </div>
-      )}
-
-      {/* Model Pricing Info */}
-      <div className='rounded-md border p-4'>
-        <h4 className='mb-3 text-sm font-medium'>Model Pricing</h4>
-        <div className='space-y-2 text-sm'>
-          <div className='flex justify-between'>
-            <span>Input cost per 1M tokens:</span>
-            <span className='font-mono'>{formatCost(model.input_cost)}</span>
-          </div>
-          <div className='flex justify-between'>
-            <span>Output cost per 1M tokens:</span>
-            <span className='font-mono'>{formatCost(model.output_cost)}</span>
-          </div>
-          <div className='flex justify-between'>
-            <span>Minimum cost per request:</span>
-            <span className='font-mono'>
-              {formatCost(model.min_cost_per_request)}
-            </span>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-}

ui/components/CostCalculatorDialog.tsx

@@ -1,46 +0,0 @@
-'use client';
-
-import React from 'react';
-import { type Model } from '@/lib/api/schemas/models';
-import { CostCalculator } from '@/components/CostCalculator';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import { Calculator } from 'lucide-react';
-
-interface CostCalculatorDialogProps {
-  model: Model;
-  isOpen: boolean;
-  onClose: () => void;
-}
-
-export function CostCalculatorDialog({
-  model,
-  isOpen,
-  onClose,
-}: CostCalculatorDialogProps) {
-  return (
-    <Dialog open={isOpen} onOpenChange={onClose}>
-      <DialogContent className='max-h-[90vh] overflow-y-auto sm:max-w-[700px]'>
-        <DialogHeader>
-          <DialogTitle className='flex items-center gap-2'>
-            <Calculator className='h-5 w-5' />
-            Cost Calculator - {model.name}
-          </DialogTitle>
-          <DialogDescription>
-            Calculate costs and estimate token usage for &quot;{model.name}
-            &quot;
-          </DialogDescription>
-        </DialogHeader>
-
-        <div className='mt-4'>
-          <CostCalculator model={model} />
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
-}

ui/components/EditGroupForm.tsx

@@ -1,361 +0,0 @@
-'use client';
-
-import React, { useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import {
-  GroupSettingsSchema,
-  type GroupSettings,
-  type Model,
-} from '@/lib/api/schemas/models';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import {
-  Form,
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@/components/ui/form';
-import { Switch } from '@/components/ui/switch';
-import { Users, Key, Loader2, Globe, AlertTriangle, Info } from 'lucide-react';
-import { toast } from 'sonner';
-import { Alert, AlertDescription } from '@/components/ui/alert';
-
-interface EditGroupFormProps {
-  provider: string;
-  models: Model[];
-  groupSettings?: { group_api_key?: string; group_url?: string };
-  onGroupUpdate: (oldProvider: string, updatedData: GroupSettings) => void;
-  onCancel?: () => void;
-  isOpen: boolean;
-}
-
-export function EditGroupForm({
-  provider,
-  models,
-  groupSettings,
-  onGroupUpdate,
-  onCancel,
-  isOpen,
-}: EditGroupFormProps) {
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [showApiKey, setShowApiKey] = useState(false);
-  const [useGroupUrl, setUseGroupUrl] = useState(!!groupSettings?.group_url);
-
-  const form = useForm<GroupSettings>({
-    resolver: zodResolver(GroupSettingsSchema),
-    defaultValues: {
-      provider: provider,
-      group_api_key: groupSettings?.group_api_key || '',
-      group_url: groupSettings?.group_url || '',
-    },
-  });
-
-  const onSubmit = async (data: GroupSettings) => {
-    setIsSubmitting(true);
-    try {
-      // Clean up empty strings and handle URL removal
-      const cleanData = {
-        ...data,
-        group_api_key: data.group_api_key?.trim() || undefined,
-        group_url: useGroupUrl
-          ? data.group_url?.trim() || undefined
-          : undefined,
-      };
-      await onGroupUpdate(provider, cleanData);
-      toast.success(`Group "${provider}" updated successfully!`);
-      onCancel?.();
-    } catch (error) {
-      toast.error('Failed to update group. Please try again.');
-      console.error('Error updating group:', error);
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  // Count models that have individual API keys
-  const modelsWithoutKeys = models.filter((model) => !model.api_key).length;
-
-  // Count models that would be affected by URL changes
-  const modelsUsingGroupUrl = models.filter(
-    (model) => !model.api_key && (!model.url || model.url.startsWith('/'))
-  ).length;
-
-  const handleClose = () => {
-    if (!isSubmitting) {
-      onCancel?.();
-    }
-  };
-
-  return (
-    <Dialog open={isOpen} onOpenChange={handleClose}>
-      <DialogContent className='max-h-[90vh] overflow-y-auto sm:max-w-[700px]'>
-        <DialogHeader>
-          <DialogTitle className='flex items-center gap-2'>
-            <Users className='h-5 w-5' />
-            Edit Provider Group: {provider}
-          </DialogTitle>
-          <DialogDescription>
-            Update settings for all {models.length} models in this group. Group
-            settings provide defaults for models without individual
-            configurations.
-          </DialogDescription>
-        </DialogHeader>
-
-        <div className='mb-6 space-y-4'>
-          {/* API Key Status */}
-          <div className='rounded-md border p-4'>
-            <h4 className='mb-2 flex items-center gap-2 text-sm font-medium'>
-              <Key className='h-4 w-4' />
-              API Key Configuration
-            </h4>
-            <div className='space-y-2 text-sm'>
-              <div className='flex justify-between'>
-                <span>Models using group API key:</span>
-                <span className='font-medium text-blue-600'>
-                  {modelsWithoutKeys}
-                </span>
-              </div>
-            </div>
-          </div>
-
-          {/* URL Configuration Status */}
-          <div className='rounded-md border p-4'>
-            <h4 className='mb-2 flex items-center gap-2 text-sm font-medium'>
-              <Globe className='h-4 w-4' />
-              URL Configuration
-            </h4>
-            <div className='space-y-2 text-sm'>
-              <div className='flex justify-between'>
-                <span>Models using group URL:</span>
-                <span className='font-medium text-blue-600'>
-                  {modelsUsingGroupUrl}
-                </span>
-              </div>
-              <div className='flex justify-between'>
-                <span>Models with individual URLs:</span>
-                <span className='font-medium text-green-600'>
-                  {models.length - modelsUsingGroupUrl}
-                </span>
-              </div>
-              {groupSettings?.group_url && (
-                <div className='mt-2 rounded bg-blue-50 p-2 text-xs'>
-                  <span className='font-medium'>Current group URL:</span>{' '}
-                  {groupSettings.group_url}
-                </div>
-              )}
-            </div>
-          </div>
-
-          {/* Models in this group */}
-          <div className='rounded-md border p-4'>
-            <h4 className='mb-2 text-sm font-medium'>Models in this group:</h4>
-            <div className='max-h-32 overflow-y-auto'>
-              <div className='flex flex-wrap gap-2'>
-                {models.map((model) => (
-                  <span
-                    key={model.id}
-                    className={`inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${
-                      model.api_key
-                        ? 'bg-green-100 text-green-800'
-                        : 'bg-blue-100 text-blue-800'
-                    }`}
-                    title={
-                      model.api_key
-                        ? 'Has individual API key and URL'
-                        : 'Uses group API key and URL'
-                    }
-                  >
-                    {model.name}
-                    {model.api_key && ' 🔑'}
-                    {model.url &&
-                      !model.url.startsWith('/') &&
-                      model.api_key &&
-                      ' 🌐'}
-                  </span>
-                ))}
-              </div>
-            </div>
-          </div>
-        </div>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className='space-y-6'>
-            <FormField
-              control={form.control}
-              name='provider'
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Provider Name *</FormLabel>
-                  <FormControl>
-                    <Input
-                      placeholder='e.g., OpenAI, Anthropic'
-                      {...field}
-                      className='w-full'
-                    />
-                  </FormControl>
-                  <FormDescription>
-                    This will update the provider name for all models in this
-                    group
-                  </FormDescription>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            {/* Group URL Toggle */}
-            <div className='space-y-4'>
-              <div className='flex items-center justify-between'>
-                <div className='space-y-0.5'>
-                  <FormLabel className='text-base'>Group Base URL</FormLabel>
-                  <FormDescription>
-                    Provide a custom base URL for this provider group
-                  </FormDescription>
-                </div>
-                <Switch
-                  checked={useGroupUrl}
-                  onCheckedChange={setUseGroupUrl}
-                />
-              </div>
-
-              {useGroupUrl && (
-                <FormField
-                  control={form.control}
-                  name='group_url'
-                  render={({ field }) => (
-                    <FormItem>
-                      <FormLabel>Base URL</FormLabel>
-                      <FormControl>
-                        <Input
-                          placeholder='https://api.openai.com/v1 or https://your-proxy.com/v1'
-                          {...field}
-                          className='w-full'
-                        />
-                      </FormControl>
-                      <FormDescription>
-                        This base URL will be used for models without individual
-                        URLs. Models will append their endpoint path (e.g.,
-                        /chat/completions) to this base.
-                      </FormDescription>
-                      <FormMessage />
-                    </FormItem>
-                  )}
-                />
-              )}
-
-              {!useGroupUrl && groupSettings?.group_url && (
-                <Alert>
-                  <AlertTriangle className='h-4 w-4' />
-                  <AlertDescription>
-                    Removing the group URL will make models in this group fall
-                    back to the default system endpoint. Models with individual
-                    URLs will be unaffected.
-                  </AlertDescription>
-                </Alert>
-              )}
-
-              {useGroupUrl && !groupSettings?.group_url && (
-                <Alert>
-                  <Info className='h-4 w-4' />
-                  <AlertDescription>
-                    Adding a group URL will allow models in this group to use a
-                    custom endpoint instead of the default system endpoint.
-                  </AlertDescription>
-                </Alert>
-              )}
-            </div>
-
-            <FormField
-              control={form.control}
-              name='group_api_key'
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Group API Key</FormLabel>
-                  <div className='relative'>
-                    <FormControl>
-                      <Input
-                        type={showApiKey ? 'text' : 'password'}
-                        placeholder='sk-... (leave empty to remove)'
-                        {...field}
-                        className='w-full pr-24'
-                      />
-                    </FormControl>
-                    <Button
-                      type='button'
-                      variant='ghost'
-                      size='sm'
-                      className='absolute top-0 right-0 h-full px-3 py-2 hover:bg-transparent'
-                      onClick={() => setShowApiKey(!showApiKey)}
-                    >
-                      {showApiKey ? 'Hide' : 'Show'}
-                    </Button>
-                  </div>
-                  <FormDescription>
-                    This API key will be used for models that don&apos;t have
-                    individual API keys ({modelsWithoutKeys} models). Leave
-                    empty to remove the group API key.
-                  </FormDescription>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <div className='rounded-md border border-amber-200 bg-amber-50 p-4'>
-              <p className='text-sm text-amber-800'>
-                <strong>How group settings work:</strong>
-              </p>
-              <ul className='mt-2 list-inside list-disc space-y-1 text-sm text-amber-800'>
-                <li>
-                  Models with individual API keys and URLs will keep their
-                  specific settings
-                </li>
-                <li>
-                  Models without individual settings will use the group defaults
-                </li>
-                <li>
-                  Removing the group URL makes models fall back to the system
-                  default endpoint
-                </li>
-                <li>
-                  You can use &quot;Apply Group Settings&quot; to force models
-                  to use group configurations
-                </li>
-              </ul>
-            </div>
-
-            <div className='flex justify-end gap-2 pt-4'>
-              <Button
-                type='button'
-                variant='outline'
-                onClick={handleClose}
-                disabled={isSubmitting}
-              >
-                Cancel
-              </Button>
-              <Button type='submit' disabled={isSubmitting}>
-                {isSubmitting ? (
-                  <>
-                    <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-                    Updating...
-                  </>
-                ) : (
-                  'Update Group'
-                )}
-              </Button>
-            </div>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-}

ui/components/EditModelForm.tsx

@@ -1,470 +0,0 @@
-'use client';
-
-import React, { useState, useEffect, useCallback } from 'react';
-import { useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
-import { type Model } from '@/lib/api/schemas/models';
-import { AdminService } from '@/lib/api/services/admin';
-import { Button } from '@/components/ui/button';
-import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
-import {
-  Dialog,
-  DialogContent,
-  DialogDescription,
-  DialogHeader,
-  DialogTitle,
-} from '@/components/ui/dialog';
-import {
-  Form,
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@/components/ui/form';
-import { Edit3, Loader2 } from 'lucide-react';
-import { toast } from 'sonner';
-import { Switch } from '@/components/ui/switch';
-
-const EditModelFormSchema = z.object({
-  name: z.string().min(1, 'Name is required'),
-  description: z.string().optional(),
-  context_length: z.coerce.number().min(0),
-  prompt: z.coerce.number().min(0),
-  completion: z.coerce.number().min(0),
-  enabled: z.boolean(),
-});
-
-type EditModelFormData = z.infer<typeof EditModelFormSchema>;
-
-const roundToFiveDecimals = (value: number | undefined | null): number => {
-  if (value === undefined || value === null || isNaN(value)) {
-    return 0;
-  }
-  return Math.round(value * 100000) / 100000;
-};
-
-interface EditModelFormProps {
-  model: Model;
-  providerId?: number;
-  onModelUpdate?: () => void;
-  onCancel?: () => void;
-  isOpen: boolean;
-}
-
-interface AdminModelData {
-  id: string;
-  name: string;
-  description?: string;
-  created: number;
-  context_length: number;
-  architecture: {
-    modality: string;
-    input_modalities: string[];
-    output_modalities: string[];
-    tokenizer: string;
-    instruct_type: string | null;
-  };
-  pricing: {
-    prompt: number;
-    completion: number;
-    request: number;
-    image: number;
-    web_search: number;
-    internal_reasoning: number;
-  };
-  per_request_limits: null | undefined;
-  top_provider: null | undefined;
-  upstream_provider_id: number;
-  enabled: boolean;
-}
-
-export function EditModelForm({
-  model,
-  providerId,
-  onModelUpdate,
-  onCancel,
-  isOpen,
-}: EditModelFormProps) {
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [adminModelData, setAdminModelData] = useState<AdminModelData | null>(
-    null
-  );
-  const [isNewOverride, setIsNewOverride] = useState(false);
-
-  const form = useForm<EditModelFormData>({
-    resolver: zodResolver(EditModelFormSchema),
-    defaultValues: {
-      name: model.name,
-      description: model.description || '',
-      context_length: model.contextLength || 4096,
-      prompt: roundToFiveDecimals(model.input_cost),
-      completion: roundToFiveDecimals(model.output_cost),
-      enabled: model.isEnabled !== false,
-    },
-  });
-
-  const loadAdminModel = useCallback(async () => {
-    if (!providerId) {
-      console.error('loadAdminModel called without providerId');
-      return;
-    }
-
-    try {
-      console.log('Loading admin model:', {
-        providerId,
-        modelId: model.full_name,
-      });
-
-      const adminModel = await AdminService.getProviderModel(
-        providerId,
-        model.id
-      );
-
-      setAdminModelData(adminModel as AdminModelData);
-      setIsNewOverride(false);
-
-      form.reset({
-        name: adminModel.name,
-        description: adminModel.description || '',
-        context_length: adminModel.context_length,
-        prompt: roundToFiveDecimals(adminModel.pricing.prompt),
-        completion: roundToFiveDecimals(adminModel.pricing.completion),
-        enabled: adminModel.enabled !== false,
-      });
-    } catch (error: unknown) {
-      console.log('Model not in database, will create new override:', error);
-      setIsNewOverride(true);
-      setAdminModelData({
-        id: model.full_name,
-        name: model.name,
-        description: model.description || '',
-        created: Math.floor(Date.now() / 1000),
-        context_length: model.contextLength || 4096,
-        architecture: {
-          modality: model.modelType || 'text',
-          input_modalities: [model.modelType || 'text'],
-          output_modalities: [model.modelType || 'text'],
-          tokenizer: '',
-          instruct_type: null,
-        },
-        pricing: {
-          prompt: roundToFiveDecimals(model.input_cost),
-          completion: roundToFiveDecimals(model.output_cost),
-          request: 0,
-          image: 0,
-          web_search: 0,
-          internal_reasoning: 0,
-        },
-        per_request_limits: null,
-        top_provider: null,
-        upstream_provider_id: providerId,
-        enabled: model.isEnabled !== false,
-      });
-
-      form.reset({
-        name: model.name,
-        description: model.description || '',
-        context_length: model.contextLength || 4096,
-        prompt: roundToFiveDecimals(model.input_cost),
-        completion: roundToFiveDecimals(model.output_cost),
-        enabled: model.isEnabled !== false,
-      });
-    }
-  }, [providerId, model, form]);
-
-  useEffect(() => {
-    if (isOpen && providerId) {
-      loadAdminModel();
-    } else if (isOpen && !providerId) {
-      console.error('EditModelForm opened without providerId', {
-        model,
-        providerId,
-      });
-      toast.error('Missing provider information for this model');
-    }
-  }, [isOpen, providerId, model, loadAdminModel]);
-
-  const onSubmit = async (data: EditModelFormData) => {
-    if (!providerId) {
-      console.error('onSubmit called without providerId', {
-        model,
-        providerId,
-      });
-      toast.error('Missing provider ID - cannot update model');
-      return;
-    }
-
-    if (!adminModelData) {
-      console.error('onSubmit called without adminModelData', {
-        model,
-        providerId,
-        adminModelData,
-      });
-      toast.error('Model data not loaded - please try reopening the form');
-      return;
-    }
-
-    setIsSubmitting(true);
-    try {
-      const payload = {
-        id: adminModelData.id,
-        name: data.name,
-        description: data.description || '',
-        created: adminModelData.created || Math.floor(Date.now() / 1000),
-        context_length: data.context_length,
-        architecture: adminModelData.architecture || {
-          modality: 'text',
-          input_modalities: ['text'],
-          output_modalities: ['text'],
-          tokenizer: '',
-          instruct_type: null,
-        },
-        pricing: {
-          prompt: roundToFiveDecimals(data.prompt),
-          completion: roundToFiveDecimals(data.completion),
-          request: 0,
-          image: 0,
-          web_search: 0,
-          internal_reasoning: 0,
-        },
-        per_request_limits: adminModelData.per_request_limits,
-        top_provider: adminModelData.top_provider,
-        upstream_provider_id: providerId,
-        enabled: data.enabled,
-      };
-
-      if (isNewOverride) {
-        console.log('Creating new model override');
-        await AdminService.createProviderModel(providerId, payload);
-        toast.success('Model override created successfully!');
-      } else {
-        console.log('Updating existing model override');
-        await AdminService.updateProviderModel(
-          providerId,
-          adminModelData.id,
-          payload
-        );
-        toast.success('Model updated successfully!');
-      }
-
-      onModelUpdate?.();
-      onCancel?.();
-    } catch (error) {
-      const action = isNewOverride ? 'create' : 'update';
-      toast.error(`Failed to ${action} model. Please try again.`);
-      console.error(`Error ${action}ing model:`, error);
-    } finally {
-      setIsSubmitting(false);
-    }
-  };
-
-  const handleClose = () => {
-    if (!isSubmitting) {
-      onCancel?.();
-    }
-  };
-
-  return (
-    <Dialog open={isOpen} onOpenChange={handleClose}>
-      <DialogContent className='max-h-[90vh] overflow-y-auto sm:max-w-[600px]'>
-        <DialogHeader>
-          <DialogTitle className='flex items-center gap-2'>
-            <Edit3 className='h-5 w-5' />
-            {isNewOverride ? 'Create Model Override' : 'Edit Model Override'}
-          </DialogTitle>
-          <DialogDescription>
-            {isNewOverride
-              ? `Create an override for &quot;${model.name}&quot;`
-              : `Update the model override for &quot;${model.name}&quot;`}
-          </DialogDescription>
-        </DialogHeader>
-
-        <Form {...form}>
-          <form onSubmit={form.handleSubmit(onSubmit)} className='space-y-4'>
-            <div className='grid grid-cols-1 gap-4 sm:grid-cols-2'>
-              <FormField
-                control={form.control}
-                name='name'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Display Name *</FormLabel>
-                    <FormControl>
-                      <Input
-                        placeholder='e.g., GPT-4'
-                        {...field}
-                        className='w-full'
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      Custom display name for the model
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name='context_length'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Context Length *</FormLabel>
-                    <FormControl>
-                      <Input
-                        type='number'
-                        min='0'
-                        placeholder='4096'
-                        {...field}
-                        className='w-full'
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      Maximum context window size
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            </div>
-
-            <FormField
-              control={form.control}
-              name='description'
-              render={({ field }) => (
-                <FormItem>
-                  <FormLabel>Description</FormLabel>
-                  <FormControl>
-                    <Textarea
-                      placeholder='Brief description of the model...'
-                      {...field}
-                      rows={3}
-                      className='w-full'
-                    />
-                  </FormControl>
-                  <FormDescription>
-                    Optional description or notes about the model
-                  </FormDescription>
-                  <FormMessage />
-                </FormItem>
-              )}
-            />
-
-            <div className='grid grid-cols-1 gap-4 sm:grid-cols-2'>
-              <FormField
-                control={form.control}
-                name='prompt'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Input Cost (per 1M tokens) *</FormLabel>
-                    <FormControl>
-                      <Input
-                        type='number'
-                        step='0.00001'
-                        min='0'
-                        placeholder='5.00000'
-                        value={field.value ?? ''}
-                        onChange={(e) => {
-                          const value = e.target.value;
-                          field.onChange(value === '' ? 0 : parseFloat(value));
-                        }}
-                        onBlur={(e) => {
-                          const value = parseFloat(e.target.value);
-                          field.onChange(roundToFiveDecimals(value));
-                        }}
-                        className='w-full'
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      Cost in USD per 1,000,000 input tokens (max 5 decimals)
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-
-              <FormField
-                control={form.control}
-                name='completion'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Output Cost (per 1M tokens) *</FormLabel>
-                    <FormControl>
-                      <Input
-                        type='number'
-                        step='0.00001'
-                        min='0'
-                        placeholder='15.00000'
-                        value={field.value ?? ''}
-                        onChange={(e) => {
-                          const value = e.target.value;
-                          field.onChange(value === '' ? 0 : parseFloat(value));
-                        }}
-                        onBlur={(e) => {
-                          const value = parseFloat(e.target.value);
-                          field.onChange(roundToFiveDecimals(value));
-                        }}
-                        className='w-full'
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      Cost in USD per 1,000,000 output tokens (max 5 decimals)
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-            </div>
-
-            <FormField
-              control={form.control}
-              name='enabled'
-              render={({ field }) => (
-                <FormItem className='flex flex-row items-center justify-between rounded-lg border p-4'>
-                  <div className='space-y-0.5'>
-                    <FormLabel className='text-base'>Model Enabled</FormLabel>
-                    <FormDescription>
-                      Enable or disable this model override
-                    </FormDescription>
-                  </div>
-                  <FormControl>
-                    <Switch
-                      checked={field.value}
-                      onCheckedChange={field.onChange}
-                    />
-                  </FormControl>
-                </FormItem>
-              )}
-            />
-
-            <div className='flex justify-end gap-2 pt-4'>
-              <Button
-                type='button'
-                variant='outline'
-                onClick={handleClose}
-                disabled={isSubmitting}
-              >
-                Cancel
-              </Button>
-              <Button type='submit' disabled={isSubmitting}>
-                {isSubmitting ? (
-                  <>
-                    <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-                    {isNewOverride ? 'Creating...' : 'Updating...'}
-                  </>
-                ) : isNewOverride ? (
-                  'Create Override'
-                ) : (
-                  'Update Model'
-                )}
-              </Button>
-            </div>
-          </form>
-        </Form>
-      </DialogContent>
-    </Dialog>
-  );
-}

ui/components/ModelSearchFilter.tsx

@@ -1,145 +0,0 @@
-'use client';
-
-import React, { useState, useMemo } from 'react';
-import { Input } from '@/components/ui/input';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
-import { Button } from '@/components/ui/button';
-import { Search, Filter, X } from 'lucide-react';
-import { cn } from '@/lib/utils';
-import type { Model } from '@/lib/api/schemas/models';
-
-interface ModelSearchFilterProps {
-  models: Model[];
-  onFilteredModelsChange: (filteredModels: Model[]) => void;
-  className?: string;
-}
-
-type SortOption = 'name-asc' | 'name-desc' | 'price-asc' | 'price-desc';
-
-export function ModelSearchFilter({
-  models,
-  onFilteredModelsChange,
-  className,
-}: ModelSearchFilterProps) {
-  const [searchQuery, setSearchQuery] = useState('');
-  const [sortOption, setSortOption] = useState<SortOption>('name-asc');
-
-  const filteredAndSortedModels = useMemo(() => {
-    let filtered = [...models];
-
-    // Apply search filter
-    if (searchQuery.trim()) {
-      const query = searchQuery.toLowerCase().trim();
-      filtered = filtered.filter((model) => {
-        return (
-          model.name.toLowerCase().includes(query) ||
-          model.full_name.toLowerCase().includes(query) ||
-          model.provider.toLowerCase().includes(query) ||
-          (model.description &&
-            model.description.toLowerCase().includes(query)) ||
-          model.modelType.toLowerCase().includes(query)
-        );
-      });
-    }
-
-    // Apply sorting
-    filtered.sort((a, b) => {
-      switch (sortOption) {
-        case 'name-asc':
-          return a.name.localeCompare(b.name);
-        case 'name-desc':
-          return b.name.localeCompare(a.name);
-        case 'price-asc': {
-          const aPrice = a.is_free
-            ? 0
-            : (a.input_cost || 0) + (a.output_cost || 0);
-          const bPrice = b.is_free
-            ? 0
-            : (b.input_cost || 0) + (b.output_cost || 0);
-          return aPrice - bPrice;
-        }
-        case 'price-desc': {
-          const aPrice = a.is_free
-            ? 0
-            : (a.input_cost || 0) + (a.output_cost || 0);
-          const bPrice = b.is_free
-            ? 0
-            : (b.input_cost || 0) + (b.output_cost || 0);
-          return bPrice - aPrice;
-        }
-        default:
-          return 0;
-      }
-    });
-
-    return filtered;
-  }, [models, searchQuery, sortOption]);
-
-  // Notify parent component when filtered models change
-  React.useEffect(() => {
-    onFilteredModelsChange(filteredAndSortedModels);
-  }, [filteredAndSortedModels, onFilteredModelsChange]);
-
-  const clearFilters = () => {
-    setSearchQuery('');
-    setSortOption('name-asc');
-  };
-
-  const hasActiveFilters =
-    searchQuery.trim() !== '' || sortOption !== 'name-asc';
-
-  return (
-    <div
-      className={cn(
-        'flex flex-col gap-4 sm:flex-row sm:items-center sm:gap-3',
-        className
-      )}
-    >
-      <div className='relative flex-1'>
-        <Search className='text-muted-foreground absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2' />
-        <Input
-          placeholder='Search models by name, provider, or description...'
-          value={searchQuery}
-          onChange={(e) => setSearchQuery(e.target.value)}
-          className='pl-9'
-        />
-      </div>
-
-      <div className='flex items-center gap-2'>
-        <Select
-          value={sortOption}
-          onValueChange={(value: SortOption) => setSortOption(value)}
-        >
-          <SelectTrigger className='w-full sm:w-[180px]'>
-            <Filter className='mr-2 h-4 w-4' />
-            <SelectValue placeholder='Sort by' />
-          </SelectTrigger>
-          <SelectContent>
-            <SelectItem value='name-asc'>Name (A-Z)</SelectItem>
-            <SelectItem value='name-desc'>Name (Z-A)</SelectItem>
-            <SelectItem value='price-asc'>Price (Low to High)</SelectItem>
-            <SelectItem value='price-desc'>Price (High to Low)</SelectItem>
-          </SelectContent>
-        </Select>
-
-        {hasActiveFilters && (
-          <Button
-            variant='outline'
-            size='icon'
-            onClick={clearFilters}
-            className='h-9 w-9'
-            title='Clear filters'
-          >
-            <X className='h-4 w-4' />
-          </Button>
-        )}
-      </div>
-    </div>
-  );
-}

ui/components/ModelTester.tsx

@@ -1,451 +0,0 @@
-'use client';
-
-import React, { useState } from 'react';
-import { useMutation, useQuery } from '@tanstack/react-query';
-import { type Model } from '@/lib/api/schemas/models';
-import { ModelService } from '@/lib/api/services/models';
-import { Button } from '@/components/ui/button';
-import { Textarea } from '@/components/ui/textarea';
-import { Label } from '@/components/ui/label';
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
-import { Badge } from '@/components/ui/badge';
-import { Alert, AlertDescription } from '@/components/ui/alert';
-import {
-  Loader2,
-  Send,
-  CheckCircle,
-  XCircle,
-  Info,
-  Key,
-  Globe,
-} from 'lucide-react';
-import { toast } from 'sonner';
-
-interface ModelTesterProps {
-  models: Model[];
-}
-
-interface ChatCompletionRequest {
-  model: string;
-  messages: {
-    role: 'system' | 'user' | 'assistant';
-    content: string;
-  }[];
-  max_tokens?: number;
-  temperature?: number;
-}
-
-interface ChatCompletionResponse {
-  id: string;
-  object: string;
-  created: number;
-  model: string;
-  choices: {
-    index: number;
-    message: {
-      role: string;
-      content: string;
-    };
-    finish_reason: string;
-  }[];
-  usage?: {
-    prompt_tokens: number;
-    completion_tokens: number;
-    total_tokens: number;
-  };
-}
-
-const DEFAULT_SYSTEM_MESSAGE =
-  'You are a helpful assistant. Please respond concisely.';
-const DEFAULT_USER_MESSAGE =
-  'Hello! Can you tell me what model you are and confirm that you are working correctly?';
-
-export function ModelTester({ models }: ModelTesterProps) {
-  const [selectedModelId, setSelectedModelId] = useState<string>('');
-  const [systemMessage, setSystemMessage] = useState(DEFAULT_SYSTEM_MESSAGE);
-  const [userMessage, setUserMessage] = useState(DEFAULT_USER_MESSAGE);
-  const [maxTokens, setMaxTokens] = useState<number>(150);
-  const [temperature, setTemperature] = useState<number>(0.7);
-  const [response, setResponse] = useState<ChatCompletionResponse | null>(null);
-  const [error, setError] = useState<string | null>(null);
-
-  // Fetch model groups for API key resolution
-  const { data: groups = [] } = useQuery({
-    queryKey: ['model-groups'],
-    queryFn: () => ModelService.getModelGroups(),
-    refetchOnWindowFocus: false,
-  });
-
-  const selectedModel = models.find((model) => model.id === selectedModelId);
-
-  // Get effective API key and endpoint URL for the selected model
-  const getModelCredentials = (model: Model) => {
-    const group = groups.find((g) => g.provider === model.provider);
-
-    // Determine API key (individual takes precedence over group)
-    const apiKey = model.api_key || group?.group_api_key;
-
-    // Determine endpoint URL
-    let endpointUrl = model.url;
-
-    // If model URL is relative and group has a base URL, combine them
-    if (model.url.startsWith('/') && group?.group_url) {
-      endpointUrl = `${group.group_url.replace(/\/$/, '')}${model.url}`;
-    }
-
-    // Ensure the URL ends with /chat/completions for chat models
-    if (
-      model.modelType === 'text' &&
-      !endpointUrl.includes('/chat/completions')
-    ) {
-      endpointUrl = endpointUrl.replace(/\/$/, '') + '/chat/completions';
-    }
-
-    return {
-      apiKey,
-      endpointUrl,
-      group,
-    };
-  };
-
-  const testModelMutation = useMutation({
-    mutationFn: async (request: ChatCompletionRequest) => {
-      if (!selectedModel) {
-        throw new Error('No model selected');
-      }
-
-      setError(null);
-      setResponse(null);
-
-      try {
-        console.log(`Testing model via proxy: ${selectedModel.name}`);
-        console.log('Request payload:', request);
-
-        const response = await ModelService.testModel(
-          selectedModel.id,
-          'chat-completions',
-          request as unknown as Record<string, unknown>
-        );
-
-        if (!response.success) {
-          throw new Error(response.error || 'Test failed');
-        }
-
-        return response.data as ChatCompletionResponse;
-      } catch (err: unknown) {
-        console.error('Model test error via proxy:', err);
-
-        const errorMessage =
-          err instanceof Error ? err.message : 'Failed to test model via proxy';
-        throw new Error(errorMessage);
-      }
-    },
-    onSuccess: (data) => {
-      setResponse(data);
-      toast.success('Model test completed successfully!');
-    },
-    onError: (err: Error) => {
-      const errorMessage = err?.message || 'Unknown error occurred';
-      setError(errorMessage);
-      toast.error(`Model test failed: ${errorMessage}`);
-    },
-  });
-
-  const handleTest = async () => {
-    if (!selectedModel) {
-      toast.error('Please select a model to test');
-      return;
-    }
-
-    if (!userMessage.trim()) {
-      toast.error('Please enter a test message');
-      return;
-    }
-
-    const messages = [];
-
-    if (systemMessage.trim()) {
-      messages.push({
-        role: 'system' as const,
-        content: systemMessage.trim(),
-      });
-    }
-
-    messages.push({
-      role: 'user' as const,
-      content: userMessage.trim(),
-    });
-
-    const request: ChatCompletionRequest = {
-      model: selectedModel.name,
-      messages,
-      max_tokens: maxTokens,
-      temperature: temperature,
-    };
-
-    testModelMutation.mutate(request);
-  };
-
-  const enabledModels = models.filter((model) => model.isEnabled);
-  const credentials = selectedModel ? getModelCredentials(selectedModel) : null;
-
-  return (
-    <Card className='w-full'>
-      <CardHeader>
-        <CardTitle className='flex items-center gap-2'>
-          <Send className='h-5 w-5' />
-          Model Credential Tester
-        </CardTitle>
-        <CardDescription>
-          Test model functionality by sending chat completion requests through
-          the secure proxy (resolves CORS and network issues)
-        </CardDescription>
-      </CardHeader>
-      <CardContent className='space-y-6'>
-        {/* Model Selection */}
-        <div className='space-y-2'>
-          <Label htmlFor='model-select'>Select Model</Label>
-          <Select value={selectedModelId} onValueChange={setSelectedModelId}>
-            <SelectTrigger id='model-select'>
-              <SelectValue placeholder='Choose a model to test...' />
-            </SelectTrigger>
-            <SelectContent>
-              {enabledModels.map((model) => (
-                <SelectItem key={model.id} value={model.id}>
-                  <div className='flex items-center gap-2'>
-                    <span>{model.name}</span>
-                    <Badge variant='outline' className='text-xs'>
-                      {model.provider}
-                    </Badge>
-                    {model.is_free && (
-                      <Badge variant='secondary' className='text-xs'>
-                        Free
-                      </Badge>
-                    )}
-                  </div>
-                </SelectItem>
-              ))}
-            </SelectContent>
-          </Select>
-
-          {selectedModel && credentials && (
-            <div className='text-muted-foreground bg-muted space-y-2 rounded-md p-3 text-sm'>
-              <div className='flex items-center gap-2'>
-                <Globe className='h-4 w-4' />
-                <span>
-                  <strong>Endpoint:</strong> {credentials.endpointUrl}
-                </span>
-              </div>
-              <div className='flex items-center gap-2'>
-                <Key className='h-4 w-4' />
-                <span>
-                  <strong>API Key:</strong>{' '}
-                  {credentials.apiKey
-                    ? `${credentials.apiKey.substring(0, 8)}...`
-                    : 'Not configured'}
-                </span>
-                <Badge
-                  variant={credentials.apiKey ? 'default' : 'destructive'}
-                  className='text-xs'
-                >
-                  {selectedModel.api_key_type || 'Unknown'}
-                </Badge>
-              </div>
-              <div>
-                <span>
-                  <strong>Provider:</strong> {selectedModel.provider}
-                </span>
-              </div>
-              <div>
-                <span>
-                  <strong>Type:</strong> {selectedModel.modelType}
-                </span>
-              </div>
-              {selectedModel.contextLength && (
-                <div>
-                  <span>
-                    <strong>Context Length:</strong>{' '}
-                    {selectedModel.contextLength.toLocaleString()}
-                  </span>
-                </div>
-              )}
-              {!credentials.apiKey && (
-                <Alert variant='default' className='mt-2'>
-                  <Info className='h-4 w-4' />
-                  <AlertDescription>
-                    No API key configured for this model. Testing may still work
-                    if the model is free or if authentication is handled
-                    elsewhere. For models requiring authentication, please add
-                    an API key to the model or its provider group.
-                  </AlertDescription>
-                </Alert>
-              )}
-            </div>
-          )}
-        </div>
-
-        {/* Test Parameters */}
-        <div className='grid grid-cols-1 gap-4 md:grid-cols-2'>
-          <div className='space-y-2'>
-            <Label htmlFor='max-tokens'>Max Tokens</Label>
-            <input
-              id='max-tokens'
-              type='number'
-              min={1}
-              max={4000}
-              value={maxTokens}
-              onChange={(e) => setMaxTokens(parseInt(e.target.value) || 150)}
-              className='border-input bg-background w-full rounded-md border px-3 py-2 text-sm'
-            />
-          </div>
-          <div className='space-y-2'>
-            <Label htmlFor='temperature'>Temperature</Label>
-            <input
-              id='temperature'
-              type='number'
-              min={0}
-              max={2}
-              step={0.1}
-              value={temperature}
-              onChange={(e) =>
-                setTemperature(parseFloat(e.target.value) || 0.7)
-              }
-              className='border-input bg-background w-full rounded-md border px-3 py-2 text-sm'
-            />
-          </div>
-        </div>
-
-        {/* System Message */}
-        <div className='space-y-2'>
-          <Label htmlFor='system-message'>System Message (Optional)</Label>
-          <Textarea
-            id='system-message'
-            placeholder='Enter system message...'
-            value={systemMessage}
-            onChange={(e) => setSystemMessage(e.target.value)}
-            rows={2}
-          />
-        </div>
-
-        {/* User Message */}
-        <div className='space-y-2'>
-          <Label htmlFor='user-message'>Test Message</Label>
-          <Textarea
-            id='user-message'
-            placeholder='Enter your test message...'
-            value={userMessage}
-            onChange={(e) => setUserMessage(e.target.value)}
-            rows={3}
-          />
-        </div>
-
-        {/* Test Button */}
-        <Button
-          onClick={handleTest}
-          disabled={!selectedModelId || testModelMutation.isPending}
-          className='w-full'
-        >
-          {testModelMutation.isPending ? (
-            <>
-              <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-              Testing Model...
-            </>
-          ) : (
-            <>
-              <Send className='mr-2 h-4 w-4' />
-              Test Model (via Proxy)
-            </>
-          )}
-        </Button>
-
-        {/* Results */}
-        {error && (
-          <Alert variant='destructive'>
-            <XCircle className='h-4 w-4' />
-            <AlertDescription>
-              <strong>Test Failed:</strong> {error}
-            </AlertDescription>
-          </Alert>
-        )}
-
-        {response && (
-          <Alert>
-            <CheckCircle className='h-4 w-4' />
-            <AlertDescription>
-              <strong>Test Successful!</strong> Model responded correctly via
-              secure proxy.
-            </AlertDescription>
-          </Alert>
-        )}
-
-        {response && (
-          <div className='space-y-4'>
-            <div className='space-y-2'>
-              <Label>Model Response</Label>
-              <div className='bg-muted rounded-md p-4'>
-                <p className='text-sm whitespace-pre-wrap'>
-                  {response.choices[0]?.message?.content ||
-                    'No content in response'}
-                </p>
-              </div>
-            </div>
-
-            {response.usage && (
-              <div className='space-y-2'>
-                <Label>Usage Statistics</Label>
-                <div className='grid grid-cols-3 gap-4 text-sm'>
-                  <div className='bg-muted rounded p-2 text-center'>
-                    <div className='font-semibold'>
-                      {response.usage.prompt_tokens}
-                    </div>
-                    <div className='text-muted-foreground'>Prompt Tokens</div>
-                  </div>
-                  <div className='bg-muted rounded p-2 text-center'>
-                    <div className='font-semibold'>
-                      {response.usage.completion_tokens}
-                    </div>
-                    <div className='text-muted-foreground'>
-                      Completion Tokens
-                    </div>
-                  </div>
-                  <div className='bg-muted rounded p-2 text-center'>
-                    <div className='font-semibold'>
-                      {response.usage.total_tokens}
-                    </div>
-                    <div className='text-muted-foreground'>Total Tokens</div>
-                  </div>
-                </div>
-              </div>
-            )}
-
-            <div className='space-y-2'>
-              <Label>Raw Response</Label>
-              <details className='group'>
-                <summary className='text-muted-foreground hover:text-foreground cursor-pointer text-sm'>
-                  <Info className='mr-1 inline h-4 w-4' />
-                  Show detailed response data
-                </summary>
-                <pre className='bg-muted mt-2 max-h-60 overflow-auto rounded-md p-4 text-xs'>
-                  {JSON.stringify(response, null, 2)}
-                </pre>
-              </details>
-            </div>
-          </div>
-        )}
-      </CardContent>
-    </Card>
-  );
-}

ui/components/app-sidebar.tsx

@@ -1,110 +0,0 @@
-'use client';
-
-import * as React from 'react';
-import {
-  DatabaseIcon,
-  LayoutDashboardIcon,
-  ServerIcon,
-  SettingsIcon,
-} from 'lucide-react';
-import Image from 'next/image';
-
-import { NavSecondary } from '@/components/nav-secondary';
-import {
-  Sidebar,
-  SidebarContent,
-  SidebarHeader,
-  SidebarMenu,
-  SidebarMenuItem,
-  SidebarMenuButton,
-} from '@/components/ui/sidebar';
-
-const data = {
-  navMain: [
-    {
-      title: 'Dashboard',
-      url: '/',
-      icon: LayoutDashboardIcon,
-    },
-  ],
-  navClouds: [],
-  navSecondary: [
-    {
-      title: 'Dashboard',
-      url: '/',
-      icon: LayoutDashboardIcon,
-    },
-    {
-      title: 'Models',
-      url: '/model',
-      icon: DatabaseIcon,
-    },
-    {
-      title: 'Providers',
-      url: '/providers',
-      icon: ServerIcon,
-    },
-    {
-      title: 'Settings',
-      url: '/settings',
-      icon: SettingsIcon,
-    },
-    // {
-    //   title: 'Transactions',
-    //   url: '/transactions',
-    //   icon: ReceiptIcon,
-    // },
-    // {
-    //   title: 'Credit',
-    //   url: '/credits',
-    //   icon: FolderIcon,
-    // },
-    // {
-    //   title: 'Users',
-    //   url: '/users',
-    //   icon: UsersIcon,
-    // },
-    // {
-    //   title: 'Organizations',
-    //   url: '/organizations',
-    //   icon: FolderIcon,
-    // },
-  ],
-  documents: [],
-};
-
-export function AppSidebar({ ...props }: React.ComponentProps<typeof Sidebar>) {
-  return (
-    <Sidebar collapsible='offcanvas' {...props}>
-      <SidebarHeader>
-        <SidebarMenu>
-          <SidebarMenuItem>
-            <SidebarMenuButton
-              asChild
-              className='data-[slot=sidebar-menu-button]:!p-1.5'
-            >
-              <div className='flex items-center gap-2'>
-                <Image
-                  src='/icon.ico'
-                  alt='Routstr Node'
-                  width={24}
-                  height={24}
-                  className='rounded'
-                />
-                <span className='text-base font-semibold'>Routstr Node</span>
-              </div>
-            </SidebarMenuButton>
-          </SidebarMenuItem>
-        </SidebarMenu>
-      </SidebarHeader>
-      <SidebarContent className='flex-1 overflow-y-auto'>
-        <NavSecondary items={data.navSecondary} className='mt-auto' />
-      </SidebarContent>
-      {/*
-      <SidebarFooter>
-        <NavUser />
-      </SidebarFooter>
-        */}
-    </Sidebar>
-  );
-}

ui/components/chart-area-interactive.tsx

@@ -1,289 +0,0 @@
-'use client';
-
-import * as React from 'react';
-import { Area, AreaChart, CartesianGrid, XAxis } from 'recharts';
-
-import { useIsMobile } from '@/hooks/use-mobile';
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card';
-import {
-  ChartConfig,
-  ChartContainer,
-  ChartTooltip,
-  ChartTooltipContent,
-} from '@/components/ui/chart';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
-import { ToggleGroup, ToggleGroupItem } from '@/components/ui/toggle-group';
-const chartData = [
-  { date: '2024-04-01', desktop: 222, mobile: 150 },
-  { date: '2024-04-02', desktop: 97, mobile: 180 },
-  { date: '2024-04-03', desktop: 167, mobile: 120 },
-  { date: '2024-04-04', desktop: 242, mobile: 260 },
-  { date: '2024-04-05', desktop: 373, mobile: 290 },
-  { date: '2024-04-06', desktop: 301, mobile: 340 },
-  { date: '2024-04-07', desktop: 245, mobile: 180 },
-  { date: '2024-04-08', desktop: 409, mobile: 320 },
-  { date: '2024-04-09', desktop: 59, mobile: 110 },
-  { date: '2024-04-10', desktop: 261, mobile: 190 },
-  { date: '2024-04-11', desktop: 327, mobile: 350 },
-  { date: '2024-04-12', desktop: 292, mobile: 210 },
-  { date: '2024-04-13', desktop: 342, mobile: 380 },
-  { date: '2024-04-14', desktop: 137, mobile: 220 },
-  { date: '2024-04-15', desktop: 120, mobile: 170 },
-  { date: '2024-04-16', desktop: 138, mobile: 190 },
-  { date: '2024-04-17', desktop: 446, mobile: 360 },
-  { date: '2024-04-18', desktop: 364, mobile: 410 },
-  { date: '2024-04-19', desktop: 243, mobile: 180 },
-  { date: '2024-04-20', desktop: 89, mobile: 150 },
-  { date: '2024-04-21', desktop: 137, mobile: 200 },
-  { date: '2024-04-22', desktop: 224, mobile: 170 },
-  { date: '2024-04-23', desktop: 138, mobile: 230 },
-  { date: '2024-04-24', desktop: 387, mobile: 290 },
-  { date: '2024-04-25', desktop: 215, mobile: 250 },
-  { date: '2024-04-26', desktop: 75, mobile: 130 },
-  { date: '2024-04-27', desktop: 383, mobile: 420 },
-  { date: '2024-04-28', desktop: 122, mobile: 180 },
-  { date: '2024-04-29', desktop: 315, mobile: 240 },
-  { date: '2024-04-30', desktop: 454, mobile: 380 },
-  { date: '2024-05-01', desktop: 165, mobile: 220 },
-  { date: '2024-05-02', desktop: 293, mobile: 310 },
-  { date: '2024-05-03', desktop: 247, mobile: 190 },
-  { date: '2024-05-04', desktop: 385, mobile: 420 },
-  { date: '2024-05-05', desktop: 481, mobile: 390 },
-  { date: '2024-05-06', desktop: 498, mobile: 520 },
-  { date: '2024-05-07', desktop: 388, mobile: 300 },
-  { date: '2024-05-08', desktop: 149, mobile: 210 },
-  { date: '2024-05-09', desktop: 227, mobile: 180 },
-  { date: '2024-05-10', desktop: 293, mobile: 330 },
-  { date: '2024-05-11', desktop: 335, mobile: 270 },
-  { date: '2024-05-12', desktop: 197, mobile: 240 },
-  { date: '2024-05-13', desktop: 197, mobile: 160 },
-  { date: '2024-05-14', desktop: 448, mobile: 490 },
-  { date: '2024-05-15', desktop: 473, mobile: 380 },
-  { date: '2024-05-16', desktop: 338, mobile: 400 },
-  { date: '2024-05-17', desktop: 499, mobile: 420 },
-  { date: '2024-05-18', desktop: 315, mobile: 350 },
-  { date: '2024-05-19', desktop: 235, mobile: 180 },
-  { date: '2024-05-20', desktop: 177, mobile: 230 },
-  { date: '2024-05-21', desktop: 82, mobile: 140 },
-  { date: '2024-05-22', desktop: 81, mobile: 120 },
-  { date: '2024-05-23', desktop: 252, mobile: 290 },
-  { date: '2024-05-24', desktop: 294, mobile: 220 },
-  { date: '2024-05-25', desktop: 201, mobile: 250 },
-  { date: '2024-05-26', desktop: 213, mobile: 170 },
-  { date: '2024-05-27', desktop: 420, mobile: 460 },
-  { date: '2024-05-28', desktop: 233, mobile: 190 },
-  { date: '2024-05-29', desktop: 78, mobile: 130 },
-  { date: '2024-05-30', desktop: 340, mobile: 280 },
-  { date: '2024-05-31', desktop: 178, mobile: 230 },
-  { date: '2024-06-01', desktop: 178, mobile: 200 },
-  { date: '2024-06-02', desktop: 470, mobile: 410 },
-  { date: '2024-06-03', desktop: 103, mobile: 160 },
-  { date: '2024-06-04', desktop: 439, mobile: 380 },
-  { date: '2024-06-05', desktop: 88, mobile: 140 },
-  { date: '2024-06-06', desktop: 294, mobile: 250 },
-  { date: '2024-06-07', desktop: 323, mobile: 370 },
-  { date: '2024-06-08', desktop: 385, mobile: 320 },
-  { date: '2024-06-09', desktop: 438, mobile: 480 },
-  { date: '2024-06-10', desktop: 155, mobile: 200 },
-  { date: '2024-06-11', desktop: 92, mobile: 150 },
-  { date: '2024-06-12', desktop: 492, mobile: 420 },
-  { date: '2024-06-13', desktop: 81, mobile: 130 },
-  { date: '2024-06-14', desktop: 426, mobile: 380 },
-  { date: '2024-06-15', desktop: 307, mobile: 350 },
-  { date: '2024-06-16', desktop: 371, mobile: 310 },
-  { date: '2024-06-17', desktop: 475, mobile: 520 },
-  { date: '2024-06-18', desktop: 107, mobile: 170 },
-  { date: '2024-06-19', desktop: 341, mobile: 290 },
-  { date: '2024-06-20', desktop: 408, mobile: 450 },
-  { date: '2024-06-21', desktop: 169, mobile: 210 },
-  { date: '2024-06-22', desktop: 317, mobile: 270 },
-  { date: '2024-06-23', desktop: 480, mobile: 530 },
-  { date: '2024-06-24', desktop: 132, mobile: 180 },
-  { date: '2024-06-25', desktop: 141, mobile: 190 },
-  { date: '2024-06-26', desktop: 434, mobile: 380 },
-  { date: '2024-06-27', desktop: 448, mobile: 490 },
-  { date: '2024-06-28', desktop: 149, mobile: 200 },
-  { date: '2024-06-29', desktop: 103, mobile: 160 },
-  { date: '2024-06-30', desktop: 446, mobile: 400 },
-];
-
-const chartConfig = {
-  visitors: {
-    label: 'Visitors',
-  },
-  desktop: {
-    label: 'Desktop',
-    color: 'hsl(var(--chart-1))',
-  },
-  mobile: {
-    label: 'Mobile',
-    color: 'hsl(var(--chart-2))',
-  },
-} satisfies ChartConfig;
-
-export function ChartAreaInteractive() {
-  const isMobile = useIsMobile();
-  const [timeRange, setTimeRange] = React.useState('30d');
-
-  React.useEffect(() => {
-    if (isMobile) {
-      setTimeRange('7d');
-    }
-  }, [isMobile]);
-
-  const filteredData = chartData.filter((item) => {
-    const date = new Date(item.date);
-    const referenceDate = new Date('2024-06-30');
-    let daysToSubtract = 90;
-    if (timeRange === '30d') {
-      daysToSubtract = 30;
-    } else if (timeRange === '7d') {
-      daysToSubtract = 7;
-    }
-    const startDate = new Date(referenceDate);
-    startDate.setDate(startDate.getDate() - daysToSubtract);
-    return date >= startDate;
-  });
-
-  return (
-    <Card className='@container/card'>
-      <CardHeader className='relative'>
-        <CardTitle>Total Visitors</CardTitle>
-        <CardDescription>
-          <span className='hidden @[540px]/card:block'>
-            Total for the last 3 months
-          </span>
-          <span className='@[540px]/card:hidden'>Last 3 months</span>
-        </CardDescription>
-        <div className='absolute top-4 right-4'>
-          <ToggleGroup
-            type='single'
-            value={timeRange}
-            onValueChange={setTimeRange}
-            variant='outline'
-            className='hidden @[767px]/card:flex'
-          >
-            <ToggleGroupItem value='90d' className='h-8 px-2.5'>
-              Last 3 months
-            </ToggleGroupItem>
-            <ToggleGroupItem value='30d' className='h-8 px-2.5'>
-              Last 30 days
-            </ToggleGroupItem>
-            <ToggleGroupItem value='7d' className='h-8 px-2.5'>
-              Last 7 days
-            </ToggleGroupItem>
-          </ToggleGroup>
-          <Select value={timeRange} onValueChange={setTimeRange}>
-            <SelectTrigger
-              className='flex w-40 @[767px]/card:hidden'
-              aria-label='Select a value'
-            >
-              <SelectValue placeholder='Last 3 months' />
-            </SelectTrigger>
-            <SelectContent className='rounded-xl'>
-              <SelectItem value='90d' className='rounded-lg'>
-                Last 3 months
-              </SelectItem>
-              <SelectItem value='30d' className='rounded-lg'>
-                Last 30 days
-              </SelectItem>
-              <SelectItem value='7d' className='rounded-lg'>
-                Last 7 days
-              </SelectItem>
-            </SelectContent>
-          </Select>
-        </div>
-      </CardHeader>
-      <CardContent className='px-2 pt-4 sm:px-6 sm:pt-6'>
-        <ChartContainer
-          config={chartConfig}
-          className='aspect-auto h-[250px] w-full'
-        >
-          <AreaChart data={filteredData}>
-            <defs>
-              <linearGradient id='fillDesktop' x1='0' y1='0' x2='0' y2='1'>
-                <stop
-                  offset='5%'
-                  stopColor='var(--color-desktop)'
-                  stopOpacity={1.0}
-                />
-                <stop
-                  offset='95%'
-                  stopColor='var(--color-desktop)'
-                  stopOpacity={0.1}
-                />
-              </linearGradient>
-              <linearGradient id='fillMobile' x1='0' y1='0' x2='0' y2='1'>
-                <stop
-                  offset='5%'
-                  stopColor='var(--color-mobile)'
-                  stopOpacity={0.8}
-                />
-                <stop
-                  offset='95%'
-                  stopColor='var(--color-mobile)'
-                  stopOpacity={0.1}
-                />
-              </linearGradient>
-            </defs>
-            <CartesianGrid vertical={false} />
-            <XAxis
-              dataKey='date'
-              tickLine={false}
-              axisLine={false}
-              tickMargin={8}
-              minTickGap={32}
-              tickFormatter={(value) => {
-                const date = new Date(value);
-                return date.toLocaleDateString('en-US', {
-                  month: 'short',
-                  day: 'numeric',
-                });
-              }}
-            />
-            <ChartTooltip
-              cursor={false}
-              content={
-                <ChartTooltipContent
-                  labelFormatter={(value) => {
-                    return new Date(value).toLocaleDateString('en-US', {
-                      month: 'short',
-                      day: 'numeric',
-                    });
-                  }}
-                  indicator='dot'
-                />
-              }
-            />
-            <Area
-              dataKey='mobile'
-              type='natural'
-              fill='url(#fillMobile)'
-              stroke='var(--color-mobile)'
-              stackId='a'
-            />
-            <Area
-              dataKey='desktop'
-              type='natural'
-              fill='url(#fillDesktop)'
-              stroke='var(--color-desktop)'
-              stackId='a'
-            />
-          </AreaChart>
-        </ChartContainer>
-      </CardContent>
-    </Card>
-  );
-}

ui/components/data-table.tsx

@@ -1,817 +0,0 @@
-'use client';
-
-import * as React from 'react';
-import {
-  DndContext,
-  KeyboardSensor,
-  MouseSensor,
-  TouchSensor,
-  closestCenter,
-  useSensor,
-  useSensors,
-  type DragEndEvent,
-  type UniqueIdentifier,
-} from '@dnd-kit/core';
-import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
-import {
-  SortableContext,
-  arrayMove,
-  useSortable,
-  verticalListSortingStrategy,
-} from '@dnd-kit/sortable';
-import { CSS } from '@dnd-kit/utilities';
-import {
-  ColumnDef,
-  ColumnFiltersState,
-  Row,
-  SortingState,
-  VisibilityState,
-  flexRender,
-  getCoreRowModel,
-  getFacetedRowModel,
-  getFacetedUniqueValues,
-  getFilteredRowModel,
-  getPaginationRowModel,
-  getSortedRowModel,
-  useReactTable,
-} from '@tanstack/react-table';
-import {
-  CheckCircle2Icon,
-  ChevronDownIcon,
-  ChevronLeftIcon,
-  ChevronRightIcon,
-  ChevronsLeftIcon,
-  ChevronsRightIcon,
-  ColumnsIcon,
-  GripVerticalIcon,
-  LoaderIcon,
-  MoreVerticalIcon,
-  PlusIcon,
-  TrendingUpIcon,
-} from 'lucide-react';
-import { Area, AreaChart, CartesianGrid, XAxis } from 'recharts';
-import { toast } from 'sonner';
-import { z } from 'zod';
-
-import { useIsMobile } from '@/hooks/use-mobile';
-import { Badge } from '@/components/ui/badge';
-import { Button } from '@/components/ui/button';
-import {
-  ChartConfig,
-  ChartContainer,
-  ChartTooltip,
-  ChartTooltipContent,
-} from '@/components/ui/chart';
-import { Checkbox } from '@/components/ui/checkbox';
-import {
-  DropdownMenu,
-  DropdownMenuCheckboxItem,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Input } from '@/components/ui/input';
-import { Label } from '@/components/ui/label';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
-import { Separator } from '@/components/ui/separator';
-import {
-  Sheet,
-  SheetClose,
-  SheetContent,
-  SheetDescription,
-  SheetFooter,
-  SheetHeader,
-  SheetTitle,
-  SheetTrigger,
-} from '@/components/ui/sheet';
-import {
-  Table,
-  TableBody,
-  TableCell,
-  TableHead,
-  TableHeader,
-  TableRow,
-} from '@/components/ui/table';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
-
-export const schema = z.object({
-  id: z.number(),
-  header: z.string(),
-  type: z.string(),
-  status: z.string(),
-  target: z.string(),
-  limit: z.string(),
-  reviewer: z.string(),
-});
-
-// Create a separate component for the drag handle
-function DragHandle({ id }: { id: number }) {
-  const { attributes, listeners } = useSortable({
-    id,
-  });
-
-  return (
-    <Button
-      {...attributes}
-      {...listeners}
-      variant='ghost'
-      size='icon'
-      className='text-muted-foreground size-7 hover:bg-transparent'
-    >
-      <GripVerticalIcon className='text-muted-foreground size-3' />
-      <span className='sr-only'>Drag to reorder</span>
-    </Button>
-  );
-}
-
-const columns: ColumnDef<z.infer<typeof schema>>[] = [
-  {
-    id: 'drag',
-    header: () => null,
-    cell: ({ row }) => <DragHandle id={row.original.id} />,
-  },
-  {
-    id: 'select',
-    header: ({ table }) => (
-      <div className='flex items-center justify-center'>
-        <Checkbox
-          checked={
-            table.getIsAllPageRowsSelected() ||
-            (table.getIsSomePageRowsSelected() && 'indeterminate')
-          }
-          onCheckedChange={(value) => table.toggleAllPageRowsSelected(!!value)}
-          aria-label='Select all'
-        />
-      </div>
-    ),
-    cell: ({ row }) => (
-      <div className='flex items-center justify-center'>
-        <Checkbox
-          checked={row.getIsSelected()}
-          onCheckedChange={(value) => row.toggleSelected(!!value)}
-          aria-label='Select row'
-        />
-      </div>
-    ),
-    enableSorting: false,
-    enableHiding: false,
-  },
-  {
-    accessorKey: 'header',
-    header: 'Header',
-    cell: ({ row }) => {
-      return <TableCellViewer item={row.original} />;
-    },
-    enableHiding: false,
-  },
-  {
-    accessorKey: 'type',
-    header: 'Section Type',
-    cell: ({ row }) => (
-      <div className='w-32'>
-        <Badge variant='outline' className='text-muted-foreground px-1.5'>
-          {row.original.type}
-        </Badge>
-      </div>
-    ),
-  },
-  {
-    accessorKey: 'status',
-    header: 'Status',
-    cell: ({ row }) => (
-      <Badge
-        variant='outline'
-        className='text-muted-foreground flex gap-1 px-1.5 [&_svg]:size-3'
-      >
-        {row.original.status === 'Done' ? (
-          <CheckCircle2Icon className='text-green-500 dark:text-green-400' />
-        ) : (
-          <LoaderIcon />
-        )}
-        {row.original.status}
-      </Badge>
-    ),
-  },
-  {
-    accessorKey: 'target',
-    header: () => <div className='w-full text-right'>Target</div>,
-    cell: ({ row }) => (
-      <form
-        onSubmit={(e) => {
-          e.preventDefault();
-          toast.promise(new Promise((resolve) => setTimeout(resolve, 1000)), {
-            loading: `Saving ${row.original.header}`,
-            success: 'Done',
-            error: 'Error',
-          });
-        }}
-      >
-        <Label htmlFor={`${row.original.id}-target`} className='sr-only'>
-          Target
-        </Label>
-        <Input
-          className='hover:bg-input/30 focus-visible:bg-background h-8 w-16 border-transparent bg-transparent text-right shadow-none focus-visible:border'
-          defaultValue={row.original.target}
-          id={`${row.original.id}-target`}
-        />
-      </form>
-    ),
-  },
-  {
-    accessorKey: 'limit',
-    header: () => <div className='w-full text-right'>Limit</div>,
-    cell: ({ row }) => (
-      <form
-        onSubmit={(e) => {
-          e.preventDefault();
-          toast.promise(new Promise((resolve) => setTimeout(resolve, 1000)), {
-            loading: `Saving ${row.original.header}`,
-            success: 'Done',
-            error: 'Error',
-          });
-        }}
-      >
-        <Label htmlFor={`${row.original.id}-limit`} className='sr-only'>
-          Limit
-        </Label>
-        <Input
-          className='hover:bg-input/30 focus-visible:bg-background h-8 w-16 border-transparent bg-transparent text-right shadow-none focus-visible:border'
-          defaultValue={row.original.limit}
-          id={`${row.original.id}-limit`}
-        />
-      </form>
-    ),
-  },
-  {
-    accessorKey: 'reviewer',
-    header: 'Reviewer',
-    cell: ({ row }) => {
-      const isAssigned = row.original.reviewer !== 'Assign reviewer';
-
-      if (isAssigned) {
-        return row.original.reviewer;
-      }
-
-      return (
-        <>
-          <Label htmlFor={`${row.original.id}-reviewer`} className='sr-only'>
-            Reviewer
-          </Label>
-          <Select>
-            <SelectTrigger
-              className='h-8 w-40'
-              id={`${row.original.id}-reviewer`}
-            >
-              <SelectValue placeholder='Assign reviewer' />
-            </SelectTrigger>
-            <SelectContent align='end'>
-              <SelectItem value='Eddie Lake'>Eddie Lake</SelectItem>
-              <SelectItem value='Jamik Tashpulatov'>
-                Jamik Tashpulatov
-              </SelectItem>
-            </SelectContent>
-          </Select>
-        </>
-      );
-    },
-  },
-  {
-    id: 'actions',
-    cell: () => (
-      <DropdownMenu>
-        <DropdownMenuTrigger asChild>
-          <Button
-            variant='ghost'
-            className='text-muted-foreground data-[state=open]:bg-muted flex size-8'
-            size='icon'
-          >
-            <MoreVerticalIcon />
-            <span className='sr-only'>Open menu</span>
-          </Button>
-        </DropdownMenuTrigger>
-        <DropdownMenuContent align='end' className='w-32'>
-          <DropdownMenuItem>Edit</DropdownMenuItem>
-          <DropdownMenuItem>Make a copy</DropdownMenuItem>
-          <DropdownMenuItem>Favorite</DropdownMenuItem>
-          <DropdownMenuSeparator />
-          <DropdownMenuItem>Delete</DropdownMenuItem>
-        </DropdownMenuContent>
-      </DropdownMenu>
-    ),
-  },
-];
-
-function DraggableRow({ row }: { row: Row<z.infer<typeof schema>> }) {
-  const { transform, transition, setNodeRef, isDragging } = useSortable({
-    id: row.original.id,
-  });
-
-  return (
-    <TableRow
-      data-state={row.getIsSelected() && 'selected'}
-      data-dragging={isDragging}
-      ref={setNodeRef}
-      className='relative z-0 data-[dragging=true]:z-10 data-[dragging=true]:opacity-80'
-      style={{
-        transform: CSS.Transform.toString(transform),
-        transition: transition,
-      }}
-    >
-      {row.getVisibleCells().map((cell) => (
-        <TableCell key={cell.id}>
-          {flexRender(cell.column.columnDef.cell, cell.getContext())}
-        </TableCell>
-      ))}
-    </TableRow>
-  );
-}
-
-export function DataTable({
-  data: initialData,
-}: {
-  data: z.infer<typeof schema>[];
-}) {
-  const [data, setData] = React.useState(() => initialData);
-  const [rowSelection, setRowSelection] = React.useState({});
-  const [columnVisibility, setColumnVisibility] =
-    React.useState<VisibilityState>({});
-  const [columnFilters, setColumnFilters] = React.useState<ColumnFiltersState>(
-    []
-  );
-  const [sorting, setSorting] = React.useState<SortingState>([]);
-  const [pagination, setPagination] = React.useState({
-    pageIndex: 0,
-    pageSize: 10,
-  });
-  const sortableId = React.useId();
-  const sensors = useSensors(
-    useSensor(MouseSensor, {}),
-    useSensor(TouchSensor, {}),
-    useSensor(KeyboardSensor, {})
-  );
-
-  const dataIds = React.useMemo<UniqueIdentifier[]>(
-    () => data?.map(({ id }) => id) || [],
-    [data]
-  );
-
-  const table = useReactTable({
-    data,
-    columns,
-    state: {
-      sorting,
-      columnVisibility,
-      rowSelection,
-      columnFilters,
-      pagination,
-    },
-    getRowId: (row) => row.id.toString(),
-    enableRowSelection: true,
-    onRowSelectionChange: setRowSelection,
-    onSortingChange: setSorting,
-    onColumnFiltersChange: setColumnFilters,
-    onColumnVisibilityChange: setColumnVisibility,
-    onPaginationChange: setPagination,
-    getCoreRowModel: getCoreRowModel(),
-    getFilteredRowModel: getFilteredRowModel(),
-    getPaginationRowModel: getPaginationRowModel(),
-    getSortedRowModel: getSortedRowModel(),
-    getFacetedRowModel: getFacetedRowModel(),
-    getFacetedUniqueValues: getFacetedUniqueValues(),
-  });
-
-  function handleDragEnd(event: DragEndEvent) {
-    const { active, over } = event;
-    if (active && over && active.id !== over.id) {
-      setData((data) => {
-        const oldIndex = dataIds.indexOf(active.id);
-        const newIndex = dataIds.indexOf(over.id);
-        return arrayMove(data, oldIndex, newIndex);
-      });
-    }
-  }
-
-  return (
-    <Tabs
-      defaultValue='outline'
-      className='flex w-full flex-col justify-start gap-6'
-    >
-      <div className='flex items-center justify-between px-4 lg:px-6'>
-        <Label htmlFor='view-selector' className='sr-only'>
-          View
-        </Label>
-        <Select defaultValue='outline'>
-          <SelectTrigger
-            className='flex w-fit @4xl/main:hidden'
-            id='view-selector'
-          >
-            <SelectValue placeholder='Select a view' />
-          </SelectTrigger>
-          <SelectContent>
-            <SelectItem value='outline'>Outline</SelectItem>
-            <SelectItem value='past-performance'>Past Performance</SelectItem>
-            <SelectItem value='key-personnel'>Key Personnel</SelectItem>
-            <SelectItem value='focus-documents'>Focus Documents</SelectItem>
-          </SelectContent>
-        </Select>
-        <TabsList className='hidden @4xl/main:flex'>
-          <TabsTrigger value='outline'>Outline</TabsTrigger>
-          <TabsTrigger value='past-performance' className='gap-1'>
-            Past Performance{' '}
-            <Badge
-              variant='secondary'
-              className='bg-muted-foreground/30 flex h-5 w-5 items-center justify-center rounded-full'
-            >
-              3
-            </Badge>
-          </TabsTrigger>
-          <TabsTrigger value='key-personnel' className='gap-1'>
-            Key Personnel{' '}
-            <Badge
-              variant='secondary'
-              className='bg-muted-foreground/30 flex h-5 w-5 items-center justify-center rounded-full'
-            >
-              2
-            </Badge>
-          </TabsTrigger>
-          <TabsTrigger value='focus-documents'>Focus Documents</TabsTrigger>
-        </TabsList>
-        <div className='flex items-center gap-2'>
-          <DropdownMenu>
-            <DropdownMenuTrigger asChild>
-              <Button variant='outline' size='sm'>
-                <ColumnsIcon />
-                <span className='hidden lg:inline'>Customize Columns</span>
-                <span className='lg:hidden'>Columns</span>
-                <ChevronDownIcon />
-              </Button>
-            </DropdownMenuTrigger>
-            <DropdownMenuContent align='end' className='w-56'>
-              {table
-                .getAllColumns()
-                .filter(
-                  (column) =>
-                    typeof column.accessorFn !== 'undefined' &&
-                    column.getCanHide()
-                )
-                .map((column) => {
-                  return (
-                    <DropdownMenuCheckboxItem
-                      key={column.id}
-                      className='capitalize'
-                      checked={column.getIsVisible()}
-                      onCheckedChange={(value) =>
-                        column.toggleVisibility(!!value)
-                      }
-                    >
-                      {column.id}
-                    </DropdownMenuCheckboxItem>
-                  );
-                })}
-            </DropdownMenuContent>
-          </DropdownMenu>
-          <Button variant='outline' size='sm'>
-            <PlusIcon />
-            <span className='hidden lg:inline'>Add Section</span>
-          </Button>
-        </div>
-      </div>
-      <TabsContent
-        value='outline'
-        className='relative flex flex-col gap-4 overflow-auto px-4 lg:px-6'
-      >
-        <div className='overflow-hidden rounded-lg border'>
-          <DndContext
-            collisionDetection={closestCenter}
-            modifiers={[restrictToVerticalAxis]}
-            onDragEnd={handleDragEnd}
-            sensors={sensors}
-            id={sortableId}
-          >
-            <Table>
-              <TableHeader className='bg-muted sticky top-0 z-10'>
-                {table.getHeaderGroups().map((headerGroup) => (
-                  <TableRow key={headerGroup.id}>
-                    {headerGroup.headers.map((header) => {
-                      return (
-                        <TableHead key={header.id} colSpan={header.colSpan}>
-                          {header.isPlaceholder
-                            ? null
-                            : flexRender(
-                                header.column.columnDef.header,
-                                header.getContext()
-                              )}
-                        </TableHead>
-                      );
-                    })}
-                  </TableRow>
-                ))}
-              </TableHeader>
-              <TableBody className='**:data-[slot=table-cell]:first:w-8'>
-                {table.getRowModel().rows?.length ? (
-                  <SortableContext
-                    items={dataIds}
-                    strategy={verticalListSortingStrategy}
-                  >
-                    {table.getRowModel().rows.map((row) => (
-                      <DraggableRow key={row.id} row={row} />
-                    ))}
-                  </SortableContext>
-                ) : (
-                  <TableRow>
-                    <TableCell
-                      colSpan={columns.length}
-                      className='h-24 text-center'
-                    >
-                      No results.
-                    </TableCell>
-                  </TableRow>
-                )}
-              </TableBody>
-            </Table>
-          </DndContext>
-        </div>
-        <div className='flex items-center justify-between px-4'>
-          <div className='text-muted-foreground hidden flex-1 text-sm lg:flex'>
-            {table.getFilteredSelectedRowModel().rows.length} of{' '}
-            {table.getFilteredRowModel().rows.length} row(s) selected.
-          </div>
-          <div className='flex w-full items-center gap-8 lg:w-fit'>
-            <div className='hidden items-center gap-2 lg:flex'>
-              <Label htmlFor='rows-per-page' className='text-sm font-medium'>
-                Rows per page
-              </Label>
-              <Select
-                value={`${table.getState().pagination.pageSize}`}
-                onValueChange={(value) => {
-                  table.setPageSize(Number(value));
-                }}
-              >
-                <SelectTrigger className='w-20' id='rows-per-page'>
-                  <SelectValue
-                    placeholder={table.getState().pagination.pageSize}
-                  />
-                </SelectTrigger>
-                <SelectContent side='top'>
-                  {[10, 20, 30, 40, 50].map((pageSize) => (
-                    <SelectItem key={pageSize} value={`${pageSize}`}>
-                      {pageSize}
-                    </SelectItem>
-                  ))}
-                </SelectContent>
-              </Select>
-            </div>
-            <div className='flex w-fit items-center justify-center text-sm font-medium'>
-              Page {table.getState().pagination.pageIndex + 1} of{' '}
-              {table.getPageCount()}
-            </div>
-            <div className='ml-auto flex items-center gap-2 lg:ml-0'>
-              <Button
-                variant='outline'
-                className='hidden h-8 w-8 p-0 lg:flex'
-                onClick={() => table.setPageIndex(0)}
-                disabled={!table.getCanPreviousPage()}
-              >
-                <span className='sr-only'>Go to first page</span>
-                <ChevronsLeftIcon />
-              </Button>
-              <Button
-                variant='outline'
-                className='size-8'
-                size='icon'
-                onClick={() => table.previousPage()}
-                disabled={!table.getCanPreviousPage()}
-              >
-                <span className='sr-only'>Go to previous page</span>
-                <ChevronLeftIcon />
-              </Button>
-              <Button
-                variant='outline'
-                className='size-8'
-                size='icon'
-                onClick={() => table.nextPage()}
-                disabled={!table.getCanNextPage()}
-              >
-                <span className='sr-only'>Go to next page</span>
-                <ChevronRightIcon />
-              </Button>
-              <Button
-                variant='outline'
-                className='hidden size-8 lg:flex'
-                size='icon'
-                onClick={() => table.setPageIndex(table.getPageCount() - 1)}
-                disabled={!table.getCanNextPage()}
-              >
-                <span className='sr-only'>Go to last page</span>
-                <ChevronsRightIcon />
-              </Button>
-            </div>
-          </div>
-        </div>
-      </TabsContent>
-      <TabsContent
-        value='past-performance'
-        className='flex flex-col px-4 lg:px-6'
-      >
-        <div className='aspect-video w-full flex-1 rounded-lg border border-dashed'></div>
-      </TabsContent>
-      <TabsContent value='key-personnel' className='flex flex-col px-4 lg:px-6'>
-        <div className='aspect-video w-full flex-1 rounded-lg border border-dashed'></div>
-      </TabsContent>
-      <TabsContent
-        value='focus-documents'
-        className='flex flex-col px-4 lg:px-6'
-      >
-        <div className='aspect-video w-full flex-1 rounded-lg border border-dashed'></div>
-      </TabsContent>
-    </Tabs>
-  );
-}
-
-const chartData = [
-  { month: 'January', desktop: 186, mobile: 80 },
-  { month: 'February', desktop: 305, mobile: 200 },
-  { month: 'March', desktop: 237, mobile: 120 },
-  { month: 'April', desktop: 73, mobile: 190 },
-  { month: 'May', desktop: 209, mobile: 130 },
-  { month: 'June', desktop: 214, mobile: 140 },
-];
-
-const chartConfig = {
-  desktop: {
-    label: 'Desktop',
-    color: 'var(--primary)',
-  },
-  mobile: {
-    label: 'Mobile',
-    color: 'var(--primary)',
-  },
-} satisfies ChartConfig;
-
-function TableCellViewer({ item }: { item: z.infer<typeof schema> }) {
-  const isMobile = useIsMobile();
-
-  return (
-    <Sheet>
-      <SheetTrigger asChild>
-        <Button variant='link' className='text-foreground w-fit px-0 text-left'>
-          {item.header}
-        </Button>
-      </SheetTrigger>
-      <SheetContent side='right' className='flex flex-col'>
-        <SheetHeader className='gap-1'>
-          <SheetTitle>{item.header}</SheetTitle>
-          <SheetDescription>
-            Showing total visitors for the last 6 months
-          </SheetDescription>
-        </SheetHeader>
-        <div className='flex flex-1 flex-col gap-4 overflow-y-auto py-4 text-sm'>
-          {!isMobile && (
-            <>
-              <ChartContainer config={chartConfig}>
-                <AreaChart
-                  accessibilityLayer
-                  data={chartData}
-                  margin={{
-                    left: 0,
-                    right: 10,
-                  }}
-                >
-                  <CartesianGrid vertical={false} />
-                  <XAxis
-                    dataKey='month'
-                    tickLine={false}
-                    axisLine={false}
-                    tickMargin={8}
-                    tickFormatter={(value) => value.slice(0, 3)}
-                    hide
-                  />
-                  <ChartTooltip
-                    cursor={false}
-                    content={<ChartTooltipContent indicator='dot' />}
-                  />
-                  <Area
-                    dataKey='mobile'
-                    type='natural'
-                    fill='var(--color-mobile)'
-                    fillOpacity={0.6}
-                    stroke='var(--color-mobile)'
-                    stackId='a'
-                  />
-                  <Area
-                    dataKey='desktop'
-                    type='natural'
-                    fill='var(--color-desktop)'
-                    fillOpacity={0.4}
-                    stroke='var(--color-desktop)'
-                    stackId='a'
-                  />
-                </AreaChart>
-              </ChartContainer>
-              <Separator />
-              <div className='grid gap-2'>
-                <div className='flex gap-2 leading-none font-medium'>
-                  Trending up by 5.2% this month{' '}
-                  <TrendingUpIcon className='size-4' />
-                </div>
-                <div className='text-muted-foreground'>
-                  Showing total visitors for the last 6 months. This is just
-                  some random text to test the layout. It spans multiple lines
-                  and should wrap around.
-                </div>
-              </div>
-              <Separator />
-            </>
-          )}
-          <form className='flex flex-col gap-4'>
-            <div className='flex flex-col gap-3'>
-              <Label htmlFor='header'>Header</Label>
-              <Input id='header' defaultValue={item.header} />
-            </div>
-            <div className='grid grid-cols-2 gap-4'>
-              <div className='flex flex-col gap-3'>
-                <Label htmlFor='type'>Type</Label>
-                <Select defaultValue={item.type}>
-                  <SelectTrigger id='type' className='w-full'>
-                    <SelectValue placeholder='Select a type' />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem value='Table of Contents'>
-                      Table of Contents
-                    </SelectItem>
-                    <SelectItem value='Executive Summary'>
-                      Executive Summary
-                    </SelectItem>
-                    <SelectItem value='Technical Approach'>
-                      Technical Approach
-                    </SelectItem>
-                    <SelectItem value='Design'>Design</SelectItem>
-                    <SelectItem value='Capabilities'>Capabilities</SelectItem>
-                    <SelectItem value='Focus Documents'>
-                      Focus Documents
-                    </SelectItem>
-                    <SelectItem value='Narrative'>Narrative</SelectItem>
-                    <SelectItem value='Cover Page'>Cover Page</SelectItem>
-                  </SelectContent>
-                </Select>
-              </div>
-              <div className='flex flex-col gap-3'>
-                <Label htmlFor='status'>Status</Label>
-                <Select defaultValue={item.status}>
-                  <SelectTrigger id='status' className='w-full'>
-                    <SelectValue placeholder='Select a status' />
-                  </SelectTrigger>
-                  <SelectContent>
-                    <SelectItem value='Done'>Done</SelectItem>
-                    <SelectItem value='In Progress'>In Progress</SelectItem>
-                    <SelectItem value='Not Started'>Not Started</SelectItem>
-                  </SelectContent>
-                </Select>
-              </div>
-            </div>
-            <div className='grid grid-cols-2 gap-4'>
-              <div className='flex flex-col gap-3'>
-                <Label htmlFor='target'>Target</Label>
-                <Input id='target' defaultValue={item.target} />
-              </div>
-              <div className='flex flex-col gap-3'>
-                <Label htmlFor='limit'>Limit</Label>
-                <Input id='limit' defaultValue={item.limit} />
-              </div>
-            </div>
-            <div className='flex flex-col gap-3'>
-              <Label htmlFor='reviewer'>Reviewer</Label>
-              <Select defaultValue={item.reviewer}>
-                <SelectTrigger id='reviewer' className='w-full'>
-                  <SelectValue placeholder='Select a reviewer' />
-                </SelectTrigger>
-                <SelectContent>
-                  <SelectItem value='Eddie Lake'>Eddie Lake</SelectItem>
-                  <SelectItem value='Jamik Tashpulatov'>
-                    Jamik Tashpulatov
-                  </SelectItem>
-                  <SelectItem value='Emily Whalen'>Emily Whalen</SelectItem>
-                </SelectContent>
-              </Select>
-            </div>
-          </form>
-        </div>
-        <SheetFooter className='mt-auto flex gap-2 sm:flex-col sm:space-x-0'>
-          <Button className='w-full'>Submit</Button>
-          <SheetClose asChild>
-            <Button variant='outline' className='w-full'>
-              Done
-            </Button>
-          </SheetClose>
-        </SheetFooter>
-      </SheetContent>
-    </Sheet>
-  );
-}

ui/components/detailed-wallet-balance.tsx

@@ -1,288 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import { useQuery } from '@tanstack/react-query';
-import { Loader2, RefreshCw, AlertCircle, Wallet } from 'lucide-react';
-import { WalletService, BalanceDetail } from '@/lib/api/services/wallet';
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card';
-import { Button } from '@/components/ui/button';
-import { WithdrawModal } from '@/components/withdraw-modal';
-import { cn } from '@/lib/utils';
-import type { DisplayUnit } from '@/lib/types/units';
-import { convertToMsat, formatFromMsat } from '@/lib/currency';
-
-export function DetailedWalletBalance({
-  refreshInterval = 10000,
-  displayUnit,
-  usdPerSat,
-}: {
-  refreshInterval?: number;
-  displayUnit: DisplayUnit;
-  usdPerSat: number | null;
-}) {
-  const [withdrawModalOpen, setWithdrawModalOpen] = useState(false);
-
-  const { data, isLoading, isError, error, isFetching, refetch } = useQuery({
-    queryKey: ['detailed-wallet-balance'],
-    queryFn: async () => {
-      return WalletService.getDetailedBalances();
-    },
-    refetchInterval: refreshInterval,
-  });
-
-  const formatAmount = (msatAmount: number): string =>
-    formatFromMsat(msatAmount, displayUnit, usdPerSat);
-
-  const calculateTotals = (balances: BalanceDetail[]) => {
-    let totalWallet = 0;
-    let totalUser = 0;
-    let totalOwner = 0;
-
-    balances.forEach((detail) => {
-      if (!detail.error) {
-        const walletMsat = convertToMsat(
-          detail.wallet_balance || 0,
-          detail.unit
-        );
-        const userMsat = convertToMsat(detail.user_balance || 0, detail.unit);
-        const ownerMsat = convertToMsat(detail.owner_balance || 0, detail.unit);
-
-        totalWallet += walletMsat;
-        totalUser += userMsat;
-        totalOwner += ownerMsat;
-      }
-    });
-
-    return { totalWallet, totalUser, totalOwner };
-  };
-
-  const totals = data
-    ? calculateTotals(data)
-    : { totalWallet: 0, totalUser: 0, totalOwner: 0 };
-
-  return (
-    <>
-      <Card className='h-full w-full shadow-sm'>
-        <CardHeader className='pb-4'>
-          <div className='flex items-center justify-between'>
-            <CardTitle className='text-xl'>Cashu Wallet Balance</CardTitle>
-            <div className='flex gap-2'>
-              <Button
-                variant='default'
-                size='sm'
-                onClick={() => setWithdrawModalOpen(true)}
-                disabled={isLoading || !data || data.length === 0}
-              >
-                <Wallet className='mr-2 h-4 w-4' />
-                Withdraw
-              </Button>
-              <Button
-                variant='ghost'
-                size='icon'
-                onClick={() => refetch()}
-                disabled={isLoading || isFetching}
-                className='h-8 w-8'
-              >
-                <RefreshCw
-                  className={cn(
-                    'h-4 w-4',
-                    (isFetching || isLoading) && 'animate-spin'
-                  )}
-                />
-                <span className='sr-only'>Refresh balance</span>
-              </Button>
-            </div>
-          </div>
-          <CardDescription>
-            Detailed balance breakdown by mint and currency
-          </CardDescription>
-        </CardHeader>
-        <CardContent>
-          {isLoading ? (
-            <div className='flex items-center justify-center py-8'>
-              <Loader2 className='text-primary h-8 w-8 animate-spin' />
-            </div>
-          ) : isError ? (
-            <div className='bg-destructive/10 text-destructive flex items-center space-x-2 rounded-md p-4'>
-              <AlertCircle className='h-5 w-5' />
-              <span>Error loading balance: {(error as Error).message}</span>
-            </div>
-          ) : (
-            <div className='space-y-6'>
-              <div className='space-y-3'>
-                <div className='flex items-center justify-between'>
-                  <span className='text-muted-foreground text-sm'>
-                    Your Balance (Total)
-                  </span>
-                  <span className='text-2xl font-bold text-green-600'>
-                    {formatAmount(totals.totalOwner)}
-                  </span>
-                </div>
-                <div className='flex items-center justify-between'>
-                  <span className='text-muted-foreground text-sm'>
-                    Total Wallet
-                  </span>
-                  <span className='text-lg font-semibold'>
-                    {formatAmount(totals.totalWallet)}
-                  </span>
-                </div>
-                <div className='flex items-center justify-between'>
-                  <span className='text-muted-foreground text-sm'>
-                    User Balance
-                  </span>
-                  <span className='text-lg font-semibold'>
-                    {formatAmount(totals.totalUser)}
-                  </span>
-                </div>
-              </div>
-
-              <p className='text-muted-foreground text-xs'>
-                Your balance = Total wallet - User balance
-              </p>
-
-              <div className='overflow-hidden rounded-lg border'>
-                {/* Desktop Table Header */}
-                <div className='bg-muted hidden grid-cols-4 gap-2 p-3 text-sm font-semibold md:grid'>
-                  <div>Mint / Unit</div>
-                  <div className='text-right'>Wallet</div>
-                  <div className='text-right'>Users</div>
-                  <div className='text-right'>Owner</div>
-                </div>
-
-                {data && data.length > 0 ? (
-                  data
-                    .filter(
-                      (detail) =>
-                        (detail.wallet_balance && detail.wallet_balance > 0) ||
-                        detail.error
-                    )
-                    .map((detail, index) => {
-                      const walletMsat = convertToMsat(
-                        detail.wallet_balance || 0,
-                        detail.unit
-                      );
-                      const userMsat = convertToMsat(
-                        detail.user_balance || 0,
-                        detail.unit
-                      );
-                      const ownerMsat = convertToMsat(
-                        detail.owner_balance || 0,
-                        detail.unit
-                      );
-
-                      return (
-                        <div
-                          key={index}
-                          className={cn(
-                            'border-t p-3 text-sm',
-                            detail.error && 'bg-destructive/10 text-destructive'
-                          )}
-                        >
-                          {/* Desktop Layout */}
-                          <div className='hidden grid-cols-4 gap-2 md:grid'>
-                            <div className='text-xs break-all'>
-                              {detail.mint_url
-                                .replace('https://', '')
-                                .replace('http://', '')}{' '}
-                              • {detail.unit.toUpperCase()}
-                            </div>
-                            <div className='text-right font-mono'>
-                              {detail.error
-                                ? 'error'
-                                : formatAmount(walletMsat)}
-                            </div>
-                            <div className='text-right font-mono'>
-                              {detail.error ? '-' : formatAmount(userMsat)}
-                            </div>
-                            <div
-                              className={cn(
-                                'text-right font-mono',
-                                !detail.error &&
-                                  ownerMsat > 0 &&
-                                  'font-semibold text-green-600'
-                              )}
-                            >
-                              {detail.error ? '-' : formatAmount(ownerMsat)}
-                            </div>
-                          </div>
-
-                          {/* Mobile Layout */}
-                          <div className='space-y-3 md:hidden'>
-                            <div className='space-y-1'>
-                              <span className='text-muted-foreground text-xs font-medium'>
-                                Mint / Unit
-                              </span>
-                              <div className='font-mono text-xs break-all'>
-                                {detail.mint_url
-                                  .replace('https://', '')
-                                  .replace('http://', '')}{' '}
-                                • {detail.unit.toUpperCase()}
-                              </div>
-                            </div>
-                            <div className='grid grid-cols-3 gap-2'>
-                              <div className='space-y-1'>
-                                <div className='text-muted-foreground text-xs font-medium'>
-                                  Wallet
-                                </div>
-                                <div className='truncate font-mono text-sm'>
-                                  {detail.error
-                                    ? 'error'
-                                    : formatAmount(walletMsat)}
-                                </div>
-                              </div>
-                              <div className='space-y-1'>
-                                <div className='text-muted-foreground text-xs font-medium'>
-                                  Users
-                                </div>
-                                <div className='truncate font-mono text-sm'>
-                                  {detail.error ? '-' : formatAmount(userMsat)}
-                                </div>
-                              </div>
-                              <div className='space-y-1'>
-                                <div className='text-muted-foreground text-xs font-medium'>
-                                  Owner
-                                </div>
-                                <div
-                                  className={cn(
-                                    'truncate font-mono text-sm',
-                                    !detail.error &&
-                                      ownerMsat > 0 &&
-                                      'font-semibold text-green-600'
-                                  )}
-                                >
-                                  {detail.error ? '-' : formatAmount(ownerMsat)}
-                                </div>
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      );
-                    })
-                ) : (
-                  <div className='text-muted-foreground p-4 text-center text-sm'>
-                    No balances to display
-                  </div>
-                )}
-              </div>
-            </div>
-          )}
-        </CardContent>
-      </Card>
-
-      <WithdrawModal
-        open={withdrawModalOpen}
-        onOpenChange={setWithdrawModalOpen}
-        balances={data || []}
-        onSuccess={() => {
-          refetch();
-        }}
-      />
-    </>
-  );
-}

ui/components/ecash-redeem.tsx

@@ -1,202 +0,0 @@
-'use client';
-
-import { useState } from 'react';
-import { useForm } from 'react-hook-form';
-import { z } from 'zod';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { Loader2, Copy, Check, SendIcon } from 'lucide-react';
-import { toast } from 'sonner';
-import { useQueryClient } from '@tanstack/react-query';
-import { QRCodeSVG } from 'qrcode.react';
-
-import { Button } from '@/components/ui/button';
-import {
-  Card,
-  CardContent,
-  CardDescription,
-  CardFooter,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card';
-import {
-  Form,
-  FormControl,
-  FormDescription,
-  FormField,
-  FormItem,
-  FormLabel,
-  FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
-import { WalletService } from '@/lib/api/services/wallet';
-
-const formSchema = z.object({
-  amount: z
-    .string()
-    .min(1, { message: 'Amount is required' })
-    .refine((val) => !isNaN(Number(val)), {
-      message: 'Amount must be a valid number',
-    })
-    .refine((val) => Number(val) > 0, {
-      message: 'Amount must be greater than 0',
-    }),
-});
-
-type FormValues = z.infer<typeof formSchema>;
-
-export function EcashRedeem() {
-  const [isSubmitting, setIsSubmitting] = useState(false);
-  const [generatedToken, setGeneratedToken] = useState<string | null>(null);
-  const [copied, setCopied] = useState(false);
-  const queryClient = useQueryClient();
-
-  const form = useForm<FormValues>({
-    resolver: zodResolver(formSchema),
-    defaultValues: {
-      amount: '',
-    },
-  });
-
-  async function onSubmit(values: FormValues) {
-    setIsSubmitting(true);
-    try {
-      // Use the wallet service to generate a token
-      const result = await WalletService.sendToken(Number(values.amount));
-
-      if (result.token) {
-        setGeneratedToken(result.token);
-        queryClient.invalidateQueries({ queryKey: ['wallet-balance'] });
-      } else {
-        toast.error('Failed to generate token. Please try again.');
-      }
-    } catch (error) {
-      console.error('Error generating token:', error);
-      toast.error(
-        'An error occurred while generating the token. Please try again.'
-      );
-    } finally {
-      setIsSubmitting(false);
-    }
-  }
-
-  const copyToClipboard = async () => {
-    if (generatedToken) {
-      try {
-        await navigator.clipboard.writeText(generatedToken);
-        setCopied(true);
-        toast.success('Token copied to clipboard');
-        setTimeout(() => setCopied(false), 2000);
-      } catch {
-        toast.error('Failed to copy token');
-      }
-    }
-  };
-
-  const handleReset = () => {
-    setGeneratedToken(null);
-    form.reset();
-  };
-
-  return (
-    <Card className='h-full w-full shadow-sm'>
-      <CardHeader>
-        <div className='flex items-center space-x-2'>
-          <SendIcon className='text-primary h-5 w-5' />
-          <CardTitle>Send eCash</CardTitle>
-        </div>
-        <CardDescription>
-          Generate a token to send eCash to someone
-        </CardDescription>
-      </CardHeader>
-      <CardContent>
-        {!generatedToken ? (
-          <Form {...form}>
-            <form onSubmit={form.handleSubmit(onSubmit)} className='space-y-4'>
-              <FormField
-                control={form.control}
-                name='amount'
-                render={({ field }) => (
-                  <FormItem>
-                    <FormLabel>Amount (sats)</FormLabel>
-                    <FormControl>
-                      <Input
-                        type='number'
-                        placeholder='Enter amount to send'
-                        {...field}
-                      />
-                    </FormControl>
-                    <FormDescription>
-                      Enter the amount of satoshis you want to send
-                    </FormDescription>
-                    <FormMessage />
-                  </FormItem>
-                )}
-              />
-              <Button
-                type='submit'
-                className='w-full'
-                disabled={isSubmitting}
-                size='lg'
-              >
-                {isSubmitting ? (
-                  <>
-                    <Loader2 className='mr-2 h-4 w-4 animate-spin' />
-                    Generating...
-                  </>
-                ) : (
-                  'Generate Token'
-                )}
-              </Button>
-            </form>
-          </Form>
-        ) : (
-          <div className='space-y-6'>
-            <Tabs defaultValue='text' className='w-full'>
-              <TabsList className='grid w-full grid-cols-2'>
-                <TabsTrigger value='text'>Text</TabsTrigger>
-                <TabsTrigger value='qr'>QR Code</TabsTrigger>
-              </TabsList>
-              <TabsContent value='text' className='py-4'>
-                <div className='bg-muted/50 overflow-hidden rounded-md p-4'>
-                  <div className='flex items-start justify-between gap-2'>
-                    <pre className='font-mono text-sm break-all whitespace-pre-wrap'>
-                      {generatedToken}
-                    </pre>
-                    <Button
-                      variant='ghost'
-                      size='icon'
-                      onClick={copyToClipboard}
-                      className='flex-shrink-0'
-                    >
-                      {copied ? (
-                        <Check className='h-4 w-4' />
-                      ) : (
-                        <Copy className='h-4 w-4' />
-                      )}
-                    </Button>
-                  </div>
-                </div>
-              </TabsContent>
-              <TabsContent value='qr' className='flex justify-center py-4'>
-                <div className='rounded-lg bg-white p-4'>
-                  {generatedToken && (
-                    <QRCodeSVG value={generatedToken} className='mx-auto' />
-                  )}
-                </div>
-              </TabsContent>
-            </Tabs>
-            <Button variant='outline' onClick={handleReset} className='w-full'>
-              Generate Another Token
-            </Button>
-          </div>
-        )}
-      </CardContent>
-      <CardFooter className='text-muted-foreground flex justify-center border-t pt-4 text-sm'>
-        {!generatedToken
-          ? 'Tokens can only be redeemed once'
-          : 'Share this token with the recipient to transfer funds'}
-      </CardFooter>
-    </Card>
-  );
-}

ui/components/nav-documents.tsx

@@ -1,86 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-import {
-  FolderIcon,
-  MoreHorizontalIcon,
-  ShareIcon,
-  type LucideIcon,
-} from 'lucide-react';
-
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuItem,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import {
-  SidebarGroup,
-  SidebarGroupLabel,
-  SidebarMenu,
-  SidebarMenuAction,
-  SidebarMenuButton,
-  SidebarMenuItem,
-  useSidebar,
-} from '@/components/ui/sidebar';
-
-export function NavDocuments({
-  items,
-}: {
-  items: {
-    name: string;
-    url: string;
-    icon: LucideIcon;
-  }[];
-}) {
-  const { isMobile } = useSidebar();
-
-  return (
-    <SidebarGroup className='group-data-[collapsible=icon]:hidden'>
-      <SidebarGroupLabel>Documents</SidebarGroupLabel>
-      <SidebarMenu>
-        {items.map((item) => (
-          <SidebarMenuItem key={item.name}>
-            <SidebarMenuButton asChild>
-              <Link href={item.url}>
-                <item.icon />
-                <span>{item.name}</span>
-              </Link>
-            </SidebarMenuButton>
-            <DropdownMenu>
-              <DropdownMenuTrigger asChild>
-                <SidebarMenuAction
-                  showOnHover
-                  className='data-[state=open]:bg-accent rounded-sm'
-                >
-                  <MoreHorizontalIcon />
-                  <span className='sr-only'>More</span>
-                </SidebarMenuAction>
-              </DropdownMenuTrigger>
-              <DropdownMenuContent
-                className='w-24 rounded-lg'
-                side={isMobile ? 'bottom' : 'right'}
-                align={isMobile ? 'end' : 'start'}
-              >
-                <DropdownMenuItem>
-                  <FolderIcon />
-                  <span>Open</span>
-                </DropdownMenuItem>
-                <DropdownMenuItem>
-                  <ShareIcon />
-                  <span>Share</span>
-                </DropdownMenuItem>
-              </DropdownMenuContent>
-            </DropdownMenu>
-          </SidebarMenuItem>
-        ))}
-        <SidebarMenuItem>
-          <SidebarMenuButton className='text-sidebar-foreground/70'>
-            <MoreHorizontalIcon className='text-sidebar-foreground/70' />
-            <span>More</span>
-          </SidebarMenuButton>
-        </SidebarMenuItem>
-      </SidebarMenu>
-    </SidebarGroup>
-  );
-}

ui/components/nav-main.tsx

@@ -1,41 +0,0 @@
-'use client';
-
-import Link from 'next/link';
-import { type LucideIcon } from 'lucide-react';
-
-import {
-  SidebarGroup,
-  SidebarGroupContent,
-  SidebarMenu,
-  SidebarMenuButton,
-  SidebarMenuItem,
-} from '@/components/ui/sidebar';
-
-export function NavMain({
-  items,
-}: {
-  items: {
-    title: string;
-    url: string;
-    icon: LucideIcon;
-  }[];
-}) {
-  return (
-    <SidebarGroup>
-      <SidebarGroupContent>
-        <SidebarMenu>
-          {items.map((item) => (
-            <SidebarMenuItem key={item.title}>
-              <SidebarMenuButton tooltip={item.title} asChild>
-                <Link href={item.url}>
-                  <item.icon />
-                  <span>{item.title}</span>
-                </Link>
-              </SidebarMenuButton>
-            </SidebarMenuItem>
-          ))}
-        </SidebarMenu>
-      </SidebarGroupContent>
-    </SidebarGroup>
-  );
-}

ui/components/nav-secondary.tsx

@@ -1,43 +0,0 @@
-'use client';
-
-import * as React from 'react';
-import Link from 'next/link';
-import { LucideIcon } from 'lucide-react';
-
-import {
-  SidebarGroup,
-  SidebarGroupContent,
-  SidebarMenu,
-  SidebarMenuButton,
-  SidebarMenuItem,
-} from '@/components/ui/sidebar';
-
-export function NavSecondary({
-  items,
-  ...props
-}: {
-  items: {
-    title: string;
-    url: string;
-    icon: LucideIcon;
-  }[];
-} & React.ComponentPropsWithoutRef<typeof SidebarGroup>) {
-  return (
-    <SidebarGroup {...props}>
-      <SidebarGroupContent>
-        <SidebarMenu>
-          {items.map((item) => (
-            <SidebarMenuItem key={item.title}>
-              <SidebarMenuButton asChild tooltip={item.title}>
-                <Link href={item.url}>
-                  <item.icon />
-                  <span>{item.title}</span>
-                </Link>
-              </SidebarMenuButton>
-            </SidebarMenuItem>
-          ))}
-        </SidebarMenu>
-      </SidebarGroupContent>
-    </SidebarGroup>
-  );
-}

ui/components/nav-user.tsx

@@ -1,142 +0,0 @@
-'use client';
-
-import {
-  BellIcon,
-  CreditCardIcon,
-  LogOutIcon,
-  MoreVerticalIcon,
-  UserCircleIcon,
-} from 'lucide-react';
-
-import { Avatar, AvatarFallback, AvatarImage } from '@/components/ui/avatar';
-import {
-  DropdownMenu,
-  DropdownMenuContent,
-  DropdownMenuGroup,
-  DropdownMenuItem,
-  DropdownMenuLabel,
-  DropdownMenuSeparator,
-  DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import {
-  SidebarMenu,
-  SidebarMenuButton,
-  SidebarMenuItem,
-  useSidebar,
-} from '@/components/ui/sidebar';
-import { useAuth } from '@/lib/auth/AuthContext';
-import { useRouter } from 'next/navigation';
-
-type NavUserProps = {
-  user?: {
-    name: string;
-    email: string;
-    avatar: string;
-  };
-};
-
-export function NavUser({ user: propUser }: NavUserProps) {
-  const { isMobile } = useSidebar();
-  const { user: authUser, signout } = useAuth();
-  const router = useRouter();
-
-  // Use authenticated user if available, otherwise fall back to prop user or default
-  const userData = authUser
-    ? {
-        name: authUser.name,
-        email: authUser.email,
-        avatar: authUser.avatar_url || '/avatars/default.jpg',
-      }
-    : propUser || {
-        name: 'Guest User',
-        email: 'guest@example.com',
-        avatar: '/avatars/default.jpg',
-      };
-
-  const handleLogout = () => {
-    signout();
-    router.push('/');
-  };
-
-  return (
-    <SidebarMenu>
-      <SidebarMenuItem>
-        <DropdownMenu>
-          <DropdownMenuTrigger asChild>
-            <SidebarMenuButton
-              size='lg'
-              className='data-[state=open]:bg-sidebar-accent data-[state=open]:text-sidebar-accent-foreground'
-            >
-              <Avatar className='h-8 w-8 rounded-lg grayscale'>
-                <AvatarImage src={userData.avatar} alt={userData.name} />
-                <AvatarFallback className='rounded-lg'>
-                  {userData.name
-                    .split(' ')
-                    .map((part) => part[0])
-                    .join('')
-                    .toUpperCase()
-                    .slice(0, 2)}
-                </AvatarFallback>
-              </Avatar>
-              <div className='grid flex-1 text-left text-sm leading-tight'>
-                <span className='truncate font-medium'>{userData.name}</span>
-                <span className='text-muted-foreground truncate text-xs'>
-                  {userData.email}
-                </span>
-              </div>
-              <MoreVerticalIcon className='ml-auto size-4' />
-            </SidebarMenuButton>
-          </DropdownMenuTrigger>
-          <DropdownMenuContent
-            className='w-[--radix-dropdown-menu-trigger-width] min-w-56 rounded-lg'
-            side={isMobile ? 'bottom' : 'right'}
-            align='end'
-            sideOffset={4}
-          >
-            <DropdownMenuLabel className='p-0 font-normal'>
-              <div className='flex items-center gap-2 px-1 py-1.5 text-left text-sm'>
-                <Avatar className='h-8 w-8 rounded-lg'>
-                  <AvatarImage src={userData.avatar} alt={userData.name} />
-                  <AvatarFallback className='rounded-lg'>
-                    {userData.name
-                      .split(' ')
-                      .map((part) => part[0])
-                      .join('')
-                      .toUpperCase()
-                      .slice(0, 2)}
-                  </AvatarFallback>
-                </Avatar>
-                <div className='grid flex-1 text-left text-sm leading-tight'>
-                  <span className='truncate font-medium'>{userData.name}</span>
-                  <span className='text-muted-foreground truncate text-xs'>
-                    {userData.email}
-                  </span>
-                </div>
-              </div>
-            </DropdownMenuLabel>
-            <DropdownMenuSeparator />
-            <DropdownMenuGroup>
-              <DropdownMenuItem onClick={() => router.push('/profile')}>
-                <UserCircleIcon className='mr-2 h-4 w-4' />
-                Profile
-              </DropdownMenuItem>
-              <DropdownMenuItem>
-                <CreditCardIcon className='mr-2 h-4 w-4' />
-                Billing
-              </DropdownMenuItem>
-              <DropdownMenuItem>
-                <BellIcon className='mr-2 h-4 w-4' />
-                Notifications
-              </DropdownMenuItem>
-            </DropdownMenuGroup>
-            <DropdownMenuSeparator />
-            <DropdownMenuItem onClick={handleLogout}>
-              <LogOutIcon className='mr-2 h-4 w-4' />
-              Log out
-            </DropdownMenuItem>
-          </DropdownMenuContent>
-        </DropdownMenu>
-      </SidebarMenuItem>
-    </SidebarMenu>
-  );
-}

ui/components/section-cards.tsx

@@ -1,101 +0,0 @@
-import { TrendingDownIcon, TrendingUpIcon } from 'lucide-react';
-
-import { Badge } from '@/components/ui/badge';
-import {
-  Card,
-  CardDescription,
-  CardFooter,
-  CardHeader,
-  CardTitle,
-} from '@/components/ui/card';
-
-export function SectionCards() {
-  return (
-    <div className='*:data-[slot=card]:from-primary/5 *:data-[slot=card]:to-card dark:*:data-[slot=card]:bg-card grid grid-cols-1 gap-4 px-4 *:data-[slot=card]:bg-gradient-to-t *:data-[slot=card]:shadow-xs lg:px-6 @xl/main:grid-cols-2 @5xl/main:grid-cols-4'>
-      <Card className='@container/card'>
-        <CardHeader className='relative'>
-          <CardDescription>Total Revenue</CardDescription>
-          <CardTitle className='text-2xl font-semibold tabular-nums @[250px]/card:text-3xl'>
-            $1,250.00
-          </CardTitle>
-          <div className='absolute top-4 right-4'>
-            <Badge variant='outline' className='flex gap-1 rounded-lg text-xs'>
-              <TrendingUpIcon className='size-3' />
-              +12.5%
-            </Badge>
-          </div>
-        </CardHeader>
-        <CardFooter className='flex-col items-start gap-1 text-sm'>
-          <div className='line-clamp-1 flex gap-2 font-medium'>
-            Trending up this month <TrendingUpIcon className='size-4' />
-          </div>
-          <div className='text-muted-foreground'>
-            Visitors for the last 6 months
-          </div>
-        </CardFooter>
-      </Card>
-      <Card className='@container/card'>
-        <CardHeader className='relative'>
-          <CardDescription>New Customers</CardDescription>
-          <CardTitle className='text-2xl font-semibold tabular-nums @[250px]/card:text-3xl'>
-            1,234
-          </CardTitle>
-          <div className='absolute top-4 right-4'>
-            <Badge variant='outline' className='flex gap-1 rounded-lg text-xs'>
-              <TrendingDownIcon className='size-3' />
-              -20%
-            </Badge>
-          </div>
-        </CardHeader>
-        <CardFooter className='flex-col items-start gap-1 text-sm'>
-          <div className='line-clamp-1 flex gap-2 font-medium'>
-            Down 20% this period <TrendingDownIcon className='size-4' />
-          </div>
-          <div className='text-muted-foreground'>
-            Acquisition needs attention
-          </div>
-        </CardFooter>
-      </Card>
-      <Card className='@container/card'>
-        <CardHeader className='relative'>
-          <CardDescription>Active Accounts</CardDescription>
-          <CardTitle className='text-2xl font-semibold tabular-nums @[250px]/card:text-3xl'>
-            45,678
-          </CardTitle>
-          <div className='absolute top-4 right-4'>
-            <Badge variant='outline' className='flex gap-1 rounded-lg text-xs'>
-              <TrendingUpIcon className='size-3' />
-              +12.5%
-            </Badge>
-          </div>
-        </CardHeader>
-        <CardFooter className='flex-col items-start gap-1 text-sm'>
-          <div className='line-clamp-1 flex gap-2 font-medium'>
-            Strong user retention <TrendingUpIcon className='size-4' />
-          </div>
-          <div className='text-muted-foreground'>Engagement exceed targets</div>
-        </CardFooter>
-      </Card>
-      <Card className='@container/card'>
-        <CardHeader className='relative'>
-          <CardDescription>Growth Rate</CardDescription>
-          <CardTitle className='text-2xl font-semibold tabular-nums @[250px]/card:text-3xl'>
-            4.5%
-          </CardTitle>
-          <div className='absolute top-4 right-4'>
-            <Badge variant='outline' className='flex gap-1 rounded-lg text-xs'>
-              <TrendingUpIcon className='size-3' />
-              +4.5%
-            </Badge>
-          </div>
-        </CardHeader>
-        <CardFooter className='flex-col items-start gap-1 text-sm'>
-          <div className='line-clamp-1 flex gap-2 font-medium'>
-            Steady performance <TrendingUpIcon className='size-4' />
-          </div>
-          <div className='text-muted-foreground'>Meets growth projections</div>
-        </CardFooter>
-      </Card>
-    </div>
-  );
-}