tavily-python 0.7.11__tar.gz → 0.7.13__tar.gz

{tavily_python-0.7.11 → tavily_python-0.7.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tavily-python
-Version: 0.7.11
+Version: 0.7.13
 Summary: Python wrapper for the Tavily API
 Home-page: https://github.com/tavily-ai/tavily-python
 Author: Tavily AI
@@ -8,7 +8,7 @@ Author-email: support@tavily.com
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests

{tavily_python-0.7.11 → tavily_python-0.7.13}/setup.py

@@ -5,7 +5,7 @@ with open('README.md', 'r', encoding='utf-8') as f:
 
 setup(
     name='tavily-python',
-    version='0.7.11',
+    version='0.7.13',
     url='https://github.com/tavily-ai/tavily-python',
     author='Tavily AI',
     author_email='support@tavily.com',
@@ -19,5 +19,5 @@ setup(
         'License :: OSI Approved :: MIT License',
         'Operating System :: OS Independent',
     ],
-    python_requires='>=3.6',
+    python_requires='>=3.8',
 )

{tavily_python-0.7.11 → tavily_python-0.7.13}/tavily/async_tavily.py

@@ -7,7 +7,6 @@ import httpx
 
 from .utils import get_max_items_from_list
 from .errors import UsageLimitExceededError, InvalidAPIKeyError, MissingAPIKeyError, BadRequestError, ForbiddenError, TimeoutError
-from .config import AllowedCategory
 
 
 class AsyncTavilyClient:
@@ -67,7 +66,7 @@ class AsyncTavilyClient:
             include_answer: Union[bool, Literal["basic", "advanced"]] = None,
             include_raw_content: Union[bool, Literal["markdown", "text"]] = None,
             include_images: bool = None,
-            timeout: int = 60,
+            timeout: float = 60,
             country: str = None,
             auto_parameters: bool = None,
             include_favicon: bool = None,
@@ -142,7 +141,7 @@ class AsyncTavilyClient:
                      include_answer: Union[bool, Literal["basic", "advanced"]] = None,
                      include_raw_content: Union[bool, Literal["markdown", "text"]] = None,
                      include_images: bool = None,
-                     timeout: int = 60,
+                     timeout: float = 60,
                      country: str = None,
                      auto_parameters: bool = None,
                      include_favicon: bool = None,
@@ -184,7 +183,7 @@ class AsyncTavilyClient:
             include_images: bool = None,
             extract_depth: Literal["basic", "advanced"] = None,
             format: Literal["markdown", "text"] = None,
-            timeout: int = 30,
+            timeout: float = 30,
             include_favicon: bool = None,
             **kwargs
     ) -> dict:
@@ -206,8 +205,6 @@ class AsyncTavilyClient:
         if kwargs:
             data.update(kwargs)
 
-        timeout = min(timeout, 120)
-
         async with self._client_creator() as client:
             try:
                 response = await client.post("/extract", content=json.dumps(data), timeout=timeout)
@@ -240,7 +237,7 @@ class AsyncTavilyClient:
                       include_images: bool = None,
                       extract_depth: Literal["basic", "advanced"] = None,
                       format: Literal["markdown", "text"] = None,
-                      timeout: int = 30,
+                      timeout: float = 30,
                       include_favicon: bool = None,
                       **kwargs,  # Accept custom arguments
                       ) -> dict:
@@ -248,7 +245,6 @@ class AsyncTavilyClient:
         Combined extract method.
         include_favicon: If True, include the favicon in the extraction results.
         """
-        timeout = min(timeout, 120)
         response_dict = await self._extract(urls,
                                             include_images,
                                             extract_depth,
@@ -278,10 +274,9 @@ class AsyncTavilyClient:
                exclude_domains: Sequence[str] = None,
                allow_external: bool = None,
                include_images: bool = None,
-               categories: Sequence[AllowedCategory] = None,
                extract_depth: Literal["basic", "advanced"] = None,
                format: Literal["markdown", "text"] = None,
-               timeout: int = 60,
+               timeout: float = 150,
                include_favicon: bool = None,
                **kwargs
                ) -> dict:
@@ -299,10 +294,10 @@ class AsyncTavilyClient:
             "exclude_paths": exclude_paths,
             "exclude_domains": exclude_domains,
             "allow_external": allow_external,
-            "categories": categories,
             "include_images": include_images,
             "extract_depth": extract_depth,
             "format": format,
+            "timeout": timeout,
             "include_favicon": include_favicon,
         }
 
@@ -311,8 +306,6 @@ class AsyncTavilyClient:
 
         data = {k: v for k, v in data.items() if v is not None}
 
-        timeout = min(timeout, 120)
-
         async with self._client_creator() as client:
             try:
                 response = await client.post("/crawl", content=json.dumps(data), timeout=timeout)
@@ -350,11 +343,10 @@ class AsyncTavilyClient:
                     exclude_paths: Sequence[str] = None,
                     exclude_domains: Sequence[str] = None,
                     allow_external: bool = None,
-                    categories: Sequence[AllowedCategory] = None,
                     extract_depth: Literal["basic", "advanced"] = None,
                     include_images: bool = None,
                     format: Literal["markdown", "text"] = None,
-                    timeout: int = 60,
+                    timeout: float = 150,
                     include_favicon: bool = None,
                     **kwargs
                     ) -> dict:
@@ -362,7 +354,6 @@ class AsyncTavilyClient:
         Combined crawl method.
         
         """
