Merge pull request #169 from Routstr/dev

## Routstr v0.1.3 — 2025-09-15

### Highlights

- **DB-backed settings with live updates**: Env vars seed on first run; DB is the source of truth (except `DATABASE_URL`). Manage via Admin UI or `PATCH /admin/api/settings`.
- **Models moved to database** with background sats-pricing computation and optional periodic refresh.
- **Smarter max-cost reservation**: Discount based on prompt tokens and `max_tokens` using `TOLERANCE_PERCENTAGE`, with a `MIN_REQUEST_MSAT` floor.
- **Faster startup and provider discovery**; `.onion` endpoints use Tor proxy by default.

### Breaking changes

- **Configuration is DB-first** after bootstrap. Env changes won’t auto-apply (besides `DATABASE_URL`).
- **Models endpoint**: Use `/v1/models` for canonical model info; `/v1/info` keeps an empty `models` field for back-compat.
- **Legacy pricing envs** are auto-mapped but deprecated:
  - `MODEL_BASED_PRICING` → `!FIXED_PRICING`
  - `COST_PER_REQUEST` → `FIXED_COST_PER_REQUEST`
  - `COST_PER_1K_*` → `FIXED_PER_1K_*`

### Added

- **SettingsService** with env→computed→DB merge; runtime edits; app metadata (name/description) applied to OpenAPI.
- **Automatic migrations** on startup; new tables: `settings`, `models`.
- **Per-model sats pricing** and per-request maximums computed in the background.
- **Pricing controls**: `FIXED_PRICING`, `FIXED_COST_PER_REQUEST`, optional per-1k token overrides, `MIN_REQUEST_MSAT`.
- **Azure chat support**: Optional `CHAT_COMPLETIONS_API_VERSION` adds `api-version` to `/chat/completions`.
- **Derive `NPUB` from `NSEC`** during bootstrap if not provided.

### Changed / Improvements

- **Proxy header hardening**: Strip sensitive headers; replace Authorization with upstream key when configured.
- **Discovery**: Read `RELAYS` from settings; Tor proxy defaults for `.onion` via `TOR_PROXY_URL`; faster announcement fetching.
- **Admin**: Improved auth/log UX; fixed log search; show mint balances in dashboard.
- **Performance**: Optimized startup; lazy DB info loading.

### Fixed

- **Refunds**: Correct msat→sat conversion; configurable refund cache TTL via `REFUND_CACHE_TTL_SECONDS`; better error mapping for mint outages.
- **Balances**: Reserved balance reporting and negative-reserved edge cases.
- **Tests**: Updated to patch settings and use fixed-pricing flags.

### Upgrade notes (from v0.1.2)

1. Ensure `DATABASE_URL`, `UPSTREAM_BASE_URL`, and `ADMIN_PASSWORD` are set. Optionally set `UPSTREAM_API_KEY`, `RELAYS`, `CASHU_MINTS`, `TOR_PROXY_URL`.
2. Start the service; automatic Alembic migrations will run (`settings`, `models` tables).
3. Configure settings via Admin UI (`/admin`) or `PATCH /admin/api/settings`. Env changes after first run won’t apply automatically.
4. Prefer new pricing envs or a `models.json` at `MODELS_PATH`. Legacy envs are mapped but will be removed in a future release.
5. Optional tuning: `TOLERANCE_PERCENTAGE`, `MIN_REQUEST_MSAT`, `PRICING_REFRESH_INTERVAL_SECONDS`, `MODELS_REFRESH_INTERVAL_SECONDS`, `ENABLE_*_REFRESH`.
6. For Azure, set `CHAT_COMPLETIONS_API_VERSION`.

### References

- Configuration: `docs/getting-started/configuration.md`
- API: `docs/api/endpoints.md`
- Custom pricing: `docs/advanced/custom-pricing.md`

### Stats and credits

- 42 files changed, +1819/−832 lines.
- Merges: #170 token-discount-max-cost, #171 move-models-to-db.
- Contributors: Shroominic.

Author: shroominic

.env.example

@@ -1,43 +1,39 @@
 # Core Configuration
 UPSTREAM_BASE_URL=https://api.openai.com/v1
 UPSTREAM_API_KEY=your-upstream-api-key
