monorepo packages (#344)

.github/workflows/fastgpt-image.yml

@@ -3,7 +3,7 @@ on:
   workflow_dispatch:
   push:
     paths:
-      - 'client/**'
+      - 'projects/app/**'
     branches:
       - 'main'
     tags:
@@ -49,8 +49,8 @@ jobs:
         env:
           DOCKER_REPO_TAGGED: ${{ env.DOCKER_REPO_TAGGED }}
         run: |
-          cd client && \
           docker buildx build \
+          --build-arg name=app \
           --platform linux/amd64,linux/arm64 \
           --label "org.opencontainers.image.source=  https://github.com/  ${{ github.repository_owner }}/FastGPT" \
           --label "org.opencontainers.image.description=fastgpt image" \
@@ -64,6 +64,7 @@ jobs:
   push-to-docker-hub:
     needs: build-fastgpt-images
     runs-on: ubuntu-20.04
+    if: github.repository == 'labring/FastGPT'
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
@@ -87,6 +88,7 @@ jobs:
         run: docker push ${{ secrets.DOCKER_IMAGE_NAME }}:${{env.IMAGE_TAG}}
   push-to-ali-hub:
     needs: build-fastgpt-images
+    if: github.repository == 'labring/FastGPT'
     runs-on: ubuntu-20.04
     steps:
       - name: Checkout code

.vscode/settings.json

@@ -1,10 +1,10 @@
 {
     "editor.formatOnSave": true,
     "editor.mouseWheelZoom": true,
-    "typescript.tsdk": "client/node_modules/typescript/lib",
+    "typescript.tsdk": "node_modules/typescript/lib",
     "prettier.prettierPath": "./node_modules/prettier",
     "i18n-ally.localesPaths": [
-        "client/public/locales"
+        "projects/app/public/locales"
     ],
     "i18n-ally.enabledParsers": ["json"],
     "i18n-ally.keystyle": "nested",

Dockerfile

@@ -0,0 +1,71 @@
+# Install dependencies only when needed
+FROM node:current-alpine AS deps
+# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
+RUN apk add --no-cache libc6-compat && npm install -g pnpm
+WORKDIR /app
+
+ARG name
+
+# copy packages and one project
+COPY package.json pnpm-lock.yaml pnpm-workspace.yaml ./
+COPY ./packages ./packages
+COPY ./projects/$name/package.json ./projects/$name/package.json
+COPY ./projects/$name/pnpm-lock.yaml ./projects/$name/pnpm-lock.yaml
+
+RUN \
+  [ -f pnpm-lock.yaml ] && pnpm install || \
+  (echo "Lockfile not found." && exit 1)
+
+RUN pnpm prune
+
+# Rebuild the source code only when needed
+FROM node:current-alpine AS builder
+WORKDIR /app
+
+ARG name
+
+# copy common node_modules and one project node_modules
+COPY --from=deps /app/node_modules ./node_modules
+COPY ./projects/$name ./projects/$name
+COPY --from=deps /app/projects/$name/node_modules ./projects/$name/node_modules
+COPY pnpm-lock.yaml pnpm-workspace.yaml ./
+COPY ./packages ./packages
+
+# Uncomment the following line in case you want to disable telemetry during the build.
+ENV NEXT_TELEMETRY_DISABLED 1
+RUN npm install -g pnpm
+RUN pnpm --filter=$name run build
+
+FROM node:current-alpine AS runner
+WORKDIR /app
+
+ARG name
+
+# create user and use it
+RUN addgroup --system --gid 1001 nodejs
+RUN adduser --system --uid 1001 nextjs
+
+RUN sed -i 's/https/http/' /etc/apk/repositories
+RUN apk add curl \
+  && apk add ca-certificates \
+  && update-ca-certificates
+
+# copy running files
+COPY --from=builder /app/projects/$name/public ./projects/$name/public
+COPY --from=builder /app/projects/$name/next.config.js ./projects/$name/next.config.js
+COPY --from=builder --chown=nextjs:nodejs /app/projects/$name/.next/standalone ./
+COPY --from=builder --chown=nextjs:nodejs /app/projects/$name/.next/static ./projects/$name/.next/static
+# copy package.json to version file
+COPY --from=builder /app/projects/$name/package.json ./package.json 
+
+ENV NODE_ENV production
+ENV NEXT_TELEMETRY_DISABLED 1
+ENV PORT=3000
+
+EXPOSE 3000
+
+USER nextjs
+
+ENV serverPath=./projects/$name/server.js
+
+ENTRYPOINT ["sh","-c","node ${serverPath}"]

client/Dockerfile

@@ -1,65 +0,0 @@
-# Install dependencies only when needed
-FROM node:current-alpine AS deps
-# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
-RUN apk add --no-cache libc6-compat && npm install -g pnpm
-WORKDIR /app
-
-# Install dependencies based on the preferred package manager
-COPY package.json ./
-COPY pnpm-lock.yaml* ./
-RUN \
-  [ -f pnpm-lock.yaml ] && pnpm fetch || \
-  (echo "Lockfile not found." && exit 1)
-
-# Rebuild the source code only when needed
-FROM node:current-alpine AS builder
-WORKDIR /app
-COPY --from=deps /app/node_modules ./node_modules
-COPY pnpm-lock.yaml* ./
-COPY package.json ./
-COPY . .
-
-# Next.js collects completely anonymous telemetry data about general usage.
-# Learn more here: https://nextjs.org/telemetry
-# Uncomment the following line in case you want to disable telemetry during the build.
-ENV NEXT_TELEMETRY_DISABLED 1
-
-RUN npm install -g pnpm
-RUN \
-  [ -f pnpm-lock.yaml ] && (pnpm --offline install && pnpm run build) || \
-  (echo "Lockfile not found." && exit 1) 
-
-# Production image, copy all the files and run next
-FROM node:current-alpine AS runner
-WORKDIR /app
-
-ENV NODE_ENV production
-# Uncomment the following line in case you want to disable telemetry during runtime.
-ENV NEXT_TELEMETRY_DISABLED 1
-
-RUN addgroup --system --gid 1001 nodejs
-RUN adduser --system --uid 1001 nextjs
-
-RUN sed -i 's/https/http/' /etc/apk/repositories
-RUN apk add curl \
-  && apk add ca-certificates \
-  && update-ca-certificates
-
-# You only need to copy next.config.js if you are NOT using the default configuration
-# COPY --from=builder /app/next.config.js ./
-COPY --from=builder /app/public ./public
-COPY --from=builder /app/package.json ./package.json
-# COPY --from=builder /app/.env* .
-
-# Automatically leverage output traces to reduce image size
-# https://nextjs.org/docs/advanced-features/output-file-tracing
-COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
-COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
-
-USER nextjs
-
-ENV PORT=3000
-
-EXPOSE 3000
-
-CMD ["node", "server.js"]

client/next-env.d.ts

@@ -1,5 +0,0 @@
-/// <reference types="next" />
-/// <reference types="next/image-types/global" />
-
-// NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.

docSite/content/docs/development/configuration.md

@@ -7,7 +7,7 @@ toc: true
 weight: 520
 ---
 
-由于环境变量不利于配置复杂的内容，新版 FastGPT 采用了 ConfigMap 的形式挂载配置文件，你可以在 `client/data/config.json` 看到默认的配置文件。可以参考 [docker-compose 快速部署](/docs/installation/docker/) 来挂载配置文件。
+由于环境变量不利于配置复杂的内容，新版 FastGPT 采用了 ConfigMap 的形式挂载配置文件，你可以在 `projects/app/data/config.json` 看到默认的配置文件。可以参考 [docker-compose 快速部署](/docs/installation/docker/) 来挂载配置文件。
 
 **开发环境下**，你需要将示例配置文件 `config.json` 复制成 `config.local.json` 文件才会生效。
 

docSite/content/docs/development/intro.md

@@ -41,7 +41,8 @@ weight: 510
 git clone git@github.com:<github_username>/FastGPT.git
 ```
 
-client 目录下为 FastGPT 核心代码。NextJS 框架前后端放在一起，API 服务位于 `src/pages/api` 目录内。
+projects 目录下为 FastGPT 应用代码。NextJS 框架前后端放在一起，API 服务位于 `src/pages/api` 目录内。
+packages 目录为相关的共用包。
 
 ### 安装数据库
 

docSite/content/docs/installation/one-api.md

@@ -92,7 +92,7 @@ CHAT_API_KEY=sk-xxxxxx
 
 ### 2. 修改 FastGPT 配置文件
 
-可以在 `/client/src/data/config.json` 里找到配置文件（本地开发需要复制成 config.local.json），配置文件中有一项是对话模型配置：
+可以在 `/projects/app/src/data/config.json` 里找到配置文件（本地开发需要复制成 config.local.json），配置文件中有一项是对话模型配置：
 
 ```json
 "ChatModels": [

packages/common/bill/constants.ts

@@ -0,0 +1 @@
+export const PRICE_SCALE = 100000;

packages/common/bill/index.ts

@@ -0,0 +1,9 @@
+/* bill common  */
+import { PRICE_SCALE } from './constants';
+
+/**
+ * dataset price / PRICE_SCALE = real price
+ */
+export const formatPrice = (val = 0, multiple = 1) => {
+  return Number(((val / PRICE_SCALE) * multiple).toFixed(10));
+};

packages/common/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@fastgpt/common",
+  "version": "1.0.0"
+}

packages/common/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2015",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "baseUrl": "."
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.d.ts"],
+  "exclude": ["node_modules"]
+}

packages/core/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@fastgpt/core",
+  "version": "1.0.0"
+}