-        timeout = min(timeout, 120)
         response_dict = await self._crawl(url,
                                     max_depth=max_depth,
                                     max_breadth=max_breadth,
@@ -373,7 +364,6 @@ class AsyncTavilyClient:
                                     exclude_paths=exclude_paths,
                                     exclude_domains=exclude_domains,
                                     allow_external=allow_external,
-                                    categories=categories,
                                     extract_depth=extract_depth,
                                     include_images=include_images,
                                     format=format,
@@ -395,8 +385,7 @@ class AsyncTavilyClient:
                exclude_domains: Sequence[str] = None,
                allow_external: bool = None,
                include_images: bool = None,
-               categories: Sequence[AllowedCategory] = None,
-               timeout: int = 60,
+               timeout: float = 150,
                **kwargs
                ) -> dict:
         """
@@ -414,7 +403,7 @@ class AsyncTavilyClient:
             "exclude_domains": exclude_domains,
             "allow_external": allow_external,
             "include_images": include_images,
-            "categories": categories,
+            "timeout": timeout,
         }
 
         if kwargs:
@@ -422,8 +411,6 @@ class AsyncTavilyClient:
 
         data = {k: v for k, v in data.items() if v is not None}
 
-        timeout = min(timeout, 120)
-
         async with self._client_creator() as client:
             try:
                 response = await client.post("/map", content=json.dumps(data), timeout=timeout)
@@ -462,15 +449,13 @@ class AsyncTavilyClient:
                     exclude_domains: Sequence[str] = None,
                     allow_external: bool = None,
                     include_images: bool = None,
-                    categories: Sequence[AllowedCategory] = None,
-                    timeout: int = 60,
+                    timeout: float = 150,
                     **kwargs
                     ) -> dict:
         """
         Combined map method.
 
         """
-        timeout = min(timeout, 120)
         response_dict = await self._map(url,
                                     max_depth=max_depth,
                                     max_breadth=max_breadth,
@@ -482,7 +467,6 @@ class AsyncTavilyClient:
                                     exclude_domains=exclude_domains,
                                     allow_external=allow_external,
                                     include_images=include_images,
-                                    categories=categories,
                                     timeout=timeout,
                                     **kwargs)
 
@@ -497,7 +481,7 @@ class AsyncTavilyClient:
                                  include_domains: Sequence[str] = None,
                                  exclude_domains: Sequence[str] = None,
                                  max_tokens: int = 4000,
-                                 timeout: int = 60,
+                                 timeout: float = 60,
                                  country: str = None,
                                  include_favicon: bool = None,
                                  **kwargs,  # Accept custom arguments
@@ -538,7 +522,7 @@ class AsyncTavilyClient:
                          max_results: int = 5,
                          include_domains: Sequence[str] = None,
                          exclude_domains: Sequence[str] = None,
-                         timeout: int = 60,
+                         timeout: float = 60,
                          country: str = None,
                          include_favicon: bool = None,
                          **kwargs,  # Accept custom arguments
@@ -568,7 +552,7 @@ class AsyncTavilyClient:
                                query: str,
                                search_depth: Literal["basic", "advanced"] = "advanced",
                                max_results: int = 5,
-                               timeout: int = 60,
+                               timeout: float = 60,
                                country: str = None,
                                ) -> Sequence[dict]:
         """ Company information search method. Search depth is advanced by default to get the best answer. """

tavily_python-0.7.13/tavily/config.py

@@ -0,0 +1,2 @@
+DEFAULT_MODEL_ENCODING = "gpt-3.5-turbo"
+DEFAULT_MAX_TOKENS = 4000

{tavily_python-0.7.11 → tavily_python-0.7.13}/tavily/errors.py

@@ -17,7 +17,7 @@ class InvalidAPIKeyError(Exception):
         super().__init__(message)
 
 class TimeoutError(Exception):
-    def __init__(self, timeout: int):
+    def __init__(self, timeout: float):
         super().__init__(f"Request timed out after {timeout} seconds.")
 
 class MissingAPIKeyError(Exception):

{tavily_python-0.7.11 → tavily_python-0.7.13}/tavily/tavily.py

@@ -6,7 +6,6 @@ from typing import Literal, Sequence, Optional, List, Union
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from .utils import get_max_items_from_list
 from .errors import UsageLimitExceededError, InvalidAPIKeyError, MissingAPIKeyError, BadRequestError, ForbiddenError, TimeoutError
-from .config import AllowedCategory
 
 class TavilyClient:
     """
