aient 1.0.63__tar.gz → 1.0.65__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.0.63/src/aient.egg-info → aient-1.0.65}/PKG-INFO +1 -1
- {aient-1.0.63 → aient-1.0.65}/setup.py +1 -1
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/test/test_base_api.py +4 -3
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/utils.py +1 -1
- {aient-1.0.63 → aient-1.0.65}/src/aient/models/base.py +0 -5
- {aient-1.0.63 → aient-1.0.65}/src/aient/models/chatgpt.py +3 -3
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/__init__.py +1 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/config.py +7 -2
- {aient-1.0.63 → aient-1.0.65/src/aient.egg-info}/PKG-INFO +1 -1
- {aient-1.0.63 → aient-1.0.65}/LICENSE +0 -0
- {aient-1.0.63 → aient-1.0.65}/MANIFEST.in +0 -0
- {aient-1.0.63 → aient-1.0.65}/README.md +0 -0
- {aient-1.0.63 → aient-1.0.65}/setup.cfg +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/__init__.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/.git +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/__init__.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/log_config.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/models.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/request.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/response.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/test/test_image.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/core/test/test_payload.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/models/__init__.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/models/audio.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/models/claude.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/models/duckduckgo.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/models/gemini.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/models/groq.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/models/vertex.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/arXiv.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/excute_command.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/get_time.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/image.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/list_directory.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/read_file.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/registry.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/run_python.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/websearch.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/plugins/write_file.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/prompt/__init__.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/prompt/agent.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/utils/__init__.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/utils/prompt.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient/utils/scripts.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient.egg-info/SOURCES.txt +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient.egg-info/dependency_links.txt +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient.egg-info/requires.txt +0 -0
- {aient-1.0.63 → aient-1.0.65}/src/aient.egg-info/top_level.txt +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_API.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_Deepbricks.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_Web_crawler.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_aiwaves.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_aiwaves_arxiv.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_ask_gemini.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_class.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_claude.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_claude_zh_char.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_ddg_search.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_download_pdf.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_gemini.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_get_token_dict.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_google_search.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_jieba.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_json.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_langchain_search_old.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_logging.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_ollama.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_plugin.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_py_run.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_requests.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_search.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_tikitoken.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_token.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_url.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_whisper.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_wildcard.py +0 -0
- {aient-1.0.63 → aient-1.0.65}/test/test_yjh.py +0 -0
@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
|
|
4
4
|
|
5
5
|
setup(
|
6
6
|
name="aient",
|
7
|
-
version="1.0.
|
7
|
+
version="1.0.65",
|
8
8
|
description="Aient: The Awakening of Agent.",
|
9
9
|
long_description=Path.open(Path("README.md"), encoding="utf-8").read(),
|
10
10
|
long_description_content_type="text/markdown",
|
@@ -1,7 +1,5 @@
|
|
1
1
|
from ..utils import BaseAPI
|
2
2
|
|
3
|
-
import os
|
4
|
-
|
5
3
|
# GOOGLE_AI_API_KEY = os.environ.get('GOOGLE_AI_API_KEY', None)
|
6
4
|
|
7
5
|
# base_api = BaseAPI("https://generativelanguage.googleapis.com/v1beta/models/gemini-2.0-flash:streamGenerateContent?key=" + GOOGLE_AI_API_KEY)
|
@@ -9,9 +7,12 @@ import os
|
|
9
7
|
# print(base_api.chat_url)
|
10
8
|
|
11
9
|
base_api = BaseAPI("http://127.0.0.1:8000/v1")
|
12
|
-
|
13
10
|
print(base_api.chat_url)
|
14
11
|
|
12
|
+
base_api = BaseAPI("http://127.0.0.1:8000/v1/images/generations")
|
13
|
+
print(base_api.image_url)
|
14
|
+
|
15
15
|
"""
|
16
16
|
python -m core.test.test_base_api
|
17
|
+
python -m aient.src.aient.core.test.test_base_api
|
17
18
|
"""
|
@@ -124,6 +124,7 @@ def get_engine(provider, endpoint=None, original_model=""):
|
|
124
124
|
|
125
125
|
return engine, stream
|
126
126
|
|
127
|
+
from httpx_socks import AsyncProxyTransport
|
127
128
|
def get_proxy(proxy, client_config = {}):
|
128
129
|
if proxy:
|
129
130
|
# 解析代理URL
|
@@ -132,7 +133,6 @@ def get_proxy(proxy, client_config = {}):
|
|
132
133
|
|
133
134
|
if scheme == 'socks5':
|
134
135
|
try:
|
135
|
-
from httpx_socks import AsyncProxyTransport
|
136
136
|
proxy = proxy.replace('socks5h://', 'socks5://')
|
137
137
|
transport = AsyncProxyTransport.from_url(proxy)
|
138
138
|
client_config["transport"] = transport
|
@@ -37,11 +37,6 @@ class BaseLLM:
|
|
37
37
|
self.presence_penalty: float = presence_penalty
|
38
38
|
self.frequency_penalty: float = frequency_penalty
|
39
39
|
self.reply_count: int = reply_count
|
40
|
-
self.max_tokens: int = max_tokens or (
|
41
|
-
4096
|
42
|
-
if "gpt-4" or "claude" in engine
|
43
|
-
else 4000
|
44
|
-
)
|
45
40
|
self.truncate_limit: int = truncate_limit or (
|
46
41
|
198000
|
47
42
|
if "claude" in engine
|
@@ -83,8 +83,6 @@ class chatgpt(BaseLLM):
|
|
83
83
|
# 注册和处理传入的工具
|
84
84
|
self._register_tools(tools)
|
85
85
|
|
86
|
-
if self.tokens_usage["default"] > self.max_tokens:
|
87
|
-
raise Exception("System prompt is too long")
|
88
86
|
|
89
87
|
def _register_tools(self, tools):
|
90
88
|
"""动态注册工具函数并更新配置"""
|
@@ -255,7 +253,6 @@ class chatgpt(BaseLLM):
|
|
255
253
|
{"role": "system","content": self.system_prompt},
|
256
254
|
{"role": role, "content": prompt}
|
257
255
|
],
|
258
|
-
"max_tokens": kwargs.get("max_tokens", self.max_tokens),
|
259
256
|
"stream": True,
|
260
257
|
"stream_options": {
|
261
258
|
"include_usage": True
|
@@ -263,6 +260,9 @@ class chatgpt(BaseLLM):
|
|
263
260
|
"temperature": kwargs.get("temperature", self.temperature)
|
264
261
|
}
|
265
262
|
|
263
|
+
if kwargs.get("max_tokens", self.max_tokens):
|
264
|
+
request_data["max_tokens"] = kwargs.get("max_tokens", self.max_tokens)
|
265
|
+
|
266
266
|
# 添加工具相关信息
|
267
267
|
if kwargs.get("plugins", None):
|
268
268
|
self.plugins = kwargs.get("plugins")
|
@@ -143,10 +143,15 @@ def get_plugins():
|
|
143
143
|
}
|
144
144
|
|
145
145
|
# 修改function_call_list定义,使用registry中的工具
|
146
|
-
def get_function_call_list():
|
146
|
+
def get_function_call_list(tools_list=None):
|
147
147
|
function_list = {}
|
148
|
+
if tools_list is None:
|
149
|
+
filtered_tools = registry.tools.keys()
|
150
|
+
else:
|
151
|
+
filtered_tools = [tool.__name__ if callable(tool) else str(tool) for tool in tools_list]
|
148
152
|
for tool_name, tool_func in registry.tools.items():
|
149
|
-
|
153
|
+
if tool_name in filtered_tools:
|
154
|
+
function_list[tool_name] = function_to_json(tool_func)
|
150
155
|
return function_list
|
151
156
|
|
152
157
|
def get_claude_tools_list():
|
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
|
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
|