From 9aba5b18c4301882877b418aac5e0327fbfbdbb5 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Wed, 18 Jun 2025 20:39:29 +0000 Subject: [PATCH 1/5] enable header for non streaming Signed-off-by: Ubuntu --- comps/cores/mega/micro_service.py | 3 +-- comps/cores/mega/orchestrator.py | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/comps/cores/mega/micro_service.py b/comps/cores/mega/micro_service.py index 5d96be70c4..2adc6fd326 100644 --- a/comps/cores/mega/micro_service.py +++ b/comps/cores/mega/micro_service.py @@ -159,8 +159,7 @@ def _validate_env(self): def endpoint_path(self, model=None): if self.api_key: - model_endpoint = model.split("/")[1] - return f"{self.host}/{model_endpoint}{self.endpoint}" + return f"{self.host}{self.endpoint}" else: return f"{self.protocol}://{self.host}:{self.port}{self.endpoint}" diff --git a/comps/cores/mega/orchestrator.py b/comps/cores/mega/orchestrator.py index 61246ee5a8..06ea06e2af 100644 --- a/comps/cores/mega/orchestrator.py +++ b/comps/cores/mega/orchestrator.py @@ -276,6 +276,7 @@ async def execute( stream=True, timeout=2000, ) + else: response = requests.post( url=endpoint, @@ -367,7 +368,7 @@ def generate(): if ENABLE_OPEA_TELEMETRY else contextlib.nullcontext() ): - response = await session.post(endpoint, json=input_data) + response = await session.post(endpoint, json=input_data,headers={"Content-type": "application/json","Authorization": f"Bearer {access_token}"}) if response.content_type == "audio/wav": audio_data = await response.read() From 22c60cbc9197ea2fa176bf6db8ed1203333d4f28 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 20 Jun 2025 03:51:47 +0000 Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- comps/cores/mega/orchestrator.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/comps/cores/mega/orchestrator.py b/comps/cores/mega/orchestrator.py index 06ea06e2af..bae5f24c99 100644 --- a/comps/cores/mega/orchestrator.py +++ b/comps/cores/mega/orchestrator.py @@ -276,7 +276,7 @@ async def execute( stream=True, timeout=2000, ) - + else: response = requests.post( url=endpoint, @@ -368,7 +368,11 @@ def generate(): if ENABLE_OPEA_TELEMETRY else contextlib.nullcontext() ): - response = await session.post(endpoint, json=input_data,headers={"Content-type": "application/json","Authorization": f"Bearer {access_token}"}) + response = await session.post( + endpoint, + json=input_data, + headers={"Content-type": "application/json", "Authorization": f"Bearer {access_token}"}, + ) if response.content_type == "audio/wav": audio_data = await response.read() From c5133231d99dd940a7db43f4008197a0d659b68b Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 23 Jun 2025 17:48:14 +0000 Subject: [PATCH 3/5] docsum changes Signed-off-by: Ubuntu --- .../llms/src/doc-summarization/integrations/common.py | 10 +++++++--- comps/llms/src/doc-summarization/integrations/vllm.py | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/comps/llms/src/doc-summarization/integrations/common.py b/comps/llms/src/doc-summarization/integrations/common.py index 654fca37cb..d7622fa9c4 100644 --- a/comps/llms/src/doc-summarization/integrations/common.py +++ b/comps/llms/src/doc-summarization/integrations/common.py @@ -27,6 +27,7 @@ TOKEN_URL = os.getenv("TOKEN_URL") CLIENTID = os.getenv("CLIENTID") CLIENT_SECRET = os.getenv("CLIENT_SECRET") +OPENAI_API_KEY = os.getenv("OPENAI_API_KEY") MAX_INPUT_TOKENS = int(os.getenv("MAX_INPUT_TOKENS", 2048)) MAX_TOTAL_TOKENS = int(os.getenv("MAX_TOTAL_TOKENS", 4096)) @@ -67,9 +68,12 @@ class OpeaDocSum(OpeaComponent): def __init__(self, name: str, description: str, config: dict = None): super().__init__(name, ServiceType.LLM.name.lower(), description, config) - self.access_token = ( - get_access_token(TOKEN_URL, CLIENTID, CLIENT_SECRET) if TOKEN_URL and CLIENTID and CLIENT_SECRET else None - ) + if OPENAI_API_KEY: + self.access_token = OPENAI_API_KEY + else: + self.access_token = ( + get_access_token(TOKEN_URL, CLIENTID, CLIENT_SECRET) if TOKEN_URL and CLIENTID and CLIENT_SECRET else None + ) self.llm_endpoint = get_llm_endpoint() self.tokenizer = AutoTokenizer.from_pretrained(MODEL_NAME) health_status = self.check_health() diff --git a/comps/llms/src/doc-summarization/integrations/vllm.py b/comps/llms/src/doc-summarization/integrations/vllm.py index a2126c4d52..f51ba42ebb 100644 --- a/comps/llms/src/doc-summarization/integrations/vllm.py +++ b/comps/llms/src/doc-summarization/integrations/vllm.py @@ -48,6 +48,9 @@ async def invoke(self, input: DocSumChatCompletionRequest): input (DocSumChatCompletionRequest): The input text(s). """ headers = {} + print("...........") + print(self.access_token,self.llm_endpoint) + print("...........") if self.access_token: headers = {"Authorization": f"Bearer {self.access_token}"} From 29b551ea21549c3edbbf3e5c4e6ae449364c5365 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Mon, 23 Jun 2025 17:49:26 +0000 Subject: [PATCH 4/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- comps/llms/src/doc-summarization/integrations/common.py | 4 +++- comps/llms/src/doc-summarization/integrations/vllm.py | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/comps/llms/src/doc-summarization/integrations/common.py b/comps/llms/src/doc-summarization/integrations/common.py index d7622fa9c4..8edccb5331 100644 --- a/comps/llms/src/doc-summarization/integrations/common.py +++ b/comps/llms/src/doc-summarization/integrations/common.py @@ -72,7 +72,9 @@ def __init__(self, name: str, description: str, config: dict = None): self.access_token = OPENAI_API_KEY else: self.access_token = ( - get_access_token(TOKEN_URL, CLIENTID, CLIENT_SECRET) if TOKEN_URL and CLIENTID and CLIENT_SECRET else None + get_access_token(TOKEN_URL, CLIENTID, CLIENT_SECRET) + if TOKEN_URL and CLIENTID and CLIENT_SECRET + else None ) self.llm_endpoint = get_llm_endpoint() self.tokenizer = AutoTokenizer.from_pretrained(MODEL_NAME) diff --git a/comps/llms/src/doc-summarization/integrations/vllm.py b/comps/llms/src/doc-summarization/integrations/vllm.py index f51ba42ebb..39cca3ce0e 100644 --- a/comps/llms/src/doc-summarization/integrations/vllm.py +++ b/comps/llms/src/doc-summarization/integrations/vllm.py @@ -49,7 +49,7 @@ async def invoke(self, input: DocSumChatCompletionRequest): """ headers = {} print("...........") - print(self.access_token,self.llm_endpoint) + print(self.access_token, self.llm_endpoint) print("...........") if self.access_token: headers = {"Authorization": f"Bearer {self.access_token}"} From b771e7fac1c6586424825af1bf4c2e9d8e0cefd2 Mon Sep 17 00:00:00 2001 From: Ubuntu Date: Mon, 23 Jun 2025 17:50:20 +0000 Subject: [PATCH 5/5] removed prints Signed-off-by: Ubuntu --- comps/llms/src/doc-summarization/integrations/vllm.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/comps/llms/src/doc-summarization/integrations/vllm.py b/comps/llms/src/doc-summarization/integrations/vllm.py index f51ba42ebb..a2126c4d52 100644 --- a/comps/llms/src/doc-summarization/integrations/vllm.py +++ b/comps/llms/src/doc-summarization/integrations/vllm.py @@ -48,9 +48,6 @@ async def invoke(self, input: DocSumChatCompletionRequest): input (DocSumChatCompletionRequest): The input text(s). """ headers = {} - print("...........") - print(self.access_token,self.llm_endpoint) - print("...........") if self.access_token: headers = {"Authorization": f"Bearer {self.access_token}"}