fix: issue #10

Author: LuckyYC

backend/api/api_upload.py

@@ -5,7 +5,7 @@
 
 from typing import List, Optional
 
-from fastapi import APIRouter, File, Request, UploadFile
+from fastapi import APIRouter, File, Form, Request, UploadFile
 
 from model.upload import UploadFileRsp
 from service.upload_service import upload_file_svc
@@ -17,25 +17,25 @@
 @router.post("", response_model=UploadFileRsp)
 async def upload_file(
     request: Request,
-    type: str = "cert",
-    cert_type: str = "cert_file",
     task_id: Optional[str] = None,
-    file: List[UploadFile] = File(..., description="The file(s) to upload"),
+    file_type: Optional[str] = "dataset",
+    cert_type: Optional[str] = "cert_file",
+    files: List[UploadFile] = File(..., description="The file(s) to upload"),
 ):
     """
     Upload one or more files.
 
     This endpoint handles file uploads and can be used for different purposes
-    based on the 'type' parameter. For example, it can be used to upload
+    based on the 'file_type' parameter. For example, it can be used to upload
     certificates or files related to a specific task.
 
     Args:
-        type (str): The type of upload (e.g., "cert"). Defaults to "cert".
-        cert_type (str): The specific type of certificate. Defaults to "cert_file".
-        task_id (str, optional): The ID of the task to associate the upload with. Defaults to None.
-        file (List[UploadFile]): A list of files to be uploaded.
+        file_type (str, optional): The type of upload (e.g., "cert", "dataset").
+        cert_type (str, optional): The specific type of certificate. Only used for cert uploads.
+        task_id (str, optional): The ID of the task to associate the upload with.
+        files (List[UploadFile]): A list of files to be uploaded.
 
     Returns:
         UploadFileRsp: A response object confirming the file upload.
     """
-    return await upload_file_svc(request, file, type, cert_type, task_id)
+    return await upload_file_svc(request, task_id, file_type, cert_type, files)

backend/db/init_db.sql

