feat: 添加风险规则及 agent assets 功能增强

server/tests/test_agent_asset_onlyoffice_key.py

@@ -15,9 +15,8 @@ def test_rule_spreadsheet_onlyoffice_key_uses_safe_characters() -> None:
 
     key = AgentAssetService._build_onlyoffice_document_key(
         "asset:id",
-        "v1.0.0",
         metadata,
     )
 
-    assert key == "asset_id-v1.0.0-abc123"
+    assert key == "asset_id-abc123"
     assert ":" not in key

server/tests/test_agent_asset_service.py

@@ -310,7 +310,7 @@ def test_restore_version_creates_new_working_copy_without_rewriting_published_ve
         assert restored.current_version_change_note == "基于历史版本 v1.0.0 恢复生成工作稿"
 
 
-def test_spreadsheet_version_compare_returns_sheet_and_cell_changes() -> None:
+def test_spreadsheet_upload_records_sheet_and_cell_changes_without_versions() -> None:
     with build_session() as db:
         service = AgentAssetService(db)
         rule = next(
@@ -322,34 +322,33 @@ def test_spreadsheet_version_compare_returns_sheet_and_cell_changes() -> None:
         service.upload_rule_spreadsheet(
             rule.id,
             filename="公司差旅费报销规则.xlsx",
-            content=build_workbook_bytes([["城市", "住宿"], ["北京", 500]]),
+                content=build_workbook_bytes([["城市", "住宿"], ["北京", 500]]),
             actor="finance_user",
         )
-        base_version = service.get_asset(rule.id).working_version  # type: ignore[union-attr]
         service.upload_rule_spreadsheet(
             rule.id,
             filename="公司差旅费报销规则.xlsx",
             content=build_workbook_bytes([["城市", "住宿"], ["北京", 550], ["武汉", 450]]),
             actor="finance_user",
         )
-        target_version = service.get_asset(rule.id).working_version  # type: ignore[union-attr]
 
-        diff = service.compare_spreadsheet_versions(
-            rule.id,
-            base_version=base_version or "",
-            target_version=target_version or "",
-        )
+        records = service.list_spreadsheet_change_records(rule.id)
+        latest = records[0]
 
-        assert diff.changed_sheet_count == 1
-        assert diff.changed_cell_count == 3
+        assert latest.changed_sheet_count == 1
+        assert latest.changed_cell_count == 3
         assert any(
             item.cell == "B2" and item.change_type == "modified"
-            for item in diff.cell_changes
+            for item in latest.cell_changes
         )
-        assert any(item.cell == "A3" and item.change_type == "added" for item in diff.cell_changes)
+        assert any(
+            item.cell == "A3" and item.change_type == "added"
+            for item in latest.cell_changes
+        )
+        assert not hasattr(latest, "version")
 
 
-def test_working_spreadsheet_version_reads_immutable_snapshot_instead_of_live_copy() -> None:
+def test_spreadsheet_content_reads_current_rule_file_without_version_snapshot() -> None:
     with build_session() as db:
         service = AgentAssetService(db)
         rule = next(
@@ -366,7 +365,6 @@ def test_working_spreadsheet_version_reads_immutable_snapshot_instead_of_live_co
         )
         detail = service.get_asset(rule.id)
         assert detail is not None
-        working_version = detail.working_version or ""
 
         current_asset = service.repository.get(rule.id)
         assert current_asset is not None
@@ -375,23 +373,13 @@ def test_working_spreadsheet_version_reads_immutable_snapshot_instead_of_live_co
         assert "agent_assets" not in live_storage_key
         live_path = service.spreadsheet_manager.resolve_storage_path(live_storage_key)
         assert not service.spreadsheet_manager.asset_root.exists()
-        original_live_bytes = live_path.read_bytes()
-        try:
-            live_path.write_bytes(build_workbook_bytes([["城市", "住宿"], ["北京", 999]]))
 
-            snapshot_path, _, _ = service.get_rule_spreadsheet_content(
-                rule.id,
-                version=working_version,
-            )
+        current_path, _, _ = service.get_rule_spreadsheet_content(rule.id)
 
-            assert snapshot_path != live_path
-            assert FINANCE_RULES_LIBRARY in snapshot_path.parts
-            assert ".versions" in snapshot_path.parts
-            assert "agent_assets" not in snapshot_path.parts
-            workbook = load_workbook(snapshot_path, data_only=False)
-            assert workbook.active["B2"].value == 500
-        finally:
-            live_path.write_bytes(original_live_bytes)
+        assert current_path == live_path
+        assert ".versions" not in current_path.parts
+        workbook = load_workbook(current_path, data_only=False)
+        assert workbook.active["B2"].value == 500
 
 
 def test_spreadsheet_change_records_return_recent_edit_details() -> None:
@@ -454,7 +442,6 @@ def test_spreadsheet_change_records_include_all_modified_sheets() -> None:
         )
         detail = service.get_asset(rule.id)
         assert detail is not None
