aient 1.1.69__tar.gz → 1.1.71__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.1.69 → aient-1.1.71}/PKG-INFO +1 -1
- {aient-1.1.69 → aient-1.1.71}/aient/models/chatgpt.py +8 -7
- {aient-1.1.69 → aient-1.1.71}/aient.egg-info/PKG-INFO +1 -1
- {aient-1.1.69 → aient-1.1.71}/pyproject.toml +1 -1
- {aient-1.1.69 → aient-1.1.71}/LICENSE +0 -0
- {aient-1.1.69 → aient-1.1.71}/README.md +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/__init__.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/__init__.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/log_config.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/models.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/request.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/response.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/test/test_base_api.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/test/test_geminimask.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/test/test_image.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/test/test_payload.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/core/utils.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/models/__init__.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/models/audio.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/models/base.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/__init__.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/arXiv.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/config.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/excute_command.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/get_time.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/image.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/list_directory.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/read_file.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/read_image.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/readonly.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/registry.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/run_python.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/websearch.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/plugins/write_file.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/utils/__init__.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/utils/prompt.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient/utils/scripts.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient.egg-info/SOURCES.txt +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient.egg-info/dependency_links.txt +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient.egg-info/requires.txt +0 -0
- {aient-1.1.69 → aient-1.1.71}/aient.egg-info/top_level.txt +0 -0
- {aient-1.1.69 → aient-1.1.71}/setup.cfg +0 -0
- {aient-1.1.69 → aient-1.1.71}/test/test_Web_crawler.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/test/test_ddg_search.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/test/test_google_search.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/test/test_ollama.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/test/test_plugin.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/test/test_search.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/test/test_url.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/test/test_whisper.py +0 -0
- {aient-1.1.69 → aient-1.1.71}/test/test_yjh.py +0 -0
@@ -6,9 +6,8 @@ import httpx
|
|
6
6
|
import asyncio
|
7
7
|
import logging
|
8
8
|
import inspect
|
9
|
-
import requests
|
10
9
|
from typing import Set
|
11
|
-
from typing import Union, Optional, Callable
|
10
|
+
from typing import Union, Optional, Callable
|
12
11
|
from pathlib import Path
|
13
12
|
|
14
13
|
|
@@ -360,6 +359,7 @@ class chatgpt(BaseLLM):
|
|
360
359
|
system_prompt=None,
|
361
360
|
pass_history=9999,
|
362
361
|
is_async=False,
|
362
|
+
stream: bool = True,
|
363
363
|
**kwargs
|
364
364
|
):
|
365
365
|
"""
|
@@ -388,6 +388,7 @@ class chatgpt(BaseLLM):
|
|
388
388
|
elif isinstance(line, (dict, list)):
|
389
389
|
if isinstance(line, dict) and safe_get(line, "choices", 0, "message", "content"):
|
390
390
|
full_response = line["choices"][0]["message"]["content"]
|
391
|
+
total_tokens = safe_get(line, "usage", "total_tokens", default=0)
|
391
392
|
return full_response
|
392
393
|
else:
|
393
394
|
return str(line)
|
@@ -660,7 +661,7 @@ class chatgpt(BaseLLM):
|
|
660
661
|
model=model or self.engine, function_arguments=function_full_response,
|
661
662
|
function_call_id=function_call_id, api_key=kwargs.get('api_key', self.api_key),
|
662
663
|
api_url=kwargs.get('api_url', self.api_url.chat_url),
|
663
|
-
plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt
|
664
|
+
plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt, stream=stream
|
664
665
|
):
|
665
666
|
yield chunk
|
666
667
|
else:
|
@@ -670,7 +671,7 @@ class chatgpt(BaseLLM):
|
|
670
671
|
model=model or self.engine, function_arguments=function_full_response,
|
671
672
|
function_call_id=function_call_id, api_key=kwargs.get('api_key', self.api_key),
|
672
673
|
api_url=kwargs.get('api_url', self.api_url.chat_url),
|
673
|
-
plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt
|
674
|
+
plugins=kwargs.get("plugins", self.plugins), system_prompt=system_prompt, stream=stream
|
674
675
|
):
|
675
676
|
yield chunk
|
676
677
|
else:
|
@@ -764,7 +765,7 @@ class chatgpt(BaseLLM):
|
|
764
765
|
generator, convo_id=convo_id, function_name=function_name,
|
765
766
|
total_tokens=total_tokens, function_arguments=function_arguments,
|
766
767
|
function_call_id=function_call_id, model=model, language=language,
|
767
|
-
system_prompt=system_prompt, pass_history=pass_history, is_async=True, **kwargs
|
768
|
+
system_prompt=system_prompt, pass_history=pass_history, is_async=True, stream=stream, **kwargs
|
768
769
|
):
|
769
770
|
yield processed_chunk
|
770
771
|
|
@@ -867,7 +868,7 @@ class chatgpt(BaseLLM):
|
|
867
868
|
convo_id=convo_id,
|
868
869
|
pass_history=pass_history,
|
869
870
|
model=model or self.engine,
|
870
|
-
stream=
|
871
|
+
stream=True,
|
871
872
|
**kwargs,
|
872
873
|
)
|
873
874
|
full_response: str = "".join([r async for r in response])
|
@@ -891,7 +892,7 @@ class chatgpt(BaseLLM):
|
|
891
892
|
convo_id=convo_id,
|
892
893
|
pass_history=pass_history,
|
893
894
|
model=model or self.engine,
|
894
|
-
stream=
|
895
|
+
stream=True,
|
895
896
|
**kwargs,
|
896
897
|
)
|
897
898
|
full_response: str = "".join([r for r in response])
|
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
|