@@ -0,0 +1,69 @@
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+-- 确保数据库存在并使用该数据库
+CREATE DATABASE IF NOT EXISTS lmeterx;
+USE lmeterx;
+
+-- ----------------------------
+-- Table structure for tasks
+-- ----------------------------
+DROP TABLE IF EXISTS `tasks`;
+CREATE TABLE `tasks` (
+  `id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `name` varchar(100) COLLATE utf8mb4_unicode_ci NOT NULL,
+  `status` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT 'idle',
+  `target_host` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `model` varchar(100) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `system_prompt` longtext COLLATE utf8mb4_unicode_ci,
+  `user_prompt` longtext COLLATE utf8mb4_unicode_ci,
+  `stream_mode` varchar(20) COLLATE utf8mb4_unicode_ci DEFAULT 'True',
+  `concurrent_users` int(11) DEFAULT '1',
+  `spawn_rate` int(11) DEFAULT '0',
+  `duration` int(11) DEFAULT '60',
+  `chat_type` int(11) DEFAULT '0',
+  `log_file` longtext COLLATE utf8mb4_unicode_ci,
+  `result_file` longtext COLLATE utf8mb4_unicode_ci,
+  `cert_file` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `key_file` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,
+  `headers` json DEFAULT NULL,
+  `error_message` text COLLATE utf8mb4_unicode_ci,
+  `created_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  `updated_at` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  `api_path` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT 'API路径',
+  PRIMARY KEY (`id`),
+  KEY `idx_status_created` (`status`,`created_at`),
+  KEY `idx_updated_at` (`updated_at`),
+  KEY `idx_name` (`name`),
+  KEY `idx_status` (`status`),
+  KEY `idx_created_at` (`created_at`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- ----------------------------
+-- Table structure for task_results
+-- ----------------------------
+DROP TABLE IF EXISTS `task_results`;
+CREATE TABLE `task_results` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `task_id` varchar(36) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '任务ID',
+  `metric_type` varchar(36) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '指标类型',
+  `num_requests` int(11) DEFAULT '0' COMMENT '请求总数量',
+  `num_failures` int(11) DEFAULT '0' COMMENT '请求失败数量',
+  `avg_latency` float DEFAULT '0' COMMENT '请求平均响应时间',
+  `min_latency` float DEFAULT '0' COMMENT '请求最小响应时间',
+  `max_latency` float DEFAULT '0' COMMENT '请求最大响应时间',
+  `median_latency` float DEFAULT '0' COMMENT '请求中位响应时间',
+  `p90_latency` float DEFAULT '0' COMMENT '请求90%响应时间',
+  `rps` float DEFAULT '0' COMMENT '每秒请求数',
+  `avg_content_length` float DEFAULT '0' COMMENT '平均输出的字符长度',
+  `completion_tps` float DEFAULT '0' COMMENT '每秒输出的token数量',
+  `total_tps` float DEFAULT '0' COMMENT '每秒输入输出的总token数量',
+  `avg_total_tokens_per_req` float DEFAULT '0' COMMENT '每个请求的平均输入输出的总token数量',
+  `avg_completion_tokens_per_req` float DEFAULT '0' COMMENT '每个请求的平均输出token数量',
+  `created_at` datetime DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+  `updated_at` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
+  PRIMARY KEY (`id`),
+  KEY `idx_task_id` (`task_id`)
+) ENGINE=InnoDB AUTO_INCREMENT=262 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
+
+-- 最后重新启用外键检查
+SET FOREIGN_KEY_CHECKS = 1;

backend/requirements.txt

@@ -10,3 +10,4 @@ greenlet
 werkzeug
 python-multipart
 httpx
+python-magic

backend/service/task_service.py

@@ -4,6 +4,7 @@
 """
 
 import json
+import os
 import time
 import uuid
 from typing import Dict, List, Optional, Tuple, Union
@@ -61,13 +62,13 @@ def _normalize_file_path(file_path: str) -> str:
 
 def _get_cert_config(body: TaskCreateReq) -> Tuple[str, str]:
     """
-    Get and normalize certificate configuration from the request body.
+    Get certificate configuration from the request body.
 
     Args:
         body: The task creation request body
 
     Returns:
-        A tuple of (cert_file, key_file) normalized paths
+        A tuple of (cert_file, key_file) absolute paths
     """
     cert_file = ""
     key_file = ""
@@ -83,10 +84,6 @@ def _get_cert_config(body: TaskCreateReq) -> Tuple[str, str]:
         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
 
 
@@ -327,15 +324,8 @@ async def create_task_svc(request: Request, body: TaskCreateReq):
     }
     cookies_json = json.dumps(cookies)
 
-    # Normalize test_data path to ensure cross-service compatibility
+    # Use test_data as provided (should be absolute path from upload service)
     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:
@@ -848,11 +838,25 @@ def _prepare_request_payload(body: TaskCreateReq) -> Dict:
 def _prepare_client_cert(body: TaskCreateReq):
     """Prepare SSL certificate configuration for the HTTP client."""
     client_cert: Optional[Union[str, Tuple[str, str]]] = None
-    if hasattr(body, "cert_config") and body.cert_config:
-        if body.cert_config.cert_file and body.cert_config.key_file:
-            client_cert = (body.cert_config.cert_file, body.cert_config.key_file)
-        elif body.cert_config.cert_file:
-            client_cert = body.cert_config.cert_file
+
+    # Get certificate configuration
+    cert_file, key_file = _get_cert_config(body)
+
+    # Use absolute paths directly from upload service
+    if cert_file or key_file:
+        try:
+            if cert_file and key_file:
+                # Both cert and key files provided
+                if os.path.exists(cert_file) and os.path.exists(key_file):
+                    client_cert = (cert_file, key_file)
+            elif cert_file:
+                # Only cert file provided (combined cert+key file)
+                if os.path.exists(cert_file):
+                    client_cert = cert_file
+        except Exception as e:
+            logger.error(f"Error preparing certificate configuration: {e}")
+            return None
+
     return client_cert
 
 
@@ -1016,8 +1020,8 @@ async def _handle_streaming_response(response, full_url: str) -> Dict:
             }
 
         # For testing purposes, we limit the time and data we collect
-        max_chunks = 300  # max chunks to collect for testing
-        max_duration = 15  # max duration to wait for testing
+        max_chunks = 5000  # max chunks to collect for testing
+        max_duration = 60  # max duration to wait for testing
 
         start_time = asyncio.get_event_loop().time()