@@ -50,7 +49,7 @@ class TavilyClient:
                 include_answer: Union[bool, Literal["basic", "advanced"]] = None,
                 include_raw_content: Union[bool, Literal["markdown", "text"]] = None,
                 include_images: bool = None,
-                timeout: int = 60,
+                timeout: float = 60,
                 country: str = None,
                 auto_parameters: bool = None,
                 include_favicon: bool = None,
@@ -127,7 +126,7 @@ class TavilyClient:
                include_answer: Union[bool, Literal["basic", "advanced"]] = None,
                include_raw_content: Union[bool, Literal["markdown", "text"]] = None,
                include_images: bool = None,
-               timeout: int = 60,
+               timeout: float = 60,
                country: str = None,
                auto_parameters: bool = None,
                include_favicon: bool = None,
@@ -136,7 +135,7 @@ class TavilyClient:
         """
         Combined search method.
         """
-        timeout = min(timeout, 120)
+
         response_dict = self._search(query,
                                      search_depth=search_depth,
                                      topic=topic,
@@ -168,7 +167,7 @@ class TavilyClient:
                  include_images: bool = None,
                  extract_depth: Literal["basic", "advanced"] = None,
                  format: Literal["markdown", "text"] = None,
-                 timeout: int = 30,
+                 timeout: float = 30,
                  include_favicon: bool = None,
                  **kwargs
                  ) -> dict:
@@ -189,8 +188,6 @@ class TavilyClient:
         if kwargs:
             data.update(kwargs)
 
-        timeout = min(timeout, 120)
-
         try:
             response = requests.post(self.base_url + "/extract", data=json.dumps(data), headers=self.headers, timeout=timeout, proxies=self.proxies)
         except requests.exceptions.Timeout:
@@ -221,14 +218,13 @@ class TavilyClient:
                 include_images: bool = None,
                 extract_depth: Literal["basic", "advanced"] = None,
                 format: Literal["markdown", "text"] = None,
-                timeout: int = 30,
+                timeout: float = 30,
                 include_favicon: bool = None,
                 **kwargs,  # Accept custom arguments
                 ) -> dict:
         """
         Combined extract method.
         """
-        timeout = min(timeout, 120)
         response_dict = self._extract(urls,
                                       include_images,
                                       extract_depth,
@@ -257,10 +253,9 @@ class TavilyClient:
             exclude_domains: Sequence[str] = None,
             allow_external: bool = None,
             include_images: bool = None,
-            categories: Sequence[AllowedCategory] = None,
             extract_depth: Literal["basic", "advanced"] = None,
             format: Literal["markdown", "text"] = None,
-            timeout: int = 60,
+            timeout: float = 150,
             include_favicon: bool = None,
             **kwargs
             ) -> dict:
@@ -280,9 +275,9 @@ class TavilyClient:
             "exclude_domains": exclude_domains,
             "allow_external": allow_external,
             "include_images": include_images,
-            "categories": categories,
             "extract_depth": extract_depth,
             "format": format,
+            "timeout": timeout,
             "include_favicon": include_favicon,
         }
 
@@ -290,8 +285,6 @@ class TavilyClient:
             data.update(kwargs)
         
         data = {k: v for k, v in data.items() if v is not None}
-    
-        timeout = min(timeout, 120)
 
         try:
             response = requests.post(
@@ -331,10 +324,9 @@ class TavilyClient:
               exclude_domains: Sequence[str] = None,
               allow_external: bool = None,
               include_images: bool = None,
-              categories: Sequence[AllowedCategory] = None,
               extract_depth: Literal["basic", "advanced"] = None,
               format: Literal["markdown", "text"] = None,
-              timeout: int = 60,
+              timeout: float = 150,
               include_favicon: bool = None,
               **kwargs
               ) -> dict:
@@ -342,7 +334,6 @@ class TavilyClient:
         Combined crawl method.
         include_favicon: If True, include the favicon in the crawl results.
         """
-        timeout = min(timeout, 120)
         response_dict = self._crawl(url,
                                     max_depth=max_depth,
                                     max_breadth=max_breadth,
@@ -354,7 +345,6 @@ class TavilyClient:
                                     exclude_domains=exclude_domains,
                                     allow_external=allow_external,
                                     include_images=include_images,
-                                    categories=categories,
                                     extract_depth=extract_depth,
                                     format=format,
                                     timeout=timeout,
@@ -375,8 +365,7 @@ class TavilyClient:
             exclude_domains: Sequence[str] = None,
             allow_external: bool = None,
             include_images: bool = None,
-            categories: Sequence[AllowedCategory] = None,
-            timeout: int = 60,
+            timeout: float = 150,
             **kwargs
             ) -> dict:
         """
