exa-py 1.1.6__tar.gz → 1.1.8__tar.gz

{exa_py-1.1.6 → exa_py-1.1.8}/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
 Name: exa_py
-Version: 1.1.6
+Version: 1.1.8
 Summary: Python SDK for Exa API.
 Home-page: https://github.com/exa-labs/exa-py
 Author: Exa
 Author-email: hello@exa.ai
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -17,6 +15,9 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
+Requires-Dist: requests
+Requires-Dist: typing-extensions
+Requires-Dist: openai>=1.10.0
 
 # Exa
 
@@ -91,5 +92,3 @@ exa = Exa(api_key="your-api-key")
                              highlights={"highlights_per_url": 2, "num_sentences": 1, "query": "This is the highlight query:"})
 ```
 
-
-

{exa_py-1.1.6 → exa_py-1.1.8}/exa_py/api.py

@@ -15,6 +15,8 @@ from typing import (
     overload,
     Union,
     Literal,
+    get_origin,
+    get_args
 )
 from typing_extensions import TypedDict
 
@@ -144,11 +146,9 @@ CONTENTS_OPTIONS_TYPES = {
     "filter_empty_results": [bool],
 }
 
-
-
 # FOR BETA OPTIONS
 # if is_beta:
-    
+
 
 def validate_search_options(
     options: Dict[str, Optional[object]], expected: dict
@@ -165,30 +165,20 @@ def validate_search_options(
     for key, value in options.items():
         if key not in expected:
             raise ValueError(f"Invalid option: '{key}'")
-        if not any(isinstance(value, t) for t in expected[key]):
+        if value is None:
+            continue
+        expected_types = expected[key]
+        if not any(is_valid_type(value, t) for t in expected_types):
             raise ValueError(
-                f"Invalid type for option '{key}': Expected one of {expected[key]}, got {type(value)}"
+                f"Invalid value for option '{key}': {value}. Expected one of {expected_types}"
             )
 
-def is_instance_or_subclass(obj, class_or_tuple):
-    if isinstance(class_or_tuple, tuple):
-        return any(is_instance_or_subclass(obj, cls) for cls in class_or_tuple)
-    
-    if get_origin(class_or_tuple) is Literal:
-        return obj in get_args(class_or_tuple)
-    
-    if get_origin(class_or_tuple) is not None:
-        # Handle subscripted generics
-        origin = get_origin(class_or_tuple)
-        args = get_args(class_or_tuple)
-        
-        if origin is list:
-            return isinstance(obj, list) and all(isinstance(item, args[0]) for item in obj)
-        elif origin is dict:
-            return isinstance(obj, dict) and all(isinstance(k, args[0]) and isinstance(v, args[1]) for k, v in obj.items())
-        # Add more cases for other generic types as needed
-    
-    return isinstance(obj, class_or_tuple)
+def is_valid_type(value, expected_type):
+    if get_origin(expected_type) is Literal:
+        return value in get_args(expected_type)
+    if isinstance(expected_type, type):
+        return isinstance(value, expected_type)
+    return False  # For any other case
 
 class TextContentsOptions(TypedDict, total=False):
     """A class representing the options that you can specify when requesting text
@@ -476,7 +466,7 @@ class Exa:
         self,
         api_key: Optional[str],
         base_url: str = "https://api.exa.ai",
-        user_agent: str = "exa-py 1.0.18",
+        user_agent: str = "exa-py 1.1.8",
     ):
         """Initialize the Exa client with the provided API key and optional base URL and user agent.
 
@@ -1181,10 +1171,6 @@ class Exa:
                 **openai_kwargs,
             }
 
-            if use_exa != "none":
-                assert "tools" not in create_kwargs, "Tool use is not supported with Exa"
-                create_kwargs["tool_choice"] = use_exa
-
             return self._create_with_tool(
                 create_fn=func,
                 messages=list(messages),
@@ -1238,8 +1224,6 @@ class Exa:
         exa_result = self.search_and_contents(query, **exa_kwargs)
         exa_str = format_exa_result(exa_result, max_len=max_len)
         new_messages = add_message_to_messages(completion, messages, exa_str)
-        # For now, don't allow recursive tool calls
-        create_kwargs["tool_choice"] = "none"
         completion = create_fn(messages=new_messages, **create_kwargs)
 
         exa_completion = ExaOpenAICompletion.from_completion(

{exa_py-1.1.6 → exa_py-1.1.8}/exa_py.egg-info/PKG-INFO

@@ -1,12 +1,10 @@
 Metadata-Version: 2.1
-Name: exa-py
-Version: 1.1.6
+Name: exa_py
+Version: 1.1.8
 Summary: Python SDK for Exa API.
 Home-page: https://github.com/exa-labs/exa-py
 Author: Exa
 Author-email: hello@exa.ai
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
@@ -17,6 +15,9 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Description-Content-Type: text/markdown
+Requires-Dist: requests
+Requires-Dist: typing-extensions
+Requires-Dist: openai>=1.10.0
 
 # Exa
 
@@ -91,5 +92,3 @@ exa = Exa(api_key="your-api-key")
                              highlights={"highlights_per_url": 2, "num_sentences": 1, "query": "This is the highlight query:"})
 ```
 
-
-

{exa_py-1.1.6 → exa_py-1.1.8}/pyproject.toml

@@ -9,7 +9,7 @@ readme = "README.md"
 python = "^3.9"
 requests = "^2.32.3"
 typing-extensions = "^4.12.2"
-openai = "^1.10"
+openai = "^1.48"
 
 [tool.poetry.group.dev.dependencies]
 python-dotenv = "^1.0.1"
@@ -22,4 +22,4 @@ requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
 [virtualenvs]
-in-project = true
+in-project = true

{exa_py-1.1.6 → exa_py-1.1.8}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="exa_py",
-    version="1.1.6",
+    version="1.1.8",
     description="Python SDK for Exa API.",
     long_description_content_type="text/markdown",
     long_description=open("README.md").read(),