vue2server7 7.0.98 → 7.0.100

package/1.js

@@ -0,0 +1,218 @@
+import express from "express";
+import cors from "cors";
+import axios from "axios";
+import dotenv from "dotenv";
+
+dotenv.config();
+
+const app = express();
+
+app.use(cors());
+app.use(express.json({ limit: "20mb" }));
+
+const PORT = Number(process.env.PORT || 3000);
+const TARGET_URL = process.env.TARGET_URL;
+const TARGET_API_KEY = process.env.TARGET_API_KEY;
+const TARGET_APP_TAG = process.env.TARGET_APP_TAG || "proxyai";
+const TARGET_MODEL = process.env.TARGET_MODEL || "qwen15-32b";
+const TARGET_TEMPERATURE = Number(process.env.TARGET_TEMPERATURE || 0.1);
+const TARGET_MAX_TOKENS = Number(process.env.TARGET_MAX_TOKENS || 20000);
+
+function normalizeMessages(messages) {
+  if (!Array.isArray(messages)) return [];
+
+  return messages.map((item) => {
+    // Continue / OpenAI 标准格式直接透传
+    if (typeof item?.content === "string") {
+      return {
+        role: item.role || "user",
+        content: item.content
+      };
+    }
+
+    // 兼容 content 为数组的情况
+    if (Array.isArray(item?.content)) {
+      const text = item.content
+          .map((part) => {
+            if (typeof part === "string") return part;
+            if (part?.type === "text") return part.text || "";
+            return "";
+          })
+          .join("");
+
+      return {
+        role: item.role || "user",
+        content: text
+      };
+    }
+
+    return {
+      role: item?.role || "user",
+      content: ""
+    };
+  });
+}
+
+function buildOpenAIResponse({ model, content, usage }) {
+  return {
+    id: `chatcmpl-${Date.now()}`,
+    object: "chat.completion",
+    created: Math.floor(Date.now() / 1000),
+    model,
+    choices: [
+      {
+        index: 0,
+        message: {
+          role: "assistant",
+          content: content ?? ""
+        },
+        finish_reason: "stop"
+      }
+    ],
+    usage: usage || {
+      prompt_tokens: 0,
+      completion_tokens: 0,
+      total_tokens: 0
+    }
+  };
+}
+
+app.get("/health", (req, res) => {
+  res.json({ ok: true });
+});
+
+app.get("/v1/models", (req, res) => {
+  res.json({
+    object: "list",
+    data: [
+      {
+        id: TARGET_MODEL,
+        object: "model",
+        created: Math.floor(Date.now() / 1000),
+        owned_by: "continue-proxy"
+      }
+    ]
+  });
+});
+
+app.post("/v1/chat/completions", async (req, res) => {
+  const requestId = `req_${Date.now()}`;
+
+  try {
+    const incoming = req.body || {};
+    const incomingMessages = normalizeMessages(incoming.messages);
+
+    // 严格参考 ProxyAI 配置来组织上游 body
+    const upstreamBody = {
+      stream: typeof incoming.stream === "boolean" ? incoming.stream : true,
+      model: incoming.model || TARGET_MODEL,
+      messages: incomingMessages,
+      temperature:
+          typeof incoming.temperature === "number"
+              ? incoming.temperature
+              : TARGET_TEMPERATURE,
+      max_tokens:
+          typeof incoming.max_tokens === "number"
+              ? incoming.max_tokens
+              : typeof incoming.max_completion_tokens === "number"
+                  ? incoming.max_completion_tokens
+                  : TARGET_MAX_TOKENS
+    };
+
+    const upstreamHeaders = {
+      Authorization: `Bearer ${TARGET_API_KEY}`,
+      "X-LLM-Application-Tag": TARGET_APP_TAG,
+      "Content-Type": "application/json"
+    };
+
+    console.log(`\n[${requestId}] ===== incoming body =====`);
+    console.log(JSON.stringify(incoming, null, 2));
+
+    console.log(`\n[${requestId}] ===== upstream headers =====`);
+    console.log({
+      Authorization: "Bearer ***",
+      "X-LLM-Application-Tag": TARGET_APP_TAG,
+      "Content-Type": "application/json"
+    });
+
+    console.log(`\n[${requestId}] ===== upstream body =====`);
+    console.log(JSON.stringify(upstreamBody, null, 2));
+
+    // 先按非流式转，最稳
+    // 因为很多内网服务 stream=true 时返回格式不一定被 Continue 正确识别
+    const forceNonStream = true;
+    if (forceNonStream) {
+      upstreamBody.stream = false;
+    }
+
+    const upstreamResp = await axios.post(TARGET_URL, upstreamBody, {
+      headers: upstreamHeaders,
+      timeout: 120000,
+      validateStatus: () => true
+    });
+
+    console.log(`\n[${requestId}] ===== upstream status =====`);
+    console.log(upstreamResp.status);
+
+    console.log(`\n[${requestId}] ===== upstream data =====`);
+    console.log(
+        typeof upstreamResp.data === "string"
+            ? upstreamResp.data
+            : JSON.stringify(upstreamResp.data, null, 2)
+    );
+
+    if (upstreamResp.status >= 400) {
+      return res.status(upstreamResp.status).json({
+        error: {
+          message:
+              typeof upstreamResp.data === "string"
+                  ? upstreamResp.data
+                  : JSON.stringify(upstreamResp.data),
+          type: "upstream_error",
+          code: upstreamResp.status
+        }
+      });
+    }
+
+    const data = upstreamResp.data;
+
+    // 情况1：上游已经是 OpenAI 格式
+    if (data?.choices?.[0]?.message?.content !== undefined) {
+      return res.json(data);
+    }
+
+    // 情况2：提取常见文本字段
+    const text =
+        data?.choices?.[0]?.text ??
+        data?.data?.content ??
+        data?.data?.text ??
+        data?.text ??
+        data?.reply ??
+        data?.result ??
+        "";
+
+    return res.json(
+        buildOpenAIResponse({
+          model: upstreamBody.model,
+          content: text,
+          usage: data?.usage
+        })
+    );
+  } catch (error) {
+    console.error("\n===== proxy exception =====");
+    console.error(error?.message);
+    console.error(error?.response?.data);
+
+    return res.status(500).json({
+      error: {
+        message: error?.message || "proxy internal error",
+        type: "proxy_internal_error",
+        code: 500
+      }
+    });
+  }
+});
+
+app.listen(PORT, () => {
+  console.log(`Proxy server running at http://127.0.0.1:${PORT}`);
+});

