From a3f963f1039b0a7d4764a538a4321daa7dc39cea Mon Sep 17 00:00:00 2001 From: zjrwtx <3038880699@qq.com> Date: Tue, 11 Mar 2025 16:33:15 +0800 Subject: [PATCH] pre-commit fix --- owl/app.py | 2 +- owl/run.py | 5 +++-- owl/run_deepseek_zh.py | 4 ++-- owl/run_mini.py | 10 +++------- owl/run_openai_compatiable_model.py | 4 ++-- owl/run_qwen_mini_zh.py | 6 +++--- owl/run_qwen_zh.py | 3 ++- owl/run_write_files.py | 5 +++-- 8 files changed, 19 insertions(+), 20 deletions(-) diff --git a/owl/app.py b/owl/app.py index e214577..20c7376 100644 --- a/owl/app.py +++ b/owl/app.py @@ -25,7 +25,7 @@ import signal import dotenv # 设置日志队列 -log_queue = queue.Queue() +log_queue: queue.Queue[str] = queue.Queue() # 当前运行的进程 current_process = None diff --git a/owl/run.py b/owl/run.py index 5138b52..679d618 100644 --- a/owl/run.py +++ b/owl/run.py @@ -12,11 +12,12 @@ # limitations under the License. # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. ========= from dotenv import load_dotenv +import os from camel.models import ModelFactory from camel.toolkits import ( AudioAnalysisToolkit, CodeExecutionToolkit, - FileWriteToolkit, + FileWriteToolkit, ExcelToolkit, ImageAnalysisToolkit, SearchToolkit, @@ -86,7 +87,7 @@ def construct_society(question: str) -> OwlRolePlaying: # Initialize the FileWriteToolkit with the output directory file_toolkit = FileWriteToolkit(output_dir=output_dir) - + # Configure toolkits tools = [ *file_toolkit.get_tools(), diff --git a/owl/run_deepseek_zh.py b/owl/run_deepseek_zh.py index 3aea329..251d78f 100644 --- a/owl/run_deepseek_zh.py +++ b/owl/run_deepseek_zh.py @@ -20,7 +20,7 @@ from dotenv import load_dotenv - +import os from camel.models import ModelFactory from camel.toolkits import ( CodeExecutionToolkit, @@ -94,7 +94,7 @@ def construct_society(question: str) -> OwlRolePlaying: # Initialize the FileWriteToolkit with the output directory file_toolkit = FileWriteToolkit(output_dir=output_dir) - + # Configure toolkits tools = [ *file_toolkit.get_tools(), diff --git a/owl/run_mini.py b/owl/run_mini.py index 3a305ed..7a48a74 100644 --- a/owl/run_mini.py +++ b/owl/run_mini.py @@ -12,13 +12,9 @@ # limitations under the License. # ========= Copyright 2023-2024 @ CAMEL-AI.org. All Rights Reserved. ========= from dotenv import load_dotenv - +import os from camel.models import ModelFactory -from camel.toolkits import ( - SearchToolkit, - WebToolkit, - FileWriteToolkit -) +from camel.toolkits import SearchToolkit, WebToolkit, FileWriteToolkit from camel.types import ModelPlatformType, ModelType from camel.logger import set_log_level @@ -68,7 +64,7 @@ def construct_society(question: str) -> OwlRolePlaying: # Initialize the FileWriteToolkit with the output directory file_toolkit = FileWriteToolkit(output_dir=output_dir) - + # Configure toolkits tools = [ *file_toolkit.get_tools(), diff --git a/owl/run_openai_compatiable_model.py b/owl/run_openai_compatiable_model.py index c29faba..05f9b6e 100644 --- a/owl/run_openai_compatiable_model.py +++ b/owl/run_openai_compatiable_model.py @@ -17,7 +17,7 @@ from dotenv import load_dotenv from camel.models import ModelFactory from camel.toolkits import ( CodeExecutionToolkit, - FileWriteToolkit, + FileWriteToolkit, ExcelToolkit, ImageAnalysisToolkit, SearchToolkit, @@ -89,7 +89,7 @@ def construct_society(question: str) -> OwlRolePlaying: # Initialize the FileWriteToolkit with the output directory file_toolkit = FileWriteToolkit(output_dir=output_dir) - + # Configure toolkits tools = [ *file_toolkit.get_tools(), diff --git a/owl/run_qwen_mini_zh.py b/owl/run_qwen_mini_zh.py index ee37e94..145c37d 100644 --- a/owl/run_qwen_mini_zh.py +++ b/owl/run_qwen_mini_zh.py @@ -17,7 +17,7 @@ # Set it as QWEN_API_KEY="your-api-key" in your .env file or add it to your environment variables from dotenv import load_dotenv - +import os from camel.models import ModelFactory from camel.toolkits import WebToolkit, SearchToolkit, FileWriteToolkit from camel.types import ModelPlatformType, ModelType @@ -66,9 +66,9 @@ def construct_society(question: str) -> OwlRolePlaying: # Initialize the FileWriteToolkit with the output directory file_toolkit = FileWriteToolkit(output_dir=output_dir) - + # Configure toolkits - tools = [ + tools_list = [ *file_toolkit.get_tools(), *WebToolkit( headless=False, diff --git a/owl/run_qwen_zh.py b/owl/run_qwen_zh.py index 6cd32ad..9bdf511 100644 --- a/owl/run_qwen_zh.py +++ b/owl/run_qwen_zh.py @@ -18,6 +18,7 @@ from dotenv import load_dotenv from camel.models import ModelFactory +import os from camel.toolkits import ( CodeExecutionToolkit, ExcelToolkit, @@ -93,7 +94,7 @@ def construct_society(question: str) -> OwlRolePlaying: # Initialize the FileWriteToolkit with the output directory file_toolkit = FileWriteToolkit(output_dir=output_dir) - + # Configure toolkits tools = [ *file_toolkit.get_tools(), diff --git a/owl/run_write_files.py b/owl/run_write_files.py index 0fc4c11..70315be 100644 --- a/owl/run_write_files.py +++ b/owl/run_write_files.py @@ -87,7 +87,7 @@ def construct_society(question: str) -> OwlRolePlaying: # Initialize the FileWriteToolkit with the output directory file_toolkit = FileWriteToolkit(output_dir=output_dir) - + # Configure toolkits tools = [ *file_toolkit.get_tools(), @@ -132,7 +132,7 @@ def construct_society(question: str) -> OwlRolePlaying: def main(): r"""Main function to run the OWL system with an example question.""" # Example research question - question ="""请使用文件写入工具生成一个Python脚本，创建一个简单的Flask网络服务器，并将其保存到file_write_outputs目录中的flask_server.py文件。脚本应该包含基本的路由和启动服务器的代码。""" + question = """请使用文件写入工具生成一个Python脚本，创建一个简单的Flask网络服务器，并将其保存到file_write_outputs目录中的flask_server.py文件。脚本应该包含基本的路由和启动服务器的代码。""" # Construct and run the society society = construct_society(question) answer, chat_history, token_count = run_society(society) @@ -140,5 +140,6 @@ def main(): # Output the result print(f"\033[94mAnswer: {answer}\033[0m") + if __name__ == "__main__": main()