diff --git a/server2.js b/server2.js index dfe0b7e..e5acd7d 100755 --- a/server2.js +++ b/server2.js @@ -106,7 +106,7 @@ app.get("/sessions", async (req, res) => { console.log("收到的 userId:", req.query.userId); try { const userId = req.query.userId; - if (!userId || userId === "NaN" || isNaN(Number(userId))) + if (!userId || userId == "NaN" || isNaN(Number(userId))) { console.log("userId:", req.query.userId); res.json({ @@ -146,27 +146,29 @@ app.get("/sessions", async (req, res) => { // 查询会话历史 app.get("/history", async (req, res) => { - try { - const { sessionId } = req.query; - if (!sessionId) { - return res.status(400).json({ code: 1, error: "sessionId 必填" }); - } + try + { + if(!req.query?.sessionId || req.query?.sessionId == "NaN") + { + return res.status(400).json({ code: 1, error: "sessionId 必填" }); + } + const { sessionId } = req.query; - // 查询数据库 - const [rows] = await pool.query( - "SELECT user_id, role, content, image_base64, created_at FROM ai_chat_messages WHERE session_id = ? ORDER BY id ASC", - [sessionId] - ); + // 查询数据库 + const [rows] = await pool.query( + "SELECT user_id, role, content, image_base64, created_at FROM ai_chat_messages WHERE session_id = ? ORDER BY id ASC", + [sessionId] + ); - res.json({ - code: 0, - sessionId, - messages: rows, - }); - } catch (err) { - console.error("查询会话历史失败:", err); - res.status(500).json({ code: 1, error: err.message }); - } + res.json({ + code: 0, + sessionId, + messages: rows, + }); + } catch (err) { + console.error("查询会话历史失败:", err); + res.status(500).json({ code: 1, error: err.message }); + } }); // 删除指定会话及其消息 @@ -174,12 +176,15 @@ app.delete("/session", async (req, res) => { try { console.log("会话删除:", req.query); - const { sessionId, userId } = req.query; - - if (!sessionId || !userId) { + + // if (!sessionId || !userId) + if (req.query?.userId == "NaN" || !req.query?.userId || !req.query?.sessionId || req.query?.sessionId == "NaN") + { return res.status(400).json({ code: 1, error: "sessionId 和 userId 必填" }); } + const { sessionId, userId } = req.query; + // 确保只能删除自己的会话 const [rows] = await pool.query( "SELECT COUNT(*) as cnt FROM ai_chat_messages WHERE session_id = ? AND user_id = ?", @@ -213,13 +218,15 @@ app.post("/session", async (req, res) => { try { console.log("新建会话: ",req.body) - const { userId, sessionId } = req.body; - - if (!userId || !sessionId) + + if (req.body?.userId == "NaN" || !req.body?.userId || !req.body?.sessionId || req.body?.sessionId == "NaN") { + console.log("=== userId: ",req.body?.userId) return res.status(400).json({ code: 1, error: "userId 和 sessionId 必填" }); } + const { userId, sessionId } = req.body; + // 插入一条“新会话”的首条消息,可以是空内容 await pool.query( "INSERT INTO ai_chat_messages (user_id, session_id, role, content) VALUES (?, ?, 'system', '')", @@ -249,7 +256,10 @@ app.post("/analyze", upload.single("file"), async (req, res) => { res.setHeader("Connection", "keep-alive"); const logBody = { ...req.body }; - delete logBody.imageBase64; + if(req.body?.imageBase64) + { + delete logBody.imageBase64; + } console.log("analyze: ", logBody); // console.log("analyze: ",req.body) @@ -264,10 +274,46 @@ app.post("/analyze", upload.single("file"), async (req, res) => { // 如果前端没有传 sessionId,生成一个 const sessId = sessionId || Date.now().toString(); - // ------------------ 1️⃣ 保存用户提问 ------------------ + // ------------------ 获取历史对话(上下文) ------------------ + const [historyRows] = await pool.query( + "SELECT role, content, image_base64 FROM ai_chat_messages WHERE session_id = ? AND user_id = ? ORDER BY created_at ASC", + [sessId, userId || null] + ); + + // 构建历史消息数组 + const historyMessages = historyRows.map(row => { + const message = { + role: row.role, + content: [] + }; + + // 添加文本内容 + if (row.content) + { + message.content.push({ type: "text", text: row.content }); + } + + // 添加图片内容 + if (row.image_base64) + { + message.content.push({ + type: "image_url", + image_url: { + url: row.image_base64.startsWith("data:") + ? row.image_base64 + : `data:image/png;base64,${row.image_base64}`, + } + }); + } + + return message; + }); + + + // ------------------ 保存用户提问 ------------------ await pool.query( - "INSERT INTO ai_chat_messages (session_id, user_id, role, content, image_base64) VALUES (?, ?, 'user', ?, ?)", - [sessId, userId || null, userPrompt || "", imageBase64 || null] + "INSERT INTO ai_chat_messages (session_id, user_id, role, content, image_base64) VALUES (?, ?, 'user', ?, ?)", + [sessId, userId || null, userPrompt || "", imageBase64 || null] ); // console.log("userPrompt: ",userPrompt); @@ -275,35 +321,36 @@ app.post("/analyze", upload.single("file"), async (req, res) => { // console.log("userId: ",userId); // console.log("sessionId: ",sessionId); - // ------------------ 2️⃣ 图像分析 ------------------ + // ------------------ 图像分析 ------------------ + // 构建包含上下文的消息数组 + const imageAnalysisMessages = [ + { + role: "system", + content: "你是一名图像分析专家,需要结合历史对话内容分析当前图像。" + }, + ...historyMessages, // 添加历史对话作为上下文 + { + role: "user", + content: [ + { type: "text", text: userPrompt || "请描述图片内容。" }, + imageBase64 + ? { + type: "image_url", + image_url: { + url: imageBase64.startsWith("data:") + ? imageBase64 + : `data:image/png;base64,${imageBase64}`, + }, + } + : null, + ].filter(Boolean), + }, + ]; + const completion = await client.chat.completions.create({ model: "gpt-4.1", stream: true, - // do_scene: true, - // do_behavior: true, - // llm_model: "hunyuan-turbos-latest", - messages: [ - { - role: "system", - content: "", - }, - { - role: "user", - content: [ - { type: "text", text: userPrompt || "请描述图片内容。" }, - imageBase64 - ? { - type: "image_url", - image_url: { - url: imageBase64.startsWith("data:") - ? imageBase64 - : `data:image/png;base64,${imageBase64}`, - }, - } - : null, - ].filter(Boolean), - }, - ], + messages: imageAnalysisMessages }); console.log("====== 开始图像分析... ======") @@ -314,7 +361,7 @@ app.post("/analyze", upload.single("file"), async (req, res) => { sceneText += delta; if (delta) res.write( - `data: ${JSON.stringify({ type: "scene", content: delta })}\n\n` + `data: ${JSON.stringify({ type: "scene", content: delta })}\n\n` ); } console.log("====== 图像分析结束 ======") @@ -332,33 +379,39 @@ app.post("/analyze", upload.single("file"), async (req, res) => { // + "如果这个光伏场站需要用无人机清洗怎么做,给出一份详细的计划" // + "如果这个光伏场站需要巡检怎么做,给出一份详细的计划" - // sceneText += preText; + // 构建包含完整上下文的LLM消息数组 + const llmMessages = [ + { + role: "system", + content: "你是一名新能源项目的图像分析AI分析师,需要结合历史对话提供专业建议。" + }, + ...historyMessages, // 添加历史对话作为上下文 + { + role: "user", + content: userPrompt || "请基于图片分析提供建议。" + }, + { + role: "assistant", + content: sceneText // 添加当前图像分析结果 + } + ]; + const llmStream = await client1.chat.completions.create({ model: "gpt-5-mini", stream: true, - messages: [ - { - role: "system", - content:"" - // content: "你是一名新能源项目的图像分析AI分析师。", - }, - { - role: "user", - content: `${sceneText}`, - // content: `请基于以下场景分析结果提供部署建议或优化意见:\n${sceneText}`, - }, - ], + messages: llmMessages }); console.log("====== 开始深度思考... ======") let llmText = ""; - for await (const chunk of llmStream) { + for await (const chunk of llmStream) + { const delta = chunk.choices[0]?.delta?.content || ""; llmText += delta; if (delta) res.write( - `data: ${JSON.stringify({ type: "llm", content: delta})}\n\n` + `data: ${JSON.stringify({ type: "llm", content: delta})}\n\n` ); } @@ -372,7 +425,8 @@ app.post("/analyze", upload.single("file"), async (req, res) => { res.end(); // 删除上传文件 - if (req.file && req.file.path) { + if (req.file && req.file.path) + { fs.unlinkSync(req.file.path); } console.log("====== 分析完成 ======") @@ -384,6 +438,7 @@ app.post("/analyze", upload.single("file"), async (req, res) => { } }); + // 静态文件服务 app.use("/uploads", express.static("uploads"));