exa-py 1.14.13__py3-none-any.whl → 1.14.15__py3-none-any.whl

exa_py/api.py

@@ -32,14 +32,18 @@ from typing_extensions import TypedDict
 
 from exa_py.utils import (
     ExaOpenAICompletion,
+    _convert_schema_input,
+    _get_package_version,
     add_message_to_messages,
     format_exa_result,
     maybe_get_query,
+    JSONSchemaInput,
 )
 from .websets import WebsetsClient
 from .websets.core.base import ExaJSONEncoder
 from .research.client import ResearchClient, AsyncResearchClient
 
+
 is_beta = os.getenv("IS_BETA") == "True"
 
 
@@ -62,7 +66,7 @@ def snake_to_camel(snake_str: str) -> str:
     return components[0] + "".join(x.title() for x in components[1:])
 
 
-def to_camel_case(data: dict) -> dict:
+def to_camel_case(data: dict, skip_keys: list[str] = []) -> dict:
     """
     Convert keys in a dictionary from snake_case to camelCase recursively.
 
@@ -74,7 +78,9 @@ def to_camel_case(data: dict) -> dict:
     """
     if isinstance(data, dict):
         return {
-            snake_to_camel(k): to_camel_case(v) if isinstance(v, dict) else v
+            snake_to_camel(k): to_camel_case(v, skip_keys)
+            if isinstance(v, dict) and k not in skip_keys
+            else v
             for k, v in data.items()
             if v is not None
         }
@@ -261,6 +267,11 @@ class HighlightsContentsOptions(TypedDict, total=False):
 
 class JSONSchema(TypedDict, total=False):
     """Represents a JSON Schema definition used for structured summary output.
+
+    .. deprecated:: 1.15.0
+        Use Pydantic models or dict[str, Any] directly instead.
+        This will be removed in a future version.
+
     To learn more visit https://json-schema.org/overview/what-is-jsonschema.
     """
 
@@ -286,11 +297,12 @@ class SummaryContentsOptions(TypedDict, total=False):
 
     Attributes:
         query (str): The query string for the summary. Summary will bias towards answering the query.
