@@ -908,7 +908,7 @@ const ask_gpt = async (message_id, message_index = -1, regenerate = false, provi
controller_storage[message_id] = new AbortController();
- let content_el = document.getElementById(`gpt_${message_id}`)
+ let content_el = message_el.querySelector('.content');
let content_map = content_storage[message_id] = {
container: message_el,
content: content_el,
@@ -1986,7 +1986,7 @@ async function on_api() {
console.log("pressed enter");
prompt_lock = true;
setTimeout(()=>prompt_lock=false, 3000);
- await handle_ask();
+ await handle_ask(!do_enter);
} else {
messageInput.style.height = messageInput.scrollHeight + "px";
}
@@ -2777,7 +2777,9 @@ if (SpeechRecognition) {
buffer = "";
};
recognition.onend = function() {
- messageInput.value = `${startValue ? startValue + "\n" : ""}${buffer}`;
+ if (buffer) {
+ messageInput.value = `${startValue ? startValue + "\n" : ""}${buffer}`;
+ }
if (microLabel.classList.contains("recognition")) {
recognition.start();
} else {
diff --git a/g4f/providers/base_provider.py b/g4f/providers/base_provider.py
index b1b1b392..f16dcc7b 100644
--- a/g4f/providers/base_provider.py
+++ b/g4f/providers/base_provider.py
@@ -361,7 +361,7 @@ class ProviderModelMixin:
model = cls.model_aliases[model]
else:
if model not in cls.get_models(**kwargs) and cls.models:
- raise ModelNotSupportedError(f"Model is not supported: {model} in: {cls.__name__}")
+ raise ModelNotSupportedError(f"Model is not supported: {model} in: {cls.__name__} Valid models: {cls.models}")
cls.last_model = model
debug.last_model = model
return model
@@ -373,9 +373,11 @@ class RaiseErrorMixin():
if "error_message" in data:
raise ResponseError(data["error_message"])
elif "error" in data:
- if "code" in data["error"]:
+ if isinstance(data["error"], str):
+ raise ResponseError(data["error"])
+ elif "code" in data["error"]:
raise ResponseError("\n".join(
- [e for e in [f'Error {data["error"]["code"]}: {data["error"]["message"]}', data["error"].get("failed_generation")] if e is not None]
+ [e for e in [f'Error {data["error"]["code"]}:{data["error"]["message"]}', data["error"].get("failed_generation")] if e is not None]
))
elif "message" in data["error"]:
raise ResponseError(data["error"]["message"])
diff --git a/g4f/requests/raise_for_status.py b/g4f/requests/raise_for_status.py
index b7cd9f04..e82564bf 100644
--- a/g4f/requests/raise_for_status.py
+++ b/g4f/requests/raise_for_status.py
@@ -23,10 +23,20 @@ def is_openai(text: str) -> bool:
async def raise_for_status_async(response: Union[StreamResponse, ClientResponse], message: str = None):
if response.ok:
return
- text = await response.text()
+ text = (await response.text()).strip()
if message is None:
- is_html = response.headers.get("content-type", "").startswith("text/html") or text.startswith(" dict:
+ message_dict: Dict[str, Any]
+ if isinstance(message, ChatCompletionMessage):
+ message_dict = {"role": message.role, "content": message.content}
+ if message.tool_calls is not None:
+ message_dict["tool_calls"] = [{
+ "id": tool_call.id,
+ "type": tool_call.type,
+ "function": tool_call.function
+ } for tool_call in message.tool_calls]
+ if message_dict["content"] == "":
+ message_dict["content"] = None
+ else:
+ message_dict = convert_message_to_dict(message)
+ return message_dict
+
+openai.convert_message_to_dict = new_convert_message_to_dict
+
+class ChatAI(openai.ChatOpenAI):
+ model_name: str = Field(default="gpt-4o", alias="model")
+
+ @classmethod
+ def validate_environment(cls, values: dict) -> dict:
+ client_params = {
+ "api_key": values["g4f_api_key"] if "g4f_api_key" in values else None,
+ "provider": values["provider"] if "provider" in values else None,
+ }
+ values["client"] = Client(**client_params).chat.completions
+ values["async_client"] = AsyncClient(
+ **client_params
+ ).chat.completions
+ return values
\ No newline at end of file
diff --git a/g4f/tools/run_tools.py b/g4f/tools/run_tools.py
index f9d7246b..a34a2bdb 100644
--- a/g4f/tools/run_tools.py
+++ b/g4f/tools/run_tools.py
@@ -10,7 +10,7 @@ from typing import Optional, Callable, AsyncIterator
from ..typing import Messages
from ..providers.helper import filter_none
from ..providers.asyncio import to_async_iterator
-from ..providers.response import Reasoning, FinishReason
+from ..providers.response import Reasoning, FinishReason, Sources
from ..providers.types import ProviderType
from ..cookies import get_cookies_dir
from .web_search import do_search, get_search_message
@@ -208,6 +208,8 @@ def iter_run_tools(
sources = None
yield chunk
continue
+ elif isinstance(chunk, Sources):
+ sources = None
if not isinstance(chunk, str):
yield chunk
continue