feat:custom dataset

Author: LuckyYC

README.md

@@ -21,7 +21,7 @@ LMeterX is a professional large language model performance testing platform that
 - **Universal compatibility**: Supports any language/multimodal/CoT model (GPT/Claude/Llama, etc.) service API stress testing
 - **Smart load testing**: Precise concurrency control & Real user simulation
 - **Professional metrics**: TTFT, TPS, RPS, success/error rate, etc
-- **Multi-scenario support**: Text conversations & Multimodal (image+text)
+- **Multi-scenario support**: Text conversations & Multimodal (image+text) & Custom dataset
 - **Visualize the results**: Performance reports & Model arena
 - **Real-time monitoring**: Hierarchical monitoring of tasks and services
 - **Enterprise ready**: Docker deployment & Web management console & Scalable architecture
@@ -131,7 +131,6 @@ LMeterX/
 ## 🗺️ Development Roadmap
 
 ### In Development
-- [ ] Support for user-defined load test datasets
 - [ ] Support for client resource monitoring
 
 ### Planned

README_CN.md

@@ -21,7 +21,7 @@ LMeterX 是一个专业的大语言模型性能测试平台，支持对 LLM 服
 - **通用兼容性**：支持任何语言/多模态/CoT模型（GPT/Claude/Llama等）服务API压测
 - **智能负载测试**：精确并发控制 & 真实用户模拟
 - **专业性能指标**：TTFT、TPS、RPS、成功/错误率等
-- **多场景支持**：文本对话 & 多模态（图像+文本）
+- **多场景支持**：文本对话 & 多模态（图像+文本）& 自定义数据集
 - **可视化结果**：性能报告一键生成 & 多维度模型对比
 - **实时监控**：任务和服务的分层监控
 - **企业就绪**: Docker部署 & Web管理控制台 &可扩展架构
@@ -131,7 +131,6 @@ LMeterX 采用现代化的技术栈，确保系统的可靠性和可维护性：
 ## 🗺️ 发展路线图
 
 ### 开发中
-- [ ] 支持用户自定义压测数据集
 - [ ] 支持客户端资源监控
 
 ### 规划中

backend/service/task_service.py

@@ -32,6 +32,64 @@
 from utils.logger import logger
 
 