-        schema (JSONSchema): JSON schema for structured output from summary.
+        schema (Union[BaseModel, dict[str, Any]]): JSON schema for structured output from summary.
+            Can be a Pydantic model (automatically converted) or a dict containing JSON Schema.
     """
 
     query: str
-    schema: JSONSchema
+    schema: JSONSchemaInput
 
 
 class ContextContentsOptions(TypedDict, total=False):
@@ -362,7 +374,19 @@ class _Result:
     subpages: Optional[List[_Result]] = None
     extras: Optional[Dict] = None
 
-    def __init__(self, url, id, title=None, score=None, published_date=None, author=None, image=None, favicon=None, subpages=None, extras=None):
+    def __init__(
+        self,
+        url,
+        id,
+        title=None,
+        score=None,
+        published_date=None,
+        author=None,
+        image=None,
+        favicon=None,
+        subpages=None,
+        extras=None,
+    ):
         self.url = url
         self.id = id
         self.title = title
@@ -406,8 +430,35 @@ class Result(_Result):
     highlight_scores: Optional[List[float]] = None
     summary: Optional[str] = None
 
-    def __init__(self, url, id, title=None, score=None, published_date=None, author=None, image=None, favicon=None, subpages=None, extras=None, text=None, highlights=None, highlight_scores=None, summary=None):
-        super().__init__(url, id, title, score, published_date, author, image, favicon, subpages, extras)
+    def __init__(
+        self,
+        url,
+        id,
+        title=None,
+        score=None,
+        published_date=None,
+        author=None,
+        image=None,
+        favicon=None,
+        subpages=None,
+        extras=None,
+        text=None,
+        highlights=None,
+        highlight_scores=None,
+        summary=None,
+    ):
+        super().__init__(
+            url,
+            id,
+            title,
+            score,
+            published_date,
+            author,
+            image,
+            favicon,
+            subpages,
+            extras,
+        )
         self.text = text
         self.highlights = highlights
         self.highlight_scores = highlight_scores
@@ -434,8 +485,32 @@ class ResultWithText(_Result):
 
     text: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, url, id, title=None, score=None, published_date=None, author=None, image=None, favicon=None, subpages=None, extras=None, text=""):
-        super().__init__(url, id, title, score, published_date, author, image, favicon, subpages, extras)
+    def __init__(
+        self,
+        url,
+        id,
+        title=None,
+        score=None,
+        published_date=None,
+        author=None,
+        image=None,
+        favicon=None,
+        subpages=None,
+        extras=None,
+        text="",
+    ):
+        super().__init__(
+            url,
+            id,
+            title,
+            score,
+            published_date,
+            author,
+            image,
+            favicon,
+            subpages,
+            extras,
+        )
         self.text = text
 
     def __str__(self):
@@ -456,8 +531,33 @@ class ResultWithHighlights(_Result):
     highlights: List[str] = dataclasses.field(default_factory=list)
     highlight_scores: List[float] = dataclasses.field(default_factory=list)
 
-    def __init__(self, url, id, title=None, score=None, published_date=None, author=None, image=None, favicon=None, subpages=None, extras=None, highlights=None, highlight_scores=None):
-        super().__init__(url, id, title, score, published_date, author, image, favicon, subpages, extras)
+    def __init__(
+        self,
+        url,
+        id,
+        title=None,
+        score=None,
+        published_date=None,
+        author=None,
+        image=None,
+        favicon=None,
+        subpages=None,
+        extras=None,
+        highlights=None,
+        highlight_scores=None,
+    ):
+        super().__init__(
+            url,
+            id,
+            title,
+            score,
+            published_date,
+            author,
+            image,
+            favicon,
+            subpages,
+            extras,
+        )
         self.highlights = highlights if highlights is not None else []
         self.highlight_scores = highlight_scores if highlight_scores is not None else []
 
@@ -484,8 +584,34 @@ class ResultWithTextAndHighlights(_Result):
     highlights: List[str] = dataclasses.field(default_factory=list)
     highlight_scores: List[float] = dataclasses.field(default_factory=list)
 
-    def __init__(self, url, id, title=None, score=None, published_date=None, author=None, image=None, favicon=None, subpages=None, extras=None, text="", highlights=None, highlight_scores=None):
-        super().__init__(url, id, title, score, published_date, author, image, favicon, subpages, extras)
+    def __init__(
+        self,
+        url,
+        id,
+        title=None,
+        score=None,
+        published_date=None,
+        author=None,
+        image=None,
+        favicon=None,
+        subpages=None,
+        extras=None,
+        text="",
+        highlights=None,
+        highlight_scores=None,
+    ):
+        super().__init__(
+            url,
+            id,
+            title,
+            score,
+            published_date,
+            author,
+            image,
+            favicon,
+            subpages,
+            extras,
+        )
         self.text = text
         self.highlights = highlights if highlights is not None else []
         self.highlight_scores = highlight_scores if highlight_scores is not None else []
@@ -510,8 +636,32 @@ class ResultWithSummary(_Result):
 
     summary: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, url, id, title=None, score=None, published_date=None, author=None, image=None, favicon=None, subpages=None, extras=None, summary=""):
-        super().__init__(url, id, title, score, published_date, author, image, favicon, subpages, extras)
+    def __init__(
+        self,
+        url,
+        id,
+        title=None,
+        score=None,
+        published_date=None,
+        author=None,
+        image=None,
+        favicon=None,
+        subpages=None,
+        extras=None,
+        summary="",
+    ):
+        super().__init__(
+            url,
+            id,
+            title,
+            score,
+            published_date,
+            author,
+            image,
+            favicon,
+            subpages,
+            extras,
+        )
         self.summary = summary
 
     def __str__(self):
@@ -532,8 +682,33 @@ class ResultWithTextAndSummary(_Result):
     text: str = dataclasses.field(default_factory=str)
     summary: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, url, id, title=None, score=None, published_date=None, author=None, image=None, favicon=None, subpages=None, extras=None, text="", summary=""):
-        super().__init__(url, id, title, score, published_date, author, image, favicon, subpages, extras)
+    def __init__(
+        self,
+        url,
+        id,
+        title=None,
+        score=None,
+        published_date=None,
+        author=None,
+        image=None,
+        favicon=None,
+        subpages=None,
+        extras=None,
+        text="",
+        summary="",
+    ):
+        super().__init__(
+            url,
+            id,
+            title,
+            score,
+            published_date,
+            author,
+            image,
+            favicon,
+            subpages,
+            extras,
+        )
         self.text = text
         self.summary = summary
 
@@ -557,8 +732,34 @@ class ResultWithHighlightsAndSummary(_Result):
     highlight_scores: List[float] = dataclasses.field(default_factory=list)
     summary: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, url, id, title=None, score=None, published_date=None, author=None, image=None, favicon=None, subpages=None, extras=None, highlights=None, highlight_scores=None, summary=""):
-        super().__init__(url, id, title, score, published_date, author, image, favicon, subpages, extras)
+    def __init__(
+        self,
+        url,
+        id,
+        title=None,
+        score=None,
+        published_date=None,
+        author=None,
+        image=None,
+        favicon=None,
+        subpages=None,
+        extras=None,
+        highlights=None,
+        highlight_scores=None,
+        summary="",
+    ):
+        super().__init__(
+            url,
+            id,
+            title,
+            score,
+            published_date,
+            author,
+            image,
+            favicon,
+            subpages,
+            extras,
+        )
         self.highlights = highlights if highlights is not None else []
         self.highlight_scores = highlight_scores if highlight_scores is not None else []
         self.summary = summary
@@ -589,8 +790,35 @@ class ResultWithTextAndHighlightsAndSummary(_Result):
     highlight_scores: List[float] = dataclasses.field(default_factory=list)
     summary: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, url, id, title=None, score=None, published_date=None, author=None, image=None, favicon=None, subpages=None, extras=None, text="", highlights=None, highlight_scores=None, summary=""):
-        super().__init__(url, id, title, score, published_date, author, image, favicon, subpages, extras)
+    def __init__(
+        self,
+        url,
+        id,
+        title=None,
+        score=None,
+        published_date=None,
+        author=None,
+        image=None,
+        favicon=None,
+        subpages=None,
+        extras=None,
+        text="",
+        highlights=None,
+        highlight_scores=None,
+        summary="",
+    ):
+        super().__init__(
+            url,
+            id,
+            title,
+            score,
+            published_date,
+            author,
+            image,
+            favicon,
+            subpages,
+            extras,
+        )
         self.text = text
         self.highlights = highlights if highlights is not None else []
         self.highlight_scores = highlight_scores if highlight_scores is not None else []
@@ -626,7 +854,9 @@ class AnswerResult:
     author: Optional[str] = None
     text: Optional[str] = None
 
-    def __init__(self, id, url, title=None, published_date=None, author=None, text=None):
+    def __init__(
+        self, id, url, title=None, published_date=None, author=None, text=None
+    ):
         self.id = id
         self.url = url
         self.title = title
@@ -736,14 +966,16 @@ class StreamAnswerResponse:
                 citations = []
                 for s in chunk["citations"]:
                     snake_s = to_snake_case(s)
-                    citations.append(AnswerResult(
-                        id=snake_s.get("id"),
-                        url=snake_s.get("url"),
-                        title=snake_s.get("title"),
-                        published_date=snake_s.get("published_date"),
-                        author=snake_s.get("author"),
-                        text=snake_s.get("text")
-                    ))
+                    citations.append(
+                        AnswerResult(
+                            id=snake_s.get("id"),
+                            url=snake_s.get("url"),
+                            title=snake_s.get("title"),
+                            published_date=snake_s.get("published_date"),
+                            author=snake_s.get("author"),
+                            text=snake_s.get("text"),
+                        )
+                    )
 
             stream_chunk = StreamChunk(content=content, citations=citations)
             if stream_chunk.has_data():
@@ -793,14 +1025,16 @@ class AsyncStreamAnswerResponse:
                     citations = []
                     for s in chunk["citations"]:
                         snake_s = to_snake_case(s)
-                        citations.append(AnswerResult(
-                            id=snake_s.get("id"),
-                            url=snake_s.get("url"),
-                            title=snake_s.get("title"),
-                            published_date=snake_s.get("published_date"),
-                            author=snake_s.get("author"),
-                            text=snake_s.get("text")
-                        ))
+                        citations.append(
+                            AnswerResult(
+                                id=snake_s.get("id"),
+                                url=snake_s.get("url"),
+                                title=snake_s.get("title"),
+                                published_date=snake_s.get("published_date"),
+                                author=snake_s.get("author"),
+                                text=snake_s.get("text"),
+                            )
+                        )
 
                 stream_chunk = StreamChunk(content=content, citations=citations)
                 if stream_chunk.has_data():
@@ -815,6 +1049,7 @@ class AsyncStreamAnswerResponse:
 
 T = TypeVar("T")
 
+
 @dataclass
 class ContentStatus:
     """A class representing the status of a content retrieval operation."""
@@ -824,7 +1059,6 @@ class ContentStatus:
     source: str
 
 
-
 @dataclass
 class SearchResponse(Generic[T]):
     """A class representing the response for a search operation.