@@ -394,7 +383,7 @@ class TavilyClient:
             "exclude_domains": exclude_domains,
             "allow_external": allow_external,
             "include_images": include_images,
-            "categories": categories,
+            "timeout": timeout,
         }
 
         if kwargs:
@@ -402,8 +391,6 @@ class TavilyClient:
         
         data = {k: v for k, v in data.items() if v is not None}
 
-        timeout = min(timeout, 120)
-
         try:
             response = requests.post(
                 self.base_url + "/map", data=json.dumps(data), headers=self.headers, timeout=timeout, proxies=self.proxies)
@@ -442,15 +429,13 @@ class TavilyClient:
               exclude_domains: Sequence[str] = None,
               allow_external: bool = None,
               include_images: bool = None,
-              categories: Sequence[AllowedCategory] = None,
-              timeout: int = 60,
+              timeout: float = 150,
               **kwargs
               ) -> dict:
         """
         Combined map method.
         
         """
-        timeout = min(timeout, 120)
         response_dict = self._map(url,
                                     max_depth=max_depth,
                                     max_breadth=max_breadth,
@@ -462,7 +447,6 @@ class TavilyClient:
                                     exclude_domains=exclude_domains,
                                     allow_external=allow_external,
                                     include_images=include_images,
-                                    categories=categories,
                                     timeout=timeout,
                                     **kwargs)
 
@@ -477,7 +461,7 @@ class TavilyClient:
                            include_domains: Sequence[str] = None,
                            exclude_domains: Sequence[str] = None,
                            max_tokens: int = 4000,
-                           timeout: int = 60,
+                           timeout: float = 60,
                            country: str = None,
                            include_favicon: bool = None,
                            **kwargs,  # Accept custom arguments