+def _normalize_file_path(file_path: str) -> str:
+    """
+    Normalize file path to ensure cross-service compatibility.
+    Converts various absolute path formats to relative paths.
+
+    Args:
+        file_path: The file path to normalize
+
+    Returns:
+        The normalized relative path
+    """
+    if not file_path or file_path.strip() == "":
+        return ""
+
+    # Convert various absolute path formats to relative paths
+    if file_path.startswith(UPLOAD_FOLDER + "/"):
+        return file_path.replace(UPLOAD_FOLDER + "/", "")
+    elif file_path.startswith("/app/upload_files/"):
+        # For backward compatibility with existing Docker paths
+        return file_path.replace("/app/upload_files/", "")
+    elif file_path.startswith("/upload_files/"):
+        # Handle paths starting with /upload_files/
+        return file_path[len("/upload_files/") :]
+
+    return file_path
+
+
+def _get_cert_config(body: TaskCreateReq) -> Tuple[str, str]:
+    """
+    Get and normalize certificate configuration from the request body.
+
+    Args:
+        body: The task creation request body
+
+    Returns:
+        A tuple of (cert_file, key_file) normalized paths
+    """
+    cert_file = ""
+    key_file = ""
+
+    if body.cert_config:
+        cert_file = body.cert_config.cert_file or ""
+        key_file = body.cert_config.key_file or ""
+    else:
+        # Try to get certificate configuration from upload service
+        from service.upload_service import get_task_cert_config
+
+        cert_config = get_task_cert_config(body.temp_task_id)
+        cert_file = cert_config.get("cert_file", "")
+        key_file = cert_config.get("key_file", "")
+
+    # Normalize paths
+    cert_file = _normalize_file_path(cert_file)
+    key_file = _normalize_file_path(key_file)
+
+    return cert_file, key_file
+
+
 async def get_tasks_svc(
     request: Request,
     page: int = Query(1, ge=1, alias="page"),
@@ -251,35 +309,7 @@ async def create_task_svc(request: Request, body: TaskCreateReq):
     task_id = str(uuid.uuid4())
     logger.info(f"Creating task '{body.name}' with ID: {task_id}")
 
-    cert_file = ""
-    key_file = ""
-    if body.cert_config:
-        cert_file = body.cert_config.cert_file or ""
-        key_file = body.cert_config.key_file or ""
-    else:
-        # Try to get certificate configuration from upload service
-        from service.upload_service import get_task_cert_config
-
-        cert_config = get_task_cert_config(body.temp_task_id)
-        cert_file = cert_config.get("cert_file", "")
-        key_file = cert_config.get("key_file", "")
-
-    # Convert absolute paths to relative paths for cross-service compatibility
-    if cert_file:
-        # Convert backend upload path to relative path that st_engine can access
-        if cert_file.startswith(UPLOAD_FOLDER + "/"):
-            cert_file = cert_file.replace(UPLOAD_FOLDER + "/", "")
-        elif cert_file.startswith("/app/upload_files/"):
-            # For backward compatibility with existing Docker paths
-            cert_file = cert_file.replace("/app/upload_files/", "")
-
-    if key_file:
-        # Convert backend upload path to relative path that st_engine can access
-        if key_file.startswith(UPLOAD_FOLDER + "/"):
-            key_file = key_file.replace(UPLOAD_FOLDER + "/", "")
-        elif key_file.startswith("/app/upload_files/"):
-            # For backward compatibility with existing Docker paths
-            key_file = key_file.replace("/app/upload_files/", "")
+    cert_file, key_file = _get_cert_config(body)
 
     # Convert headers from a list of objects to a dictionary, then to a JSON string.
     headers = {
@@ -297,6 +327,16 @@ async def create_task_svc(request: Request, body: TaskCreateReq):
     }
     cookies_json = json.dumps(cookies)
 
+    # Normalize test_data path to ensure cross-service compatibility
+    test_data = body.test_data or ""
+    if (
+        test_data
+        and not test_data.strip().lower() in ("", "default")
+        and not test_data.strip().startswith("{")
+    ):
+        # If test_data is a file path, convert it to relative path
+        test_data = _normalize_file_path(test_data)
+
     db = request.state.db
     try:
         # Convert field_mapping to JSON string if provided
@@ -325,7 +365,7 @@ async def create_task_svc(request: Request, body: TaskCreateReq):
             api_path=body.api_path,
             request_payload=body.request_payload,
             field_mapping=field_mapping_json,
-            test_data=body.test_data,
+            test_data=test_data,
         )
 
         db.add(new_task)

backend/service/upload_service.py

