Merge branch 'main' into bun

This commit is contained in:
ThatOneCalculator 2024-01-04 13:30:30 -08:00
commit 8480a9b418
No known key found for this signature in database
GPG key ID: 8703CACD01000000
16 changed files with 543 additions and 445 deletions

View file

@ -47,7 +47,7 @@ async def check_url(request: Request, call_next):
app.mount("/api/v1", webui_app)
app.mount("/ollama/api", WSGIMiddleware(ollama_app))
app.mount("/",
SPAStaticFiles(directory="../build", html=True),
name="spa-static-files")
# app.mount("/ollama/api", WSGIMiddleware(ollama_app))
app.mount("/ollama/api", ollama_app)
app.mount("/", SPAStaticFiles(directory="../build", html=True), name="spa-static-files")