Include Ollama & reorganise endpoints
This commit is contained in:
parent
2625657699
commit
3282d85e10
2 changed files with 11 additions and 3 deletions
|
@ -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
|
||||||
|
|
|
@ -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"""
|
||||||
|
|
Loading…
Reference in a new issue