|
@@ -99,8 +99,12 @@ class ServerProcess:
|
|
|
self.debug = True
|
|
self.debug = True
|
|
|
if "PORT" in os.environ:
|
|
if "PORT" in os.environ:
|
|
|
self.server_port = int(os.environ["PORT"])
|
|
self.server_port = int(os.environ["PORT"])
|
|
|
|
|
+ self.external_server = "DEBUG_EXTERNAL" in os.environ
|
|
|
|
|
|
|
|
def start(self, timeout_seconds: int | None = DEFAULT_HTTP_TIMEOUT) -> None:
|
|
def start(self, timeout_seconds: int | None = DEFAULT_HTTP_TIMEOUT) -> None:
|
|
|
|
|
+ if self.external_server:
|
|
|
|
|
+ print(f"[external_server]: Assuming external server running on {self.server_host}:{self.server_port}")
|
|
|
|
|
+ return
|
|
|
if self.server_path is not None:
|
|
if self.server_path is not None:
|
|
|
server_path = self.server_path
|
|
server_path = self.server_path
|
|
|
elif "LLAMA_SERVER_BIN_PATH" in os.environ:
|
|
elif "LLAMA_SERVER_BIN_PATH" in os.environ:
|
|
@@ -244,6 +248,9 @@ class ServerProcess:
|
|
|
raise TimeoutError(f"Server did not start within {timeout_seconds} seconds")
|
|
raise TimeoutError(f"Server did not start within {timeout_seconds} seconds")
|
|
|
|
|
|
|
|
def stop(self) -> None:
|
|
def stop(self) -> None:
|
|
|
|
|
+ if self.external_server:
|
|
|
|
|
+ print("[external_server]: Not stopping external server")
|
|
|
|
|
+ return
|
|
|
if self in server_instances:
|
|
if self in server_instances:
|
|
|
server_instances.remove(self)
|
|
server_instances.remove(self)
|
|
|
if self.process:
|
|
if self.process:
|