nex/college-bot-v2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Activity Actions

Include Ollama & reorganise endpoints

Browse source
This commit is contained in:
Nexus 2024-06-06 00:21:56 +01:00
parent 2625657699
commit 3282d85e10
Signed by: nex
GPG key ID: 0FA334385D0B689F
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docker-compose.yml
View file

@ -9,7 +9,6 @@ services:
- ./jimmy.log:/app/jimmy.log - ./jimmy.log:/app/jimmy.log
- /dev/dri:/dev/dri - /dev/dri:/dev/dri
- jimmy-data:/app/data - jimmy-data:/app/data
- ./ipc/:/tmp/ipc/
extra_hosts: extra_hosts:
- host.docker.internal:host-gateway - host.docker.internal:host-gateway
depends_on: depends_on:
@ -19,7 +18,6 @@ services:
image: git.i-am.nexus/nex/college-bot:latest image: git.i-am.nexus/nex/college-bot:latest
restart: unless-stopped restart: unless-stopped
depends_on: depends_on:
- jimmy
- redis - redis
environment: environment:
- REDIS=redis://redis:6379 - REDIS=redis://redis:6379

12
src/server.py
View file

@ -61,7 +61,7 @@ app = FastAPI(
truth_router = APIRouter(prefix="/truths") truth_router = APIRouter(prefix="/truths")
@truth_router.get("/") @truth_router.get("")
def get_all_truths(rich: bool = True, db: redis.Redis = Depends(get_db_factory())): def get_all_truths(rich: bool = True, db: redis.Redis = Depends(get_db_factory())):
"""Retrieves all stored truths""" """Retrieves all stored truths"""
keys = db.keys() keys = db.keys()
@ -71,6 +71,16 @@ def get_all_truths(rich: bool = True, db: redis.Redis = Depends(get_db_factory()
return truths return truths
@truth_router.get("/all", deprecated=True)
def get_all_truths_deprecated(rich: bool = True, db: redis.Redis = Depends(get_db_factory())):
"""Retrieves all stored truths"""
keys = db.keys()
if rich is False:
return keys
truths = [json.loads(db.get(key)) for key in keys]
return truths
@truth_router.get("/{truth_id}") @truth_router.get("/{truth_id}")
def get_truth(truth_id: str, db: redis.Redis = Depends(get_db_factory())): def get_truth(truth_id: str, db: redis.Redis = Depends(get_db_factory())):
"""Retrieves a stored truth""" """Retrieves a stored truth"""