Merge branch 'main' into select-datastore-in-api-server

This commit is contained in:
zrguo
2025-02-13 20:03:38 +08:00
committed by GitHub
73 changed files with 6101 additions and 1322 deletions

View File

@@ -101,7 +101,6 @@ def estimate_tokens(text: str) -> int:
return int(tokens)
def get_default_host(binding_type: str) -> str:
default_hosts = {
"ollama": os.getenv("LLM_BINDING_HOST", "http://localhost:11434"),
@@ -249,6 +248,10 @@ def display_splash_screen(args: argparse.Namespace) -> None:
ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/docs")
ASCIIColors.white(" └─ Alternative Documentation (local): ", end="")
ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/redoc")
ASCIIColors.white(" ├─ WebUI (local): ", end="")
ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/webui")
ASCIIColors.white(" ├─ Graph Viewer (local): ", end="")
ASCIIColors.yellow(f"{protocol}://localhost:{args.port}/graph-viewer")
ASCIIColors.yellow("\n📝 Note:")
ASCIIColors.white(""" Since the server is running on 0.0.0.0:
@@ -1614,8 +1617,8 @@ def create_app(args):
# query all graph
@app.get("/graphs")
async def get_graphs(label: str):
return await rag.get_graps(nodel_label=label, max_depth=100)
async def get_knowledge_graph(label: str):
return await rag.get_knowledge_graph(nodel_label=label, max_depth=100)
# Add Ollama API routes
ollama_api = OllamaAPI(rag, top_k=args.top_k)
@@ -1653,19 +1656,18 @@ def create_app(args):
},
}
# webui mount /webui/index.html
# app.mount(
# "/webui",
# StaticFiles(
# directory=Path(__file__).resolve().parent / "webui" / "static", html=True
# ),
# name="webui_static",
# )
# Webui mount webui/index.html
webui_dir = Path(__file__).parent / "webui"
app.mount(
"/graph-viewer",
StaticFiles(directory=webui_dir, html=True),
name="webui",
)
# Serve the static files
static_dir = Path(__file__).parent / "static"
static_dir.mkdir(exist_ok=True)
app.mount("/", StaticFiles(directory=static_dir, html=True), name="static")
app.mount("/webui", StaticFiles(directory=static_dir, html=True), name="static")
return app