♻️ refactor: move backend api to (backend) folder group

lobehub · Oct 5, 2024 · 01c961e · 01c961e
1 parent bdc4f4e
commit 01c961e
Show file tree

Hide file tree

Showing 68 changed files with 21 additions and 21 deletions.
diff --git a/src/app/api/auth/[...nextauth]/route.ts → ...(backend)/api/auth/[...nextauth]/route.ts b/src/app/api/auth/[...nextauth]/route.ts → ...(backend)/api/auth/[...nextauth]/route.ts
diff --git a/src/app/api/auth/error/AuthErrorPage.tsx → ...backend)/api/auth/error/AuthErrorPage.tsx b/src/app/api/auth/error/AuthErrorPage.tsx → ...backend)/api/auth/error/AuthErrorPage.tsx
diff --git a/src/app/api/auth/error/page.tsx → src/app/(backend)/api/auth/error/page.tsx b/src/app/api/auth/error/page.tsx → src/app/(backend)/api/auth/error/page.tsx
diff --git a/src/app/api/chat/[provider]/route.test.ts → ...ackend)/api/chat/[provider]/route.test.ts b/src/app/api/chat/[provider]/route.test.ts → ...ackend)/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';

diff --git a/src/app/api/chat/[provider]/route.ts → ...pp/(backend)/api/chat/[provider]/route.ts b/src/app/api/chat/[provider]/route.ts → ...pp/(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';

diff --git a/src/app/api/chat/agentRuntime.test.ts → ...p/(backend)/api/chat/agentRuntime.test.ts b/src/app/api/chat/agentRuntime.test.ts → ...p/(backend)/api/chat/agentRuntime.test.ts
diff --git a/src/app/api/chat/agentRuntime.ts → src/app/(backend)/api/chat/agentRuntime.ts b/src/app/api/chat/agentRuntime.ts → src/app/(backend)/api/chat/agentRuntime.ts
diff --git a/src/app/api/chat/anthropic/route.test.ts → ...backend)/api/chat/anthropic/route.test.ts b/src/app/api/chat/anthropic/route.test.ts → ...backend)/api/chat/anthropic/route.test.ts
diff --git a/src/app/api/chat/anthropic/route.ts → ...app/(backend)/api/chat/anthropic/route.ts b/src/app/api/chat/anthropic/route.ts → ...app/(backend)/api/chat/anthropic/route.ts
diff --git a/src/app/api/chat/apiKeyManager.test.ts → .../(backend)/api/chat/apiKeyManager.test.ts b/src/app/api/chat/apiKeyManager.test.ts → .../(backend)/api/chat/apiKeyManager.test.ts
diff --git a/src/app/api/chat/apiKeyManager.ts → src/app/(backend)/api/chat/apiKeyManager.ts b/src/app/api/chat/apiKeyManager.ts → src/app/(backend)/api/chat/apiKeyManager.ts
diff --git a/src/app/api/chat/google/route.test.ts → ...p/(backend)/api/chat/google/route.test.ts b/src/app/api/chat/google/route.test.ts → ...p/(backend)/api/chat/google/route.test.ts
diff --git a/src/app/api/chat/google/route.ts → src/app/(backend)/api/chat/google/route.ts b/src/app/api/chat/google/route.ts → src/app/(backend)/api/chat/google/route.ts
diff --git a/src/app/api/chat/minimax/route.test.ts → .../(backend)/api/chat/minimax/route.test.ts b/src/app/api/chat/minimax/route.test.ts → .../(backend)/api/chat/minimax/route.test.ts
diff --git a/src/app/api/chat/minimax/route.ts → src/app/(backend)/api/chat/minimax/route.ts b/src/app/api/chat/minimax/route.ts → src/app/(backend)/api/chat/minimax/route.ts
diff --git a/src/app/api/chat/models/[provider]/route.ts → ...kend)/api/chat/models/[provider]/route.ts b/src/app/api/chat/models/[provider]/route.ts → ...kend)/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';
 

diff --git a/src/app/api/chat/openai/route.test.ts → ...p/(backend)/api/chat/openai/route.test.ts b/src/app/api/chat/openai/route.test.ts → ...p/(backend)/api/chat/openai/route.test.ts
diff --git a/src/app/api/chat/openai/route.ts → src/app/(backend)/api/chat/openai/route.ts b/src/app/api/chat/openai/route.ts → src/app/(backend)/api/chat/openai/route.ts
diff --git a/src/app/api/chat/wenxin/route.test.ts → ...p/(backend)/api/chat/wenxin/route.test.ts b/src/app/api/chat/wenxin/route.test.ts → ...p/(backend)/api/chat/wenxin/route.test.ts
diff --git a/src/app/api/chat/wenxin/route.ts → src/app/(backend)/api/chat/wenxin/route.ts b/src/app/api/chat/wenxin/route.ts → src/app/(backend)/api/chat/wenxin/route.ts
diff --git a/src/app/api/errorResponse.test.ts → src/app/(backend)/api/errorResponse.test.ts b/src/app/api/errorResponse.test.ts → src/app/(backend)/api/errorResponse.test.ts
diff --git a/src/app/api/errorResponse.ts → src/app/(backend)/api/errorResponse.ts b/src/app/api/errorResponse.ts → src/app/(backend)/api/errorResponse.ts
diff --git a/src/app/api/middleware/auth/index.test.ts → ...ackend)/api/middleware/auth/index.test.ts b/src/app/api/middleware/auth/index.test.ts → ...ackend)/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';
 

