Move off v1

src/crewai_tools/tools/serper_dev_tool/serper_dev_tool.py

@@ -1,80 +1,94 @@
 import datetime
-import os
 import json
-import requests
+import os
+from typing import Any, Optional, Type
+
+import requests
+from pydantic import BaseModel, Field
 
-from typing import Optional, Type, Any
-from pydantic.v1 import BaseModel, Field
 from crewai_tools.tools.base_tool import BaseTool
 
+
 def _save_results_to_file(content: str) -> None:
-		"""Saves the search results to a file."""
-		filename = f"search_results_{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}.txt"
-		with open(filename, 'w') as file:
-				file.write(content)
-		print(f"Results saved to {filename}")
+    """Saves the search results to a file."""
+    filename = f"search_results_{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}.txt"
+    with open(filename, "w") as file:
+        file.write(content)
+    print(f"Results saved to {filename}")
 
 
 class SerperDevToolSchema(BaseModel):
-	"""Input for SerperDevTool."""
-	search_query: str = Field(..., description="Mandatory search query you want to use to search the internet")
+    """Input for SerperDevTool."""
+
+    search_query: str = Field(
+        ..., description="Mandatory search query you want to use to search the internet"
+    )
+
 
 class SerperDevTool(BaseTool):
-	name: str = "Search the internet"
-	description: str = "A tool that can be used to search the internet with a search_query."
-	args_schema: Type[BaseModel] = SerperDevToolSchema
-	search_url: str = "https://google.serper.dev/search"
-	country: Optional[str] = ''
-	location: Optional[str] = ''
-	locale: Optional[str] = ''
-	n_results: int = 10
-	save_file: bool = False
+    name: str = "Search the internet"
+    description: str = (
+        "A tool that can be used to search the internet with a search_query."
+    )
+    args_schema: Type[BaseModel] = SerperDevToolSchema
+    search_url: str = "https://google.serper.dev/search"
+    country: Optional[str] = ""
+    location: Optional[str] = ""
+    locale: Optional[str] = ""
+    n_results: int = 10
+    save_file: bool = False
 
-	def _run(
-		self,
-		**kwargs: Any,
-	) -> Any:
+    def _run(
+        self,
+        **kwargs: Any,
+    ) -> Any:
 
-		search_query = kwargs.get('search_query') or kwargs.get('query')
-		save_file = kwargs.get('save_file', self.save_file)
-		n_results = kwargs.get('n_results', self.n_results)
+        search_query = kwargs.get("search_query") or kwargs.get("query")
+        save_file = kwargs.get("save_file", self.save_file)
+        n_results = kwargs.get("n_results", self.n_results)
 
-		payload = { "q": search_query, "num": n_results }
+        payload = {"q": search_query, "num": n_results}
 
-		if self.country != '':
-			payload["gl"] = self.country
-		if self.location != '':
-			payload["location"] = self.location
-		if self.locale != '':
-			payload["hl"] = self.locale
+        if self.country != "":
+            payload["gl"] = self.country
+        if self.location != "":
+            payload["location"] = self.location
+        if self.locale != "":
+            payload["hl"] = self.locale
 
-		payload = json.dumps(payload)
+        payload = json.dumps(payload)
 
-		headers = {
-			'X-API-KEY': os.environ['SERPER_API_KEY'],
-			'content-type': 'application/json'
-		}
+        headers = {
+            "X-API-KEY": os.environ["SERPER_API_KEY"],
+            "content-type": "application/json",
+        }
 
-		response = requests.request("POST", self.search_url, headers=headers, data=payload)
-		results = response.json()
+        response = requests.request(
+            "POST", self.search_url, headers=headers, data=payload
+        )
+        results = response.json()
 
-		if 'organic' in results:
-			results = results['organic'][:self.n_results]
-			string = []
-			for result in results:
-				try:
-					string.append('\n'.join([
-							f"Title: {result['title']}",
-							f"Link: {result['link']}",
-							f"Snippet: {result['snippet']}",
-							"---"
-					]))
-				except KeyError:
-					continue
+        if "organic" in results:
+            results = results["organic"][: self.n_results]
+            string = []
+            for result in results:
+                try:
+                    string.append(
+                        "\n".join(
+                            [
+                                f"Title: {result['title']}",
+                                f"Link: {result['link']}",
+                                f"Snippet: {result['snippet']}",
+                                "---",
+                            ]
+                        )
+                    )
+                except KeyError:
+                    continue
 
-			content = '\n'.join(string)
-			if save_file:
-				_save_results_to_file(content)
-			return f"\nSearch results: {content}\n"
-		else:
-			return results
+            content = "\n".join(string)
+            if save_file:
+                _save_results_to_file(content)
+            return f"\nSearch results: {content}\n"
+        else:
+            return results