Skip to content

Commit c3f5739

Browse files
author
Paweł Kędzia
committed
Merge branch 'features/stream'
2 parents 6861772 + 421a9f3 commit c3f5739

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

llm_router_api/endpoints/httprequest.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
"""
2222

2323
import json
24-
import urllib
2524

2625
import requests
2726
import datetime
@@ -121,7 +120,6 @@ def call_http_request(
121120
)
122121

123122
full_url = self._prepare_full_url_ep(ep_url)
124-
125123
if not headers:
126124
headers = {"Content-Type": "application/json"}
127125

@@ -222,6 +220,7 @@ def stream_response(
222220
if token:
223221
headers["Authorization"] = f"Bearer {token}"
224222

223+
params = self._convert_ollama_messages_if_needed(params=params)
225224
if is_ollama:
226225
return self._stream_ollama(full_url, params, method, headers)
227226
if is_generic_to_ollama:
@@ -233,7 +232,10 @@ def stream_response(
233232
# Private helpers
234233
# ------------------------------------------------------------------
235234
def _prepare_full_url_ep(self, ep_url: str) -> str:
236-
return urllib.parse.urljoin(self._endpoint.api_model.api_host, ep_url)
235+
full_url = (
236+
self._endpoint.api_model.api_host.rstrip("/") + "/" + ep_url.lstrip("/")
237+
)
238+
return full_url
237239

238240
def _call_for_each_user_message(
239241
self,
@@ -491,8 +493,7 @@ def _stream_ollama(
491493
Iterator[bytes]
492494
An iterator yielding Ollama‑compatible NDJSON lines.
493495
"""
494-
# Normalise messages if needed (unchanged static helper)
495-
payload = self._convert_ollama_messages_if_needed(params=payload)
496+
496497
try:
497498
if method == "POST":
498499
with requests.post(

0 commit comments

Comments
 (0)