-        first_version = detail.working_version
 
         service.upload_rule_spreadsheet(
             rule.id,
@@ -473,7 +460,7 @@ def test_spreadsheet_change_records_include_all_modified_sheets() -> None:
         changed_sheets = {item.sheet_name for item in latest.sheet_changes}
         changed_cell_sheets = {item.sheet_name for item in latest.cell_changes}
 
-        assert latest.version != first_version
+        assert not hasattr(latest, "version")
         assert latest.changed_sheet_count == 2
         assert {"差旅标准", "填表说明"}.issubset(changed_sheets)
         assert {"差旅标准", "填表说明"}.issubset(changed_cell_sheets)
@@ -513,6 +500,8 @@ def test_editable_spreadsheet_onlyoffice_config_enables_forcesave(monkeypatch) -
         customization = config.config["editorConfig"]["customization"]
         assert config.config["editorConfig"]["mode"] == "edit"
         assert customization["forcesave"] is True
+        assert "version=" not in config.config["document"]["url"]
+        assert "version=" not in config.config["editorConfig"]["callbackUrl"]
 
 
 def test_version_timeline_contains_created_review_and_publish_events() -> None:

server/tests/test_agent_foundation_endpoints.py

@@ -1,98 +1,98 @@
-from __future__ import annotations
-
-from collections.abc import Generator
-
-from fastapi.testclient import TestClient
-from sqlalchemy import create_engine
-from sqlalchemy.orm import Session, sessionmaker
-from sqlalchemy.pool import StaticPool
-
-from app.api.deps import get_db
-from app.core.agent_enums import AgentAssetStatus
-from app.db.base import Base
-from app.main import create_app
-from app.services.agent_assets import AgentAssetService
-
-
-def build_client() -> tuple[TestClient, sessionmaker[Session]]:
-    engine = create_engine(
-        "sqlite+pysqlite:///:memory:",
-        connect_args={"check_same_thread": False},
-        poolclass=StaticPool,
-    )
-    Base.metadata.create_all(bind=engine)
-    session_factory = sessionmaker(bind=engine, autoflush=False, autocommit=False)
-
-    app = create_app()
-
-    def override_db() -> Generator[Session, None, None]:
-        db = session_factory()
-        try:
-            yield db
-        finally:
-            db.close()
-
-    app.dependency_overrides[get_db] = override_db
-    return TestClient(app), session_factory
-
-
-def test_list_agent_assets_endpoint_returns_seeded_items() -> None:
-    client, _ = build_client()
-
-    response = client.get("/api/v1/agent-assets", params={"asset_type": "rule"})
-
-    assert response.status_code == 200
-    payload = response.json()
-    assert payload
-    assert all(item["asset_type"] == "rule" for item in payload)
-    assert any(item["code"] == "rule.expense.travel_risk_control_standard" for item in payload)
-
-
-def test_get_agent_asset_detail_endpoint_returns_version_history() -> None:
-    client, _ = build_client()
-
-    list_response = client.get("/api/v1/agent-assets", params={"asset_type": "rule"})
-    asset_id = next(
-        item["id"]
-        for item in list_response.json()
-        if item["code"] == "rule.expense.travel_risk_control_standard"
-    )
-
-    response = client.get(f"/api/v1/agent-assets/{asset_id}")
-
-    assert response.status_code == 200
-    payload = response.json()
-    assert payload["recent_versions"]
-    assert payload["current_version_content_type"] == "markdown"
-    assert payload["current_version"] == "v1.1.0"
-    assert "行程闭环" in payload["current_version_content"]
-
-
-def test_activate_pending_rule_endpoint_is_blocked() -> None:
-    client, session_factory = build_client()
-
-    with session_factory() as db:
-        pending_rule = next(
-            item
-            for item in AgentAssetService(db).list_assets(asset_type="rule")
-            if item.status == AgentAssetStatus.REVIEW.value
-        )
-
-    response = client.post(
-        f"/api/v1/agent-assets/{pending_rule.id}/activate",
-        headers={"x-actor": "pytest"},
-    )
-
-    assert response.status_code == 400
-    assert "审核" in response.json()["detail"]
-
-
-def test_list_audit_logs_endpoint_returns_seeded_logs() -> None:
-    client, _ = build_client()
-
-    response = client.get("/api/v1/audit-logs")
-
-    assert response.status_code == 200
-    payload = response.json()
-    assert payload
-    assert any(item["action"] == "review_rule" for item in payload)
+from __future__ import annotations
+
+from collections.abc import Generator
+
+from fastapi.testclient import TestClient
+from sqlalchemy import create_engine
+from sqlalchemy.orm import Session, sessionmaker
+from sqlalchemy.pool import StaticPool
+
+from app.api.deps import get_db
+from app.core.agent_enums import AgentAssetStatus
+from app.db.base import Base
+from app.main import create_app
+from app.services.agent_assets import AgentAssetService
+
+
+def build_client() -> tuple[TestClient, sessionmaker[Session]]:
+    engine = create_engine(
+        "sqlite+pysqlite:///:memory:",
+        connect_args={"check_same_thread": False},
+        poolclass=StaticPool,
+    )
+    Base.metadata.create_all(bind=engine)
+    session_factory = sessionmaker(bind=engine, autoflush=False, autocommit=False)
+
+    app = create_app()
+
+    def override_db() -> Generator[Session, None, None]:
+        db = session_factory()
+        try:
+            yield db
+        finally:
+            db.close()
+
+    app.dependency_overrides[get_db] = override_db
+    return TestClient(app), session_factory
+
+
+def test_list_agent_assets_endpoint_returns_seeded_items() -> None:
+    client, _ = build_client()
+
+    response = client.get("/api/v1/agent-assets", params={"asset_type": "rule"})
+
+    assert response.status_code == 200
+    payload = response.json()
+    assert payload
+    assert all(item["asset_type"] == "rule" for item in payload)
+    assert any(item["code"] == "rule.expense.travel_risk_control_standard" for item in payload)
+
+
+def test_get_agent_asset_detail_endpoint_returns_version_history() -> None:
+    client, _ = build_client()
+
+    list_response = client.get("/api/v1/agent-assets", params={"asset_type": "rule"})
+    asset_id = next(
+        item["id"]
+        for item in list_response.json()
+        if item["code"] == "rule.expense.travel_risk_control_standard"
+    )
+
+    response = client.get(f"/api/v1/agent-assets/{asset_id}")
+
+    assert response.status_code == 200
+    payload = response.json()
+    assert payload["recent_versions"]
+    assert payload["current_version_content_type"] == "markdown"
+    assert payload["current_version"] == "v1.1.0"
+    assert "行程闭环" in payload["current_version_content"]
+
+
+def test_activate_pending_rule_endpoint_is_blocked() -> None:
+    client, session_factory = build_client()
+
+    with session_factory() as db:
+        pending_rule = next(
+            item
+            for item in AgentAssetService(db).list_assets(asset_type="rule")
+            if item.status == AgentAssetStatus.REVIEW.value
+        )
+
+    response = client.post(
+        f"/api/v1/agent-assets/{pending_rule.id}/activate",
+        headers={"x-actor": "pytest"},
+    )
+
+    assert response.status_code == 400
+    assert "审核" in response.json()["detail"]
+
+
+def test_list_audit_logs_endpoint_returns_seeded_logs() -> None:
+    client, _ = build_client()
+
+    response = client.get("/api/v1/audit-logs")
+
+    assert response.status_code == 200
+    payload = response.json()
+    assert payload
+    assert any(item["action"] == "review_rule" for item in payload)