@@ -890,13 +1124,14 @@ class Exa:
         self,
         api_key: Optional[str],
         base_url: str = "https://api.exa.ai",
-        user_agent: str = "exa-py 1.14.9",
+        user_agent: Optional[str] = None,
     ):
         """Initialize the Exa client with the provided API key and optional base URL and user agent.
 
         Args:
             api_key (str): The API key for authenticating with the Exa API.
             base_url (str, optional): The base URL for the Exa API. Defaults to "https://api.exa.ai".
+            user_agent (str, optional): Custom user agent. Defaults to "exa-py {version}".
         """
         if api_key is None:
             import os
@@ -906,6 +1141,11 @@ class Exa:
                 raise ValueError(
                     "API key must be provided as an argument or in EXA_API_KEY environment variable"
                 )
+
+        # Set default user agent with dynamic version if not provided
+        if user_agent is None:
+            user_agent = f"exa-py {_get_package_version()}"
+
         self.base_url = base_url
         self.headers = {
             "x-api-key": api_key,
@@ -1027,22 +1267,24 @@ class Exa:
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data["autopromptString"] if "autopromptString" in data else None,
@@ -1299,6 +1541,12 @@ class Exa:
         merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
         validate_search_options(options, merged_options)
 
+        # Convert schema if present in summary options
+        if "summary" in options and isinstance(options["summary"], dict):
+            summary_opts = options["summary"]
+            if "schema" in summary_opts:
+                summary_opts["schema"] = _convert_schema_input(summary_opts["schema"])
+
         # Nest the appropriate fields under "contents"
         options = nest_fields(
             options,
@@ -1315,28 +1563,30 @@ class Exa:
             ],
             "contents",
         )
