github-actions[bot]
commited on
Commit
·
60fe004
1
Parent(s):
59cf859
Update from GitHub Actions
Browse files
server.js
CHANGED
@@ -243,7 +243,25 @@ function convertMessagesToFalPrompt(messages) {
|
|
243 |
};
|
244 |
}
|
245 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
246 |
|
|
|
|
|
|
|
|
|
|
|
247 |
// POST /v1/chat/completions endpoint (保持不变)
|
248 |
app.post('/v1/chat/completions', async (req, res) => {
|
249 |
|
@@ -291,7 +309,7 @@ app.post('/v1/chat/completions', async (req, res) => {
|
|
291 |
|
292 |
try {
|
293 |
// *** 使用更新后的转换函数 ***
|
294 |
-
const { prompt, system_prompt } =
|
295 |
|
296 |
const falInput = {
|
297 |
model: model,
|
|
|
243 |
};
|
244 |
}
|
245 |
|
246 |
+
function convertMessagesToFalPrompt1(messages) {
|
247 |
+
let system_message_content = "";
|
248 |
+
let prompt ="";
|
249 |
+
for (const message of messages) {
|
250 |
+
const content = (message.content === null || message.content === undefined) ? "" : String(message.content).trim();
|
251 |
+
if (content.length > 0) {
|
252 |
+
if (message.role === 'system') {
|
253 |
+
system_message_content = content; // 只保留最后一个非空系统消息
|
254 |
+
} else if (message.role === 'user') {
|
255 |
+
prompt = content;
|
256 |
+
}
|
257 |
+
}
|
258 |
+
}
|
259 |
|
260 |
+
return {
|
261 |
+
system_prompt: system_message_content,
|
262 |
+
prompt: prompt
|
263 |
+
};
|
264 |
+
}
|
265 |
// POST /v1/chat/completions endpoint (保持不变)
|
266 |
app.post('/v1/chat/completions', async (req, res) => {
|
267 |
|
|
|
309 |
|
310 |
try {
|
311 |
// *** 使用更新后的转换函数 ***
|
312 |
+
const { prompt, system_prompt } = convertMessagesToFalPrompt1(messages);
|
313 |
|
314 |
const falInput = {
|
315 |
model: model,
|