exa-py 1.1.5__py3-none-any.whl → 1.1.7__py3-none-any.whl

exa_py/api.py

@@ -15,6 +15,8 @@ from typing import (
     overload,
     Union,
     Literal,
+    get_origin,
+    get_args
 )
 from typing_extensions import TypedDict
 
@@ -130,6 +132,9 @@ FIND_SIMILAR_OPTIONS_TYPES = {
     "category": [str],
 }
 
+# the livecrawl options
+LIVECRAWL_OPTIONS = Literal["always", "fallback", "never"]
+
 CONTENTS_OPTIONS_TYPES = {
     "ids": [list],
     "text": [dict, bool],
@@ -141,9 +146,6 @@ CONTENTS_OPTIONS_TYPES = {
     "filter_empty_results": [bool],
 }
 
-# the livecrawl options
-LIVECRAWL_OPTIONS = Literal["always", "fallback", "never"]
-
 # FOR BETA OPTIONS
 # if is_beta:
     
@@ -163,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

{exa_py-1.1.5.dist-info → exa_py-1.1.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: exa-py
-Version: 1.1.5
+Version: 1.1.7
 Summary: Python SDK for Exa API.
 Home-page: https://github.com/exa-labs/exa-py
 Author: Exa

exa_py-1.1.7.dist-info/RECORD

@@ -0,0 +1,8 @@
+exa_py/__init__.py,sha256=aVF1zB_UV3dagJ5Vn2WrdcInzibdIW61M89sjwRCU_g,29
+exa_py/api.py,sha256=Ew0bqFsCVC5NyD7BJ9fVT292v3z3Axz7cbi_ci-om1k,46645
+exa_py/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+exa_py/utils.py,sha256=Rc1FJjoR9LQ7L_OJM91Sd1GNkbHjcLyEvJENhRix6gc,2405
+exa_py-1.1.7.dist-info/METADATA,sha256=FCuU11OAguAvMwWQEbEOtWvRDx3cn93aS9QFeZS1MNg,3069
+exa_py-1.1.7.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
+exa_py-1.1.7.dist-info/top_level.txt,sha256=Mfkmscdw9HWR1PtVhU1gAiVo6DHu_tyiVdb89gfZBVI,7
+exa_py-1.1.7.dist-info/RECORD,,

exa_py-1.1.5.dist-info/RECORD

@@ -1,8 +0,0 @@
-exa_py/__init__.py,sha256=aVF1zB_UV3dagJ5Vn2WrdcInzibdIW61M89sjwRCU_g,29
-exa_py/api.py,sha256=kUE28BRwe25a1nDQlsgunkXZujB57L3BlkSEKQMhpww,47105
-exa_py/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-exa_py/utils.py,sha256=Rc1FJjoR9LQ7L_OJM91Sd1GNkbHjcLyEvJENhRix6gc,2405
-exa_py-1.1.5.dist-info/METADATA,sha256=FQl2zDgFLlgMZRKDTrJo8BwUhJYfTIsjOd5VZsBWp1s,3069
-exa_py-1.1.5.dist-info/WHEEL,sha256=ewwEueio1C2XeHTvT17n8dZUJgOvyCWCt0WVNLClP9o,92
-exa_py-1.1.5.dist-info/top_level.txt,sha256=Mfkmscdw9HWR1PtVhU1gAiVo6DHu_tyiVdb89gfZBVI,7
-exa_py-1.1.5.dist-info/RECORD,,