packages/core/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2015",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "baseUrl": "."
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.d.ts"],
+  "exclude": ["node_modules"]
+}

packages/support/package.json

@@ -0,0 +1,4 @@
+{
+  "name": "@fastgpt/support",
+  "version": "1.0.0"
+}

packages/support/tsconfig.json

@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "target": "es2015",
+    "lib": ["dom", "dom.iterable", "esnext"],
+    "allowJs": true,
+    "skipLibCheck": true,
+    "strict": true,
+    "forceConsistentCasingInFileNames": true,
+    "noEmit": true,
+    "esModuleInterop": true,
+    "module": "esnext",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "isolatedModules": true,
+    "jsx": "preserve",
+    "incremental": true,
+    "baseUrl": "."
+  },
+  "include": ["next-env.d.ts", "**/*.ts", "**/*.tsx", "**/*.d.ts"],
+  "exclude": ["node_modules"]
+}

pnpm-workspace.yaml

@@ -0,0 +1,3 @@
+packages:
+  - 'packages/*'
+  - 'projects/*'

projects/app/next.config.js

@@ -1,12 +1,13 @@
 /** @type {import('next').NextConfig} */
 const { i18n } = require('./next-i18next.config');
+const path = require('path');
 
 const nextConfig = {
   i18n,
   output: 'standalone',
   reactStrictMode: false,
   compress: true,
-
+  transpilePackages: ['@fastgpt/*'],
   webpack(config, { isServer }) {
     if (!isServer) {
       config.resolve = {
@@ -30,6 +31,9 @@ const nextConfig = {
     };
 
     return config;
+  },
+  experimental: {
+    outputFileTracingRoot: path.join(__dirname, '../../')
   }
 };
 

projects/app/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "fastgpt",
+  "name": "app",
   "version": "4.4.5",
   "private": false,
   "scripts": {
@@ -15,7 +15,6 @@
     "@emotion/react": "^11.10.6",
     "@emotion/styled": "^11.10.6",
     "@mozilla/readability": "^0.4.4",
-    "@next/font": "13.1.6",
     "@tanstack/react-query": "^4.24.10",
     "@types/nprogress": "^0.2.0",
     "axios": "^1.3.3",
@@ -42,8 +41,8 @@
     "mongoose": "^6.10.0",
     "multer": "1.4.5-lts.1",
     "nanoid": "^4.0.1",
-    "next": "13.1.6",
-    "next-i18next": "^13.3.0",
+    "next": "13.5.2",
+    "next-i18next": "^14.0.3",
     "nextjs-cors": "^2.1.2",
     "nprogress": "^0.2.0",
     "openai": "^3.3.0",
@@ -68,7 +67,10 @@
     "tunnel": "^0.0.6",
     "winston": "^3.10.0",
     "winston-mongodb": "^5.1.1",
-    "zustand": "^4.3.5"
+    "zustand": "^4.3.5",
+    "@fastgpt/support": "workspace:*",
+    "@fastgpt/common": "workspace:*",
+    "@fastgpt/core": "workspace:*"
   },
   "devDependencies": {
     "@svgr/webpack": "^6.5.1",