Merge branch 'main' into feat/password-transit-encryption

Author: cubxxw

.cursor/rules/github-issue-operation.mdc

@@ -14,13 +14,15 @@ alwaysApply: false
 
     (i.e., https://github.com/telepace/nexus)
 
-- The language chosen for raising an issue: Chinese-
+- The language chosen for raising an issue: Chinese, Concise content
 - Before writing the issue content, use mcp's thinking in combination with the current repository code and implementation to think about what the solution to the task is.
 - Be careful not to be too AI in your tone.
 - Pay attention to choosing the appropriate labels and types. And select the latest Milestone(OR v0.1)
 - Assign tasks. If it is a simple UI-related task, assign it to @Neo-Neooo, and if it is a complex task, deployment, cicd, assign it to @cubxxw. If both the front-end and back-end are involved, it only needs to be assigned to @cubxxw
 - If possible, describe the design drawings or architecture drawings using mermaid code blocks as much as possible
 - No need for my confirmation. Just execute directly
+- Issue should not provide the task cycle
+- The acceptance criteria must be supplemented. For example, it is allowed only after passing the xxx test
 
 **Postgres db operation Logic:**
 

.github/workflows/test-backend.yml

@@ -66,11 +66,10 @@ jobs:
       - name: Install dependencies
         run: docker compose --project-name $STACK_NAME run --rm backend uv pip install -e .
       - name: Migrate DB
-        run: docker compose --project-name $STACK_NAME run --rm -e TESTING=true -e TEST_MODE=true backend uv run bash scripts/prestart.sh
+        run: docker compose --project-name $STACK_NAME run --rm backend uv run bash scripts/prestart.sh
         working-directory: backend
 
       - name: Run tests
-<<<<<<< HEAD
         run: |
           # Set test environment variables to ensure consistency
           export TESTING=true
@@ -79,21 +78,11 @@ jobs:
           export [email protected]
           docker compose --project-name $STACK_NAME run --rm backend uv run bash scripts/tests-start.sh "Coverage for ${{ github.sha }}"
         working-directory: backend
-<<<<<<< HEAD
         timeout-minutes: 20
-=======
-        env:
-          TESTING: "true"
-          TEST_MODE: "true"
->>>>>>> 0a834ae (chore: update test-backend workflow to enable testing environment variables)
-=======
-        run: docker compose --project-name $STACK_NAME run --rm -e TESTING=true -e TEST_MODE=true backend uv run bash scripts/tests-start.sh "Coverage for ${{ github.sha }}"
-        working-directory: backend
->>>>>>> 1d6b4c6 (chore: improve test scripts for CI environment detection)
       - run: docker compose --project-name $STACK_NAME down -v --remove-orphans
       - name: Store coverage files
         uses: actions/upload-artifact@v4
         with:
           name: coverage-html
           path: backend/htmlcov
-          include-hidden-files: true
+          include-hidden-files: true

backend/app/api/routes/llm_service.py

@@ -18,6 +18,7 @@
 
 # Helper function to prepare headers for LiteLLM
 def _get_litellm_headers(api_key: str | None = None) -> dict:
+    """Prepare headers for LiteLLM, including authorization if an API key is provided."""
     headers = {"Content-Type": "application/json"}
     if api_key: # If a specific API key is provided in the request
         headers["Authorization"] = f"Bearer {api_key}"
@@ -35,6 +36,22 @@ async def _forward_request_to_litellm(
     headers: dict | None = None,
     stream: bool = False
 ):
+    """Asynchronously forwards a request to the LiteLLM proxy.
+    
+    This function constructs the full URL by joining the base URL from settings
+    with the provided endpoint path. It handles both streaming and non-streaming
+    requests. If an HTTP status error occurs, it parses the response to extract an
+    appropriate error message and raises an HTTPException. Network errors are
+    caught and raised as a 503 Service Unavailable exception.
+    
+    Args:
+        client (httpx.AsyncClient): The asynchronous HTTP client to use for making requests.
+        method (str): The HTTP method to use (e.g., 'GET', 'POST').
+        endpoint_path (str): The path of the endpoint to which the request is sent.
+        data (dict | None?): JSON data to be sent in the request body. Defaults to None.
+        headers (dict | None?): Headers to include with the request. Defaults to None.
+        stream (bool?): If True, the response will be streamed. Defaults to False.
+    """
     try:
         # Ensure proper URL joining without double slashes
         base_url = str(settings.LITELLM_PROXY_URL).rstrip('/')
@@ -72,6 +89,7 @@ async def _forward_request_to_litellm(
 async def create_completion(
     request_data: CompletionRequest = Body(...),
 ):
+    """Handles creation of completions based on request data."""
     async with httpx.AsyncClient(timeout=300.0) as client: # Increased timeout for LLMs
         litellm_endpoint = "/chat/completions" # Common LiteLLM endpoint for chat models
 
@@ -87,6 +105,7 @@ async def create_completion(
                 )
 
                 async def event_generator():
+                    """Generates decoded chunks from a response stream."""
                     async for chunk in response_stream.aiter_bytes():
                         if chunk:
                             # LiteLLM streaming chunks are typically SSE formatted like:
@@ -141,6 +160,7 @@ async def event_generator():
 async def create_embedding(
     request_data: EmbeddingRequest = Body(...),
 ):
+    """Handles the creation of embeddings by forwarding a request to LiteLLM."""
     async with httpx.AsyncClient(timeout=60.0) as client: # Standard timeout for embeddings
         litellm_endpoint = "/embeddings" # Common LiteLLM endpoint
         payload = request_data.model_dump(exclude_none=True)

backend/scripts/test.sh

@@ -12,27 +12,7 @@ BACKEND_DIR="$( cd "$SCRIPT_DIR/.." && pwd )"
 
 echo "🧪 Running backend tests with coverage..."
 
-<<<<<<< HEAD
 # Make sure we're using the test database
-=======
-# 检测 CI 环境
-CI_ENV=${CI:-false}
-
-# 检查环境变量是否已正确设置
-if [ "$TESTING" != "true" ] || [ "$TEST_MODE" != "true" ]; then
-  if [ "$CI_ENV" = "true" ]; then
-    echo "⚠️  CI 环境检测到，自动设置测试环境变量"
-    export TESTING=true
-    export TEST_MODE=true
-  else
-    echo "❌ 错误：必须同时设置 TESTING=true 和 TEST_MODE=true 环境变量才能运行测试"
-    echo "当前环境变量：TESTING=$TESTING, TEST_MODE=$TEST_MODE"
-    exit 1
-  fi
-fi
-
-# 确保设置测试环境变量
->>>>>>> 1d6b4c6 (chore: improve test scripts for CI environment detection)
 export TESTING=true
 
 # Enter backend directory
@@ -114,4 +94,4 @@ else
     echo "📊 Generating partial coverage report..."
     coverage report --show-missing || true
     exit 1
-fi
+fi

backend/scripts/tests-start.sh

@@ -17,22 +17,6 @@ cd "$BACKEND_DIR"
 
 # 检测 CI 环境
 CI_ENV=${CI:-false}
-<<<<<<< HEAD
-=======
-
-# 检查环境变量是否已正确设置
-if [ "$TESTING" != "true" ] || [ "$TEST_MODE" != "true" ]; then
-  if [ "$CI_ENV" = "true" ]; then
-    echo "⚠️  CI 环境检测到，自动设置测试环境变量"
-    export TESTING=true
-    export TEST_MODE=true
-  else
-    echo "❌ 错误：必须同时设置 TESTING=true 和 TEST_MODE=true 环境变量才能运行测试"
-    echo "当前环境变量：TESTING=$TESTING, TEST_MODE=$TEST_MODE"
-    exit 1
-  fi
-fi
->>>>>>> 1d6b4c6 (chore: improve test scripts for CI environment detection)
 
 # 确保设置测试环境变量
 export TESTING=true
@@ -121,4 +105,4 @@ TESTING=true TEST_MODE=true bash "$SCRIPT_DIR/test.sh" "$@" || {
   exit 1
 }
 
-echo "✅ All tests completed successfully"
+echo "✅ All tests completed successfully"

extension/package.json

@@ -18,7 +18,7 @@
     "test": "playwright test",
     "test:debug": "playwright test --debug",
     "test:ui": "playwright test --ui",
-    "test:e2e": "playwright test tests/e2e",
+    "test:e2e": "playwright test",
     "test:coverage": "playwright test --coverage",
     "build:tailwind": "tailwindcss -i ./styles/globals.css -o ./styles/tailwind.css",
     "dev:with-tailwind": "concurrently \"npm run build:tailwind -- --watch\" \"npm run dev:local\"",

extension/playwright.config.ts

@@ -2,7 +2,7 @@ import { defineConfig, devices } from '@playwright/test';
 import path from 'path';
 
 export default defineConfig({
-  testDir: './tests/e2e',
+  testDir: ['./tests/e2e', './e2e'],
   fullyParallel: false,
   forbidOnly: !!process.env.CI,
   retries: process.env.CI ? 2 : 1,

frontend/components/layout/AddContentModal.tsx

@@ -17,6 +17,7 @@ import {
   AlertDialogAction,
   AlertDialogCancel,
   AlertDialogContent,
+  AlertDialogDescription,
   AlertDialogFooter,
   AlertDialogHeader,
   AlertDialogTitle,
@@ -199,6 +200,9 @@ export const AddContentModal: FC<AddContentModalProps> = ({
             <X className="h-4 w-4" />
           </Button>
         </AlertDialogHeader>
+        <AlertDialogDescription>
+          Use this modal to add new content by pasting a URL, typing text, or uploading a file.
+        </AlertDialogDescription>
 
         <div className="space-y-6 py-4">
           {/* 主拖放区域 */}

frontend/jest.config.ts

@@ -123,7 +123,7 @@ const config: Config = {
   // resetModules: false,
 
   // A path to a custom resolver
-  resolver: "<rootDir>/jest.resolver.js",
+  // resolver: "<rootDir>/jest.resolver.js",
 
   // Automatically restore mock state and implementation before every test
   // restoreMocks: false,
@@ -162,18 +162,16 @@ const config: Config = {
   // testLocationInResults: false,
 
   // The glob patterns Jest uses to detect test files
-  // testMatch: [
-  //   "**/__tests__/**/*.[jt]s?(x)",
-  //   "**/?(*.)+(spec|test).[tj]s?(x)"
-  // ],
+  testMatch: [
+    "**/__tests__/**/*.[jt]s?(x)",
+    "**/?(*.)+(spec|test).[tj]s?(x)"
+  ],
 
   // An array of regexp pattern strings that are matched against all test paths, matched tests are skipped
   testPathIgnorePatterns: [
     "/node_modules/",
     "/.next/",
-    "/.next/types/",
     "/tests/e2e/", // 排除Playwright e2e测试
-    ".*\\.spec\\.ts$", // 排除Playwright测试文件
   ],
 
   // The regexp pattern or array of patterns that Jest uses to detect test files

frontend/jest.setup.js

@@ -1,6 +1,61 @@
 import "@testing-library/jest-dom";
 import React from "react";
 
+// Keep a reference to the original window.location object
+const originalLocation = window.location;
+
+beforeAll(() => {
+  delete window.location;
+  window.location = Object.defineProperties(
+    {},
+    {
+      ...Object.getOwnPropertyDescriptors(originalLocation),
+      href: {
+        configurable: true,
+        writable: true, // Ensure it's writable
+        value: 'http://localhost', // Initial mock value
+      },
+      assign: {
+        configurable: true,
+        value: jest.fn(),
+      },
+      replace: {
+        configurable: true,
+        value: jest.fn(),
+      },
+      pathname: {
+        configurable: true,
+        writable: true,
+        value: '/',
+      },
+      search: {
+        configurable: true,
+        writable: true,
+        value: '',
+      },
+    },
+  );
+});
+
+afterAll(() => {
+  // Restore the original window.location object
+  window.location = originalLocation;
+});
+
+beforeEach(() => {
+  // Clear mock calls between tests
+  if (window.location.assign.mockClear) {
+    window.location.assign.mockClear();
+  }
+  if (window.location.replace.mockClear) {
+    window.location.replace.mockClear();
+  }
+  // Reset href to its initial mock value or a specific default for each test if needed
+  window.location.href = 'http://localhost';
+  window.location.pathname = '/';
+  window.location.search = '';
+});
+
 // Add fetch mock for tests
 global.fetch = jest.fn().mockImplementation((input, init) => {
   // Basic mock data