@@ -104,22 +104,42 @@ async def process_cert_files(
     for file in files:
         if file and file.filename and allowed_file(file.filename, "cert"):
             filename = secure_filename(file.filename)
-            file_path = os.path.join(task_upload_dir, filename)
-            with open(file_path, "wb") as f:
+            absolute_file_path = os.path.join(task_upload_dir, filename)
+            with open(absolute_file_path, "wb") as f:
                 f.write(await file.read())
 
             file_info = {
                 "originalname": filename,
-                "path": file_path,
-                "size": os.path.getsize(file_path),
+                "path": absolute_file_path,  # Keep absolute path for file info
+                "size": os.path.getsize(absolute_file_path),
             }
             uploaded_files_info.append(file_info)
             logger.info(f"Certificate file uploaded successfully, type: {cert_type}")
 
     # Retrieve existing config for the task, if any.
     existing_config = get_task_cert_config(task_id)
-    # Determine the new config based on the uploaded files.
-    cert_config = determine_cert_config(uploaded_files_info, cert_type, existing_config)
+    # Determine the new config based on the uploaded files - use relative paths
+    uploaded_files_with_relative_paths = []
+    for file_info in uploaded_files_info:
+        # Convert absolute path to relative path for cert config
+        abs_path = str(file_info["path"])
+        if abs_path.startswith(UPLOAD_FOLDER + "/"):
+            relative_path = abs_path.replace(UPLOAD_FOLDER + "/", "")
+        else:
+            # Fallback: extract relative part
+            relative_path = os.path.join(task_id, os.path.basename(abs_path))
+
+        uploaded_files_with_relative_paths.append(
+            {
+                "originalname": file_info["originalname"],
+                "path": relative_path,  # Use relative path for config
+                "size": file_info["size"],
+            }
+        )
+
+    cert_config = determine_cert_config(
+        uploaded_files_with_relative_paths, cert_type, existing_config
+    )
     # Save the updated configuration.
     save_task_cert_config(task_id, cert_config)
 
@@ -146,16 +166,20 @@ async def process_dataset_files(task_id: str, files: List[UploadFile]):
     for file in files:
         if file and file.filename and allowed_file(file.filename, "dataset"):
             filename = secure_filename(file.filename)
-            file_path = os.path.join(task_upload_dir, filename)
-            with open(file_path, "wb") as f:
+            absolute_file_path = os.path.join(task_upload_dir, filename)
+            with open(absolute_file_path, "wb") as f:
                 f.write(await file.read())
 
+            # Return relative path from upload folder for cross-service compatibility
+            relative_file_path = os.path.join(task_id, filename)
+
             file_info = {
                 "originalname": filename,
-                "path": file_path,
-                "size": os.path.getsize(file_path),
+                "path": absolute_file_path,  # Keep absolute path for file info
+                "size": os.path.getsize(absolute_file_path),
             }
             uploaded_files_info.append(file_info)
+            file_path = relative_file_path  # Use relative path for test_data
             logger.info(f"Dataset file uploaded successfully: {filename}")
 
     return uploaded_files_info, file_path

backend/utils/be_config.py

@@ -16,4 +16,10 @@
 LOG_TASK_DIR = os.path.join(LOG_DIR, "task")
 
 # Directory for storing uploaded files
-UPLOAD_FOLDER = os.path.join(BASE_DIR, "upload_files")
+# Handle different environments: Docker vs local development
+if os.path.exists("/app") and os.getcwd().startswith("/app"):
+    # Docker environment: use /app/upload_files (matches docker-compose volume mapping)
+    UPLOAD_FOLDER = "/app/upload_files"
+else:
+    # Local development: use project root upload_files
+    UPLOAD_FOLDER = os.path.join(BASE_DIR, "upload_files")

docker-compose.dev.yml

@@ -40,7 +40,7 @@ services:
       - FLASK_DEBUG=false
     volumes:
       - ./logs:/logs
-      - upload_files:/app/upload_files
+      - ./upload_files:/app/upload_files
     ports:
       - "5001:5001"
     healthcheck:
@@ -66,11 +66,9 @@ services:
       - DB_USER=root
       - DB_PASSWORD=lmeterx123
       - DB_NAME=lmeterx
-      - SECRET_KEY=your_secret_key_here
-      - FLASK_DEBUG=false
     volumes:
       - ./logs:/logs
-      - upload_files:/app/upload_files
+      - ./upload_files:/app/upload_files
     ports:
       - "5002:5002"
     healthcheck:
@@ -102,10 +100,9 @@ services:
     volumes:
       - ./frontend/nginx.conf:/etc/nginx/conf.d/default.conf
       - ./frontend/nginx-map.conf:/etc/nginx/conf.d/map.conf
-      - upload_files:/usr/share/nginx/html/uploads
+      - ./upload_files:/usr/share/nginx/html/uploads
 volumes:
   mysql_data:
-  upload_files:
 
 networks:
   default:

docker-compose.yml

@@ -34,7 +34,7 @@ services:
       - DB_NAME=lmeterx
     volumes:
       - ./logs:/logs
-      - upload_files:/app/upload_files
+      - ./upload_files:/app/upload_files
     ports:
       - "5001:5001"
     healthcheck:
@@ -60,7 +60,7 @@ services:
       - DB_NAME=lmeterx
     volumes:
       - ./logs:/logs
-      - upload_files:/app/upload_files
+      - ./upload_files:/app/upload_files
     ports:
       - "5002:5002"
     healthcheck:
@@ -88,11 +88,10 @@ services:
       timeout: 5s
       retries: 3
     volumes:
-      - upload_files:/usr/share/nginx/html/uploads
+      - ./upload_files:/usr/share/nginx/html/uploads
 
 volumes:
   mysql_data:
-  upload_files:
 
 networks:
   default:

st_engine/engine/locustfile.py

@@ -698,7 +698,7 @@ def chat_request(self):
         base_request_kwargs, user_prompt = self.request_handler.prepare_request_kwargs(
             prompt_data
         )
-        self.task_logger.info(f"base_request_kwargs: {base_request_kwargs}")
+        # self.task_logger.info(f"base_request_kwargs: {base_request_kwargs}")
 
         if not base_request_kwargs:
             self.task_logger.error(

st_engine/utils/config.py

@@ -20,7 +20,15 @@
 DATA_DIR = os.path.join(ST_ENGINE_DIR, "data")
 PROMPTS_DIR = os.path.join(DATA_DIR, "prompts")
 IMAGES_DIR = os.path.join(DATA_DIR, "pic")
-UPLOAD_FOLDER = os.path.join(BASE_DIR, "upload_files")
+
+# === UPLOAD PATHS ===
+# Handle different environments: Docker vs local development
+if os.path.exists("/app") and os.getcwd().startswith("/app"):
+    # Docker environment: use /app/upload_files
+    UPLOAD_FOLDER = "/app/upload_files"
+else:
+    # Local development: use project root upload_files
+    UPLOAD_FOLDER = os.path.join(BASE_DIR, "upload_files")
 
 # === TASK STATUS CONSTANTS ===
 TASK_STATUS_CREATED = "created"

st_engine/utils/tools.py

@@ -92,7 +92,16 @@ def resolve_upload_file_path(file_path: str) -> str:
 
         normalized_path = os.path.normpath(file_path)
 
-        if os.path.isabs(normalized_path):
+        # Handle special case: paths starting with /upload_files/ should be treated as relative
+        if normalized_path.startswith("/upload_files/"):
+            # Extract relative part after /upload_files/
+            relative_part = normalized_path[len("/upload_files/") :]
+            if relative_part.startswith("../"):
+                raise ValueError(
+                    f"Invalid relative path (contains parent directory): {file_path}"
+                )
+            absolute_path = os.path.join(UPLOAD_FOLDER, relative_part)
+        elif os.path.isabs(normalized_path):
             # Handle absolute path - ensure it's within upload folder
             upload_folder_abs = os.path.abspath(UPLOAD_FOLDER)
             if not normalized_path.startswith(upload_folder_abs):
@@ -504,10 +513,22 @@ def init_prompt_queue(
         effective_logger.info("Processing test_data as JSONL content string")
         return init_prompt_queue_from_string(test_data, task_logger)
 
-    # Case 4: test_data is an existing file path
-    if os.path.exists(test_data):
-        effective_logger.info(f"Processing test_data as file path: {test_data}")
-        return init_prompt_queue_from_file(test_data, task_logger)
+    # Case 4: test_data is a file path - handle both absolute and relative paths
+    effective_logger.info(f"Processing test_data as file path: {test_data}")
+
+    # Try to resolve the path using FilePathUtils for upload files
+    try:
+        # First, try to resolve as an upload file path (handles both relative and absolute paths)
+        resolved_path = FilePathUtils.resolve_upload_file_path(test_data)
+        effective_logger.info(f"Resolved upload file path: {resolved_path}")
+        return init_prompt_queue_from_file(resolved_path, task_logger)
+    except (ValueError, FileNotFoundError) as e:
+        effective_logger.warning(f"Failed to resolve as upload file path: {e}")
+
+        # Fallback: try as direct file path for backward compatibility
+        if os.path.exists(test_data):
+            effective_logger.info(f"Using direct file path: {test_data}")
+            return init_prompt_queue_from_file(test_data, task_logger)
 
     # Invalid test_data provided
     raise ValueError(