-        options = to_camel_case(options)
+        options = to_camel_case(options, skip_keys=["schema"])
         data = self.request("/search", options)
         cost_dollars = parse_cost_dollars(data.get("costDollars"))
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data["autopromptString"] if "autopromptString" in data else None,
@@ -1474,7 +1724,7 @@ class Exa:
         for k, v in kwargs.items():
             if k != "self" and v is not None:
                 options[k] = v
-        
+
         if (
             "text" not in options
             and "highlights" not in options
@@ -1487,35 +1737,46 @@ class Exa:
         merged_options.update(CONTENTS_OPTIONS_TYPES)
         merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
         validate_search_options(options, merged_options)
-        options = to_camel_case(options)
+
+        # Convert schema if present in summary options
+        if "summary" in options and isinstance(options["summary"], dict):
+            summary_opts = options["summary"]
+            if "schema" in summary_opts:
+                summary_opts["schema"] = _convert_schema_input(summary_opts["schema"])
+
+        options = to_camel_case(options, ["schema"])
         data = self.request("/contents", options)
         cost_dollars = parse_cost_dollars(data.get("costDollars"))
         statuses = []
         for status in data.get("statuses", []):
-            statuses.append(ContentStatus(
-                id=status.get("id"),
-                status=status.get("status"),
-                source=status.get("source")
-            ))
+            statuses.append(
+                ContentStatus(
+                    id=status.get("id"),
+                    status=status.get("status"),
+                    source=status.get("source"),
+                )
+            )
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data.get("autopromptString"),
@@ -1571,22 +1832,24 @@ class Exa:
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data.get("autopromptString"),
@@ -1825,6 +2088,13 @@ class Exa:
         merged_options.update(CONTENTS_OPTIONS_TYPES)
         merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
         validate_search_options(options, merged_options)
+
+        # Convert schema if present in summary options
+        if "summary" in options and isinstance(options["summary"], dict):
+            summary_opts = options["summary"]
+            if "schema" in summary_opts:
+                summary_opts["schema"] = _convert_schema_input(summary_opts["schema"])
+
         # We nest the content fields
         options = nest_fields(
             options,
@@ -1841,28 +2111,30 @@ class Exa:
             ],
             "contents",
         )