package/2

@@ -0,0 +1,30 @@
+name: Internal Qwen Proxy
+version: 1.0.0
+schema: v1
+
+models:
+  - name: qwen15-32b
+    provider: openai
+    model: qwen15-32b
+    apiKey: anything
+    apiBase: http://127.0.0.1:3000/v1
+
+    defaultCompletionOptions:
+      temperature: 0.1
+      maxTokens: 20000
+
+
+      PORT=3000
+
+      TARGET_URL=http://maasapp.aip.bj.bob.test8080/apis/ais-v2/chat/completions
+      TARGET_API_KEY=你在ProxyAI顶部填写的那个真实API_KEY
+      TARGET_APP_TAG=proxyai
+      TARGET_MODEL=qwen15-32b
+      TARGET_TEMPERATURE=0.1
+      TARGET_MAX_TOKENS=20000
+
+
+
+      curl -X POST "http://127.0.0.1:3000/v1/chat/completions" ^
+        -H "Content-Type: application/json" ^
+        -d "{\"model\":\"qwen15-32b\",\"messages\":[{\"role\":\"user\",\"content\":\"你好\"}]}"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2server7",
-  "version": "7.0.98",
+  "version": "7.0.100",
   "description": "",
   "scripts": {
     "dev": "nodemon --watch src --ext ts --exec \"ts-node src/app.ts\"",

package/11

@@ -1,160 +0,0 @@
-import express from "express";
-import axios from "axios";
-import cors from "cors";
-
-const app = express();
-
-app.use(cors());
-app.use(express.json({ limit: "10mb" }));
-
-// ===== 你的内网模型网关配置 =====
-const TARGET_URL = "http://maasapp.aip.bj.bob.test8080/apis/ais-v2/chat/completions";
-const TARGET_API_KEY = "你的真实内网API_KEY";
-const TARGET_APP_TAG = "proxyai";
-const DEFAULT_MODEL = "qwen15-32b";
-
-// ===== 健康检查 =====
-app.get("/health", (req, res) => {
-  res.json({ ok: true });
-});
-
-// ===== 可选：给 Continue 用的模型列表接口 =====
-app.get("/v1/models", (req, res) => {
-  res.json({
-    object: "list",
-    data: [
-      {
-        id: DEFAULT_MODEL,
-        object: "model",
-        created: Math.floor(Date.now() / 1000),
-        owned_by: "local-proxy"
-      }
-    ]
-  });
-});
-
-// ===== OpenAI Chat Completions 兼容接口 =====
-app.post("/v1/chat/completions", async (req, res) => {
-  try {
-    const {
-      model,
-      messages,
-      temperature,
-      max_tokens,
-      stream
-    } = req.body;
-
-    const finalModel = model || DEFAULT_MODEL;
-    const finalStream = !!stream;
-
-    const requestBody = {
-      model: finalModel,
-      messages: Array.isArray(messages) ? messages : [],
-      temperature: typeof temperature === "number" ? temperature : 0.1,
-      max_tokens: typeof max_tokens === "number" ? max_tokens : 20000,
-      stream: finalStream
-    };
-
-    // ===== 非流式 =====
-    if (!finalStream) {
-      const response = await axios.post(TARGET_URL, requestBody, {
-        headers: {
-          Authorization: `Bearer ${TARGET_API_KEY}`,
-          "X-LLM-Application-Tag": TARGET_APP_TAG,
-          "Content-Type": "application/json"
-        },
-        timeout: 120000
-      });
-
-      // 如果你的内网返回已经接近 OpenAI 格式，可直接透传
-      // 这里做一层兼容处理，更稳
-      const data = response.data;
-
-      // 兼容：如果对方已经是 OpenAI 格式
-      if (data?.choices) {
-        return res.json(data);
-      }
-
-      // 兼容：如果对方返回的是别的结构，尝试提取文本
-      const text =
-        data?.choices?.[0]?.message?.content ??
-        data?.data?.content ??
-        data?.data?.text ??
-        data?.text ??
-        data?.reply ??
-        "";
-
-      return res.json({
-        id: `chatcmpl-${Date.now()}`,
-        object: "chat.completion",
-        created: Math.floor(Date.now() / 1000),
-        model: finalModel,
-        choices: [
-          {
-            index: 0,
-            message: {
-              role: "assistant",
-              content: text
-            },
-            finish_reason: "stop"
-          }
-        ],
-        usage: data?.usage || {
-          prompt_tokens: 0,
-          completion_tokens: 0,
-          total_tokens: 0
-        }
-      });
-    }
-
-    // ===== 流式 =====
-    const response = await axios.post(TARGET_URL, requestBody, {
-      headers: {
-        Authorization: `Bearer ${TARGET_API_KEY}`,
-        "X-LLM-Application-Tag": TARGET_APP_TAG,
-        "Content-Type": "application/json"
-      },
-      responseType: "stream",
-      timeout: 120000
-    });
-
-    res.setHeader("Content-Type", "text/event-stream; charset=utf-8");
-    res.setHeader("Cache-Control", "no-cache, no-transform");
-    res.setHeader("Connection", "keep-alive");
-
-    response.data.on("data", (chunk) => {
-      const text = chunk.toString("utf8");
-
-      // 情况1：你的内网本来就是标准 SSE，直接透传
-      // 如果不是标准 SSE，可以在这里做转换
-      res.write(text);
-    });
-
-    response.data.on("end", () => {
-      res.end();
-    });
-
-    response.data.on("error", (err) => {
-      console.error("stream error:", err.message);
-      res.end();
-    });
-  } catch (error) {
-    const status = error.response?.status || 500;
-    const detail = error.response?.data || error.message;
-
-    console.error("proxy error:", detail);
-
-    res.status(status).json({
-      error: {
-        message: typeof detail === "string" ? detail : JSON.stringify(detail),
-        type: "proxy_error",
-        code: status
-      }
-    });
-  }
-});
-
-const PORT = 3000;
-app.listen(PORT, () => {
-  console.log(`Proxy server running at http://127.0.0.1:${PORT}`);
-});