@lobehub/lobehub 2.0.0-next.3 → 2.0.0-next.5

package/src/config/modelProviders/anthropic.ts

@@ -48,29 +48,6 @@ const Anthropic: ModelProviderCard = {
       maxOutput: 8192,
       releasedAt: '2024-11-05',
     },
-    {
-      contextWindowTokens: 200_000,
-      description:
-        'Claude 3.5 Sonnet 提供了超越 Opus 的能力和比 Sonnet 更快的速度，同时保持与 Sonnet 相同的价格。Sonnet 特别擅长编程、数据科学、视觉处理、代理任务。',
-      displayName: 'Claude 3.5 Sonnet',
-      enabled: true,
-      functionCall: true,
-      id: 'claude-3-5-sonnet-20241022',
-      maxOutput: 8192,
-      releasedAt: '2024-10-22',
-      vision: true,
-    },
-    {
-      contextWindowTokens: 200_000,
-      description:
-        'Claude 3.5 Sonnet 提供了超越 Opus 的能力和比 Sonnet 更快的速度，同时保持与 Sonnet 相同的价格。Sonnet 特别擅长编程、数据科学、视觉处理、代理任务。',
-      displayName: 'Claude 3.5 Sonnet 0620',
-      functionCall: true,
-      id: 'claude-3-5-sonnet-20240620',
-      maxOutput: 8192,
-      releasedAt: '2024-06-20',
-      vision: true,
-    },
     {
       contextWindowTokens: 200_000,
       description:

package/src/config/modelProviders/higress.ts

@@ -1298,29 +1298,6 @@ const Higress: ModelProviderCard = {
       maxOutput: 8192,
       releasedAt: '2024-11-05',
     },
-    {
-      contextWindowTokens: 200_000,
-      description:
-        'Claude 3.5 Sonnet 提供了超越 Opus 的能力和比 Sonnet 更快的速度，同时保持与 Sonnet 相同的价格。Sonnet 特别擅长编程、数据科学、视觉处理、代理任务。',
-      displayName: 'Claude 3.5 Sonnet',
-      enabled: true,
-      functionCall: true,
-      id: 'claude-3-5-sonnet-20241022',
-      maxOutput: 8192,
-      releasedAt: '2024-10-22',
-      vision: true,
-    },
-    {
-      contextWindowTokens: 200_000,
-      description:
-        'Claude 3.5 Sonnet 提供了超越 Opus 的能力和比 Sonnet 更快的速度，同时保持与 Sonnet 相同的价格。Sonnet 特别擅长编程、数据科学、视觉处理、代理任务。',
-      displayName: 'Claude 3.5 Sonnet 0620',
-      functionCall: true,
-      id: 'claude-3-5-sonnet-20240620',
-      maxOutput: 8192,
-      releasedAt: '2024-06-20',
-      vision: true,
-    },
     {
       contextWindowTokens: 200_000,
       description:

package/src/config/modelProviders/minimax.ts

@@ -12,7 +12,7 @@ const Minimax: ModelProviderCard = {
   settings: {
     disableBrowserRequest: true, // CORS error
     proxyUrl: {
-      placeholder: 'https://api.minimax.chat/v1',
+      placeholder: 'https://api.minimaxi.com/v1',
     },
     responseAnimation: {
       speed: 2,

package/src/config/modelProviders/qiniu.ts

@@ -28,7 +28,7 @@ const Qiniu: ModelProviderCard = {
   name: 'Qiniu',
   settings: {
     proxyUrl: {
-      placeholder: 'https://api.qnaigc.com/v1',
+      placeholder: 'https://openai.qiniu.com/v1',
     },
     sdkType: 'openai',
     showModelFetcher: true,

package/src/libs/next-auth/sso-providers/index.ts

@@ -1,7 +1,6 @@
 import Auth0 from './auth0';
 import Authelia from './authelia';
 import Authentik from './authentik';
-import AzureAD from './azure-ad';
 import Casdoor from './casdoor';
 import CloudflareZeroTrust from './cloudflare-zero-trust';
 import Cognito from './cognito';
@@ -19,7 +18,6 @@ import Zitadel from './zitadel';
 export const ssoProviders = [
   Auth0,
   Authentik,
-  AzureAD,
   GenericOIDC,
   Github,
   Zitadel,

package/src/libs/oidc-provider/provider.ts

@@ -340,7 +340,7 @@ export const createOIDCProvider = async (db: LobeChatDatabase): Promise<Provider
 
     // 8. 令牌有效期
     ttl: {
-      AccessToken: 25 * 3600, // 25 hour
+      AccessToken: 7 * 24 * 3600, // 7 days
       AuthorizationCode: 600, // 10 minutes
       DeviceCode: 600, // 10 minutes (if enabled)
 

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

@@ -97,14 +97,17 @@ export const sessionRouter = router({
     }),
 
   getGroupedSessions: publicProcedure.query(async ({ ctx }): Promise<ChatSessionList> => {
-    if (!ctx.userId) return { sessionGroups: [], sessions: [] };
+    const userId = ctx.userId;
+    if (!userId) return { sessionGroups: [], sessions: [] };
 
     const serverDB = await getServerDB();
-    const sessionModel = new SessionModel(serverDB, ctx.userId!);
-    const chatGroupModel = new ChatGroupModel(serverDB, ctx.userId!);
+    const sessionModel = new SessionModel(serverDB, userId);
+    const chatGroupModel = new ChatGroupModel(serverDB, userId);
 
-    const { sessions, sessionGroups } = await sessionModel.queryWithGroups();
-    const chatGroups = await chatGroupModel.queryWithMemberDetails();
+    const [{ sessions, sessionGroups }, chatGroups] = await Promise.all([
+      sessionModel.queryWithGroups(),
+      chatGroupModel.queryWithMemberDetails(),
+    ]);
 
     const groupSessions: LobeGroupSession[] = chatGroups.map((group) => {
       const { title, description, avatar, backgroundColor, groupId, ...rest } = group;

package/src/server/services/search/impls/firecrawl/index.ts

@@ -26,7 +26,7 @@ export class FirecrawlImpl implements SearchServiceImpl {
 
   private get baseUrl(): string {
     // Assuming the base URL is consistent with the crawl endpoint
-    return process.env.FIRECRAWL_URL || 'https://api.firecrawl.dev/v1';
+    return process.env.FIRECRAWL_URL || 'https://api.firecrawl.dev/v2';
   }
 
   async query(query: string, params: SearchParams = {}): Promise<UniformSearchResponse> {
@@ -34,13 +34,14 @@ export class FirecrawlImpl implements SearchServiceImpl {
     const endpoint = urlJoin(this.baseUrl, '/search');
 
     const defaultQueryParams: FirecrawlSearchParameters = {
-      limit: 15,
+      limit: 20,
       query,
       /*
       scrapeOptions: {
         formats: ["markdown"]
       },
       */
+      sources: [{ type: 'web' }, { type: 'news' }],
     };
 
     let body: FirecrawlSearchParameters = {
@@ -95,25 +96,64 @@ export class FirecrawlImpl implements SearchServiceImpl {
 
       log('Parsed Firecrawl response: %o', firecrawlResponse);
 
-      const mappedResults = (firecrawlResponse.data || []).map(
+      // V2 API returns data as object with web/images/news arrays
+      const webResults = firecrawlResponse.data.web || [];
+      const imageResults = firecrawlResponse.data.images || [];
+      const newsResults = firecrawlResponse.data.news || [];
+
+      // Map web results
+      const mappedWebResults = webResults.map(
+        (result): UniformSearchResult => ({
+          category: 'general',
+          content: result.description || result.markdown || '',
+          engines: ['firecrawl'],
+          parsedUrl: result.url ? new URL(result.url).hostname : '',
+          score: 1,
+          title: result.title || '',
+          url: result.url,
+        }),
+      );
+
+      // Map news results
+      const mappedNewsResults = newsResults.map(
         (result): UniformSearchResult => ({
-          category: 'general', // Default category
-          content: result.description || '', // Prioritize content, fallback to snippet
-          engines: ['firecrawl'], // Use 'firecrawl' as the engine name
-          parsedUrl: result.url ? new URL(result.url).hostname : '', // Basic URL parsing
-          score: 1, // Default score to 1
+          category: 'news',
+          content: result.snippet || result.markdown || '',
+          engines: ['firecrawl'],
+          parsedUrl: result.url ? new URL(result.url).hostname : '',
+          score: 1,
           title: result.title || '',
           url: result.url,
         }),
       );
 
-      log('Mapped %d results to SearchResult format', mappedResults.length);
+      // Map image results
+      const mappedImageResults = imageResults.map(
+        (result): UniformSearchResult => ({
+          category: 'images',
+          content: result.title || '',
+          engines: ['firecrawl'],
+          parsedUrl: result.url ? new URL(result.url).hostname : '',
+          score: 1,
+          title: result.title || '',
+          url: result.imageUrl, // Use imageUrl for images
+        }),
+      );
+
+      // Combine all results
+      const allResults = [...mappedWebResults, ...mappedNewsResults, ...mappedImageResults];
+
+      log('Mapped %d results to SearchResult format', allResults.length);
+
+      if (firecrawlResponse.warning) {
+        log.extend('warn')('Firecrawl warning: %s', firecrawlResponse.warning);
+      }
 
       return {
         costTime,
         query: query,
-        resultNumbers: mappedResults.length,
-        results: mappedResults,
+        resultNumbers: allResults.length,
+        results: allResults,
       };
     } catch (error) {
       log.extend('error')('Error parsing Firecrawl response: %o', error);

package/src/server/services/search/impls/firecrawl/type.ts

@@ -1,35 +1,86 @@
+// V2 API Types
 interface FirecrawlScrapeOptions {
-  formats: string[];
+  blockAds?: boolean;
+  formats?: string[];
+  maxAge?: number;
+  onlyMainContent?: boolean;
+  removeBase64Images?: boolean;
 }
 
+type FirecrawlSource =
+  | { location?: string; tbs?: string; type: 'web' }
+  | { type: 'images' }
+  | { type: 'news' };
+
+type FirecrawlCategory = { type: 'github' } | { type: 'research' } | { type: 'pdf' };
+
 export interface FirecrawlSearchParameters {
+  categories?: FirecrawlCategory[];
   country?: string;
-  lang?: string;
+  ignoreInvalidURLs?: boolean;
   limit?: number;
+  location?: string;
   query: string;
   scrapeOptions?: FirecrawlScrapeOptions;
+  sources?: FirecrawlSource[];
   tbs?: string;
   timeout?: number;
 }
 
 interface FirecrawlMetadata {
   description?: string;
+  error?: string | null;
   sourceURL?: string;
   statusCode?: number;
+  title?: string;
+}
+
+// Web search result
+interface FirecrawlWebResult {
+  description: string;
+  html?: string | null;
+  links?: string[];
+  markdown?: string | null;
+  metadata?: FirecrawlMetadata;
+  rawHtml?: string | null;
+  screenshot?: string | null;
   title: string;
+  url: string;
 }
 
-interface FirecrawlData {
-  description?: string;
-  html?: string;
+// Image search result
+interface FirecrawlImageResult {
+  imageHeight: number;
+  imageUrl: string;
+  imageWidth: number;
+  position: number;
+  title: string;
+  url: string;
+}
+
+// News search result
+interface FirecrawlNewsResult {
+  date: string;
+  html?: string | null;
+  imageUrl?: string;
   links?: string[];
-  markdown?: string;
+  markdown?: string | null;
   metadata?: FirecrawlMetadata;
-  title?: string;
+  position: number;
+  rawHtml?: string | null;
+  screenshot?: string | null;
+  snippet: string;
+  title: string;
   url: string;
 }
 
+// V2 Response structure
 export interface FirecrawlResponse {
-  data: FirecrawlData[];
-  success?: boolean;
+  data: {
+    images?: FirecrawlImageResult[];
+    news?: FirecrawlNewsResult[];
+    web?: FirecrawlWebResult[];
+  };
+  success: boolean;
+  warning?: string | null;
 }

package/src/services/user/client.test.ts

@@ -26,7 +26,10 @@ beforeEach(async () => {
   await initializeDB();
   await clientDB.delete(users);
 
-  await clientDB.insert(users).values({ id: mockUser.uuid, avatar: 'avatar.png' });
+  await clientDB
+    .insert(users)
+    .values({ id: mockUser.uuid, avatar: 'avatar.png' })
+    .onConflictDoNothing();
   await clientDB
     .insert(userSettings)
     .values({ id: mockUser.uuid, general: { themeMode: 'light' } });

package/src/libs/next-auth/sso-providers/azure-ad.ts

@@ -1,33 +0,0 @@
-import AzureAD from 'next-auth/providers/azure-ad';
-
-import { authEnv } from '@/envs/auth';
-
-import { getMicrosoftEntraIdIssuer } from './microsoft-entra-id-helper';
-import { CommonProviderConfig } from './sso.config';
-
-const provider = {
-  id: 'azure-ad',
-  provider: AzureAD({
-    ...CommonProviderConfig,
-    // Specify auth scope, at least include 'openid email'
-    // all scopes in Azure AD ref: https://learn.microsoft.com/en-us/entra/identity-platform/scopes-oidc#openid-connect-scopes
-    authorization: { params: { scope: 'openid email profile' } },
-    // TODO(NextAuth ENVs Migration): Remove once nextauth envs migration time end
-    clientId: authEnv.AZURE_AD_CLIENT_ID ?? process.env.AUTH_AZURE_AD_ID,
-    clientSecret: authEnv.AZURE_AD_CLIENT_SECRET ?? process.env.AUTH_AZURE_AD_SECRET,
-    issuer: getMicrosoftEntraIdIssuer(),
-    // Remove end
-    // TODO(NextAuth): map unique user id to `providerAccountId` field
-    // profile(profile) {
-    //   return {
-    //     email: profile.email,
-    //     image: profile.picture,
-    //     name: profile.name,
-    //     providerAccountId: profile.user_id,
-    //     id: profile.user_id,
-    //   };
-    // },
-  }),
-};
-
-export default provider;