@lobehub/chat 1.21.4 → 1.21.6

package/CHANGELOG.md

@@ -2,6 +2,64 @@
 
 # Changelog
 
+### [Version 1.21.6](https://github.com/lobehub/lobe-chat/compare/v1.21.5...v1.21.6)
+
+<sup>Released on **2024-10-05**</sup>
+
+#### ♻ Code Refactoring
+
+- **misc**: Move backend api to (backend) folder group.
+
+#### 🐛 Bug Fixes
+
+- **misc**: Fix txt-to-image api.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Code refactoring
+
+- **misc**: Move backend api to (backend) folder group, closes [#4262](https://github.com/lobehub/lobe-chat/issues/4262) ([d8afb46](https://github.com/lobehub/lobe-chat/commit/d8afb46))
+
+#### What's fixed
+
+- **misc**: Fix txt-to-image api, closes [#4264](https://github.com/lobehub/lobe-chat/issues/4264) ([d1ff4ba](https://github.com/lobehub/lobe-chat/commit/d1ff4ba))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
+### [Version 1.21.5](https://github.com/lobehub/lobe-chat/compare/v1.21.4...v1.21.5)
+
+<sup>Released on **2024-10-05**</sup>
+
+#### 💄 Styles
+
+- **misc**: Support shadcn in Artifacts.
+
+<br/>
+
+<details>
+<summary><kbd>Improvements and Fixes</kbd></summary>
+
+#### Styles
+
+- **misc**: Support shadcn in Artifacts, closes [#4256](https://github.com/lobehub/lobe-chat/issues/4256) ([863bae5](https://github.com/lobehub/lobe-chat/commit/863bae5))
+
+</details>
+
+<div align="right">
+
+[![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top)
+
+</div>
+
 ### [Version 1.21.4](https://github.com/lobehub/lobe-chat/compare/v1.21.3...v1.21.4)
 
 <sup>Released on **2024-10-02**</sup>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/chat",
-  "version": "1.21.4",
+  "version": "1.21.6",
   "description": "Lobe Chat - an open-source, high-performance chatbot framework that supports speech synthesis, multimodal, and extensible Function Call plugin system. Supports one-click free deployment of your private ChatGPT/LLM web application.",
   "keywords": [
     "framework",

package/src/app/{api → (backend)/api}/chat/[provider]/route.test.ts

@@ -2,7 +2,7 @@
 import { getAuth } from '@clerk/nextjs/server';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { checkAuthMethod, getJWTPayload } from '@/app/api/middleware/auth/utils';
+import { checkAuthMethod, getJWTPayload } from '@/app/(backend)/api/middleware/auth/utils';
 import { LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED } from '@/const/auth';
 import { AgentRuntime, LobeRuntimeAI } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';

package/src/app/{api → (backend)/api}/chat/[provider]/route.ts

@@ -1,4 +1,4 @@
-import { createErrorResponse } from '@/app/api/errorResponse';
+import { createErrorResponse } from '@/app/(backend)/api/errorResponse';
 import { AgentRuntime, ChatCompletionErrorPayload } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';
 import { ChatStreamPayload } from '@/types/openai/chat';

package/src/app/{api → (backend)/api}/chat/models/[provider]/route.ts

@@ -1,6 +1,6 @@
 import { NextResponse } from 'next/server';
 
-import { createErrorResponse } from '@/app/api/errorResponse';
+import { createErrorResponse } from '@/app/(backend)/api/errorResponse';
 import { ChatCompletionErrorPayload, ModelProvider } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';
 

package/src/app/{api → (backend)/api}/middleware/auth/index.test.ts

@@ -1,7 +1,7 @@
 import { getAuth } from '@clerk/nextjs/server';
 import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { createErrorResponse } from '@/app/api/errorResponse';
+import { createErrorResponse } from '@/app/(backend)/api/errorResponse';
 import { AgentRuntimeError } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';
 
@@ -12,7 +12,7 @@ vi.mock('@clerk/nextjs/server', () => ({
   getAuth: vi.fn(),
 }));
 
-vi.mock('@/app/api/errorResponse', () => ({
+vi.mock('@/app/(backend)/api/errorResponse', () => ({
   createErrorResponse: vi.fn(),
 }));
 

package/src/app/{api → (backend)/api}/middleware/auth/index.ts

@@ -2,7 +2,7 @@ import { AuthObject } from '@clerk/backend';
 import { getAuth } from '@clerk/nextjs/server';
 import { NextRequest } from 'next/server';
 
-import { createErrorResponse } from '@/app/api/errorResponse';
+import { createErrorResponse } from '@/app/(backend)/api/errorResponse';
 import { JWTPayload, LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED, enableClerk } from '@/const/auth';
 import { AgentRuntime, AgentRuntimeError, ChatCompletionErrorPayload } from '@/libs/agent-runtime';
 import { ChatErrorType } from '@/types/fetch';

package/src/app/{webapi → (backend)/webapi}/plugin/gateway/route.ts

@@ -1,8 +1,8 @@
 import { PluginRequestPayload } from '@lobehub/chat-plugin-sdk';
 import { createGatewayOnEdgeRuntime } from '@lobehub/chat-plugins-gateway';
 
-import { createErrorResponse } from '@/app/api/errorResponse';
-import { getJWTPayload } from '@/app/api/middleware/auth/utils';
+import { createErrorResponse } from '@/app/(backend)/api/errorResponse';
+import { getJWTPayload } from '@/app/(backend)/api/middleware/auth/utils';
 import { getAppConfig } from '@/config/app';
 import { LOBE_CHAT_AUTH_HEADER, OAUTH_AUTHORIZED, enableNextAuth } from '@/const/auth';
 import { LOBE_CHAT_TRACE_ID, TraceNameMap } from '@/const/trace';

package/src/app/{webapi → (backend)/webapi}/stt/openai/route.ts

@@ -1,7 +1,7 @@
 import { OpenAISTTPayload } from '@lobehub/tts';
 import { createOpenaiAudioTranscriptions } from '@lobehub/tts/server';
 
-import { createBizOpenAI } from '@/app/api/openai/createBizOpenAI';
+import { createBizOpenAI } from '@/app/(backend)/api/openai/createBizOpenAI';
 
 export const runtime = 'edge';
 

package/src/app/{webapi → (backend)/webapi}/text-to-image/[provider]/route.ts

@@ -1,8 +1,8 @@
 import { NextResponse } from 'next/server';
 
-import { initAgentRuntimeWithUserPayload } from '@/app/api/chat/agentRuntime';
-import { createErrorResponse } from '@/app/api/errorResponse';
-import { checkAuth } from '@/app/api/middleware/auth';
+import { initAgentRuntimeWithUserPayload } from '@/app/(backend)/api/chat/agentRuntime';
+import { createErrorResponse } from '@/app/(backend)/api/errorResponse';
+import { checkAuth } from '@/app/(backend)/api/middleware/auth';
 import { ChatCompletionErrorPayload } from '@/libs/agent-runtime';
 import { TextToImagePayload } from '@/libs/agent-runtime/types';
 import { ChatErrorType } from '@/types/fetch';

package/src/app/{webapi → (backend)/webapi}/tts/openai/route.ts

@@ -1,7 +1,7 @@
 import { OpenAITTSPayload } from '@lobehub/tts';
 import { createOpenaiAudioSpeech } from '@lobehub/tts/server';
 
-import { createBizOpenAI } from '@/app/api/openai/createBizOpenAI';
+import { createBizOpenAI } from '@/app/(backend)/api/openai/createBizOpenAI';
 
 export const runtime = 'edge';
 

package/src/app/(main)/chat/(workspace)/@portal/Artifacts/Body/Renderer/React/index.tsx

@@ -0,0 +1,51 @@
+import { SandpackLayout, SandpackPreview, SandpackProvider } from '@codesandbox/sandpack-react';
+import { memo } from 'react';
+
+import { useChatStore } from '@/store/chat';
+import { chatPortalSelectors } from '@/store/chat/selectors';
+
+import { createTemplateFiles } from './template';
+
+interface ReactRendererProps {
+  code: string;
+}
+
+const ReactRenderer = memo<ReactRendererProps>(({ code }) => {
+  const title = useChatStore(chatPortalSelectors.artifactTitle);
+
+  return (
+    <SandpackProvider
+      customSetup={{
+        dependencies: {
+          '@lshay/ui': 'latest',
+          '@radix-ui/react-alert-dialog': 'latest',
+          '@radix-ui/react-dialog': 'latest',
+          '@radix-ui/react-icons': 'latest',
+          'antd': 'latest',
+          'class-variance-authority': 'latest',
+          'clsx': 'latest',
+          'lucide-react': 'latest',
+          'recharts': 'latest',
+          'tailwind-merge': 'latest',
+        },
+      }}
+      files={{
+        'App.tsx': code,
+        ...createTemplateFiles({ title }),
+      }}
+      options={{
+        externalResources: ['https://cdn.tailwindcss.com'],
+        visibleFiles: ['App.tsx'],
+      }}
+      style={{ height: '100%' }}
+      template="vite-react-ts"
+      theme="auto"
+    >
+      <SandpackLayout style={{ height: '100%' }}>
+        <SandpackPreview style={{ height: '100%' }} />
+      </SandpackLayout>
+    </SandpackProvider>
+  );
+});
+
+export default ReactRenderer;

package/src/app/(main)/chat/(workspace)/@portal/Artifacts/Body/Renderer/React/template.ts

@@ -0,0 +1,32 @@
+interface TemplateFilesParams {
+  title?: string;
+}
+export const createTemplateFiles = ({ title }: TemplateFilesParams = {}) => ({
+  'index.html': `<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>${title || 'Artifacts App'}</title>
+    <script src="https://cdn.tailwindcss.com"></script>
+</head>
+  <body>
+    <div id="root"></div>
+    <script type="module" src="/index.tsx"></script>
+  </body>
+</html>
+`,
+  'vite.config.ts': {
+    code: `import { defineConfig } from 'vite';
+import react from '@vitejs/plugin-react';
+
+export default defineConfig({
+  plugins: [react()],
+  resolve: {
+    alias: {
+      '@/components/ui': '@lshay/ui/components/default',
+    },
+  },
+});`,
+  },
+});

package/src/libs/agent-runtime/AgentRuntime.test.ts

@@ -4,7 +4,7 @@ import { LangfuseGenerationClient, LangfuseTraceClient } from 'langfuse-core';
 import { ClientOptions } from 'openai';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import { createTraceOptions } from '@/app/api/chat/agentRuntime';
+import { createTraceOptions } from '@/app/(backend)/api/chat/agentRuntime';
 import * as langfuseCfg from '@/config/langfuse';
 import { JWTPayload } from '@/const/auth';
 import { TraceNameMap } from '@/const/trace';

package/src/libs/trpc/middleware/jwtPayload.test.ts

@@ -2,7 +2,7 @@
 import { TRPCError } from '@trpc/server';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 
-import * as utils from '@/app/api/middleware/auth/utils';
+import * as utils from '@/app/(backend)/api/middleware/auth/utils';
 import { createCallerFactory } from '@/libs/trpc';
 import { trpc } from '@/libs/trpc/init';
 import { AuthContext, createContextInner } from '@/server/context';

package/src/libs/trpc/middleware/jwtPayload.ts

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 
-import { getJWTPayload } from '@/app/api/middleware/auth/utils';
+import { getJWTPayload } from '@/app/(backend)/api/middleware/auth/utils';
 import { trpc } from '@/libs/trpc/init';
 
 export const jwtPayloadChecker = trpc.middleware(async (opts) => {

package/src/libs/trpc/middleware/keyVaults.ts

@@ -1,6 +1,6 @@
 import { TRPCError } from '@trpc/server';
 
-import { getJWTPayload } from '@/app/api/middleware/auth/utils';
+import { getJWTPayload } from '@/app/(backend)/api/middleware/auth/utils';
 import { trpc } from '@/libs/trpc/init';
 
 export const keyVaults = trpc.middleware(async (opts) => {

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

@@ -3,7 +3,7 @@ import { chunk } from 'lodash-es';
 import pMap from 'p-map';
 import { z } from 'zod';
 
-import { initAgentRuntimeWithUserPayload } from '@/app/api/chat/agentRuntime';
+import { initAgentRuntimeWithUserPayload } from '@/app/(backend)/api/chat/agentRuntime';
 import { fileEnv } from '@/config/file';
 import { DEFAULT_EMBEDDING_MODEL } from '@/const/settings';
 import { ASYNC_TASK_TIMEOUT, AsyncTaskModel } from '@/database/server/models/asyncTask';

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

@@ -2,7 +2,7 @@ import { TRPCError } from '@trpc/server';
 import OpenAI from 'openai';
 import { z } from 'zod';
 
-import { initAgentRuntimeWithUserPayload } from '@/app/api/chat/agentRuntime';
+import { initAgentRuntimeWithUserPayload } from '@/app/(backend)/api/chat/agentRuntime';
 import { chainAnswerWithContext } from '@/chains/answerWithContext';
 import { DEFAULT_EMBEDDING_MODEL, DEFAULT_MODEL } from '@/const/settings';
 import { ChunkModel } from '@/database/server/models/chunk';

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

@@ -1,7 +1,7 @@
 import { inArray } from 'drizzle-orm';
 import { z } from 'zod';
 
-import { initAgentRuntimeWithUserPayload } from '@/app/api/chat/agentRuntime';
+import { initAgentRuntimeWithUserPayload } from '@/app/(backend)/api/chat/agentRuntime';
 import { DEFAULT_EMBEDDING_MODEL } from '@/const/settings';
 import { serverDB } from '@/database/server';
 import { AsyncTaskModel } from '@/database/server/models/asyncTask';

package/src/services/_url.ts

@@ -36,7 +36,7 @@ export const API_ENDPOINTS = mapWithBasePath({
   trace: '/webapi/trace',
 
   // image
-  images: '/webapi/api/text-to-image/openai',
+  images: '/webapi/text-to-image/openai',
 
   // STT
   stt: '/webapi/stt/openai',

package/src/services/chat.ts

@@ -2,7 +2,7 @@ import { PluginRequestPayload, createHeadersWithPluginSettings } from '@lobehub/
 import { produce } from 'immer';
 import { merge } from 'lodash-es';
 
-import { createErrorResponse } from '@/app/api/errorResponse';
+import { createErrorResponse } from '@/app/(backend)/api/errorResponse';
 import { DEFAULT_MODEL_PROVIDER_LIST } from '@/config/modelProviders';
 import { INBOX_GUIDE_SYSTEMROLE } from '@/const/guide';
 import { INBOX_SESSION_ID } from '@/const/session';

package/src/services/ollama.ts

@@ -1,6 +1,6 @@
 import { ListResponse, Ollama as OllamaBrowser, ProgressResponse } from 'ollama/browser';
 
-import { createErrorResponse } from '@/app/api/errorResponse';
+import { createErrorResponse } from '@/app/(backend)/api/errorResponse';
 import { ModelProvider } from '@/libs/agent-runtime';
 import { useUserStore } from '@/store/user';
 import { keyVaultsConfigSelectors } from '@/store/user/selectors';

package/src/app/(main)/chat/(workspace)/@portal/Artifacts/Body/Renderer/React.tsx

@@ -1,31 +0,0 @@
-import { SandpackLayout, SandpackPreview, SandpackProvider } from '@codesandbox/sandpack-react';
-import { memo } from 'react';
-
-interface ReactRendererProps {
-  code: string;
-}
-const ReactRenderer = memo<ReactRendererProps>(({ code }) => {
-  return (
-    <SandpackProvider
-      customSetup={{
-        dependencies: {
-          antd: 'latest',
-          recharts: 'latest',
-        },
-      }}
-      files={{
-        'App.js': code,
-      }}
-      options={{ externalResources: ['https://cdn.tailwindcss.com'] }}
-      style={{ height: '100%' }}
-      template="react"
-      theme="auto"
-    >
-      <SandpackLayout style={{ height: '100%' }}>
-        <SandpackPreview style={{ height: '100%' }} />
-      </SandpackLayout>
-    </SandpackProvider>
-  );
-});
-
-export default ReactRenderer;