沃巴蒂
ff22ed3a8b
本次同步 09-12 至 09-28 的代码变更，主要内容： 新增功能 - 修改密码：后端新增 ChangePasswordRequest DTO 与UserController/UserService 对应接口，前端新增 ChangePasswordDialog 并在 Header 接入入口 - 文件预览组件重构：file-preview 目录拆分出 VideoPreview（支持 blobUrl 直传）、 ImagePreview、AudioPreview，index.tsx 统一调度各类型预览器 - 新增 my_ops 算子模块：markitdown_parser、mineru_pdf_parser、text_quality_evaluator - 新增 tools/minio-file-server MinIO 文件服务 功能增强 - 数据清洗：cleaning_task_service/scheduler/routes 重构， data_juicer_executor 与 wrapper 增强，OperatorTable/LogsTable/TaskDetail 同步调整 - 数据标注：annotation sync.py、project.py 接口与schema 更新 - 数据采集、算子市场、首页与菜单路由相关页面调整 - DataJuicer 算子接入（useOperatorOperations、dj_ops_schema） 结构调整 - deepflow/ 更名为 deep-flow/（419 个文件重命名） - 新增 helm 部署编排、GitHub Actions 之外的自建镜像构建脚本 未纳入本次提交 - scripts-backup/、runtime/python-executor-backup/、components_backup/（备份目录） - *.backup*、__pycache__ 产物 - zh_core_web_sm-3.8.0-py3-none-any.whl（46MB 构建产物） - DataX/（内嵌独立仓库，远程亦未收录其源码）
105 lines
4.3 KiB
Python
105 lines
4.3 KiB
Python
import httpx
|
|
from typing import Optional
|
|
from app.core.logging import get_logger
|
|
|
|
logger = get_logger(__name__)
|
|
|
|
|
|
class RuntimeClient:
|
|
"""HTTP client for communicating with runtime service"""
|
|
|
|
def __init__(self, base_url: str = "http://deepdata-runtime:8081"):
|
|
self.base_url = base_url
|
|
self.client = httpx.AsyncClient(timeout=60.0)
|
|
|
|
async def submit_task(self, task_id: str, retry_count: int = 0) -> bool:
|
|
"""Submit cleaning task to runtime executor"""
|
|
try:
|
|
url = f"{self.base_url}/api/task/{task_id}/submit"
|
|
response = await self.client.post(url, json={"retry_count": retry_count})
|
|
response.raise_for_status()
|
|
logger.info(f"Task {task_id} submitted successfully with retry_count={retry_count}")
|
|
return True
|
|
except httpx.HTTPError as e:
|
|
logger.error(f"Failed to submit task {task_id}: {e}")
|
|
return False
|
|
except Exception as e:
|
|
logger.error(f"Unexpected error submitting task {task_id}: {e}")
|
|
return False
|
|
|
|
async def stop_task(self, task_id: str) -> bool:
|
|
"""Stop running cleaning task"""
|
|
try:
|
|
url = f"{self.base_url}/api/task/{task_id}/stop"
|
|
response = await self.client.post(url)
|
|
response.raise_for_status()
|
|
logger.info(f"Task {task_id} stopped successfully")
|
|
return True
|
|
except httpx.HTTPError as e:
|
|
logger.error(f"Failed to stop task {task_id}: {e}")
|
|
return False
|
|
except Exception as e:
|
|
logger.error(f"Unexpected error stopping task {task_id}: {e}")
|
|
return False
|
|
|
|
'''
|
|
async def get_task_status(self, task_id: str) -> Optional[dict]:
|
|
"""Get task status from runtime"""
|
|
try:
|
|
url = f"{self.base_url}/api/task/{task_id}/status"
|
|
response = await self.client.get(url)
|
|
response.raise_for_status()
|
|
return response.json()
|
|
except httpx.HTTPError as e:
|
|
logger.error(f"Failed to get task status {task_id}: {e}")
|
|
return None
|
|
except Exception as e:
|
|
logger.error(f"Unexpected error getting task status {task_id}: {e}")
|
|
return None
|
|
'''
|
|
|
|
async def get_task_status(self, task_id: str) -> Optional[dict]:
|
|
"""Get task status from runtime"""
|
|
url = f"{self.base_url}/api/task/{task_id}/status"
|
|
try:
|
|
logger.info(f"[RuntimeClient] Requesting status for task {task_id} from {url}")
|
|
response = await self.client.get(url)
|
|
|
|
# [调试] 打印 HTTP 状态码
|
|
logger.info(f"[RuntimeClient] Response status: {response.status_code}")
|
|
|
|
# 尝试读取响应体，无论状态码是多少
|
|
try:
|
|
resp_json = response.json()
|
|
logger.info(f"[RuntimeClient] Response body: {resp_json}")
|
|
|
|
# 如果 HTTP 状态码不是 2xx，我们也打印出来，但不抛异常（视具体业务逻辑而定）
|
|
# 这里保持原逻辑：raise_for_status
|
|
response.raise_for_status()
|
|
return resp_json
|
|
except httpx.HTTPError as e:
|
|
logger.error(f"[RuntimeClient] HTTP Error: {e}")
|
|
logger.debug(f"[RuntimeClient] Response text: {response.text}")
|
|
return None
|
|
except json.JSONDecodeError as e:
|
|
logger.error(f"[RuntimeClient] JSON Decode Error: {e}")
|
|
logger.debug(f"[RuntimeClient] Raw response: {response.text}")
|
|
return None
|
|
|
|
except httpx.ConnectError as e:
|
|
# [调试] 区分连接超时和连接被拒绝
|
|
logger.error(f"[RuntimeClient] Connect Error: {e}")
|
|
return None
|
|
except httpx.TimeoutException as e:
|
|
# [调试] 明确记录超时
|
|
logger.error(f"[RuntimeClient] Timeout waiting for status of {task_id}: {e}")
|
|
return None
|
|
except Exception as e:
|
|
logger.error(f"[RuntimeClient] Unexpected error: {e}")
|
|
return None
|
|
|
|
|
|
async def close(self):
|
|
"""Close HTTP client"""
|
|
await self.client.aclose()
|