test: Update web search tests for ddgs library and cleanup code

*   In `etc/unittest/web_search.py`, updated imports from `duckduckgo_search` to `ddgs` and `DDGSError`.
*   Added an import for `MissingRequirementsError` in `etc/unittest/web_search.py`.
*   Modified exception handling in web search tests to catch both `DDGSError` and `MissingRequirementsError`.
*   Removed temporary modification comments in `g4f/cli/agent/agent.py` and `g4f/tools/web_search.py`.

Author: kqlio67

etc/unittest/web_search.py

@@ -4,14 +4,14 @@
 import unittest
 
 try:
-    from duckduckgo_search import DDGS
-    from duckduckgo_search.exceptions import DuckDuckGoSearchException
+    from ddgs import DDGS, DDGSError
     from bs4 import BeautifulSoup
     has_requirements = True
 except ImportError:
     has_requirements = False
 
 from g4f.client import AsyncClient
+from g4f.errors import MissingRequirementsError
 from .mocks import YieldProviderMock
 
 DEFAULT_MESSAGES = [{'role': 'user', 'content': 'Hello'}]
@@ -45,8 +45,8 @@ async def test_search(self):
         try:
             response = await client.chat.completions.create([{"content": "", "role": "user"}], "", tool_calls=tool_calls)
             self.assertIn("Using the provided web search results", response.choices[0].message.content)
-        except DuckDuckGoSearchException as e:
-            self.skipTest(f'DuckDuckGoSearchException: {e}')
+        except (DDGSError, MissingRequirementsError) as e:
+            self.skipTest(f'Search error: {e}')
 
     async def test_search2(self):
         client = AsyncClient(provider=YieldProviderMock)
@@ -64,8 +64,8 @@ async def test_search2(self):
         try:
             response = await client.chat.completions.create([{"content": "", "role": "user"}], "", tool_calls=tool_calls)
             self.assertIn("Using the provided web search results", response.choices[0].message.content)
-        except DuckDuckGoSearchException as e:
-            self.skipTest(f'DuckDuckGoSearchException: {e}')
+        except (DDGSError, MissingRequirementsError) as e:
+            self.skipTest(f'Search error: {e}')
 
     async def test_search3(self):
         client = AsyncClient(provider=YieldProviderMock)
@@ -85,5 +85,5 @@ async def test_search3(self):
         try:
             response = await client.chat.completions.create([{"content": "", "role": "user"}], "", tool_calls=tool_calls)
             self.assertIn("Using the provided web search results", response.choices[0].message.content)
-        except DuckDuckGoSearchException as e:
-            self.skipTest(f'DuckDuckGoSearchException: {e}')
+        except (DDGSError, MissingRequirementsError) as e:
+            self.skipTest(f'Search error: {e}')

g4f/cli/agent/agent.py

@@ -362,12 +362,10 @@ def _web_search(self, action: Action) -> Optional[str]:
         query = action.query or action.content
         self.console.print(f"[cyan]🌐 Performing web search for:[/cyan] '{query}'")
         try:
-            # --- MODIFICATION START ---
             # Use the new 'ddgs' library
             from ddgs import DDGS
             with DDGS() as ddgs:
                 results = [r for r in ddgs.text(query, max_results=3)]
-            # --- MODIFICATION END ---
                 if results:
                     search_summary = ""
                     for i, res in enumerate(results, 1):

g4f/tools/web_search.py

@@ -211,7 +211,6 @@ async def search(
         raise MissingRequirementsError('Install "ddgs" and "beautifulsoup4" | pip install -U g4f[search]')
 
     results: List[SearchResultEntry] = []
-    # --- MODIFICATION START ---
     # Use the new DDGS() context manager style
     async with DDGS() as ddgs:
         async for result in ddgs.text(
@@ -229,7 +228,6 @@ async def search(
                 url=result["href"],
                 snippet=result["body"]
             ))
-    # --- MODIFICATION END ---
 
     if add_text:
         tasks = []