From c28e4819d9c661c2eeab130a3694315dd5a6b6a6 Mon Sep 17 00:00:00 2001 From: carry Date: Sun, 20 Apr 2025 16:11:36 +0800 Subject: [PATCH] =?UTF-8?q?refactor(frontend/tools):=20=E9=87=8D=E5=91=BD?= =?UTF-8?q?=E5=90=8D=E7=94=9F=E6=88=90=E7=A4=BA=E4=BE=8B=20JSON=20?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BB=93=E6=9E=84=E7=9A=84=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将 generate_example_json 函数重命名为 generate_json_example - 更新相关文件中的函数调用和引用 - 此更改旨在使函数名称更具描述性和一致性 --- frontend/dataset_generate_page.py | 4 ++-- tools/__init__.py | 2 +- tools/json_example.py | 8 ++++---- tools/reasoning.py | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/frontend/dataset_generate_page.py b/frontend/dataset_generate_page.py index 1765a59..7d21123 100644 --- a/frontend/dataset_generate_page.py +++ b/frontend/dataset_generate_page.py @@ -6,7 +6,7 @@ from sqlmodel import Session, select sys.path.append(str(Path(__file__).resolve().parent.parent)) from schema import APIProvider, LLMRequest, LLMResponse, DatasetItem -from tools import call_openai_api, process_markdown_file, generate_example_json +from tools import call_openai_api, process_markdown_file, generate_json_example from global_var import get_docs, get_prompt_store, get_sql_engine def dataset_generate_page(): @@ -128,7 +128,7 @@ def dataset_generate_page(): for document_slice in document_slice_list: request = LLMRequest(api_provider=api_provider, prompt=prompt.format(document_slice=document_slice), - format=generate_example_json(DatasetItem)) + format=generate_json_example(DatasetItem)) call_openai_api(request, rounds) diff --git a/tools/__init__.py b/tools/__init__.py index b384ee1..6eeeaf3 100644 --- a/tools/__init__.py +++ b/tools/__init__.py @@ -1,5 +1,5 @@ from .parse_markdown import * from .document import * -from .json_example import generate_example_json +from .json_example import generate_json_example from .port import * from .reasoning import call_openai_api \ No newline at end of file diff --git a/tools/json_example.py b/tools/json_example.py index 8ebc68b..273b725 100644 --- a/tools/json_example.py +++ b/tools/json_example.py @@ -3,7 +3,7 @@ from typing import Any, Dict, List, Optional, Union, get_args, get_origin import json from datetime import datetime, date -def generate_example_json(model: type[BaseModel], include_optional: bool = False,list_length = 2) -> str: +def generate_json_example(model: type[BaseModel], include_optional: bool = False,list_length = 2) -> str: """ 根据 Pydantic V2 模型生成示例 JSON 数据结构。 """ @@ -37,14 +37,14 @@ def generate_example_json(model: type[BaseModel], include_optional: bool = False elif field_type is date: return date.today().isoformat() elif isinstance(field_type, type) and issubclass(field_type, BaseModel): - return json.loads(generate_example_json(field_type, include_optional)) + return json.loads(generate_json_example(field_type, include_optional)) else: # 处理直接类型注解(非泛型) if field_type is type(None): return None try: if issubclass(field_type, BaseModel): - return json.loads(generate_example_json(field_type, include_optional)) + return json.loads(generate_json_example(field_type, include_optional)) except TypeError: pass return "unknown" @@ -64,4 +64,4 @@ if __name__ == "__main__": from schema import Dataset print("示例 JSON:") - print(generate_example_json(Dataset)) + print(generate_json_example(Dataset)) diff --git a/tools/reasoning.py b/tools/reasoning.py index a9fde0e..ee632be 100644 --- a/tools/reasoning.py +++ b/tools/reasoning.py @@ -93,7 +93,7 @@ async def call_openai_api(llm_request: LLMRequest, rounds: int = 1, llm_paramete return llm_request if __name__ == "__main__": - from json_example import generate_example_json + from json_example import generate_json_example from sqlmodel import Session, select from global_var import get_sql_engine, init_global_var from schema import DatasetItem @@ -105,7 +105,7 @@ if __name__ == "__main__": llm_request = LLMRequest( prompt="测试,随便说点什么", api_provider=api_provider, - format=generate_example_json(DatasetItem) + format=generate_json_example(DatasetItem) ) # # 单次调用示例