-        options = to_camel_case(options)
+        options = to_camel_case(options, skip_keys=["schema"])
         data = self.request("/findSimilar", options)
         cost_dollars = parse_cost_dollars(data.get("costDollars"))
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data.get("autopromptString"),
@@ -2001,7 +2273,7 @@ class Exa:
             use_autoprompt=exa_kwargs.get("use_autoprompt"),
             type=exa_kwargs.get("type"),
             category=exa_kwargs.get("category"),
-            flags=exa_kwargs.get("flags")
+            flags=exa_kwargs.get("flags"),
         )
         exa_str = format_exa_result(exa_result, max_len=max_len)
         new_messages = add_message_to_messages(completion, messages, exa_str)
@@ -2021,7 +2293,7 @@ class Exa:
         text: Optional[bool] = False,
         system_prompt: Optional[str] = None,
         model: Optional[Literal["exa", "exa-pro"]] = None,
-        output_schema: Optional[dict[str, Any]] = None,
+        output_schema: Optional[JSONSchemaInput] = None,
     ) -> Union[AnswerResponse, StreamAnswerResponse]: ...
 
     def answer(
@@ -2032,7 +2304,7 @@ class Exa:
         text: Optional[bool] = False,
         system_prompt: Optional[str] = None,
         model: Optional[Literal["exa", "exa-pro"]] = None,
-        output_schema: Optional[dict[str, Any]] = None,
+        output_schema: Optional[JSONSchemaInput] = None,
     ) -> Union[AnswerResponse, StreamAnswerResponse]:
         """Generate an answer to a query using Exa's search and LLM capabilities.
 
@@ -2056,20 +2328,27 @@ class Exa:
             )
 
         options = {k: v for k, v in locals().items() if k != "self" and v is not None}
-        options = to_camel_case(options)
+
+        # Convert output_schema if present
+        if "output_schema" in options and options["output_schema"] is not None:
+            options["output_schema"] = _convert_schema_input(options["output_schema"])
+
+        options = to_camel_case(options, ["output_schema"])
         response = self.request("/answer", options)
 
         citations = []
         for result in response["citations"]:
             snake_result = to_snake_case(result)
-            citations.append(AnswerResult(
-                id=snake_result.get("id"),
-                url=snake_result.get("url"),
-                title=snake_result.get("title"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                text=snake_result.get("text")
-            ))
+            citations.append(
+                AnswerResult(
+                    id=snake_result.get("id"),
+                    url=snake_result.get("url"),
+                    title=snake_result.get("title"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    text=snake_result.get("text"),
+                )
+            )
         return AnswerResponse(response["answer"], citations)
 
     def stream_answer(
@@ -2079,7 +2358,7 @@ class Exa:
         text: bool = False,
         system_prompt: Optional[str] = None,
         model: Optional[Literal["exa", "exa-pro"]] = None,
-        output_schema: Optional[dict[str, Any]] = None,
+        output_schema: Optional[JSONSchemaInput] = None,
     ) -> StreamAnswerResponse:
         """Generate a streaming answer response.
 
