Compare commits
11
Commits
dd8f69ecb6
...
0.9.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c46c1c2b12 | ||
|
|
d243523906 | ||
|
|
2319434b0f | ||
|
|
7912431ffb | ||
|
|
114c45dc7e | ||
|
|
6f67f29f68 | ||
|
|
3b7c88bf2c | ||
|
|
03712fe401 | ||
|
|
a0512b3b2b | ||
|
|
511e85ea79 | ||
|
|
cdaec894d8 |
No files matched your search
+5
-1
@@ -14,7 +14,11 @@ __pycache__/
|
|||||||
*.sqlite3
|
*.sqlite3
|
||||||
|
|
||||||
# IDE
|
# IDE
|
||||||
.idea/
|
.idea/*
|
||||||
|
!.idea/runConfigurations/
|
||||||
|
.idea/runConfigurations/*
|
||||||
|
!.idea/runConfigurations/Dev.xml
|
||||||
|
!.idea/runConfigurations/Docker_Push.xml
|
||||||
.vscode/
|
.vscode/
|
||||||
|
|
||||||
# Frontend build
|
# Frontend build
|
||||||
|
|||||||
Generated
+16
@@ -0,0 +1,16 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="Dev" type="PythonConfigurationType" factoryName="Python">
|
||||||
|
<module name="llm_quota" />
|
||||||
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
|
<option name="PARENT_ENVS" value="true" />
|
||||||
|
<option name="SDK_HOME" value="" />
|
||||||
|
<option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
|
<option name="IS_MODULE_SDK" value="false" />
|
||||||
|
<option name="ADD_CONTENT_ROOTS" value="true" />
|
||||||
|
<option name="ADD_SOURCE_ROOTS" value="true" />
|
||||||
|
<option name="SCRIPT_NAME" value="$PROJECT_DIR$/run_dev.py" />
|
||||||
|
<option name="PARAMETERS" value="" />
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
Generated
+12
@@ -0,0 +1,12 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<component name="ProjectRunConfigurationManager">
|
||||||
|
<configuration default="false" name="Docker Push" type="ShConfigurationType">
|
||||||
|
<option name="SCRIPT_PATH" value="$PROJECT_DIR$/build_push.sh" />
|
||||||
|
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
|
||||||
|
<option name="INTERPRETER_PATH" value="/bin/bash" />
|
||||||
|
<option name="INTERPRETER_OPTIONS" value="" />
|
||||||
|
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
|
||||||
|
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
|
||||||
|
<method v="2" />
|
||||||
|
</configuration>
|
||||||
|
</component>
|
||||||
+206
@@ -0,0 +1,206 @@
|
|||||||
|
# mediaeng/llmproxy
|
||||||
|
|
||||||
|
Ein schlanker Reverse-Proxy für [Ollama](https://ollama.com), der API-Keys mit konfigurierbaren Token- und Request-Quoten verwaltet. Eingehende Anfragen im OpenAI-kompatiblen Format werden authentifiziert, auf Quota geprüft und an den konfigurierten Ollama-Server weitergeleitet.
|
||||||
|
|
||||||
|
Ollama muss dabei nicht auf demselben Host laufen — `OLLAMA_URL` kann auf jeden erreichbaren Server zeigen, also auf den Docker-Host selbst, einen anderen Rechner im Netzwerk oder einen Remote-Server.
|
||||||
|
|
||||||
|
## Funktionen
|
||||||
|
|
||||||
|
- OpenAI-kompatibler Endpunkt (`/v1/chat/completions`, `/v1/models`)
|
||||||
|
- API-Key-Verwaltung mit tages- und monatlichen Token-/Request-Limits
|
||||||
|
- Web-basierte Admin-Oberfläche (Port 8001)
|
||||||
|
- Streaming-Support (Server-Sent Events)
|
||||||
|
- Tool-Use / Function Calling wird durchgereicht
|
||||||
|
- Rotierende Nutzungs-Logs
|
||||||
|
- SQLite (Standard) oder PostgreSQL
|
||||||
|
|
||||||
|
## Ports
|
||||||
|
|
||||||
|
| Port | Dienst |
|
||||||
|
|------|--------|
|
||||||
|
| `8000` | Proxy-Endpunkt (OpenAI-API) |
|
||||||
|
| `8001` | Admin-API + Web-Oberfläche (nicht exponieren) |
|
||||||
|
|
||||||
|
## Umgebungsvariablen
|
||||||
|
|
||||||
|
| Variable | Standard | Beschreibung |
|
||||||
|
|----------|----------|--------------|
|
||||||
|
| `ADMIN_PASSWORD` | – | **Pflicht.** Passwort für die Admin-Oberfläche |
|
||||||
|
| `OLLAMA_URL` | `http://localhost:11434` | URL des Ollama-Servers (ohne `/v1`-Suffix) |
|
||||||
|
| `DEFAULT_MODEL` | `llama3` | Modell, das verwendet wird wenn der Client keines angibt |
|
||||||
|
| `DATABASE_URL` | `sqlite:///./test.db` | Datenbank-Verbindungsstring (SQLite oder PostgreSQL) |
|
||||||
|
| `PROXY_HOST` | `0.0.0.0` | Bind-Adresse des Proxy |
|
||||||
|
| `PROXY_PORT` | `8000` | Port des Proxy |
|
||||||
|
| `ADMIN_PORT` | `8001` | Port der Admin-API |
|
||||||
|
| `APP_TZ` | `Europe/Berlin` | Zeitzone für Tages-/Monats-Reset der Quoten |
|
||||||
|
| `LOG_FILE` | `logs/usage.log` | Pfad der rotierenden Nutzungs-Logdatei |
|
||||||
|
|
||||||
|
## Docker Compose – Ollama extern, SQLite
|
||||||
|
|
||||||
|
Wenn Ollama außerhalb von Docker läuft — auf dem Docker-Host oder einem anderen erreichbaren Server. `OLLAMA_URL` entsprechend anpassen.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
llmproxy:
|
||||||
|
image: mediaeng/llmproxy:latest
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
environment:
|
||||||
|
ADMIN_PASSWORD: changeme
|
||||||
|
OLLAMA_URL: http://host.docker.internal:11434 # oder http://<ip>:11434
|
||||||
|
DEFAULT_MODEL: llama3
|
||||||
|
APP_TZ: Europe/Berlin
|
||||||
|
volumes:
|
||||||
|
- llmproxy-data:/app/backend
|
||||||
|
# Auf Linux extra_hosts ergänzen, da host.docker.internal dort
|
||||||
|
# nicht automatisch verfügbar ist:
|
||||||
|
# extra_hosts:
|
||||||
|
# - "host.docker.internal:host-gateway"
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
llmproxy-data:
|
||||||
|
```
|
||||||
|
|
||||||
|
## Docker Compose – Ollama extern, PostgreSQL
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
llmproxy:
|
||||||
|
image: mediaeng/llmproxy:latest
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
environment:
|
||||||
|
ADMIN_PASSWORD: changeme
|
||||||
|
OLLAMA_URL: http://host.docker.internal:11434 # oder http://<ip>:11434
|
||||||
|
DEFAULT_MODEL: llama3
|
||||||
|
APP_TZ: Europe/Berlin
|
||||||
|
DATABASE_URL: postgresql://llmproxy:secret@db:5432/llmproxy
|
||||||
|
volumes:
|
||||||
|
- llmproxy-data:/app/backend
|
||||||
|
depends_on:
|
||||||
|
db:
|
||||||
|
condition: service_healthy
|
||||||
|
# extra_hosts:
|
||||||
|
# - "host.docker.internal:host-gateway"
|
||||||
|
|
||||||
|
db:
|
||||||
|
image: postgres:16-alpine
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: llmproxy
|
||||||
|
POSTGRES_USER: llmproxy
|
||||||
|
POSTGRES_PASSWORD: secret
|
||||||
|
volumes:
|
||||||
|
- pg-data:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U llmproxy"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
pg-data:
|
||||||
|
```
|
||||||
|
|
||||||
|
## Docker Compose – Ollama als Container, SQLite
|
||||||
|
|
||||||
|
Ollama und llmproxy laufen gemeinsam in Docker, Daten in einem Volume.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
llmproxy:
|
||||||
|
image: mediaeng/llmproxy:latest
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
environment:
|
||||||
|
ADMIN_PASSWORD: changeme
|
||||||
|
OLLAMA_URL: http://ollama:11434
|
||||||
|
DEFAULT_MODEL: llama3
|
||||||
|
APP_TZ: Europe/Berlin
|
||||||
|
volumes:
|
||||||
|
- llmproxy-data:/app/backend
|
||||||
|
depends_on:
|
||||||
|
- ollama
|
||||||
|
|
||||||
|
ollama:
|
||||||
|
image: ollama/ollama:latest
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- ollama-data:/root/.ollama
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
llmproxy-data:
|
||||||
|
ollama-data:
|
||||||
|
```
|
||||||
|
|
||||||
|
## Docker Compose – Ollama als Container, PostgreSQL
|
||||||
|
|
||||||
|
Für Produktionsumgebungen mit externer Datenbank.
|
||||||
|
|
||||||
|
```yaml
|
||||||
|
services:
|
||||||
|
llmproxy:
|
||||||
|
image: mediaeng/llmproxy:latest
|
||||||
|
restart: unless-stopped
|
||||||
|
ports:
|
||||||
|
- "8000:8000"
|
||||||
|
environment:
|
||||||
|
ADMIN_PASSWORD: changeme
|
||||||
|
OLLAMA_URL: http://ollama:11434
|
||||||
|
DEFAULT_MODEL: llama3
|
||||||
|
APP_TZ: Europe/Berlin
|
||||||
|
DATABASE_URL: postgresql://llmproxy:secret@db:5432/llmproxy
|
||||||
|
depends_on:
|
||||||
|
db:
|
||||||
|
condition: service_healthy
|
||||||
|
ollama:
|
||||||
|
condition: service_started
|
||||||
|
|
||||||
|
db:
|
||||||
|
image: postgres:16-alpine
|
||||||
|
restart: unless-stopped
|
||||||
|
environment:
|
||||||
|
POSTGRES_DB: llmproxy
|
||||||
|
POSTGRES_USER: llmproxy
|
||||||
|
POSTGRES_PASSWORD: secret
|
||||||
|
volumes:
|
||||||
|
- pg-data:/var/lib/postgresql/data
|
||||||
|
healthcheck:
|
||||||
|
test: ["CMD-SHELL", "pg_isready -U llmproxy"]
|
||||||
|
interval: 5s
|
||||||
|
timeout: 5s
|
||||||
|
retries: 5
|
||||||
|
|
||||||
|
ollama:
|
||||||
|
image: ollama/ollama:latest
|
||||||
|
restart: unless-stopped
|
||||||
|
volumes:
|
||||||
|
- ollama-data:/root/.ollama
|
||||||
|
|
||||||
|
volumes:
|
||||||
|
pg-data:
|
||||||
|
ollama-data:
|
||||||
|
```
|
||||||
|
|
||||||
|
## Schnellstart
|
||||||
|
|
||||||
|
```bash
|
||||||
|
docker run -d \
|
||||||
|
-p 8000:8000 \
|
||||||
|
-e ADMIN_PASSWORD=changeme \
|
||||||
|
-e OLLAMA_URL=http://host.docker.internal:11434 \
|
||||||
|
-v llmproxy-data:/app/backend \
|
||||||
|
mediaeng/llmproxy:latest
|
||||||
|
```
|
||||||
|
|
||||||
|
## Client-Konfiguration
|
||||||
|
|
||||||
|
Den Proxy als OpenAI-kompatibler Endpunkt konfigurieren:
|
||||||
|
|
||||||
|
```
|
||||||
|
Base URL: http://<host>:8000/v1
|
||||||
|
API Key: <angelegter API-Key aus der Admin-Oberfläche>
|
||||||
|
```
|
||||||
+1
-1
@@ -9,7 +9,7 @@ FROM python:3.12-slim
|
|||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY backend/requirements.txt .
|
COPY backend/requirements.txt .
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
RUN pip install --no-cache-dir -r requirements.txt psycopg2-binary
|
||||||
|
|
||||||
COPY backend/ backend/
|
COPY backend/ backend/
|
||||||
COPY --from=frontend-builder /app/frontend/dist frontend/dist
|
COPY --from=frontend-builder /app/frontend/dist frontend/dist
|
||||||
|
|||||||
Executable
+30
@@ -0,0 +1,30 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
set -e
|
||||||
|
cd "$(dirname "$0")"
|
||||||
|
|
||||||
|
IMAGE=mediaeng/llmproxy
|
||||||
|
PLATFORM=linux/arm64
|
||||||
|
|
||||||
|
VERSION=$(git describe --tags --always)
|
||||||
|
if [ -z "$VERSION" ]; then
|
||||||
|
echo "Fehler: git describe liefert kein Ergebnis"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "Version : $VERSION"
|
||||||
|
echo "Image : $IMAGE"
|
||||||
|
echo "Platform: $PLATFORM"
|
||||||
|
echo "Tags : $IMAGE:$VERSION $IMAGE:latest"
|
||||||
|
echo ""
|
||||||
|
|
||||||
|
docker buildx build \
|
||||||
|
--platform "$PLATFORM" \
|
||||||
|
--push \
|
||||||
|
-t "$IMAGE:$VERSION" \
|
||||||
|
-t "$IMAGE:latest" \
|
||||||
|
.
|
||||||
|
|
||||||
|
echo ""
|
||||||
|
echo "Fertig. Gepusht:"
|
||||||
|
echo " docker pull $IMAGE:$VERSION"
|
||||||
|
echo " docker pull $IMAGE:latest"
|
||||||
+86
@@ -0,0 +1,86 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""Dev runner: startet Proxy, Admin-API und Frontend gemeinsam."""
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
import signal
|
||||||
|
import subprocess
|
||||||
|
import threading
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
|
||||||
|
def load_env(path: Path):
|
||||||
|
if not path.exists():
|
||||||
|
return
|
||||||
|
for line in path.read_text(encoding='utf-8').splitlines():
|
||||||
|
line = line.strip()
|
||||||
|
if line and not line.startswith('#') and '=' in line:
|
||||||
|
key, _, val = line.partition('=')
|
||||||
|
os.environ.setdefault(key.strip(), val.strip().strip('"\''))
|
||||||
|
|
||||||
|
|
||||||
|
def pipe_output(proc: subprocess.Popen, label: str, color: str):
|
||||||
|
reset = '\033[0m'
|
||||||
|
prefix = f'\033[{color}m[{label}]{reset} '
|
||||||
|
for raw in iter(proc.stdout.readline, b''):
|
||||||
|
sys.stdout.write(prefix + raw.decode(errors='replace'))
|
||||||
|
sys.stdout.flush()
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
root = Path(__file__).parent
|
||||||
|
load_env(root / '.env')
|
||||||
|
|
||||||
|
if not os.environ.get('ADMIN_PASSWORD'):
|
||||||
|
print('Fehler: ADMIN_PASSWORD nicht gesetzt (siehe .env)')
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
python = root / '.venv' / 'bin' / 'python'
|
||||||
|
backend = root / 'backend'
|
||||||
|
frontend = root / 'frontend'
|
||||||
|
|
||||||
|
proxy_host = os.environ.get('PROXY_HOST', '0.0.0.0')
|
||||||
|
proxy_port = os.environ.get('PROXY_PORT', '8000')
|
||||||
|
admin_port = os.environ.get('ADMIN_PORT', '8001')
|
||||||
|
|
||||||
|
print('Initialisiere Datenbank...')
|
||||||
|
subprocess.run([str(python), 'init_db.py'], cwd=backend, check=True)
|
||||||
|
|
||||||
|
print(f'Starte Proxy → http://{proxy_host}:{proxy_port}')
|
||||||
|
print(f'Starte Admin-API → http://127.0.0.1:{admin_port}')
|
||||||
|
print('Starte Frontend → http://localhost:5173')
|
||||||
|
|
||||||
|
env = {**os.environ, 'PYTHONUNBUFFERED': '1'}
|
||||||
|
|
||||||
|
procs = [
|
||||||
|
(subprocess.Popen(
|
||||||
|
[str(python), '-m', 'uvicorn', 'main:app', '--reload',
|
||||||
|
'--host', proxy_host, '--port', proxy_port],
|
||||||
|
cwd=backend, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env,
|
||||||
|
), 'Proxy ', '34'), # blau
|
||||||
|
(subprocess.Popen(
|
||||||
|
[str(python), '-m', 'uvicorn', 'admin:app', '--reload',
|
||||||
|
'--host', '127.0.0.1', '--port', admin_port],
|
||||||
|
cwd=backend, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, env=env,
|
||||||
|
), 'Admin ', '33'), # gelb
|
||||||
|
(subprocess.Popen(
|
||||||
|
['npm', 'run', 'dev'],
|
||||||
|
cwd=frontend, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
|
||||||
|
), 'Frontend', '32'), # grün
|
||||||
|
]
|
||||||
|
|
||||||
|
for proc, label, color in procs:
|
||||||
|
threading.Thread(target=pipe_output, args=(proc, label, color), daemon=True).start()
|
||||||
|
|
||||||
|
def stop(*_):
|
||||||
|
for p, _, _ in procs:
|
||||||
|
p.terminate()
|
||||||
|
|
||||||
|
signal.signal(signal.SIGINT, stop)
|
||||||
|
signal.signal(signal.SIGTERM, stop)
|
||||||
|
|
||||||
|
for p, _, _ in procs:
|
||||||
|
p.wait()
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
main()
|
||||||
Reference in new issue
Block a user