@lobehub/lobehub 2.1.24 → 2.1.26

package/packages/database/migrations/meta/_journal.json

@@ -546,6 +546,62 @@
       "when": 1770392264696,
       "tag": "0077_add_agent_skills",
       "breakpoints": true
+    },
+    {
+      "idx": 78,
+      "version": "7",
+      "when": 1770621740632,
+      "tag": "0078_added_id_nanoid_for_replacing_id",
+      "breakpoints": true
+    },
+    {
+      "idx": 79,
+      "version": "7",
+      "when": 1770621892194,
+      "tag": "0079_update_id_nanoid_from_casted_id",
+      "breakpoints": true
+    },
+    {
+      "idx": 80,
+      "version": "7",
+      "when": 1770624987735,
+      "tag": "0080_add_constraint_unique_not_null_to_id_nanoid",
+      "breakpoints": true
+    },
+    {
+      "idx": 81,
+      "version": "7",
+      "when": 1770626135088,
+      "tag": "0081_switch_forgien_key_to_id_nanoid",
+      "breakpoints": true
+    },
+    {
+      "idx": 82,
+      "version": "7",
+      "when": 1770628390927,
+      "tag": "0082_set_id_nanoid_as_primary",
+      "breakpoints": true
+    },
+    {
+      "idx": 83,
+      "version": "7",
+      "when": 1770628799077,
+      "tag": "0083_remove_id_seq_identity_column",
+      "breakpoints": true
+    },
+    {
+      "idx": 84,
+      "version": "7",
+      "when": 1770631019385,
+      "tag": "0084_rename_id_nanoid_to_id",
+      "breakpoints": true
+    },
+    {
+      "idx": 85,
+      "version": "7",
+      "when": 1770632176750,
+      "tag": "0085_remove_id_unique_constraint",
+      "breakpoints": true
     }
   ],
   "version": "6"

package/packages/database/src/models/__tests__/apiKey.test.ts

@@ -2,10 +2,10 @@
 import { eq } from 'drizzle-orm';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
+import { getTestDB } from '../../core/getTestDB';
 import { apiKeys, users } from '../../schemas';
 import { LobeChatDatabase } from '../../type';
 import { ApiKeyModel } from '../apiKey';
-import { getTestDB } from '../../core/getTestDB';
 
 const serverDB: LobeChatDatabase = await getTestDB();
 
