Skip to content

Commit 6d899b8

Browse files
committed
refac: direct connections
1 parent eb56869 commit 6d899b8

File tree

4 files changed

+10
-6
lines changed

4 files changed

+10
-6
lines changed

backend/open_webui/main.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -947,6 +947,7 @@ async def chat_completion(
947947
else {}
948948
),
949949
}
950+
950951
request.state.metadata = metadata
951952
form_data["metadata"] = metadata
952953

backend/open_webui/socket/main.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,8 +279,8 @@ async def __event_emitter__(event_data):
279279
await sio.emit(
280280
"chat-events",
281281
{
282-
"chat_id": request_info["chat_id"],
283-
"message_id": request_info["message_id"],
282+
"chat_id": request_info.get("chat_id", None),
283+
"message_id": request_info.get("message_id", None),
284284
"data": event_data,
285285
},
286286
to=session_id,
@@ -329,8 +329,8 @@ async def __event_caller__(event_data):
329329
response = await sio.call(
330330
"chat-events",
331331
{
332-
"chat_id": request_info["chat_id"],
333-
"message_id": request_info["message_id"],
332+
"chat_id": request_info.get("chat_id", None),
333+
"message_id": request_info.get("message_id", None),
334334
"data": event_data,
335335
},
336336
to=request_info["session_id"],

backend/open_webui/utils/chat.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,10 +164,14 @@ async def generate_chat_completion(
164164
if BYPASS_MODEL_ACCESS_CONTROL:
165165
bypass_filter = True
166166

167+
if hasattr(request.state, "metadata"):
168+
form_data["metadata"] = request.state.metadata
169+
167170
if getattr(request.state, "direct", False) and hasattr(request.state, "model"):
168171
models = {
169172
request.state.model["id"]: request.state.model,
170173
}
174+
log.debug(f"direct connection to model: {models}")
171175
else:
172176
models = request.app.state.MODELS
173177

src/routes/+layout.svelte

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -266,8 +266,6 @@
266266
if (directConnections) {
267267
const urlIdx = model?.urlIdx;
268268
269-
console.log(model, directConnections);
270-
271269
const OPENAI_API_URL = directConnections.OPENAI_API_BASE_URLS[urlIdx];
272270
const OPENAI_API_KEY = directConnections.OPENAI_API_KEYS[urlIdx];
273271
const API_CONFIG = directConnections.OPENAI_API_CONFIGS[urlIdx];
@@ -315,6 +313,7 @@
315313
const lines = chunk.split('\n').filter((line) => line.trim() !== '');
316314
317315
for (const line of lines) {
316+
console.log(line);
318317
$socket?.emit(channel, line);
319318
}
320319
}

0 commit comments

Comments
 (0)