@@ -2094,7 +2373,12 @@ class Exa:
                 Each iteration yields a tuple of (Optional[str], Optional[List[AnswerResult]]).
         """
         options = {k: v for k, v in locals().items() if k != "self" and v is not None}
-        options = to_camel_case(options)
+
+        # Convert output_schema if present
+        if "output_schema" in options and options["output_schema"] is not None:
+            options["output_schema"] = _convert_schema_input(options["output_schema"])
+
+        options = to_camel_case(options, skip_keys=["output_schema"])
         options["stream"] = True
         raw_response = self.request("/answer", options)
         return StreamAnswerResponse(raw_response)
@@ -2195,22 +2479,24 @@ class AsyncExa(Exa):
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data["autopromptString"] if "autopromptString" in data else None,
@@ -2239,6 +2525,12 @@ class AsyncExa(Exa):
         merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
         validate_search_options(options, merged_options)
 
+        # Convert schema if present in summary options
+        if "summary" in options and isinstance(options["summary"], dict):
+            summary_opts = options["summary"]
+            if "schema" in summary_opts:
+                summary_opts["schema"] = _convert_schema_input(summary_opts["schema"])
+
         # Nest the appropriate fields under "contents"
         options = nest_fields(
             options,
@@ -2255,28 +2547,30 @@ class AsyncExa(Exa):
             ],
             "contents",
         )
-        options = to_camel_case(options)
+        options = to_camel_case(options, skip_keys=["schema"])
         data = await self.async_request("/search", options)
         cost_dollars = parse_cost_dollars(data.get("costDollars"))
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data["autopromptString"] if "autopromptString" in data else None,
@@ -2291,7 +2585,7 @@ class AsyncExa(Exa):
         for k, v in kwargs.items():
             if k != "self" and v is not None:
                 options[k] = v
-        
+
         if (
             "text" not in options
             and "highlights" not in options
@@ -2304,35 +2598,46 @@ class AsyncExa(Exa):
         merged_options.update(CONTENTS_OPTIONS_TYPES)
         merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
         validate_search_options(options, merged_options)
-        options = to_camel_case(options)
+
+        # Convert schema if present in summary options
+        if "summary" in options and isinstance(options["summary"], dict):
+            summary_opts = options["summary"]
+            if "schema" in summary_opts:
+                summary_opts["schema"] = _convert_schema_input(summary_opts["schema"])
+
+        options = to_camel_case(options, ["schema"])
         data = await self.async_request("/contents", options)
         cost_dollars = parse_cost_dollars(data.get("costDollars"))
         statuses = []
         for status in data.get("statuses", []):
-            statuses.append(ContentStatus(
-                id=status.get("id"),
-                status=status.get("status"),
-                source=status.get("source")
-            ))
+            statuses.append(
+                ContentStatus(
+                    id=status.get("id"),
+                    status=status.get("status"),
+                    source=status.get("source"),
+                )
+            )
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data.get("autopromptString"),
@@ -2388,22 +2693,24 @@ class AsyncExa(Exa):
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data.get("autopromptString"),
@@ -2430,6 +2737,13 @@ class AsyncExa(Exa):
         merged_options.update(CONTENTS_OPTIONS_TYPES)
         merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
         validate_search_options(options, merged_options)
+
+        # Convert schema if present in summary options
+        if "summary" in options and isinstance(options["summary"], dict):
+            summary_opts = options["summary"]
+            if "schema" in summary_opts:
+                summary_opts["schema"] = _convert_schema_input(summary_opts["schema"])
+
         # We nest the content fields
         options = nest_fields(
             options,
@@ -2446,28 +2760,30 @@ class AsyncExa(Exa):
             ],
             "contents",
         )
-        options = to_camel_case(options)
+        options = to_camel_case(options, skip_keys=["schema"])
         data = await self.async_request("/findSimilar", options)
         cost_dollars = parse_cost_dollars(data.get("costDollars"))
         results = []
         for result in data["results"]:
             snake_result = to_snake_case(result)
-            results.append(Result(
-                url=snake_result.get("url"),
-                id=snake_result.get("id"),
-                title=snake_result.get("title"),
-                score=snake_result.get("score"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                image=snake_result.get("image"),
-                favicon=snake_result.get("favicon"),
-                subpages=snake_result.get("subpages"),
-                extras=snake_result.get("extras"),
-                text=snake_result.get("text"),
-                highlights=snake_result.get("highlights"),
-                highlight_scores=snake_result.get("highlight_scores"),
-                summary=snake_result.get("summary")
-            ))
+            results.append(
+                Result(
+                    url=snake_result.get("url"),
+                    id=snake_result.get("id"),
+                    title=snake_result.get("title"),
+                    score=snake_result.get("score"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    image=snake_result.get("image"),
+                    favicon=snake_result.get("favicon"),
+                    subpages=snake_result.get("subpages"),
+                    extras=snake_result.get("extras"),
+                    text=snake_result.get("text"),
+                    highlights=snake_result.get("highlights"),
+                    highlight_scores=snake_result.get("highlight_scores"),
+                    summary=snake_result.get("summary"),
+                )
+            )
         return SearchResponse(
             results,
             data.get("autopromptString"),
@@ -2485,7 +2801,7 @@ class AsyncExa(Exa):
         text: Optional[bool] = False,
         system_prompt: Optional[str] = None,
         model: Optional[Literal["exa", "exa-pro"]] = None,
-        output_schema: Optional[dict[str, Any]] = None,
+        output_schema: Optional[JSONSchemaInput] = None,
     ) -> Union[AnswerResponse, StreamAnswerResponse]:
         """Generate an answer to a query using Exa's search and LLM capabilities.
 