@@ -490,7 +474,7 @@ class TavilyClient:
 
         Returns a string of JSON containing the search context up to context limit.
         """
-        timeout = min(timeout, 120)
+
         response_dict = self._search(query,
                                      search_depth=search_depth,
                                      topic=topic,
@@ -519,7 +503,7 @@ class TavilyClient:
                    max_results: int = 5,
                    include_domains: Sequence[str] = None,
                    exclude_domains: Sequence[str] = None,
-                   timeout: int = 60,
+                   timeout: float = 60,
                    country: str = None,
                    include_favicon: bool = None,
                    **kwargs,  # Accept custom arguments
@@ -527,7 +511,6 @@ class TavilyClient:
         """
         Q&A search method. Search depth is advanced by default to get the best answer.
         """
-        timeout = min(timeout, 120)
         response_dict = self._search(query,
                                      search_depth=search_depth,
                                      topic=topic,
@@ -550,11 +533,10 @@ class TavilyClient:
                          search_depth: Literal["basic",
                                                "advanced"] = "advanced",
                          max_results: int = 5,
-                         timeout: int = 60,
+                         timeout: float = 60,
                          country: str = None,
                          ) -> Sequence[dict]:
         """ Company information search method. Search depth is advanced by default to get the best answer. """
-        timeout = min(timeout, 120)
         def _perform_search(topic):
             return self._search(query,
                                 search_depth=search_depth,

{tavily_python-0.7.11 → tavily_python-0.7.13}/tavily_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tavily-python
-Version: 0.7.11
+Version: 0.7.13
 Summary: Python wrapper for the Tavily API
 Home-page: https://github.com/tavily-ai/tavily-python
 Author: Tavily AI
@@ -8,7 +8,7 @@ Author-email: support@tavily.com
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.6
+Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests

{tavily_python-0.7.11 → tavily_python-0.7.13}/tavily_python.egg-info/SOURCES.txt

@@ -14,9 +14,7 @@ tavily_python.egg-info/SOURCES.txt
 tavily_python.egg-info/dependency_links.txt
 tavily_python.egg-info/requires.txt
 tavily_python.egg-info/top_level.txt
-tests/test_async_search.py
 tests/test_crawl.py
 tests/test_errors.py
 tests/test_map.py
-tests/test_search.py
-tests/test_sync_search.py
+tests/test_search.py

{tavily_python-0.7.11 → tavily_python-0.7.13}/tests/test_crawl.py

@@ -40,7 +40,6 @@ def validate_specific(request, response):
         "exclude_domains": ["example.com"],
         "allow_external": False,
         "include_images": True,
-        "categories": ["pricing", "documentation"],
         "extract_depth": "advanced"
     }.items():
         assert request_json.get(key) == value
@@ -67,7 +66,6 @@ def test_sync_crawl_specific(sync_interceptor, sync_client):
         exclude_domains=["example.com"],
         allow_external=False,
         include_images=True,
-        categories=["pricing", "documentation"],
         extract_depth="advanced",
         timeout=10
     )
@@ -95,7 +93,6 @@ def test_async_crawl_specific(async_interceptor, async_client):
         exclude_domains=["example.com"],
         allow_external=False,
         include_images=True,
-        categories=["pricing", "documentation"],
         extract_depth="advanced",
         timeout=10
     ))

{tavily_python-0.7.11 → tavily_python-0.7.13}/tests/test_map.py

@@ -38,8 +38,7 @@ def validate_specific(request, response):
         "exclude_paths": ["/blog"],
         "exclude_domains": ["example.com"],
         "allow_external": False,
-        "include_images": True,
-        "categories": ["pricing", "documentation"]
+        "include_images": True
     }.items():
         assert request_json.get(key) == value
 
@@ -65,7 +64,6 @@ def test_sync_map_specific(sync_interceptor, sync_client):
         exclude_domains=["example.com"],
         allow_external=False,
         include_images=True,
-        categories=["pricing", "documentation"],
         timeout=10
     )
 
@@ -92,7 +90,6 @@ def test_async_map_specific(async_interceptor, async_client):
         exclude_domains=["example.com"],
         allow_external=False,
         include_images=True,
-        categories=["pricing", "documentation"],
         timeout=10
     ))
 

tavily_python-0.7.11/tavily/config.py

@@ -1,12 +0,0 @@
-from typing import Literal
-
-DEFAULT_MODEL_ENCODING = "gpt-3.5-turbo"
-DEFAULT_MAX_TOKENS = 4000
-
-# Create a type that represents all allowed categories
-AllowedCategory = Literal[
-    "Documentation", "Blog", "Blogs", "Community", "About", "Contact", 
-    "Privacy", "Terms", "Status", "Pricing", "Enterprise", "Careers", 
-    "E-Commerce", "Authentication", "Developer", "Developers", "Solutions", 
-    "Partners", "Downloads", "Media", "Events", "People"
-]

tavily_python-0.7.11/tests/test_async_search.py

@@ -1,219 +0,0 @@
-import unittest
-import os
-from tavily import AsyncTavilyClient, MissingAPIKeyError, InvalidAPIKeyError
-from urllib.parse import urlparse
-import asyncio
-
-from unit_tests import cases
-class SearchTest(unittest.TestCase):
-    
-    def setUp(self) -> None:
-        self.tavily_client = AsyncTavilyClient(api_key=os.getenv("TAVILY_API_KEY"))
-        return super().setUp()
-    
-    def tearDown(self) -> None:
-        return super().tearDown()
-    
-    # Every single search result should have these properties
-    def common_search_result_properties(self, result) -> None:
-        self.assertIsInstance(result, dict)
-        self.assertIn("title", result)
-        self.assertIn("url", result)
-        self.assertIn("content", result)
-        self.assertIn("score", result)
-
-    # General search results should have these properties
-    def general_search_result_properties(self, result) -> None:
-        self.common_search_result_properties(result)
-        self.assertIn("raw_content", result)
-
-    # News search results should have these properties
-    def news_search_result_properties(self, result) -> None:
-        self.common_search_result_properties(result)
-        self.assertIn("published_date", result)
-
-    # Topic-specific properties
-    def topic_specific_properties(self, result, **params) -> None:
-        if params.get("topic", "general") == "general":
-            self.assertIn("raw_content", result)
-        elif params.get("topic", "general") == "news":
-            self.assertIn("published_date", result)
-
-    # Domain inclusion/exclusion-dependent properties
-    def domain_dependent_properties(self, response, **params) -> None:
-        if params.get("topic", "general") != "general":
-            return
-
-        if params.get("include_domains", False) and len(params["include_domains"]) > 0:
-            for result in response["results"]:
-                self.assertTrue(any(domain in urlparse(result["url"]).netloc for domain in params["include_domains"]))
-
-        if params.get("exclude_domains", False) and len(params["exclude_domains"]) > 0:
-            for result in response["results"]:
-                self.assertFalse(any(domain in urlparse(result["url"]).netloc for domain in params["exclude_domains"]))
-
-    # Image-dependent properties
-    def image_properties(self, response, **params) -> None:
-        if params.get("topic", "general") == "general" and params.get("include_images", False):
-            self.assertIsNotNone(response["images"])
-            self.assertIsInstance(response["images"], list)
-            for image in response["images"]:
-                self.assertIsInstance(image, str)
-
-    # Answer-dependent properties
-    def answer_properties(self, response, **params) -> None:
-        if params.get("include_answer", False):
-            self.assertIn("answer", response)
-            self.assertIsInstance(response["answer"], str)
-
-
-    # Every single search response should have these properties
-    def common_response_properties(self, response) -> None:
-        self.assertIsNotNone(response)
-        self.assertIsInstance(response, dict)
-        self.assertIn("answer", response)
-        self.assertIn("query", response)
-        self.assertIn("results", response)
-        self.assertIn("images", response)
-        self.assertIn("response_time", response)
-        self.assertIn("follow_up_questions", response)
-
-        self.assertIsNotNone(response["query"])
-        self.assertIsNotNone(response["results"])
-        self.assertIsNotNone(response["response_time"])
-        self.assertIsNotNone(response["images"])
-
-        self.assertIsInstance(response["query"], str)
-        self.assertIsInstance(response["results"], list)
-        self.assertIsInstance(response["response_time"], float)
-        self.assertIsInstance(response["images"], list)
-
-    # Search responses also have properties that depend on the request params
-    def custom_response_properties(self, response, **params) -> None:
-        self.domain_dependent_properties(response, **params)
-        self.image_properties(response, **params)
-        self.answer_properties(response, **params)
-        for result in response["results"]:
-            self.topic_specific_properties(result, **params)
-
-    def test_internal_search(self) -> None:
-        for test_case in cases:
-            with self.subTest(msg=test_case["name"]):
-                response = asyncio.run(self.tavily_client._search(**test_case["params"]))
-                self.common_response_properties(response)
-                if test_case["params"].get("topic", "general") == "general":
-                    for search_result in response["results"]:
-                        self.general_search_result_properties(search_result)
-                elif test_case["params"].get("topic", "general") == "news":
-                    for search_result in response["results"]:
-                        self.news_search_result_properties(search_result)
-                self.custom_response_properties(response, **test_case["params"])
-
-    def test_external_search(self) -> None:
-        for test_case in cases:
-            with self.subTest(msg=test_case["name"]):
-                response = asyncio.run(self.tavily_client.search(**test_case["params"]))
-                self.common_response_properties(response)
-                if test_case["params"].get("topic", "general") == "general":
-                    for search_result in response["results"]:
-                        self.general_search_result_properties(search_result)
-                elif test_case["params"].get("topic", "general") == "news":
-                    for search_result in response["results"]:
-                        self.news_search_result_properties(search_result)
-                self.custom_response_properties(response, **test_case["params"])
-
-class QNASearchTest(unittest.TestCase):
-    
-    def setUp(self) -> None:
-        self.tavily_client = AsyncTavilyClient(api_key=os.getenv("TAVILY_API_KEY"))
-        return super().setUp()
-    
-    def tearDown(self) -> None:
-        return super().tearDown()
-    
-    def test_qna_search(self) -> None:
-        for test_case in cases:
-            if "include_answer" in test_case["params"]:
-                del test_case["params"]["include_answer"]
-            if "include_raw_content" in test_case["params"]:
-                del test_case["params"]["include_raw_content"]
-            if "include_images" in test_case["params"]:
-                del test_case["params"]["include_images"]
-            with self.subTest(msg=test_case["name"]):
-                response = asyncio.run(self.tavily_client.qna_search(**test_case["params"]))
-                self.assertIsNotNone(response)
-                self.assertIsInstance(response, str)
-                self.assertTrue(len(response) > 0)
-
-class CompanyInfoSearchTest(unittest.TestCase):
-
-    def setUp(self) -> None:
-        self.tavily_client = AsyncTavilyClient(api_key=os.getenv("TAVILY_API_KEY"))
-        return super().setUp()
-    
-    def tearDown(self) -> None:
-        return super().tearDown()
-    
-    # Every single search result should have these properties
-    def common_search_result_properties(self, result) -> None:
-        self.assertIsInstance(result, dict)
-        self.assertIn("title", result)
-        self.assertIn("url", result)
-        self.assertIn("content", result)
-        self.assertIn("score", result)
-    
-    def test_company_info_search(self) -> None:
-        for test_case in cases:
-            if "topic" in test_case["params"]:
-                del test_case["params"]["topic"]
-            if "include_domains" in test_case["params"]:
-                del test_case["params"]["include_domains"]
-            if "exclude_domains" in test_case["params"]:
-                del test_case["params"]["exclude_domains"]
-            if "include_raw_content" in test_case["params"]:
-                del test_case["params"]["include_raw_content"]
-            if "include_images" in test_case["params"]:
-                del test_case["params"]["include_images"]
-            if "include_answer" in test_case["params"]:
-                del test_case["params"]["include_answer"]
-            if "use_cache" in test_case["params"]:
-                del test_case["params"]["use_cache"]
-            with self.subTest(msg=test_case["name"]):
-                response = asyncio.run(self.tavily_client.get_company_info(**test_case["params"]))
-                self.assertIsNotNone(response)
-                self.assertIsInstance(response, list)
-                self.assertTrue(len(response) > 0)
-                for search_result in response:
-                    self.common_search_result_properties(search_result)
-            
-class ErrorTest(unittest.TestCase):
-    
-    def setUp(self) -> None:
-        return super().setUp()
-    
-    def tearDown(self) -> None:
-        return super().tearDown()
-    
-    # This test is here to ensure that no MissingAPIKeyError is raised when the API key is in the environment
-    def test_load_key_from_env(self) -> None:
-        self.assertIn('results', asyncio.run(AsyncTavilyClient().search("Why is Tavily the best search API?")))
-    
-    def test_missing_api_key(self) -> None:
-        with self.assertRaises(MissingAPIKeyError):
-            AsyncTavilyClient(api_key='')
-        
-        old_key = os.getenv("TAVILY_API_KEY")
-        del os.environ["TAVILY_API_KEY"]
-        with self.assertRaises(MissingAPIKeyError):
-            AsyncTavilyClient()
-            
-        os.environ["TAVILY_API_KEY"] = old_key
-
-
-    def test_invalid_api_key(self) -> None:
-        with self.assertRaises(InvalidAPIKeyError):
-            asyncio.run(AsyncTavilyClient(api_key="invalid_api_key").search("Why is Tavily the best search API?"))
-
-if __name__ == "__main__":
-
-    unittest.main()

tavily_python-0.7.11/tests/test_sync_search.py

@@ -1,219 +0,0 @@
-import unittest
-import os
-from tavily import TavilyClient, InvalidAPIKeyError, MissingAPIKeyError
-from urllib.parse import urlparse
-
-from unit_tests import cases
-
-class SearchTest(unittest.TestCase):
-    
-    def setUp(self) -> None:
-        self.tavily_client = TavilyClient(api_key=os.getenv("TAVILY_API_KEY"))
-        return super().setUp()
-    
-    def tearDown(self) -> None:
-        return super().tearDown()
-    
-    # Every single search result should have these properties
-    def common_search_result_properties(self, result) -> None:
-        self.assertIsInstance(result, dict)
-        self.assertIn("title", result)
-        self.assertIn("url", result)
-        self.assertIn("content", result)
-        self.assertIn("score", result)
-
-    # General search results should have these properties
-    def general_search_result_properties(self, result) -> None:
-        self.common_search_result_properties(result)
-        self.assertIn("raw_content", result)
-
-    # News search results should have these properties
-    def news_search_result_properties(self, result) -> None:
-        self.common_search_result_properties(result)
-        self.assertIn("published_date", result)
-
-    # Topic-specific properties
-    def topic_specific_properties(self, result, **params) -> None:
-        if params.get("topic", "general") == "general":
-            self.assertIn("raw_content", result)
-        elif params.get("topic", "general") == "news":
-            self.assertIn("published_date", result)
-
-    # Domain inclusion/exclusion-dependent properties
-    def domain_dependent_properties(self, response, **params) -> None:
-        if params.get("topic", "general") != "general":
-            return
-
-        if params.get("include_domains", False) and len(params["include_domains"]) > 0:
-            for result in response["results"]:
-                self.assertTrue(any(domain in urlparse(result["url"]).netloc for domain in params["include_domains"]))
-
-        if params.get("exclude_domains", False) and len(params["exclude_domains"]) > 0:
-            for result in response["results"]:
-                self.assertFalse(any(domain in urlparse(result["url"]).netloc for domain in params["exclude_domains"]))
-
-    # Image-dependent properties
-    def image_properties(self, response, **params) -> None:
-        if params.get("topic", "general") == "general" and params.get("include_images", False):
-            self.assertIsNotNone(response["images"])
-            self.assertIsInstance(response["images"], list)
-            for image in response["images"]:
-                self.assertIsInstance(image, str)
-
-    # Answer-dependent properties
-    def answer_properties(self, response, **params) -> None:
-        if params.get("include_answer", False):
-            self.assertIn("answer", response)
-            self.assertIsInstance(response["answer"], str)
-
-
-    # Every single search response should have these properties
-    def common_response_properties(self, response) -> None:
-        self.assertIsNotNone(response)
-        self.assertIsInstance(response, dict)
-        self.assertIn("answer", response)
-        self.assertIn("query", response)
-        self.assertIn("results", response)
-        self.assertIn("images", response)
-        self.assertIn("response_time", response)
-        self.assertIn("follow_up_questions", response)
-
-        self.assertIsNotNone(response["query"])
-        self.assertIsNotNone(response["results"])
-        self.assertIsNotNone(response["response_time"])
-        self.assertIsNotNone(response["images"])
-
-        self.assertIsInstance(response["query"], str)
-        self.assertIsInstance(response["results"], list)
-        self.assertIsInstance(response["response_time"], float)
-        self.assertIsInstance(response["images"], list)
-
-    # Search responses also have properties that depend on the request params
-    def custom_response_properties(self, response, **params) -> None:
-        self.domain_dependent_properties(response, **params)
-        self.image_properties(response, **params)
-        self.answer_properties(response, **params)
-        for result in response["results"]:
-            self.topic_specific_properties(result, **params)
-
-    def test_internal_search(self) -> None:
-        for test_case in cases:
-            with self.subTest(msg=test_case["name"]):
-                result = self.tavily_client._search(**test_case["params"])
-                self.common_response_properties(result)
-                if test_case["params"].get("topic", "general") == "general":
-                    for search_result in result["results"]:
-                        self.general_search_result_properties(search_result)
-                elif test_case["params"].get("topic", "general") == "news":
-                    for search_result in result["results"]:
-                        self.news_search_result_properties(search_result)
-                self.custom_response_properties(result, **test_case["params"])
-
-    def test_external_search(self) -> None:
-        for test_case in cases:
-            with self.subTest(msg=test_case["name"]):
-                response = self.tavily_client._search(**test_case["params"])
-                self.common_response_properties(response)
-                if test_case["params"].get("topic", "general") == "general":
-                    for search_result in response["results"]:
-                        self.general_search_result_properties(search_result)
-                elif test_case["params"].get("topic", "general") == "news":
-                    for search_result in response["results"]:
-                        self.news_search_result_properties(search_result)
-                self.custom_response_properties(response, **test_case["params"])
-
-class QNASearchTest(unittest.TestCase):
-    
-    def setUp(self) -> None:
-        self.tavily_client = TavilyClient(api_key=os.getenv("TAVILY_API_KEY"))
-        return super().setUp()
-    
-    def tearDown(self) -> None:
-        return super().tearDown()
-    
-    def test_qna_search(self) -> None:
-        for test_case in cases:
-            if "include_answer" in test_case["params"]:
-                del test_case["params"]["include_answer"]
-            if "include_raw_content" in test_case["params"]:
-                del test_case["params"]["include_raw_content"]
-            if "include_images" in test_case["params"]:
-                del test_case["params"]["include_images"]
-            with self.subTest(msg=test_case["name"]):
-                response = self.tavily_client.qna_search(**test_case["params"])
-                self.assertIsNotNone(response)
-                self.assertIsInstance(response, str)
-                self.assertTrue(len(response) > 0)
-
-class CompanyInfoSearchTest(unittest.TestCase):
-
-    def setUp(self) -> None:
-        self.tavily_client = TavilyClient(api_key=os.getenv("TAVILY_API_KEY"))
-        return super().setUp()
-    
-    def tearDown(self) -> None:
-        return super().tearDown()
-    
-    # Every single search result should have these properties
-    def common_search_result_properties(self, result) -> None:
-        self.assertIsInstance(result, dict)
-        self.assertIn("title", result)
-        self.assertIn("url", result)
-        self.assertIn("content", result)
-        self.assertIn("score", result)
-    
-    def test_company_info_search(self) -> None:
-        for test_case in cases:
-            if "topic" in test_case["params"]:
-                del test_case["params"]["topic"]
-            if "include_domains" in test_case["params"]:
-                del test_case["params"]["include_domains"]
-            if "exclude_domains" in test_case["params"]:
-                del test_case["params"]["exclude_domains"]
-            if "include_raw_content" in test_case["params"]:
-                del test_case["params"]["include_raw_content"]
-            if "include_images" in test_case["params"]:
-                del test_case["params"]["include_images"]
-            if "include_answer" in test_case["params"]:
-                del test_case["params"]["include_answer"]
-            if "use_cache" in test_case["params"]:
-                del test_case["params"]["use_cache"]
-            with self.subTest(msg=test_case["name"]):
-                response = self.tavily_client.get_company_info(**test_case["params"])
-                self.assertIsNotNone(response)
-                self.assertIsInstance(response, list)
-                self.assertTrue(len(response) > 0)
-                for search_result in response:
-                    self.common_search_result_properties(search_result)
-            
-class ErrorTest(unittest.TestCase):
-    
-    def setUp(self) -> None:
-        return super().setUp()
-    
-    def tearDown(self) -> None:
-        return super().tearDown()
-    
-    # This test is here to ensure that no MissingAPIKeyError is raised when the API key is in the environment
-    def test_load_key_from_env(self) -> None:
-        self.assertIn('results', TavilyClient().search("Why is Tavily the best search API?"))
-    
-    def test_missing_api_key(self) -> None:
-        with self.assertRaises(MissingAPIKeyError):
-            TavilyClient(api_key='')
-        
-        old_key = os.getenv("TAVILY_API_KEY")
-        del os.environ["TAVILY_API_KEY"]
-        with self.assertRaises(MissingAPIKeyError):
-            TavilyClient()
-            
-        os.environ["TAVILY_API_KEY"] = old_key
-
-
-    def test_invalid_api_key(self) -> None:
-        with self.assertRaises(InvalidAPIKeyError):
-            TavilyClient(api_key="invalid_api_key").search("Why is Tavily the best search API?")
-
-if __name__ == "__main__":
-
-    unittest.main()