This commit is contained in:
Timothy J. Baek 2024-07-15 13:09:15 +02:00
parent dbc352f01b
commit d258523a3c
2 changed files with 20 additions and 10 deletions

View File

@ -618,6 +618,12 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
content={"detail": str(e)}, content={"detail": str(e)},
) )
# Extract valves from the request body
valves = None
if "valves" in body:
valves = body["valves"]
del body["valves"]
# Extract session_id, chat_id and message_id from the request body # Extract session_id, chat_id and message_id from the request body
session_id = None session_id = None
if "session_id" in body: if "session_id" in body:
@ -695,6 +701,7 @@ class ChatCompletionMiddleware(BaseHTTPMiddleware):
"session_id": session_id, "session_id": session_id,
"chat_id": chat_id, "chat_id": chat_id,
"message_id": message_id, "message_id": message_id,
"valves": valves,
} }
modified_body_bytes = json.dumps(body).encode("utf-8") modified_body_bytes = json.dumps(body).encode("utf-8")
@ -982,16 +989,17 @@ async def get_all_models():
if action_id in enabled_action_ids if action_id in enabled_action_ids
] ]
model["actions"] = [ model["actions"] = []
for action_id in action_ids:
action = Functions.get_function_by_id(action_id)
model["actions"].append(
{ {
"id": action_id, "id": action_id,
"name": Functions.get_function_by_id(action_id).name, "name": action.name,
"description": Functions.get_function_by_id( "description": action.meta.description,
action_id "icon_url": action.meta.manifest.get("icon_url", None),
).meta.description,
} }
for action_id in action_ids )
]
else: else:
owned_by = "openai" owned_by = "openai"

View File

@ -804,6 +804,7 @@
keep_alive: $settings.keepAlive ?? undefined, keep_alive: $settings.keepAlive ?? undefined,
tool_ids: selectedToolIds.length > 0 ? selectedToolIds : undefined, tool_ids: selectedToolIds.length > 0 ? selectedToolIds : undefined,
files: files.length > 0 ? files : undefined, files: files.length > 0 ? files : undefined,
...(Object.keys(valves).length ? { valves } : {}),
session_id: $socket?.id, session_id: $socket?.id,
chat_id: $chatId, chat_id: $chatId,
id: responseMessageId id: responseMessageId
@ -1108,6 +1109,7 @@
max_tokens: params?.max_tokens ?? $settings?.params?.max_tokens ?? undefined, max_tokens: params?.max_tokens ?? $settings?.params?.max_tokens ?? undefined,
tool_ids: selectedToolIds.length > 0 ? selectedToolIds : undefined, tool_ids: selectedToolIds.length > 0 ? selectedToolIds : undefined,
files: files.length > 0 ? files : undefined, files: files.length > 0 ? files : undefined,
...(Object.keys(valves).length ? { valves } : {}),
session_id: $socket?.id, session_id: $socket?.id,
chat_id: $chatId, chat_id: $chatId,
id: responseMessageId id: responseMessageId