Merge pull request #2574 from hlohaus/16Jan

Add missing webview requirements

g4f/gui/server/api.py

@@ -99,14 +99,9 @@ def _prepare_conversation_kwargs(self, json_data: dict, kwargs: dict):
             },
             "type": "function"
         }]
-        do_web_search = json_data.get('web_search')
-        if do_web_search and provider:
-            kwargs["tool_calls"].append({
-                "function": {
-                    "name": "safe_search_tool"
-                },
-                "type": "function"
-            })
+        web_search = json_data.get('web_search')
+        if web_search:
+            kwargs["web_search"] = web_search
         action = json_data.get('action')
         if action == "continue":
             kwargs["tool_calls"].append({

g4f/tools/run_tools.py

@@ -29,10 +29,12 @@ def validate_arguments(data: dict) -> dict:
 
 async def async_iter_run_tools(async_iter_callback, model, messages, tool_calls: Optional[list] = None, **kwargs):
     # Handle web_search from kwargs
-    if kwargs.get('web_search'):
+    web_search = kwargs.get('web_search')
+    if web_search:
         try:
             messages = messages.copy()
-            messages[-1]["content"] = await do_search(messages[-1]["content"])
+            web_search = web_search if isinstance(web_search, str) and web_search != "true" else None
+            messages[-1]["content"] = await do_search(messages[-1]["content"], web_search)
         except Exception as e:
             debug.log(f"Couldn't do web search: {e.__class__.__name__}: {e}")
             # Keep web_search in kwargs for provider native support
@@ -78,10 +80,12 @@ def iter_run_tools(
     **kwargs
 ) -> AsyncIterator:
     # Handle web_search from kwargs
-    if kwargs.get('web_search'):
+    web_search = kwargs.get('web_search')
+    if web_search:
         try:
             messages = messages.copy()
-            messages[-1]["content"] = asyncio.run(do_search(messages[-1]["content"]))
+            web_search = web_search if isinstance(web_search, str) and web_search != "true" else None
+            messages[-1]["content"] = asyncio.run(do_search(messages[-1]["content"], web_search))
         except Exception as e:
             debug.log(f"Couldn't do web search: {e.__class__.__name__}: {e}")
             # Keep web_search in kwargs for provider native support

requirements.txt

@@ -16,6 +16,8 @@ brotli
 beautifulsoup4
 aiohttp_socks
 pywebview
+plyer
+setuptools
 cryptography
 nodriver
 python-multipart

setup.py

@@ -36,6 +36,9 @@
         "uvicorn",                 # api
         "nodriver",
         "python-multipart",
+        "pywebview",
+        "plyer",
+        "setuptools",
         "pypdf2", # files
         "docx",
         "odfpy",