修复日志图表的问题

This commit is contained in:
sijinhui 2023-12-28 18:34:47 +08:00
parent b0e56e17c7
commit 3a92a1b8d1
3 changed files with 44 additions and 13 deletions

View File

@ -21,6 +21,9 @@ RUN # 清理遗留的缓存
RUN yarn cache clean RUN yarn cache clean
RUN yarn install RUN yarn install
# 避免下面那个报错
RUN mkdir -p "/app/node_modules/tiktoken"
FROM base AS builder FROM base AS builder
ENV OPENAI_API_KEY="" ENV OPENAI_API_KEY=""
@ -48,6 +51,9 @@ COPY --from=builder /app/.next/standalone ./
COPY --from=builder /app/.next/static ./.next/static COPY --from=builder /app/.next/static ./.next/static
COPY --from=builder /app/.next/server ./.next/server COPY --from=builder /app/.next/server ./.next/server
# 一个插件一直有问题。
COPY --from=deps /app/node_modules/tiktoken ./node_modules/tiktoken
RUN rm -f .env RUN rm -f .env
EXPOSE 3000 EXPOSE 3000

View File

@ -1,7 +1,27 @@
import { NextRequest, NextResponse } from "next/server"; import { NextRequest, NextResponse } from "next/server";
import prisma from "@/lib/prisma"; import prisma from "@/lib/prisma";
import { insertUser } from "@/lib/auth"; import { insertUser } from "@/lib/auth";
import { getTokenLength } from "@/app/utils/token"; // import { getTokenLength } from "@/app/utils/token";
// import { Tiktoken } from "tiktoken/lite"
// import cl100k_base from "tiktoken/encoders/cl100k_base.json"
import "tiktoken";
import { get_encoding } from "tiktoken";
function getTokenLength(input: string): number {
// const { Tiktoken } = require("tiktoken/lite");
// const cl100k_base = require("tiktoken/encoders/cl100k_base.json");
// const encoding = new Tiktoken(
// cl100k_base.bpe_ranks,
// cl100k_base.special_tokens,
// cl100k_base.pat_str,
// );
const encoding = get_encoding("cl100k_base");
const tokenLength = encoding.encode(input).length;
// console.log('[TOKEN],=========', input, tokenLength)
return tokenLength;
}
async function handle( async function handle(
req: NextRequest, req: NextRequest,

View File

@ -11,8 +11,8 @@ console.log("[Next] build with chunk: ", disableChunk);
// 为了修复tiktoken的插件问题 // 为了修复tiktoken的插件问题
import CopyPlugin from "copy-webpack-plugin"; import CopyPlugin from "copy-webpack-plugin";
const nextConfig = { const nextConfig = {
// transpilePackages: ['tiktoken'],
webpack(config) { webpack(config) {
config.module.rules.push({ config.module.rules.push({
test: /\.svg$/, test: /\.svg$/,
@ -24,17 +24,22 @@ const nextConfig = {
new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }), new webpack.optimize.LimitChunkCountPlugin({ maxChunks: 1 }),
) )
} }
config.plugins.push( // turn off static file serving of WASM files
new CopyPlugin({ // we need to let Webpack handle WASM import
patterns: [ // config.module.rules
{ // .find((i) => "oneOf" in i)
from: ".//node_modules/tiktoken/tiktoken_bg.wasm", // .oneOf.find((i) => i.type === "asset/resource")
to: "tiktoken_bg.wasm", // .exclude.push(/\.wasm$/);
toType: "file", // config.plugins.push(
} // new CopyPlugin({
] // patterns: [
}) // {
) // from: ".//node_modules/tiktoken/,
// to: "",
// }
// ]
// })
// )
config.optimization.minimize = true config.optimization.minimize = true
config.optimization.splitChunks = { config.optimization.splitChunks = {