aient 1.2.24__tar.gz → 1.2.26__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {aient-1.2.24 → aient-1.2.26}/PKG-INFO +1 -1
- {aient-1.2.24 → aient-1.2.26}/aient/models/chatgpt.py +5 -4
- {aient-1.2.24 → aient-1.2.26}/aient.egg-info/PKG-INFO +1 -1
- {aient-1.2.24 → aient-1.2.26}/pyproject.toml +1 -1
- {aient-1.2.24 → aient-1.2.26}/LICENSE +0 -0
- {aient-1.2.24 → aient-1.2.26}/README.md +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/__init__.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/architext/architext/__init__.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/architext/architext/core.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/architext/test/openai_client.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/architext/test/test.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/architext/test/test_save_load.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/__init__.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/log_config.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/models.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/request.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/response.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/test/test_base_api.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/test/test_geminimask.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/test/test_image.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/test/test_payload.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/core/utils.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/models/__init__.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/models/audio.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/models/base.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/__init__.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/arXiv.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/config.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/excute_command.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/get_time.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/image.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/list_directory.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/read_file.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/read_image.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/readonly.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/registry.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/run_python.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/websearch.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/plugins/write_file.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/utils/__init__.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/utils/prompt.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient/utils/scripts.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient.egg-info/SOURCES.txt +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient.egg-info/dependency_links.txt +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient.egg-info/requires.txt +0 -0
- {aient-1.2.24 → aient-1.2.26}/aient.egg-info/top_level.txt +0 -0
- {aient-1.2.24 → aient-1.2.26}/setup.cfg +0 -0
- {aient-1.2.24 → aient-1.2.26}/test/test_Web_crawler.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/test/test_ddg_search.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/test/test_google_search.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/test/test_ollama.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/test/test_plugin.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/test/test_search.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/test/test_url.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/test/test_whisper.py +0 -0
- {aient-1.2.24 → aient-1.2.26}/test/test_yjh.py +0 -0
@@ -6,6 +6,7 @@ import httpx
|
|
6
6
|
import asyncio
|
7
7
|
import logging
|
8
8
|
import inspect
|
9
|
+
from collections import defaultdict
|
9
10
|
from typing import Union, Optional, Callable
|
10
11
|
|
11
12
|
from .base import BaseLLM
|
@@ -97,9 +98,7 @@ class chatgpt(BaseLLM):
|
|
97
98
|
Initialize Chatbot with API key (from https://platform.openai.com/account/api-keys)
|
98
99
|
"""
|
99
100
|
super().__init__(api_key, engine, api_url, system_prompt, proxy, timeout, max_tokens, temperature, top_p, presence_penalty, frequency_penalty, reply_count, truncate_limit, use_plugins=use_plugins, print_log=print_log)
|
100
|
-
self.conversation: dict[str, Messages] =
|
101
|
-
"default": Messages(SystemMessage(self.system_prompt)),
|
102
|
-
}
|
101
|
+
self.conversation: dict[str, Messages] = defaultdict(lambda: Messages(SystemMessage(self.system_prompt)))
|
103
102
|
if cache_messages:
|
104
103
|
self.conversation["default"] = cache_messages
|
105
104
|
self.function_calls_counter = {}
|
@@ -476,7 +475,9 @@ class chatgpt(BaseLLM):
|
|
476
475
|
# 删除 task_complete 跟其他工具一起调用的情况,因为 task_complete 必须单独调用
|
477
476
|
if len(function_parameter) > 1:
|
478
477
|
function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") != "task_complete"]
|
479
|
-
|
478
|
+
# 仅当存在其他工具时,才删除 get_task_result
|
479
|
+
if any(tool.get("function_name") != "get_task_result" for tool in function_parameter):
|
480
|
+
function_parameter = [tool_dict for tool_dict in function_parameter if tool_dict.get("function_name", "") != "get_task_result"]
|
480
481
|
if len(function_parameter) == 1 and function_parameter[0].get("function_name", "") == "task_complete":
|
481
482
|
raise TaskComplete(safe_get(function_parameter, 0, "parameter", "message", default="The task has been completed."))
|
482
483
|
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|
File without changes
|