@@ -2509,20 +2825,27 @@ class AsyncExa(Exa):
             )
 
         options = {k: v for k, v in locals().items() if k != "self" and v is not None}
-        options = to_camel_case(options)
+
+        # Convert output_schema if present
+        if "output_schema" in options and options["output_schema"] is not None:
+            options["output_schema"] = _convert_schema_input(options["output_schema"])
+
+        options = to_camel_case(options, skip_keys=["output_schema"])
         response = await self.async_request("/answer", options)
 
         citations = []
         for result in response["citations"]:
             snake_result = to_snake_case(result)
-            citations.append(AnswerResult(
-                id=snake_result.get("id"),
-                url=snake_result.get("url"),
-                title=snake_result.get("title"),
-                published_date=snake_result.get("published_date"),
-                author=snake_result.get("author"),
-                text=snake_result.get("text")
-            ))
+            citations.append(
+                AnswerResult(
+                    id=snake_result.get("id"),
+                    url=snake_result.get("url"),
+                    title=snake_result.get("title"),
+                    published_date=snake_result.get("published_date"),
+                    author=snake_result.get("author"),
+                    text=snake_result.get("text"),
+                )
+            )
         return AnswerResponse(response["answer"], citations)
 
     async def stream_answer(
@@ -2532,7 +2855,7 @@ class AsyncExa(Exa):
         text: bool = False,
         system_prompt: Optional[str] = None,
         model: Optional[Literal["exa", "exa-pro"]] = None,
-        output_schema: Optional[dict[str, Any]] = None,
+        output_schema: Optional[JSONSchemaInput] = None,
     ) -> AsyncStreamAnswerResponse:
         """Generate a streaming answer response.
 
@@ -2547,7 +2870,12 @@ class AsyncExa(Exa):
                 Each iteration yields a tuple of (Optional[str], Optional[List[AnswerResult]]).
         """
         options = {k: v for k, v in locals().items() if k != "self" and v is not None}
-        options = to_camel_case(options)
+
+        # Convert output_schema if present
+        if "output_schema" in options and options["output_schema"] is not None:
+            options["output_schema"] = _convert_schema_input(options["output_schema"])
+
+        options = to_camel_case(options, skip_keys=["output_schema"])
         options["stream"] = True
         raw_response = await self.async_request("/answer", options)
         return AsyncStreamAnswerResponse(raw_response)