feat(ai_agent): 新增openclaw_hermes混合AI适配器 新增OpenClawHermesAdapter适配器,结合Hermes记忆功能和OpenClaw执行能力, 实现AI问答流程中的记忆召回、执行操作和记忆存储的完整闭环。 同时更新NoopAdapter提示信息,添加新的模型提供商选项。 feat(business): 新增考勤、工作报告和风险事件业务模型 新增AttendanceRecord、WorkReport、RiskEvent和LegacySyncRun四个业务模型, 扩展业务领域注册表,支持考勤管理、工作报告生成和风险事件跟踪等核心业务功能。 feat(reports): 实现考勤汇总和工作日报周报生成功能 新增attendance_summary方法用于统计每日考勤情况, 新增generate_work_report方法用于生成日/周经营报告, 包含任务完成情况、待处理事项和风险指标等综合信息。 feat(risk): 扩展风险管理API端点和供应商风险检测 新增供应商风险查询端点和风险事件管理端点, 提供风险事件列表查询和自动生成功能, 增强供应商风险评估能力。 feat(feishu): 添加考勤查询命令和风险摘要增强 集成考勤汇总查询功能到飞书命令系统, 在风险摘要中添加供应商风险和开放风险事件统计, 丰富日常经营管理信息展示。 refactor(service): 优化业务服务数据验证和类型转换 重构_model_payload函数实现数据验证和类型转换, 添加列值类型强制转换逻辑,提高API数据处理的准确性和安全性。 build(deps): 添加postgresql数据库驱动依赖 在Dockerfile中添加psycopg[binary]==3.2.3依赖包, 支持PostgreSQL数据库连接和操作。 chore(config): 更新.gitignore文件排除备份和迁移目录 在.gitignore中添加AGENTS.md.bak-*和migration/目录排除规则, 避免备份文件和本地迁移工作区被提交到版本控制系统。 ```
173 lines
6.2 KiB
Python
173 lines
6.2 KiB
Python
from datetime import date, datetime
|
|
from decimal import Decimal, InvalidOperation
|
|
from typing import Any
|
|
|
|
from fastapi import HTTPException, status
|
|
from sqlalchemy import Date as SQLDate
|
|
from sqlalchemy import DateTime as SQLDateTime
|
|
from sqlalchemy import Numeric as SQLNumeric
|
|
from sqlalchemy import Select, func, select
|
|
from sqlalchemy.sql.schema import Column
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.modules.audit.schemas import AuditLogCreate
|
|
from app.modules.audit.service import AuditService
|
|
from app.modules.approvals.service import ApprovalService
|
|
from app.modules.business.registry import HIGH_RISK_DOMAINS, get_domain_model
|
|
|
|
|
|
def serialize_model(record: Any) -> dict[str, Any]:
|
|
"""Convert a SQLAlchemy model instance into a JSON-friendly dictionary."""
|
|
|
|
data: dict[str, Any] = {}
|
|
for column in record.__table__.columns:
|
|
value = getattr(record, column.name)
|
|
if isinstance(value, (datetime, date)):
|
|
data[column.name] = value.isoformat()
|
|
elif isinstance(value, Decimal):
|
|
data[column.name] = float(value)
|
|
else:
|
|
data[column.name] = value
|
|
return data
|
|
|
|
|
|
def _coerce_column_value(column: Column, value: Any) -> Any:
|
|
"""Coerce API JSON values into the Python type expected by a SQLAlchemy column."""
|
|
|
|
if value is None:
|
|
return None
|
|
if isinstance(column.type, SQLDateTime) and isinstance(value, str):
|
|
return datetime.fromisoformat(value.replace("Z", "+00:00"))
|
|
if isinstance(column.type, SQLDate) and isinstance(value, str):
|
|
return date.fromisoformat(value)
|
|
if isinstance(column.type, SQLNumeric) and not isinstance(value, Decimal):
|
|
return Decimal(str(value))
|
|
return value
|
|
|
|
|
|
def _model_payload(model: Any, data: dict[str, Any]) -> dict[str, Any]:
|
|
"""Filter unknown keys and coerce values according to model column types."""
|
|
|
|
columns = {column.name: column for column in model.__table__.columns if column.name != "id"}
|
|
payload: dict[str, Any] = {}
|
|
for key, value in data.items():
|
|
column = columns.get(key)
|
|
if column is None:
|
|
continue
|
|
try:
|
|
payload[key] = _coerce_column_value(column, value)
|
|
except (ValueError, TypeError, InvalidOperation) as exc:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_422_UNPROCESSABLE_ENTITY,
|
|
detail=f"Invalid value for field '{key}'",
|
|
) from exc
|
|
return payload
|
|
|
|
|
|
class BusinessService:
|
|
"""Manage generic CRUD operations across registered business domains."""
|
|
|
|
def __init__(self, db: Session):
|
|
self.db = db
|
|
self.audit = AuditService(db)
|
|
|
|
def list_records(
|
|
self,
|
|
domain: str,
|
|
limit: int = 50,
|
|
offset: int = 0,
|
|
status_filter: str | None = None,
|
|
) -> tuple[int, list[dict[str, Any]]]:
|
|
model = get_domain_model(domain)
|
|
stmt: Select = select(model)
|
|
count_stmt = select(func.count()).select_from(model)
|
|
if status_filter and hasattr(model, "status"):
|
|
stmt = stmt.where(model.status == status_filter)
|
|
count_stmt = count_stmt.where(model.status == status_filter)
|
|
stmt = stmt.order_by(model.id.desc()).limit(min(limit, 500)).offset(max(offset, 0))
|
|
total = int(self.db.execute(count_stmt).scalar() or 0)
|
|
return total, [serialize_model(item) for item in self.db.execute(stmt).scalars()]
|
|
|
|
def get_record(self, domain: str, record_id: int) -> dict[str, Any]:
|
|
model = get_domain_model(domain)
|
|
record = self.db.get(model, record_id)
|
|
if record is None:
|
|
raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Record not found")
|
|
return serialize_model(record)
|
|
|
|
def create_record(
|
|
self,
|
|
domain: str,
|
|
data: dict[str, Any],
|
|
actor: str = "api",
|
|
) -> dict[str, Any]:
|
|
model = get_domain_model(domain)
|
|
payload = _model_payload(model, data)
|
|
record = model(**payload)
|
|
self.db.add(record)
|
|
self.db.commit()
|
|
self.db.refresh(record)
|
|
result = serialize_model(record)
|
|
self.audit.log(
|
|
AuditLogCreate(
|
|
actor=actor,
|
|
source="api",
|
|
action=f"create:{domain}",
|
|
target_type=domain,
|
|
target_id=str(record.id),
|
|
request_payload=data,
|
|
response_payload=result,
|
|
)
|
|
)
|
|
return result
|
|
|
|
def update_record(
|
|
self,
|
|
domain: str,
|
|
record_id: int,
|
|
data: dict[str, Any],
|
|
actor: str = "api",
|
|
approval_ticket_id: str | None = None,
|
|
) -> dict[str, Any]:
|
|
if domain in HIGH_RISK_DOMAINS:
|
|
if not approval_ticket_id:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_409_CONFLICT,
|
|
detail="High-risk domain update requires approval_ticket_id",
|
|
)
|
|
if not ApprovalService(self.db).is_approved_for(
|
|
approval_ticket_id,
|
|
domain,
|
|
record_id,
|
|
f"update:{domain}",
|
|
):
|
|
raise HTTPException(
|
|
status_code=status.HTTP_403_FORBIDDEN,
|
|
detail="Approval ticket is not approved for this update",
|
|
)
|
|
model = get_domain_model(domain)
|
|
record = self.db.get(model, record_id)
|
|
if record is None:
|
|
raise HTTPException(
|
|
status_code=status.HTTP_404_NOT_FOUND,
|
|
detail="Record not found",
|
|
)
|
|
for key, value in _model_payload(model, data).items():
|
|
setattr(record, key, value)
|
|
self.db.commit()
|
|
self.db.refresh(record)
|
|
result = serialize_model(record)
|
|
self.audit.log(
|
|
AuditLogCreate(
|
|
actor=actor,
|
|
source="api",
|
|
action=f"update:{domain}",
|
|
target_type=domain,
|
|
target_id=str(record.id),
|
|
risk_level="high" if domain in HIGH_RISK_DOMAINS else "low",
|
|
request_payload={"data": data, "approval_ticket_id": approval_ticket_id},
|
|
response_payload=result,
|
|
)
|
|
)
|
|
return result
|