From 3282d85e1097bc91d10b5d9e03cab0b089c9cf25 Mon Sep 17 00:00:00 2001
From: nexy7574 <git@nexy7574.co.uk>
Date: Thu, 6 Jun 2024 00:21:56 +0100
Subject: [PATCH] Include Ollama & reorganise endpoints

---
 docker-compose.yml |  2 --
 src/server.py      | 12 +++++++++++-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 02a512b..173c937 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,6 @@ services:
       - ./jimmy.log:/app/jimmy.log
       - /dev/dri:/dev/dri
       - jimmy-data:/app/data
-      - ./ipc/:/tmp/ipc/
     extra_hosts:
       - host.docker.internal:host-gateway
     depends_on:
@@ -19,7 +18,6 @@ services:
     image: git.i-am.nexus/nex/college-bot:latest
     restart: unless-stopped
     depends_on:
-      - jimmy
       - redis
     environment:
       - REDIS=redis://redis:6379
diff --git a/src/server.py b/src/server.py
index fd89cde..550124c 100644
--- a/src/server.py
+++ b/src/server.py
@@ -61,7 +61,7 @@ app = FastAPI(
 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())):
     """Retrieves all stored truths"""
     keys = db.keys()
@@ -71,6 +71,16 @@ def get_all_truths(rich: bool = True, db: redis.Redis = Depends(get_db_factory()
     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}")
 def get_truth(truth_id: str, db: redis.Redis = Depends(get_db_factory())):
     """Retrieves a stored truth"""