From dde56af586717aa9fca51fdb97db4335c6dc7bba Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Tue, 10 Dec 2024 09:42:57 -0800 Subject: [PATCH 1/2] Remove metrics_server_config from api_server.py It seems lexically, the variable metrics_server_config is not needed. Hence this propose to remove it. --- jetstream/entrypoints/http/api_server.py | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/jetstream/entrypoints/http/api_server.py b/jetstream/entrypoints/http/api_server.py index aaced235..58e2595f 100644 --- a/jetstream/entrypoints/http/api_server.py +++ b/jetstream/entrypoints/http/api_server.py @@ -100,21 +100,15 @@ def server(argv: Sequence[str]): print(f"server_config: {server_config}") del argv - metrics_server_config: config_lib.MetricsServerConfig | None = None - # Setup Prometheus server - metrics_collector: JetstreamMetricsCollector = None if flags.FLAGS.prometheus_port != 0: - metrics_server_config = config_lib.MetricsServerConfig( - port=flags.FLAGS.prometheus_port - ) logging.info( - "Starting Prometheus server on port %d", metrics_server_config.port + "Starting Prometheus server on port %d", flags.FLAGS.prometheus_port ) - start_http_server(metrics_server_config.port) + start_http_server(flags.FLAGS.prometheus_port) metrics_collector = JetstreamMetricsCollector() else: logging.info( - "Not starting Prometheus server: --prometheus_port flag not set" + "Not starting Prometheus server as --prometheus_port flag not set" ) global llm_orchestrator From f32ae2719974a0267bf8048dec12c13a834cffc4 Mon Sep 17 00:00:00 2001 From: Yi Wang Date: Tue, 10 Dec 2024 09:47:52 -0800 Subject: [PATCH 2/2] Update api_server.py --- jetstream/entrypoints/http/api_server.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jetstream/entrypoints/http/api_server.py b/jetstream/entrypoints/http/api_server.py index 58e2595f..dbf91618 100644 --- a/jetstream/entrypoints/http/api_server.py +++ b/jetstream/entrypoints/http/api_server.py @@ -17,7 +17,7 @@ import json import logging import time -from typing import Sequence +from typing import Optional, Sequence from absl import app as abslapp from absl import flags from fastapi import APIRouter, Response @@ -100,6 +100,7 @@ def server(argv: Sequence[str]): print(f"server_config: {server_config}") del argv + metrics_collector: Optional[JetstreamMetricsCollector] = None if flags.FLAGS.prometheus_port != 0: logging.info( "Starting Prometheus server on port %d", flags.FLAGS.prometheus_port