diff --git a/src/app/api/middleware/auth/index.ts → ...pp/(backend)/api/middleware/auth/index.ts b/src/app/api/middleware/auth/index.ts → ...pp/(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';

diff --git a/src/app/api/middleware/auth/utils.test.ts → ...ackend)/api/middleware/auth/utils.test.ts b/src/app/api/middleware/auth/utils.test.ts → ...ackend)/api/middleware/auth/utils.test.ts
diff --git a/src/app/api/middleware/auth/utils.ts → ...pp/(backend)/api/middleware/auth/utils.ts b/src/app/api/middleware/auth/utils.ts → ...pp/(backend)/api/middleware/auth/utils.ts
diff --git a/...p/api/openai/createBizOpenAI/auth.test.ts → ...)/api/openai/createBizOpenAI/auth.test.ts b/...p/api/openai/createBizOpenAI/auth.test.ts → ...)/api/openai/createBizOpenAI/auth.test.ts
diff --git a/src/app/api/openai/createBizOpenAI/auth.ts → ...ckend)/api/openai/createBizOpenAI/auth.ts b/src/app/api/openai/createBizOpenAI/auth.ts → ...ckend)/api/openai/createBizOpenAI/auth.ts
diff --git a/...enai/createBizOpenAI/createAzureOpenai.ts → ...enai/createBizOpenAI/createAzureOpenai.ts b/...enai/createBizOpenAI/createAzureOpenai.ts → ...enai/createBizOpenAI/createAzureOpenai.ts
diff --git a/...pi/openai/createBizOpenAI/createOpenai.ts → ...pi/openai/createBizOpenAI/createOpenai.ts b/...pi/openai/createBizOpenAI/createOpenai.ts → ...pi/openai/createBizOpenAI/createOpenai.ts
diff --git a/src/app/api/openai/createBizOpenAI/index.ts → ...kend)/api/openai/createBizOpenAI/index.ts b/src/app/api/openai/createBizOpenAI/index.ts → ...kend)/api/openai/createBizOpenAI/index.ts
diff --git a/.../webhooks/casdoor/__tests__/route.test.ts → .../webhooks/casdoor/__tests__/route.test.ts b/.../webhooks/casdoor/__tests__/route.test.ts → .../webhooks/casdoor/__tests__/route.test.ts
diff --git a/src/app/api/webhooks/casdoor/route.ts → ...p/(backend)/api/webhooks/casdoor/route.ts b/src/app/api/webhooks/casdoor/route.ts → ...p/(backend)/api/webhooks/casdoor/route.ts
diff --git a/...p/api/webhooks/casdoor/validateRequest.ts → ...)/api/webhooks/casdoor/validateRequest.ts b/...p/api/webhooks/casdoor/validateRequest.ts → ...)/api/webhooks/casdoor/validateRequest.ts
diff --git a/.../clerk/__tests__/fixtures/createUser.json → .../clerk/__tests__/fixtures/createUser.json b/.../clerk/__tests__/fixtures/createUser.json → .../clerk/__tests__/fixtures/createUser.json
diff --git a/src/app/api/webhooks/clerk/route.ts → ...app/(backend)/api/webhooks/clerk/route.ts b/src/app/api/webhooks/clerk/route.ts → ...app/(backend)/api/webhooks/clerk/route.ts
diff --git a/...app/api/webhooks/clerk/validateRequest.ts → ...nd)/api/webhooks/clerk/validateRequest.ts b/...app/api/webhooks/clerk/validateRequest.ts → ...nd)/api/webhooks/clerk/validateRequest.ts
diff --git a/...pi/webhooks/logto/__tests__/route.test.ts → ...pi/webhooks/logto/__tests__/route.test.ts b/...pi/webhooks/logto/__tests__/route.test.ts → ...pi/webhooks/logto/__tests__/route.test.ts
diff --git a/src/app/api/webhooks/logto/route.ts → ...app/(backend)/api/webhooks/logto/route.ts b/src/app/api/webhooks/logto/route.ts → ...app/(backend)/api/webhooks/logto/route.ts
diff --git a/...app/api/webhooks/logto/validateRequest.ts → ...nd)/api/webhooks/logto/validateRequest.ts b/...app/api/webhooks/logto/validateRequest.ts → ...nd)/api/webhooks/logto/validateRequest.ts
diff --git a/src/app/trpc/async/[trpc]/route.ts → src/app/(backend)/trpc/async/[trpc]/route.ts b/src/app/trpc/async/[trpc]/route.ts → src/app/(backend)/trpc/async/[trpc]/route.ts
diff --git a/src/app/trpc/edge/[trpc]/route.ts → src/app/(backend)/trpc/edge/[trpc]/route.ts b/src/app/trpc/edge/[trpc]/route.ts → src/app/(backend)/trpc/edge/[trpc]/route.ts
diff --git a/src/app/trpc/lambda/[trpc]/route.ts → ...app/(backend)/trpc/lambda/[trpc]/route.ts b/src/app/trpc/lambda/[trpc]/route.ts → ...app/(backend)/trpc/lambda/[trpc]/route.ts
diff --git a/src/app/trpc/tools/[trpc]/route.ts → src/app/(backend)/trpc/tools/[trpc]/route.ts b/src/app/trpc/tools/[trpc]/route.ts → src/app/(backend)/trpc/tools/[trpc]/route.ts
diff --git a/src/app/webapi/assistant/[id]/route.ts → .../(backend)/webapi/assistant/[id]/route.ts b/src/app/webapi/assistant/[id]/route.ts → .../(backend)/webapi/assistant/[id]/route.ts
diff --git a/src/app/webapi/assistant/store/route.ts → ...(backend)/webapi/assistant/store/route.ts b/src/app/webapi/assistant/store/route.ts → ...(backend)/webapi/assistant/store/route.ts
diff --git a/src/app/webapi/plugin/gateway/route.ts → .../(backend)/webapi/plugin/gateway/route.ts b/src/app/webapi/plugin/gateway/route.ts → .../(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';

diff --git a/...pp/webapi/plugin/gateway/settings.test.ts → ...d)/webapi/plugin/gateway/settings.test.ts b/...pp/webapi/plugin/gateway/settings.test.ts → ...d)/webapi/plugin/gateway/settings.test.ts
diff --git a/src/app/webapi/plugin/gateway/settings.ts → ...ackend)/webapi/plugin/gateway/settings.ts b/src/app/webapi/plugin/gateway/settings.ts → ...ackend)/webapi/plugin/gateway/settings.ts
diff --git a/src/app/webapi/plugin/store/route.ts → ...pp/(backend)/webapi/plugin/store/route.ts b/src/app/webapi/plugin/store/route.ts → ...pp/(backend)/webapi/plugin/store/route.ts
diff --git a/src/app/webapi/proxy/route.ts → src/app/(backend)/webapi/proxy/route.ts b/src/app/webapi/proxy/route.ts → src/app/(backend)/webapi/proxy/route.ts
diff --git a/src/app/webapi/stt/openai/route.ts → src/app/(backend)/webapi/stt/openai/route.ts b/src/app/webapi/stt/openai/route.ts → src/app/(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';
 

diff --git a/.../webapi/text-to-image/[provider]/route.ts → .../webapi/text-to-image/[provider]/route.ts b/.../webapi/text-to-image/[provider]/route.ts → .../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';

diff --git a/src/app/webapi/tokenizer/index.test.ts → .../(backend)/webapi/tokenizer/index.test.ts b/src/app/webapi/tokenizer/index.test.ts → .../(backend)/webapi/tokenizer/index.test.ts
diff --git a/src/app/webapi/tokenizer/route.ts → src/app/(backend)/webapi/tokenizer/route.ts b/src/app/webapi/tokenizer/route.ts → src/app/(backend)/webapi/tokenizer/route.ts
diff --git a/src/app/webapi/trace/route.ts → src/app/(backend)/webapi/trace/route.ts b/src/app/webapi/trace/route.ts → src/app/(backend)/webapi/trace/route.ts
diff --git a/src/app/webapi/tts/edge/route.ts → src/app/(backend)/webapi/tts/edge/route.ts b/src/app/webapi/tts/edge/route.ts → src/app/(backend)/webapi/tts/edge/route.ts
diff --git a/src/app/webapi/tts/microsoft/route.ts → ...p/(backend)/webapi/tts/microsoft/route.ts b/src/app/webapi/tts/microsoft/route.ts → ...p/(backend)/webapi/tts/microsoft/route.ts
diff --git a/src/app/webapi/tts/openai/route.ts → src/app/(backend)/webapi/tts/openai/route.ts b/src/app/webapi/tts/openai/route.ts → src/app/(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';
 

diff --git a/src/libs/agent-runtime/AgentRuntime.test.ts b/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';

diff --git a/src/libs/trpc/middleware/jwtPayload.test.ts b/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';

diff --git a/src/libs/trpc/middleware/jwtPayload.ts b/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) => {

diff --git a/src/libs/trpc/middleware/keyVaults.ts b/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) => {

diff --git a/src/server/routers/async/file.ts b/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';

diff --git a/src/server/routers/async/ragEval.ts b/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';

diff --git a/src/server/routers/lambda/chunk.ts b/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';

diff --git a/src/services/chat.ts b/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';

diff --git a/src/services/ollama.ts b/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';