-ADMIN_PASSWORD=secure-admin-password
+
+# ADMIN_PASSWORD=secure-admin-password
 
 # Database
-DATABASE_URL=sqlite+aiosqlite:///keys.db
+# DATABASE_URL=sqlite+aiosqlite:///keys.db
 
 # Node Information
-NAME=My Routstr Node
-DESCRIPTION=Fast AI API access with Bitcoin payments
-NPUB=npub1...
-HTTP_URL=https://api.mynode.com
-ONION_URL=http://mynode.onion
-
-# Cashu Configuration
-CASHU_MINTS=https://mint.minibits.cash/Bitcoin
-RECEIVE_LN_ADDRESS=
-
-# Pricing Configuration
-MODEL_BASED_PRICING=true
-COST_PER_REQUEST=1
-COST_PER_1K_INPUT_TOKENS=0
-COST_PER_1K_OUTPUT_TOKENS=0
-EXCHANGE_FEE=1.005
-UPSTREAM_PROVIDER_FEE=1.05
+# NAME=My Routstr Node
+# DESCRIPTION=Fast AI API access with Bitcoin payments
+# NSEC=nsec1...
+# HTTP_URL=https://api.mynode.com
+# ONION_URL=http://mynode.onion (auto fetched from compose)
+# RELAYS="wss://relay.damus.io,wss://relay.nostr.band,wss://eden.nostr.land,wss://relay.routstr.com"
+# CASHU_MINTS="https://mint.minibits.cash/Bitcoin,https://mint.cubabitcoin.org,https://ecashmint.otrta.me"
+# RECEIVE_LN_ADDRESS=
+
+# Custom Pricing Configuration
+# MODEL_BASED_PRICING=true
+# COST_PER_REQUEST=1
+# COST_PER_1K_INPUT_TOKENS=0
+# COST_PER_1K_OUTPUT_TOKENS=0
+# EXCHANGE_FEE=1.005
+# UPSTREAM_PROVIDER_FEE=1.05
 
 # Network Configuration
-CORS_ORIGINS=*
-TOR_PROXY_URL=socks5://127.0.0.1:9050
+# CORS_ORIGINS=*
+# TOR_PROXY_URL=socks5://127.0.0.1:9050
 
 # Logging
-LOG_LEVEL=INFO
-ENABLE_CONSOLE_LOGGING=true
-
-# Model Management
-MODELS_PATH=models.json
-BASE_URL=https://openrouter.ai/api/v1
-SOURCE=
+# LOG_LEVEL=INFO
+# ENABLE_CONSOLE_LOGGING=true
 
-# Optional Features
-PREPAID_API_KEY=
-PREPAID_BALANCE=0
+# Custom Model Management
+# BASE_URL=https://openrouter.ai/api/v1
+# MODELS_PATH=models.json
+# SOURCE=

README.md

@@ -91,7 +91,7 @@ The most common settings are shown below. See `.env.example` for the full list.
 
 - `UPSTREAM_BASE_URL` – URL of the OpenAI-compatible service
 - `UPSTREAM_API_KEY` – API key for the upstream service (optional)
-- `MODEL_BASED_PRICING` – Set to `true` to use pricing from `models.json`
+- `FIXED_PRICING` – Set to `true` to use a fixed per-request price; `false` (default) uses model pricing from `models.json`
 - `ADMIN_PASSWORD` – Password for the `/admin/` dashboard
 - `CASHU_MINTS` – Comma-separated list of Cashu mint URLs
 - `NAME` – Name of the proxy

compose.testing.yml

@@ -19,10 +19,10 @@ services:
       - "ONION_URL=http://test.onion"
       - "CORS_ORIGINS=*"
       - "[email protected]"
-      - "COST_PER_REQUEST=10"
-      - "COST_PER_1K_INPUT_TOKENS=0"
-      - "COST_PER_1K_OUTPUT_TOKENS=0"
-      - "MODEL_BASED_PRICING=true"
+      - "FIXED_COST_PER_REQUEST=10"
+      - "FIXED_PER_1K_INPUT_TOKENS=0"
+      - "FIXED_PER_1K_OUTPUT_TOKENS=0"
+      - "FIXED_PRICING=false"
       - "NSEC=nsec1testkey1234567890abcdef"
       - "REFUND_PROCESSING_INTERVAL=3600"
       - "MINIMUM_PAYOUT=1000"

