v4.4.5-2 (#355)

Author: c121914yu

docSite/content/docs/installation/upgrading/445.md

@@ -0,0 +1,23 @@
+---
+title: '升级到 V4.4.5'
+description: 'FastGPT 从旧版本升级到 V4.4.5 操作指南'
+icon: 'upgrade'
+draft: false
+toc: true
+weight: 992
+---
+
+## 执行初始化 API
+
+发起 1 个 HTTP 请求（记得携带 `headers.rootkey`，这个值是环境变量里的）
+
+1. https://xxxxx/api/admin/initv445
+
+```bash
+curl --location --request POST 'https://{{host}}/api/admin/initv445' \
+--header 'rootkey: {{rootkey}}' \
+--header 'Content-Type: application/json'
+```
+
+初始化了 variable 模块，将其合并到用户引导模块中。
+

projects/app/src/service/lib/openai.ts renamed to packages/core/aiApi/config.ts

@@ -1,4 +1,4 @@
-import { UserModelSchema } from '@/types/mongoSchema';
+import { UserModelSchema } from '../user/type';
 import { Configuration, OpenAIApi } from 'openai';
 
 export const openaiBaseUrl = process.env.OPENAI_BASE_URL || 'https://api.openai.com/v1';

packages/core/aiApi/constant.ts

@@ -0,0 +1 @@
+export { ChatCompletionRequestMessageRoleEnum } from 'openai';

packages/core/aiApi/type.d.ts

@@ -0,0 +1 @@
+export type { CreateChatCompletionRequest, ChatCompletionRequestMessage } from 'openai';

packages/core/init.ts

@@ -0,0 +1,13 @@
+import tunnel from 'tunnel';
+
+export function initHttpAgent() {
+  // proxy obj
+  if (process.env.AXIOS_PROXY_HOST && process.env.AXIOS_PROXY_PORT) {
+    global.httpsAgent = tunnel.httpsOverHttp({
+      proxy: {
+        host: process.env.AXIOS_PROXY_HOST,
+        port: +process.env.AXIOS_PROXY_PORT
+      }
+    });
+  }
+}

packages/core/package.json

@@ -1,4 +1,11 @@
 {
   "name": "@fastgpt/core",
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "dependencies": {
+    "openai": "^3.3.0",
+    "tunnel": "^0.0.6"
+  },
+  "devDependencies": {
+    "@types/tunnel": "^0.0.4"
+  }
 }

packages/core/types/index.d.ts

@@ -0,0 +1,5 @@
+import type { Agent } from 'http';
+
+declare global {
+  var httpsAgent: Agent;
+}

packages/core/user/type.d.ts

@@ -0,0 +1,19 @@
+export type UserModelSchema = {
+  _id: string;
+  username: string;
+  password: string;
+  avatar: string;
+  balance: number;
+  promotionRate: number;
+  inviterId?: string;
+  openaiKey: string;
+  createTime: number;
+  timezone: string;
+  openaiAccount?: {
+    key: string;
+    baseUrl: string;
+  };
+  limit: {
+    exportKbTime?: Date;
+  };
+};

pnpm-lock.yaml

@@ -14,6 +14,9 @@
     "@chakra-ui/system": "^2.5.8",
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
+    "@fastgpt/common": "workspace:*",
+    "@fastgpt/core": "workspace:*",
+    "@fastgpt/support": "workspace:*",
     "@mozilla/readability": "^0.4.4",
     "@tanstack/react-query": "^4.24.10",
     "@types/nprogress": "^0.2.0",
@@ -45,7 +48,6 @@
     "next-i18next": "^14.0.3",
     "nextjs-cors": "^2.1.2",
     "nprogress": "^0.2.0",
-    "openai": "^3.3.0",
     "papaparse": "^5.4.1",
     "pg": "^8.10.0",
     "pg-query-stream": "^4.5.3",
@@ -64,13 +66,9 @@
     "request-ip": "^3.3.0",
     "sass": "^1.58.3",
     "timezones-list": "^3.0.2",
-    "tunnel": "^0.0.6",
     "winston": "^3.10.0",
     "winston-mongodb": "^5.1.1",
-    "zustand": "^4.3.5",
-    "@fastgpt/support": "workspace:*",
-    "@fastgpt/common": "workspace:*",
-    "@fastgpt/core": "workspace:*"
+    "zustand": "^4.3.5"
   },
   "devDependencies": {
     "@svgr/webpack": "^6.5.1",
@@ -89,7 +87,6 @@
     "@types/react-dom": "18.0.11",
     "@types/react-syntax-highlighter": "^15.5.6",
     "@types/request-ip": "^0.0.37",
-    "@types/tunnel": "^0.0.3",
     "eslint": "8.34.0",
     "eslint-config-next": "13.1.6",
     "typescript": "4.9.5"