@@ -95,7 +95,10 @@ describe('ApiKeyModel', () => {
       const { id: key1 } = await apiKeyModel.create({ name: 'User 1 Key', enabled: true });
 
       const anotherApiKeyModel = new ApiKeyModel(serverDB, 'user2');
-      const { id: key2 } = await anotherApiKeyModel.create({ name: 'User 2 Key', enabled: true });
+      const { id: key2 } = await anotherApiKeyModel.create({
+        name: 'User 2 Key',
+        enabled: true,
+      });
 
       await apiKeyModel.delete(key2);
 
@@ -346,7 +349,10 @@ describe('ApiKeyModel', () => {
       const { id: key1 } = await apiKeyModel.create({ name: 'User 1 Key', enabled: true });
 
       const anotherApiKeyModel = new ApiKeyModel(serverDB, 'user2');
-      const { id: key2 } = await anotherApiKeyModel.create({ name: 'User 2 Key', enabled: true });
+      const { id: key2 } = await anotherApiKeyModel.create({
+        name: 'User 2 Key',
+        enabled: true,
+      });
 
       await apiKeyModel.update(key2, { name: 'Attempted Update' });
 
@@ -372,14 +378,17 @@ describe('ApiKeyModel', () => {
     });
 
     it('should return undefined for non-existent id', async () => {
-      const found = await apiKeyModel.findById(999_999);
+      const found = await apiKeyModel.findById('999_999');
 
       expect(found).toBeUndefined();
     });
 
     it('should only find API keys for the current user', async () => {
       const anotherApiKeyModel = new ApiKeyModel(serverDB, 'user2');
-      const { id: key2 } = await anotherApiKeyModel.create({ name: 'User 2 Key', enabled: true });
+      const { id: key2 } = await anotherApiKeyModel.create({
+        name: 'User 2 Key',
+        enabled: true,
+      });
 
       const found = await apiKeyModel.findById(key2);
 
@@ -406,7 +415,10 @@ describe('ApiKeyModel', () => {
 
     it('should only update API keys for the current user', async () => {
       const anotherApiKeyModel = new ApiKeyModel(serverDB, 'user2');
-      const { id: key2 } = await anotherApiKeyModel.create({ name: 'User 2 Key', enabled: true });
+      const { id: key2 } = await anotherApiKeyModel.create({
+        name: 'User 2 Key',
+        enabled: true,
+      });
 
       await apiKeyModel.updateLastUsed(key2);
 

package/packages/database/src/models/apiKey.ts

@@ -1,9 +1,9 @@
 import { and, desc, eq } from 'drizzle-orm';
 
-import { LobeChatDatabase } from '../type';
 import { generateApiKey, isApiKeyExpired, validateApiKeyFormat } from '@/utils/apiKey';
 
 import { ApiKeyItem, NewApiKeyItem, apiKeys } from '../schemas';
+import { LobeChatDatabase } from '../type';
 
 type EncryptAPIKeyVaults = (keyVaults: string) => Promise<string>;
 type DecryptAPIKeyVaults = (keyVaults: string) => Promise<{ plaintext: string }>;
@@ -37,7 +37,7 @@ export class ApiKeyModel {
     return result;
   };
 
-  delete = async (id: number) => {
+  delete = async (id: string) => {
     return this.db.delete(apiKeys).where(and(eq(apiKeys.id, id), eq(apiKeys.userId, this.userId)));
   };
 
@@ -94,20 +94,20 @@ export class ApiKeyModel {
     return true;
   };
 
-  update = async (id: number, value: Partial<ApiKeyItem>) => {
+  update = async (id: string, value: Partial<ApiKeyItem>) => {
     return this.db
       .update(apiKeys)
       .set({ ...value, updatedAt: new Date() })
       .where(and(eq(apiKeys.id, id), eq(apiKeys.userId, this.userId)));
   };
 
-  findById = async (id: number) => {
+  findById = async (id: string) => {
     return this.db.query.apiKeys.findFirst({
       where: and(eq(apiKeys.id, id), eq(apiKeys.userId, this.userId)),
     });
   };
 
-  updateLastUsed = async (id: number) => {
+  updateLastUsed = async (id: string) => {
     return this.db
       .update(apiKeys)
       .set({ lastUsedAt: new Date() })

package/packages/database/src/schemas/apiKey.ts

@@ -1,14 +1,18 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix  */
-import { boolean, index, integer, pgTable, text, varchar } from 'drizzle-orm/pg-core';
+import { boolean, index, pgTable, text, varchar } from 'drizzle-orm/pg-core';
 import { createInsertSchema } from 'drizzle-zod';
 
+import { createNanoId } from '../utils/idGenerator';
 import { timestamps, timestamptz } from './_helpers';
 import { users } from './user';
 
 export const apiKeys = pgTable(
   'api_keys',
   {
-    id: integer('id').primaryKey().generatedByDefaultAsIdentity(), // auto-increment primary key
+    id: text('id')
+      .$defaultFn(() => createNanoId(16)())
+      .notNull()
+      .primaryKey(),
     name: varchar('name', { length: 256 }).notNull(), // name of the API key
     key: varchar('key', { length: 256 }).notNull().unique(), // API key
     enabled: boolean('enabled').default(true), // whether the API key is enabled

package/packages/database/src/schemas/ragEvals.ts

@@ -3,6 +3,7 @@ import { DEFAULT_MODEL } from '@lobechat/const';
 import { EvalEvaluationStatus } from '@lobechat/types';
 import { index, integer, jsonb, pgTable, text, uuid } from 'drizzle-orm/pg-core';
 
+import { createNanoId } from '../utils/idGenerator';
 import { timestamps } from './_helpers';
 import { knowledgeBases } from './file';
 import { embeddings } from './rag';
@@ -11,7 +12,10 @@ import { users } from './user';
 export const evalDatasets = pgTable(
   'rag_eval_datasets',
   {
-    id: integer('id').generatedAlwaysAsIdentity({ startWith: 30_000 }).primaryKey(),
+    id: text('id')
+      .$defaultFn(() => createNanoId(16)())
+      .notNull()
+      .primaryKey(),
 
     description: text('description'),
     name: text('name').notNull(),
@@ -23,9 +27,7 @@ export const evalDatasets = pgTable(
 
     ...timestamps,
   },
-  (t) => ({
-    userIdIdx: index('rag_eval_datasets_user_id_idx').on(t.userId),
-  }),
+  (t) => [index('rag_eval_datasets_user_id_idx').on(t.userId)],
 );
 
 export type NewEvalDatasetsItem = typeof evalDatasets.$inferInsert;
@@ -34,8 +36,12 @@ export type EvalDatasetsSelectItem = typeof evalDatasets.$inferSelect;
 export const evalDatasetRecords = pgTable(
   'rag_eval_dataset_records',
   {
-    id: integer('id').generatedAlwaysAsIdentity().primaryKey(),
-    datasetId: integer('dataset_id')
+    id: text('id')
+      .$defaultFn(() => createNanoId(32)())
+      .notNull()
+      .primaryKey(),
+
+    datasetId: text('dataset_id')
       .references(() => evalDatasets.id, { onDelete: 'cascade' })
       .notNull(),
 
@@ -47,9 +53,7 @@ export const evalDatasetRecords = pgTable(
     userId: text('user_id').references(() => users.id, { onDelete: 'cascade' }),
     ...timestamps,
   },
-  (t) => ({
-    userIdIdx: index('rag_eval_dataset_records_user_id_idx').on(t.userId),
-  }),
+  (t) => [index('rag_eval_dataset_records_user_id_idx').on(t.userId)],
 );
 
 export type NewEvalDatasetRecordsItem = typeof evalDatasetRecords.$inferInsert;
@@ -58,7 +62,11 @@ export type EvalDatasetRecordsSelectItem = typeof evalDatasetRecords.$inferSelec
 export const evalEvaluation = pgTable(
   'rag_eval_evaluations',
   {
-    id: integer('id').generatedAlwaysAsIdentity().primaryKey(),
+    id: text('id')
+      .$defaultFn(() => createNanoId(32)())
+      .notNull()
+      .primaryKey(),
+
     name: text('name').notNull(),
     description: text('description'),
 
@@ -66,7 +74,7 @@ export const evalEvaluation = pgTable(
     status: text('status').$defaultFn(() => EvalEvaluationStatus.Pending),
     error: jsonb('error'),
 
-    datasetId: integer('dataset_id')
+    datasetId: text('dataset_id')
       .references(() => evalDatasets.id, { onDelete: 'cascade' })
       .notNull(),
     knowledgeBaseId: text('knowledge_base_id').references(() => knowledgeBases.id, {
@@ -78,9 +86,7 @@ export const evalEvaluation = pgTable(
     userId: text('user_id').references(() => users.id, { onDelete: 'cascade' }),
     ...timestamps,
   },
-  (t) => ({
-    userIdIdx: index('rag_eval_evaluations_user_id_idx').on(t.userId),
-  }),
+  (t) => [index('rag_eval_evaluations_user_id_idx').on(t.userId)],
 );
 
 export type NewEvalEvaluationItem = typeof evalEvaluation.$inferInsert;
@@ -89,7 +95,10 @@ export type EvalEvaluationSelectItem = typeof evalEvaluation.$inferSelect;
 export const evaluationRecords = pgTable(
   'rag_eval_evaluation_records',
   {
-    id: integer('id').generatedAlwaysAsIdentity().primaryKey(),
+    id: text('id')
+      .$defaultFn(() => createNanoId(32)())
+      .notNull()
+      .primaryKey(),
 
     question: text('question').notNull(),
     answer: text('answer'),
@@ -107,19 +116,17 @@ export const evaluationRecords = pgTable(
     }),
 
     duration: integer('duration'),
-    datasetRecordId: integer('dataset_record_id')
+    datasetRecordId: text('dataset_record_id')
       .references(() => evalDatasetRecords.id, { onDelete: 'cascade' })
       .notNull(),
-    evaluationId: integer('evaluation_id')
+    evaluationId: text('evaluation_id')
       .references(() => evalEvaluation.id, { onDelete: 'cascade' })
       .notNull(),
 
     userId: text('user_id').references(() => users.id, { onDelete: 'cascade' }),
     ...timestamps,
   },
-  (t) => ({
-    userIdIdx: index('rag_eval_evaluation_records_user_id_idx').on(t.userId),
-  }),
+  (t) => [index('rag_eval_evaluation_records_user_id_idx').on(t.userId)],
 );
 
 export type NewEvaluationRecordsItem = typeof evaluationRecords.$inferInsert;

package/packages/database/src/schemas/rbac.ts

@@ -1,21 +1,17 @@
 /* eslint-disable sort-keys-fix/sort-keys-fix  */
-import {
-  boolean,
-  index,
-  integer,
-  jsonb,
-  pgTable,
-  primaryKey,
-  text,
-  timestamp,
-} from 'drizzle-orm/pg-core';
+import { boolean, index, jsonb, pgTable, primaryKey, text, timestamp } from 'drizzle-orm/pg-core';
 
+import { createNanoId } from '../utils/idGenerator';
 import { timestamps } from './_helpers';
 import { users } from './user';
 
 // Roles table
 export const roles = pgTable('rbac_roles', {
-  id: integer('id').primaryKey().generatedByDefaultAsIdentity(),
+  id: text('id')
+    .$defaultFn(() => createNanoId(16)())
+    .notNull()
+    .primaryKey(),
+
   name: text('name').notNull().unique(), // Role name, e.g.: admin, user, guest
   displayName: text('display_name').notNull(), // Display name
   description: text('description'), // Role description
@@ -31,7 +27,11 @@ export type RoleItem = typeof roles.$inferSelect;
 
 // Permissions table
 export const permissions = pgTable('rbac_permissions', {
-  id: integer('id').primaryKey().generatedByDefaultAsIdentity(),
+  id: text('id')
+    .$defaultFn(() => createNanoId(16)())
+    .notNull()
+    .primaryKey(),
+
   code: text('code').notNull().unique(), // Permission code, e.g.: chat:create, file:upload
   name: text('name').notNull(), // Permission name
   description: text('description'), // Permission description
@@ -48,10 +48,10 @@ export type PermissionItem = typeof permissions.$inferSelect;
 export const rolePermissions = pgTable(
   'rbac_role_permissions',
   {
-    roleId: integer('role_id')
+    roleId: text('role_id')
       .references(() => roles.id, { onDelete: 'cascade' })
       .notNull(),
-    permissionId: integer('permission_id')
+    permissionId: text('permission_id')
       .references(() => permissions.id, { onDelete: 'cascade' })
       .notNull(),
 
@@ -74,7 +74,7 @@ export const userRoles = pgTable(
     userId: text('user_id')
       .references(() => users.id, { onDelete: 'cascade' })
       .notNull(),
-    roleId: integer('role_id')
+    roleId: text('role_id')
       .references(() => roles.id, { onDelete: 'cascade' })
       .notNull(),
 

package/packages/database/src/server/models/ragEval/dataset.ts

@@ -21,7 +21,7 @@ export class EvalDatasetModel {
     return result;
   };
 
-  delete = async (id: number) => {
+  delete = async (id: string) => {
     return this.db
       .delete(evalDatasets)
       .where(and(eq(evalDatasets.id, id), eq(evalDatasets.userId, this.userId)));
@@ -46,13 +46,13 @@ export class EvalDatasetModel {
       .orderBy(desc(evalDatasets.createdAt));
   };
 
-  findById = async (id: number) => {
+  findById = async (id: string) => {
     return this.db.query.evalDatasets.findFirst({
       where: and(eq(evalDatasets.id, id), eq(evalDatasets.userId, this.userId)),
     });
   };
 
-  update = async (id: number, value: Partial<NewEvalDatasetsItem>) => {
+  update = async (id: string, value: Partial<NewEvalDatasetsItem>) => {
     return this.db
       .update(evalDatasets)
       .set({ ...value, updatedAt: new Date() })

package/packages/database/src/server/models/ragEval/datasetRecord.ts

@@ -30,13 +30,13 @@ export class EvalDatasetRecordModel {
     return result;
   };
 
-  delete = async (id: number) => {
+  delete = async (id: string) => {
     return this.db
       .delete(evalDatasetRecords)
       .where(and(eq(evalDatasetRecords.id, id), eq(evalDatasetRecords.userId, this.userId)));
   };
 
-  query = async (datasetId: number) => {
+  query = async (datasetId: string) => {
     const list = await this.db.query.evalDatasetRecords.findMany({
       where: and(
         eq(evalDatasetRecords.datasetId, datasetId),
@@ -60,7 +60,7 @@ export class EvalDatasetRecordModel {
     });
   };
 
-  findByDatasetId = async (datasetId: number) => {
+  findByDatasetId = async (datasetId: string) => {
     return this.db.query.evalDatasetRecords.findMany({
       where: and(
         eq(evalDatasetRecords.datasetId, datasetId),
@@ -69,13 +69,13 @@ export class EvalDatasetRecordModel {
     });
   };
 
-  findById = async (id: number) => {
+  findById = async (id: string) => {
     return this.db.query.evalDatasetRecords.findFirst({
       where: and(eq(evalDatasetRecords.id, id), eq(evalDatasetRecords.userId, this.userId)),
     });
   };
 
-  update = async (id: number, value: Partial<NewEvalDatasetRecordsItem>) => {
+  update = async (id: string, value: Partial<NewEvalDatasetRecordsItem>) => {
     return this.db
       .update(evalDatasetRecords)
       .set(value)

package/packages/database/src/server/models/ragEval/evaluation.ts

@@ -26,7 +26,7 @@ export class EvalEvaluationModel {
     return result;
   };
 
-  delete = async (id: number) => {
+  delete = async (id: string) => {
     return this.db
       .delete(evalEvaluation)
       .where(and(eq(evalEvaluation.id, id), eq(evalEvaluation.userId, this.userId)));
@@ -83,13 +83,13 @@ export class EvalEvaluationModel {
     });
   };
 
-  findById = async (id: number) => {
+  findById = async (id: string) => {
     return this.db.query.evalEvaluation.findFirst({
       where: and(eq(evalEvaluation.id, id), eq(evalEvaluation.userId, this.userId)),
     });
   };
 
-  update = async (id: number, value: Partial<NewEvalEvaluationItem>) => {
+  update = async (id: string, value: Partial<NewEvalEvaluationItem>) => {
     return this.db
       .update(evalEvaluation)
       .set(value)

package/packages/database/src/server/models/ragEval/evaluationRecord.ts

@@ -1,7 +1,7 @@
 import { and, eq } from 'drizzle-orm';
 
-import { LobeChatDatabase } from '../../../type';
 import { NewEvaluationRecordsItem, evaluationRecords } from '../../../schemas';
+import { LobeChatDatabase } from '../../../type';
 
 export class EvaluationRecordModel {
   private userId: string;
@@ -27,13 +27,13 @@ export class EvaluationRecordModel {
       .returning();
   };
 
-  delete = async (id: number) => {
+  delete = async (id: string) => {
     return this.db
       .delete(evaluationRecords)
       .where(and(eq(evaluationRecords.id, id), eq(evaluationRecords.userId, this.userId)));
   };
 
-  query = async (reportId: number) => {
+  query = async (reportId: string) => {
     return this.db.query.evaluationRecords.findMany({
       where: and(
         eq(evaluationRecords.evaluationId, reportId),
@@ -42,13 +42,13 @@ export class EvaluationRecordModel {
     });
   };
 
-  findById = async (id: number) => {
+  findById = async (id: string) => {
     return this.db.query.evaluationRecords.findFirst({
       where: and(eq(evaluationRecords.id, id), eq(evaluationRecords.userId, this.userId)),
     });
   };
 
-  findByEvaluationId = async (evaluationId: number) => {
+  findByEvaluationId = async (evaluationId: string) => {
     return this.db.query.evaluationRecords.findMany({
       where: and(
         eq(evaluationRecords.evaluationId, evaluationId),
@@ -57,7 +57,7 @@ export class EvaluationRecordModel {
     });
   };
 
-  update = async (id: number, value: Partial<NewEvaluationRecordsItem>) => {
+  update = async (id: string, value: Partial<NewEvaluationRecordsItem>) => {
     return this.db
       .update(evaluationRecords)
       .set(value)

package/packages/types/src/apiKey.ts

@@ -4,7 +4,7 @@ export interface ApiKeyItem {
   createdAt: Date;
   enabled?: boolean | null;
   expiresAt?: Date | null;
-  id: number;
+  id: string;
   key: string;
   lastUsedAt?: Date | null;
   name: string;

package/packages/types/src/eval/dataset.ts

@@ -7,7 +7,7 @@ export interface EvalDatasetRecordRefFile {
 }
 export interface EvalDatasetRecord {
   createdAt: Date;
-  id: number;
+  id: string;
   ideal?: string | null;
 
   metadata: any;
@@ -33,7 +33,7 @@ export type InsertEvalDatasetRecord = z.infer<typeof insertEvalDatasetRecordSche
 export interface RAGEvalDataSetItem {
   createdAt: Date;
   description?: string | null;
-  id: number;
+  id: string;
   name: string;
   updatedAt: Date;
 }

package/packages/types/src/eval/evaluation.ts

@@ -29,11 +29,11 @@ export type InsertEvaluationRecord = z.infer<typeof insertEvaluationSchema>;
 export interface RAGEvalEvaluationItem {
   createdAt: Date;
   dataset: {
-    id: number;
+    id: string;
     name: string;
   };
   evalRecordsUrl?: string;
-  id: number;
+  id: string;
   name: string;
   recordsStats: {
     success: number;
@@ -44,7 +44,7 @@ export interface RAGEvalEvaluationItem {
 }
 
 export const insertEvalEvaluationSchema = z.object({
-  datasetId: z.number(),
+  datasetId: z.string(),
   description: z.string().optional(),
   knowledgeBaseId: z.string(),
   name: z.string(),

package/src/app/[variants]/(main)/settings/apikey/features/ApiKey.tsx

@@ -50,7 +50,7 @@ const ApiKey: FC = () => {
   });
 
   const updateMutation = useMutation({
-    mutationFn: ({ id, params }: { id: number; params: UpdateApiKeyParams }) =>
+    mutationFn: ({ id, params }: { id: string; params: UpdateApiKeyParams }) =>
       lambdaClient.apiKey.updateApiKey.mutate({ id, value: params }),
     onSuccess: () => {
       actionRef.current?.reload();
@@ -58,7 +58,7 @@ const ApiKey: FC = () => {
   });
 
   const deleteMutation = useMutation({
-    mutationFn: (id: number) => lambdaClient.apiKey.deleteApiKey.mutate({ id }),
+    mutationFn: (id: string) => lambdaClient.apiKey.deleteApiKey.mutate({ id }),
     onSuccess: () => {
       actionRef.current?.reload();
     },

package/src/server/routers/async/ragEval.ts

@@ -39,7 +39,7 @@ export const ragEvalRouter = router({
   runRecordEvaluation: ragEvalProcedure
     .input(
       z.object({
-        evalRecordId: z.number(),
+        evalRecordId: z.string(),
       }),
     )
     .mutation(async ({ ctx, input }) => {

package/src/server/routers/lambda/apiKey.ts

@@ -35,7 +35,7 @@ export const apiKeyRouter = router({
   }),
 
   deleteApiKey: apiKeyProcedure
-    .input(z.object({ id: z.number() }))
+    .input(z.object({ id: z.string() }))
     .mutation(async ({ input, ctx }) => {
       return ctx.apiKeyModel.delete(input.id);
     }),
@@ -47,7 +47,7 @@ export const apiKeyRouter = router({
     }),
 
   getApiKeyById: apiKeyProcedure
-    .input(z.object({ id: z.number() }))
+    .input(z.object({ id: z.string() }))
     .query(async ({ input, ctx }) => {
       return ctx.apiKeyModel.findById(input.id);
     }),
@@ -59,7 +59,7 @@ export const apiKeyRouter = router({
   updateApiKey: apiKeyProcedure
     .input(
       z.object({
-        id: z.number(),
+        id: z.string(),
         value: z.object({
           description: z.string().optional(),
           enabled: z.boolean().optional(),