compose.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
   routstr:
     build: .
@@ -26,12 +24,5 @@ services:
     depends_on:
       - routstr
 
-  # Legacy service definition to ensure cleanup of old container
-  router:
-    image: alpine:latest
-    command: /bin/true
-    profiles:
-      - cleanup
-
 volumes:
   tor-data:

docs/advanced/custom-pricing.md

@@ -14,11 +14,11 @@ Routstr supports three pricing models:
 
 ### Configuration
 
-Enable model-based pricing:
+Enable model-based pricing (default behavior):
 
 ```bash
 # .env
-MODEL_BASED_PRICING=true
+FIXED_PRICING=false
 MODELS_PATH=/app/config/models.json
 EXCHANGE_FEE=1.005         # 0.5% exchange fee
 UPSTREAM_PROVIDER_FEE=1.05  # 5% provider margin
@@ -118,14 +118,14 @@ if __name__ == "__main__":
 
 ### Configuration
 
-Set up token-based pricing:
+Set up token-based pricing overrides:
 
 ```bash
 # .env
-MODEL_BASED_PRICING=false
-COST_PER_REQUEST=1              # 1 sat base fee
-COST_PER_1K_INPUT_TOKENS=5      # 5 sats per 1K input
-COST_PER_1K_OUTPUT_TOKENS=15    # 15 sats per 1K output
+FIXED_PRICING=false                 # use model pricing
+FIXED_COST_PER_REQUEST=1            # optional base fee
+FIXED_PER_1K_INPUT_TOKENS=5         # optional override
+FIXED_PER_1K_OUTPUT_TOKENS=15       # optional override
 ```
 
 ### Custom Token Counting

docs/advanced/nostr.md

@@ -102,7 +102,7 @@ Configure which relays to publish to:
 DEFAULT_RELAYS = [
     "wss://relay.damus.io",
     "wss://relay.nostr.band",
-    "wss://nostr.mom",
+    "wss://relay.routstr.com",
     "wss://nos.lol"
 ]
 

docs/api/endpoints.md

@@ -436,6 +436,27 @@ Authorization: Bearer sk-...
 
 ## Provider Discovery
 
+## Admin Settings
+
+These endpoints are protected by the Admin cookie (`admin_password` set to your configured admin password).
+
+### Get Settings
+
+```http
+GET /admin/api/settings
+```
+
+Returns the current application settings (sensitive values may be redacted).
+
+### Update Settings
+
+```http
+PATCH /admin/api/settings
+Content-Type: application/json
+```
+
+Body is a partial JSON of settings fields to update. Validated and persisted to the database.
+
 ### List Providers
 
 Get available upstream providers.

docs/api/overview.md

@@ -347,7 +347,7 @@ GET /health
 Response:
 {
   "status": "healthy",
-  "version": "0.1.2",
+  "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.1.2"
+version = "0.1.3"
 dependencies = [
     "fastapi[standard]>=0.115",
     "sqlmodel>=0.0.24",

docs/getting-started/configuration.md

@@ -1,6 +1,6 @@
 # Configuration
 
-Routstr Core is configured through environment variables. This guide covers all available options.
+Routstr Core is configured via a single settings row in the database. Environment variables are only used on first run to seed that row (with a few computed defaults like `ONION_URL`). After that, the database is the source of truth. You can update settings at runtime via the admin API. `DATABASE_URL` is always env-only.
 
 ## Environment Variables
 
@@ -33,19 +33,21 @@ Routstr Core is configured through environment variables. This guide covers all
 
 | Variable | Description | Default | Required |
 |----------|-------------|---------|----------|
-| `MODEL_BASED_PRICING` | Enable model-specific pricing from models.json | `false` | ❌ |
-| `COST_PER_REQUEST` | Fixed cost per API request in sats | `1` | ❌ |
-| `COST_PER_1K_INPUT_TOKENS` | Cost per 1000 input tokens in sats | `0` | ❌ |
-| `COST_PER_1K_OUTPUT_TOKENS` | Cost per 1000 output tokens in sats | `0` | ❌ |
+| `FIXED_PRICING` | Force fixed per-request pricing (ignore model token pricing) | `false` | ❌ |
+| `FIXED_COST_PER_REQUEST` | Fixed cost per API request in sats | `1` | ❌ |
+| `FIXED_PER_1K_INPUT_TOKENS` | Optional override: sats per 1000 input tokens | `0` | ❌ |
+| `FIXED_PER_1K_OUTPUT_TOKENS` | Optional override: sats per 1000 output tokens | `0` | ❌ |
 | `EXCHANGE_FEE` | Exchange rate markup (1.005 = 0.5% fee) | `1.005` | ❌ |
 | `UPSTREAM_PROVIDER_FEE` | Provider fee markup (1.05 = 5% fee) | `1.05` | ❌ |
 
-### Network Configuration
+### Network & Discovery
 
 | Variable | Description | Default | Required |
 |----------|-------------|---------|----------|
 | `CORS_ORIGINS` | Comma-separated list of allowed CORS origins | `*` | ❌ |
 | `TOR_PROXY_URL` | SOCKS5 proxy URL for Tor connections | `socks5://127.0.0.1:9050` | ❌ |
