From 7363a4bfdc309391873853a75323ee9a4d7719f5 Mon Sep 17 00:00:00 2001 From: Saifeddine ALOUI Date: Wed, 21 Feb 2024 01:09:31 +0100 Subject: [PATCH] new server --- lollms/services/vllm/lollms_vllm.py | 2 +- lollms/utilities.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lollms/services/vllm/lollms_vllm.py b/lollms/services/vllm/lollms_vllm.py index 5463375..bc9d5c7 100644 --- a/lollms/services/vllm/lollms_vllm.py +++ b/lollms/services/vllm/lollms_vllm.py @@ -104,7 +104,7 @@ class Service: if not self.wait_for_service(1,False) and base_url is None: ASCIIColors.info("Loading vllm service") - host, port = url2host_port(base_url) + _, host, port = url2host_port(base_url) # run vllm if platform.system() == 'Windows': #subprocess.Popen(['wsl', 'ls', '$HOME']) diff --git a/lollms/utilities.py b/lollms/utilities.py index ab70c8d..5dae8dc 100644 --- a/lollms/utilities.py +++ b/lollms/utilities.py @@ -132,13 +132,14 @@ def url2host_port(url, default_port =8000): if "http" in url: parts = url.split(":") host = ":".join(parts[:2]) + host_no_http = parts[1].replace("//","") port = url.split(":")[2] if len(parts)==3 else default_port - return host, port + return host, host_no_http, port else: parts = url.split(":") host = parts[0] port = url.split(":")[1] if len(parts)==2 else default_port - return host, port + return host, host, port def is_asyncio_loop_running(): """