From c9ff8ef2c2a6b9bf47698ba935f543ce336d1662 Mon Sep 17 00:00:00 2001 From: AlpinDale Date: Mon, 4 Nov 2024 13:28:04 +0000 Subject: [PATCH] upgrade to v0.2 --- endpoints/OAI/router.py | 13 ++++--------- endpoints/server.py | 2 +- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/endpoints/OAI/router.py b/endpoints/OAI/router.py index fe10a9d..5bdd5b0 100644 --- a/endpoints/OAI/router.py +++ b/endpoints/OAI/router.py @@ -30,8 +30,6 @@ from endpoints.OAI.utils.embeddings import get_embeddings api_name = "OAI" router = APIRouter() -host = None -port = None urls = { "Completions": "http://{host}:{port}/v1/completions", @@ -39,10 +37,7 @@ urls = { } -def setup(server_host: str = None, server_port: int = None): - global host, port - host = server_host - port = server_port +def setup(): return router @@ -177,7 +172,7 @@ async def embeddings(request: Request, data: EmbeddingsRequest) -> EmbeddingsRes @router.get("/.well-known/serviceinfo") async def service_info(): return JSONResponse(content={ - "version": 0.1, + "version": 0.2, "software": { "name": "TabbyAPI", "repository": "https://github.com/theroyallab/tabbyAPI", @@ -186,13 +181,13 @@ async def service_info(): "api": { "openai": { "name": "OpenAI API", - "base_url": f"http://{host}:{port}/v1", + "relative_url": "/v1", "documentation": "https://theroyallab.github.io/tabbyAPI", "version": 1 }, "koboldai": { "name": "KoboldAI API", - "base_url": f"http://{host}:{port}/api", + "relative_url": "/api", "documentation": "https://theroyallab.github.io/tabbyAPI", "version": 1 } diff --git a/endpoints/server.py b/endpoints/server.py index 90bf6c4..3555a5b 100644 --- a/endpoints/server.py +++ b/endpoints/server.py @@ -52,7 +52,7 @@ def setup_app(host: Optional[str] = None, port: Optional[int] = None): selected_server = router_mapping.get(server.lower()) if selected_server: - app.include_router(selected_server.setup(host, port)) + app.include_router(selected_server.setup()) logger.info(f"Starting {selected_server.api_name} API") for path, url in selected_server.urls.items():