+| `RELAYS` | Comma-separated nostr relays used for provider discovery | sane defaults | ❌ |
+| `PROVIDERS_REFRESH_INTERVAL_SECONDS` | Provider cache refresh interval | `300` | ❌ |
 
 ### Logging Configuration
 
@@ -60,6 +62,7 @@ Routstr Core is configured through environment variables. This guide covers all
 |----------|-------------|---------|----------|
 | `CHAT_COMPLETIONS_API_VERSION` | Append `api-version` to `/chat/completions` (Azure OpenAI) | - | ❌ |
 | `DATABASE_URL` | SQLite database connection string | `sqlite+aiosqlite:///keys.db` | ❌ |
+| `REFUND_CACHE_TTL_SECONDS` | Cache TTL for refund responses (seconds) | `3600` | ❌ |
 
 ## Configuration Examples
 
@@ -78,7 +81,6 @@ ADMIN_PASSWORD=my-secure-password
 # .env
 UPSTREAM_BASE_URL=https://api.anthropic.com/v1
 UPSTREAM_API_KEY=your-anthropic-key
-MODEL_BASED_PRICING=true
 MODELS_PATH=/app/config/anthropic-models.json
 ```
 
@@ -115,36 +117,21 @@ ONION_URL=http://lightningai.onion
 CASHU_MINTS=https://mint1.com,https://mint2.com
 ```
 
-## Pricing Models
+## Pricing
 
-### Fixed Pricing
+- Default: pricing comes from your `models.json`.
+- Force fixed per-request pricing: set `FIXED_PRICING=true` and `FIXED_COST_PER_REQUEST`.
+- Optional token overrides when using model pricing: set
+  `FIXED_PER_1K_INPUT_TOKENS` and/or `FIXED_PER_1K_OUTPUT_TOKENS`.
+- Legacy envs are still accepted and mapped automatically:
+  `MODEL_BASED_PRICING` → `!FIXED_PRICING`, `COST_PER_REQUEST` → `FIXED_COST_PER_REQUEST`,
+  `COST_PER_1K_*` → `FIXED_PER_1K_*`.
 
-Simple per-request pricing:
+Example fixed pricing:
 
 ```bash
-MODEL_BASED_PRICING=false
-COST_PER_REQUEST=10  # 10 sats per request
-```
-
-### Token-Based Pricing
-
-Charge based on token usage:
-
-```bash
-MODEL_BASED_PRICING=false
-COST_PER_REQUEST=1  # 1 sat base fee
-COST_PER_1K_INPUT_TOKENS=5   # 5 sats per 1k input
-COST_PER_1K_OUTPUT_TOKENS=15  # 15 sats per 1k output
-```
-
-### Model-Based Pricing
-
-Use dynamic pricing from models.json:
-
-```bash
-MODEL_BASED_PRICING=true
-EXCHANGE_FEE=1.01  # 1% exchange fee
-UPSTREAM_PROVIDER_FEE=1.00  # No additional markup
+FIXED_PRICING=true
+FIXED_COST_PER_REQUEST=10
 ```
 
 ## Custom Models Configuration