exa-py 1.14.10__py3-none-any.whl → 1.14.12__py3-none-any.whl

exa_py/api.py

@@ -362,17 +362,17 @@ class _Result:
     subpages: Optional[List[_Result]] = None
     extras: Optional[Dict] = None
 
-    def __init__(self, **kwargs):
-        self.url = kwargs["url"]
-        self.id = kwargs["id"]
-        self.title = kwargs.get("title")
-        self.score = kwargs.get("score")
-        self.published_date = kwargs.get("published_date")
-        self.author = kwargs.get("author")
-        self.image = kwargs.get("image")
-        self.favicon = kwargs.get("favicon")
-        self.subpages = kwargs.get("subpages")
-        self.extras = kwargs.get("extras")
+    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
+        self.score = score
+        self.published_date = published_date
+        self.author = author
+        self.image = image
+        self.favicon = favicon
+        self.subpages = subpages
+        self.extras = extras
 
     def __str__(self):
         return (
@@ -406,12 +406,12 @@ class Result(_Result):
     highlight_scores: Optional[List[float]] = None
     summary: Optional[str] = None
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.text = kwargs.get("text")
-        self.highlights = kwargs.get("highlights")
-        self.highlight_scores = kwargs.get("highlight_scores")
-        self.summary = kwargs.get("summary")
+    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
+        self.summary = summary
 
     def __str__(self):
         base_str = super().__str__()
@@ -434,9 +434,9 @@ class ResultWithText(_Result):
 
     text: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.text = kwargs["text"]
+    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):
         base_str = super().__str__()
@@ -456,10 +456,10 @@ class ResultWithHighlights(_Result):
     highlights: List[str] = dataclasses.field(default_factory=list)
     highlight_scores: List[float] = dataclasses.field(default_factory=list)
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.highlights = kwargs["highlights"]
-        self.highlight_scores = kwargs["highlight_scores"]
+    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 []
 
     def __str__(self):
         base_str = super().__str__()
@@ -484,11 +484,11 @@ class ResultWithTextAndHighlights(_Result):
     highlights: List[str] = dataclasses.field(default_factory=list)
     highlight_scores: List[float] = dataclasses.field(default_factory=list)
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.text = kwargs["text"]
-        self.highlights = kwargs["highlights"]
-        self.highlight_scores = kwargs["highlight_scores"]
+    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 []
 
     def __str__(self):
         base_str = super().__str__()
@@ -510,9 +510,9 @@ class ResultWithSummary(_Result):
 
     summary: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.summary = kwargs["summary"]
+    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):
         base_str = super().__str__()
@@ -532,10 +532,10 @@ class ResultWithTextAndSummary(_Result):
     text: str = dataclasses.field(default_factory=str)
     summary: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.text = kwargs["text"]
-        self.summary = kwargs["summary"]
+    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
 
     def __str__(self):
         base_str = super().__str__()
@@ -557,11 +557,11 @@ class ResultWithHighlightsAndSummary(_Result):
     highlight_scores: List[float] = dataclasses.field(default_factory=list)
     summary: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.highlights = kwargs["highlights"]
-        self.highlight_scores = kwargs["highlight_scores"]
-        self.summary = kwargs["summary"]
+    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
 
     def __str__(self):
         base_str = super().__str__()
@@ -589,12 +589,12 @@ class ResultWithTextAndHighlightsAndSummary(_Result):
     highlight_scores: List[float] = dataclasses.field(default_factory=list)
     summary: str = dataclasses.field(default_factory=str)
 
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.text = kwargs["text"]
-        self.highlights = kwargs["highlights"]
-        self.highlight_scores = kwargs["highlight_scores"]
-        self.summary = kwargs["summary"]
+    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 []
+        self.summary = summary
 
     def __str__(self):
         base_str = super().__str__()
@@ -626,13 +626,13 @@ class AnswerResult:
     author: Optional[str] = None
     text: Optional[str] = None
 
-    def __init__(self, **kwargs):
-        self.id = kwargs["id"]
-        self.url = kwargs["url"]
-        self.title = kwargs.get("title")
-        self.published_date = kwargs.get("published_date")
-        self.author = kwargs.get("author")
-        self.text = kwargs.get("text")
+    def __init__(self, id, url, title=None, published_date=None, author=None, text=None):
+        self.id = id
+        self.url = url
+        self.title = title
+        self.published_date = published_date
+        self.author = author
+        self.text = text
 
     def __str__(self):
         return (
@@ -733,9 +733,17 @@ class StreamAnswerResponse:
                 and chunk["citations"]
                 and chunk["citations"] != "null"
             ):
-                citations = [
-                    AnswerResult(**to_snake_case(s)) for s in chunk["citations"]
-                ]
+                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")
+                    ))
 
             stream_chunk = StreamChunk(content=content, citations=citations)
             if stream_chunk.has_data():
@@ -782,9 +790,17 @@ class AsyncStreamAnswerResponse:
                     and chunk["citations"]
                     and chunk["citations"] != "null"
                 ):
-                    citations = [
-                        AnswerResult(**to_snake_case(s)) for s in chunk["citations"]
-                    ]
+                    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")
+                        ))
 
                 stream_chunk = StreamChunk(content=content, citations=citations)
                 if stream_chunk.has_data():
@@ -1008,8 +1024,27 @@ class Exa:
         options = to_camel_case(options)
         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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data["autopromptString"] if "autopromptString" in data else None,
             data["resolvedSearchType"] if "resolvedSearchType" in data else None,
             data["autoDate"] if "autoDate" in data else None,
@@ -1245,7 +1280,10 @@ class Exa:
     ) -> SearchResponse[ResultWithTextAndHighlightsAndSummary]: ...
 
     def search_and_contents(self, query: str, **kwargs):
-        options = {k: v for k, v in {"query": query, **kwargs}.items() if v is not None}
+        options = {"query": query}
+        for k, v in kwargs.items():
+            if v is not None:
+                options[k] = v
         # If user didn't ask for any particular content, default to text
         if (
             "text" not in options
@@ -1255,14 +1293,11 @@ class Exa:
         ):
             options["text"] = True
 
-        validate_search_options(
-            options,
-            {
-                **SEARCH_OPTIONS_TYPES,
-                **CONTENTS_OPTIONS_TYPES,
-                **CONTENTS_ENDPOINT_OPTIONS_TYPES,
-            },
-        )
+        merged_options = {}
+        merged_options.update(SEARCH_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
+        validate_search_options(options, merged_options)
 
         # Nest the appropriate fields under "contents"
         options = nest_fields(
@@ -1283,8 +1318,27 @@ class Exa:
         options = to_camel_case(options)
         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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data["autopromptString"] if "autopromptString" in data else None,
             data["resolvedSearchType"] if "resolvedSearchType" in data else None,
             data["autoDate"] if "autoDate" in data else None,
@@ -1416,11 +1470,11 @@ class Exa:
     ) -> SearchResponse[ResultWithTextAndHighlightsAndSummary]: ...
 
     def get_contents(self, urls: Union[str, List[str], List[_Result]], **kwargs):
-        options = {
-            k: v
-            for k, v in {"urls": urls, **kwargs}.items()
-            if k != "self" and v is not None
-        }
+        options = {"urls": urls}
+        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
@@ -1429,16 +1483,41 @@ class Exa:
         ):
             options["text"] = True
 
-        validate_search_options(
-            options,
-            {**CONTENTS_OPTIONS_TYPES, **CONTENTS_ENDPOINT_OPTIONS_TYPES},
-        )
+        merged_options = {}
+        merged_options.update(CONTENTS_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
+        validate_search_options(options, merged_options)
         options = to_camel_case(options)
         data = self.request("/contents", options)
         cost_dollars = parse_cost_dollars(data.get("costDollars"))
-        statuses = [ContentStatus(**status) for status in data.get("statuses", [])]
+        statuses = []
+        for status in data.get("statuses", []):
+            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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data.get("autopromptString"),
             data.get("resolvedSearchType"),
             data.get("autoDate"),
@@ -1489,8 +1568,27 @@ class Exa:
         options = to_camel_case(options)
         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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data.get("autopromptString"),
             data.get("resolvedSearchType"),
             data.get("autoDate"),
@@ -1710,7 +1808,10 @@ class Exa:
     ) -> SearchResponse[ResultWithTextAndHighlightsAndSummary]: ...
 
     def find_similar_and_contents(self, url: str, **kwargs):
-        options = {k: v for k, v in {"url": url, **kwargs}.items() if v is not None}
+        options = {"url": url}
+        for k, v in kwargs.items():
+            if v is not None:
+                options[k] = v
         # Default to text if none specified
         if (
             "text" not in options
@@ -1719,14 +1820,11 @@ class Exa:
         ):
             options["text"] = True
 
-        validate_search_options(
-            options,
-            {
-                **FIND_SIMILAR_OPTIONS_TYPES,
-                **CONTENTS_OPTIONS_TYPES,
-                **CONTENTS_ENDPOINT_OPTIONS_TYPES,
-            },
-        )
+        merged_options = {}
+        merged_options.update(FIND_SIMILAR_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
+        validate_search_options(options, merged_options)
         # We nest the content fields
         options = nest_fields(
             options,
@@ -1746,8 +1844,27 @@ class Exa:
         options = to_camel_case(options)
         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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data.get("autopromptString"),
             data.get("resolvedSearchType"),
             data.get("autoDate"),
@@ -1813,10 +1930,8 @@ class Exa:
                 "flags": flags,
             }
 
-            create_kwargs = {
-                "model": model,
-                **openai_kwargs,
-            }
+            create_kwargs = {"model": model}
+            create_kwargs.update(openai_kwargs)
 
             return self._create_with_tool(
                 create_fn=func,
@@ -1871,7 +1986,23 @@ class Exa:
             )
 
         # We do a search_and_contents automatically
-        exa_result = self.search_and_contents(query, **exa_kwargs)
+        exa_result = self.search_and_contents(
+            query=query,
+            num_results=exa_kwargs.get("num_results"),
+            include_domains=exa_kwargs.get("include_domains"),
+            exclude_domains=exa_kwargs.get("exclude_domains"),
+            highlights=exa_kwargs.get("highlights"),
+            start_crawl_date=exa_kwargs.get("start_crawl_date"),
+            end_crawl_date=exa_kwargs.get("end_crawl_date"),
+            start_published_date=exa_kwargs.get("start_published_date"),
+            end_published_date=exa_kwargs.get("end_published_date"),
+            include_text=exa_kwargs.get("include_text"),
+            exclude_text=exa_kwargs.get("exclude_text"),
+            use_autoprompt=exa_kwargs.get("use_autoprompt"),
+            type=exa_kwargs.get("type"),
+            category=exa_kwargs.get("category"),
+            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)
         completion = create_fn(messages=new_messages, **create_kwargs)
@@ -1928,10 +2059,18 @@ class Exa:
         options = to_camel_case(options)
         response = self.request("/answer", options)
 
-        return AnswerResponse(
-            response["answer"],
-            [AnswerResult(**to_snake_case(result)) for result in response["citations"]],
-        )
+        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")
+            ))
+        return AnswerResponse(response["answer"], citations)
 
     def stream_answer(
         self,
@@ -2053,8 +2192,27 @@ class AsyncExa(Exa):
         options = to_camel_case(options)
         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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data["autopromptString"] if "autopromptString" in data else None,
             data["resolvedSearchType"] if "resolvedSearchType" in data else None,
             data["autoDate"] if "autoDate" in data else None,
@@ -2062,7 +2220,10 @@ class AsyncExa(Exa):
         )
 
     async def search_and_contents(self, query: str, **kwargs):
-        options = {k: v for k, v in {"query": query, **kwargs}.items() if v is not None}
+        options = {"query": query}
+        for k, v in kwargs.items():
+            if v is not None:
+                options[k] = v
         # If user didn't ask for any particular content, default to text
         if (
             "text" not in options
@@ -2072,14 +2233,11 @@ class AsyncExa(Exa):
         ):
             options["text"] = True
 
-        validate_search_options(
-            options,
-            {
-                **SEARCH_OPTIONS_TYPES,
-                **CONTENTS_OPTIONS_TYPES,
-                **CONTENTS_ENDPOINT_OPTIONS_TYPES,
-            },
-        )
+        merged_options = {}
+        merged_options.update(SEARCH_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
+        validate_search_options(options, merged_options)
 
         # Nest the appropriate fields under "contents"
         options = nest_fields(
@@ -2100,8 +2258,27 @@ class AsyncExa(Exa):
         options = to_camel_case(options)
         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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data["autopromptString"] if "autopromptString" in data else None,
             data["resolvedSearchType"] if "resolvedSearchType" in data else None,
             data["autoDate"] if "autoDate" in data else None,
@@ -2110,11 +2287,11 @@ class AsyncExa(Exa):
         )
 
     async def get_contents(self, urls: Union[str, List[str], List[_Result]], **kwargs):
-        options = {
-            k: v
-            for k, v in {"urls": urls, **kwargs}.items()
-            if k != "self" and v is not None
-        }
+        options = {"urls": urls}
+        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
@@ -2123,16 +2300,41 @@ class AsyncExa(Exa):
         ):
             options["text"] = True
 
-        validate_search_options(
-            options,
-            {**CONTENTS_OPTIONS_TYPES, **CONTENTS_ENDPOINT_OPTIONS_TYPES},
-        )
+        merged_options = {}
+        merged_options.update(CONTENTS_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
+        validate_search_options(options, merged_options)
         options = to_camel_case(options)
         data = await self.async_request("/contents", options)
         cost_dollars = parse_cost_dollars(data.get("costDollars"))
-        statuses = [ContentStatus(**status) for status in data.get("statuses", [])]
+        statuses = []
+        for status in data.get("statuses", []):
+            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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data.get("autopromptString"),
             data.get("resolvedSearchType"),
             data.get("autoDate"),
@@ -2183,8 +2385,27 @@ class AsyncExa(Exa):
         options = to_camel_case(options)
         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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data.get("autopromptString"),
             data.get("resolvedSearchType"),
             data.get("autoDate"),
@@ -2192,7 +2413,10 @@ class AsyncExa(Exa):
         )
 
     async def find_similar_and_contents(self, url: str, **kwargs):
-        options = {k: v for k, v in {"url": url, **kwargs}.items() if v is not None}
+        options = {"url": url}
+        for k, v in kwargs.items():
+            if v is not None:
+                options[k] = v
         # Default to text if none specified
         if (
             "text" not in options
@@ -2201,14 +2425,11 @@ class AsyncExa(Exa):
         ):
             options["text"] = True
 
-        validate_search_options(
-            options,
-            {
-                **FIND_SIMILAR_OPTIONS_TYPES,
-                **CONTENTS_OPTIONS_TYPES,
-                **CONTENTS_ENDPOINT_OPTIONS_TYPES,
-            },
-        )
+        merged_options = {}
+        merged_options.update(FIND_SIMILAR_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_OPTIONS_TYPES)
+        merged_options.update(CONTENTS_ENDPOINT_OPTIONS_TYPES)
+        validate_search_options(options, merged_options)
         # We nest the content fields
         options = nest_fields(
             options,
@@ -2228,8 +2449,27 @@ class AsyncExa(Exa):
         options = to_camel_case(options)
         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")
+            ))
         return SearchResponse(
-            [Result(**to_snake_case(result)) for result in data["results"]],
+            results,
             data.get("autopromptString"),
             data.get("resolvedSearchType"),
             data.get("autoDate"),
@@ -2272,10 +2512,18 @@ class AsyncExa(Exa):
         options = to_camel_case(options)
         response = await self.async_request("/answer", options)
 
-        return AnswerResponse(
-            response["answer"],
-            [AnswerResult(**to_snake_case(result)) for result in response["citations"]],
-        )
+        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")
+            ))
+        return AnswerResponse(response["answer"], citations)
 
     async def stream_answer(
         self,

exa_py/research/client.py

@@ -322,10 +322,24 @@ def _build_research_task(raw: Dict[str, Any]):
     from ..api import _Result, to_snake_case  # noqa: WPS433 – runtime import
 
     citations_raw = raw.get("citations", {}) or {}
-    citations_parsed = {
-        key: [_Result(**to_snake_case(c)) for c in cites]
-        for key, cites in citations_raw.items()
-    }
+    citations_parsed = {}
+    for key, cites in citations_raw.items():
+        results = []
+        for c in cites:
+            snake_c = to_snake_case(c)
+            results.append(_Result(
+                url=snake_c.get("url"),
+                id=snake_c.get("id"),
+                title=snake_c.get("title"),
+                score=snake_c.get("score"),
+                published_date=snake_c.get("published_date"),
+                author=snake_c.get("author"),
+                image=snake_c.get("image"),
+                favicon=snake_c.get("favicon"),
+                subpages=snake_c.get("subpages"),
+                extras=snake_c.get("extras")
+            ))
+        citations_parsed[key] = results
 
     return ResearchTask(
         id=raw["id"],

exa_py/utils.py

@@ -54,8 +54,8 @@ def format_exa_result(exa_result, max_len: int=-1):
 
 class ExaOpenAICompletion(ChatCompletion):
     """Exa wrapper for OpenAI completion."""
-    def __init__(self, exa_result: Optional["SearchResponse[ResultWithText]"], **kwargs):
-        super().__init__(**kwargs)
+    def __init__(self, exa_result: Optional["SearchResponse[ResultWithText]"], id, choices, created, model, object, system_fingerprint=None, usage=None):
+        super().__init__(id=id, choices=choices, created=created, model=model, object=object, system_fingerprint=system_fingerprint, usage=usage)
         self.exa_result = exa_result
     
 

exa_py/websets/__init__.py

@@ -1,7 +1,9 @@
 from .client import WebsetsClient
 from .imports import ImportsClient
+from .events import EventsClient
 
 __all__ = [
     "WebsetsClient",
     "ImportsClient",
+    "EventsClient",
 ] 

exa_py/websets/client.py

@@ -18,6 +18,7 @@ from .enrichments import WebsetEnrichmentsClient
 from .webhooks import WebsetWebhooksClient
 from .monitors import MonitorsClient
 from .imports import ImportsClient
+from .events import EventsClient
 
 class WebsetsClient(WebsetsBaseClient):
     """Client for managing Websets."""
@@ -30,6 +31,7 @@ class WebsetsClient(WebsetsBaseClient):
         self.webhooks = WebsetWebhooksClient(client)
         self.monitors = MonitorsClient(client)
         self.imports = ImportsClient(client)
+        self.events = EventsClient(client)
 
     def create(self, params: Union[Dict[str, Any], CreateWebsetParameters]) -> Webset:
         """Create a new Webset.

exa_py/websets/events/__init__.py

@@ -0,0 +1,3 @@
+from .client import EventsClient
+
+__all__ = ["EventsClient"]

exa_py/websets/events/client.py

@@ -0,0 +1,106 @@
+from __future__ import annotations
+
+from typing import List, Optional, Union
+
+from ..types import (
+    EventType,
+    ListEventsResponse,
+    WebsetCreatedEvent,
+    WebsetDeletedEvent,
+    WebsetIdleEvent,
+    WebsetPausedEvent,
+    WebsetItemCreatedEvent,
+    WebsetItemEnrichedEvent,
+    WebsetSearchCreatedEvent,
+    WebsetSearchUpdatedEvent,
+    WebsetSearchCanceledEvent,
+    WebsetSearchCompletedEvent,
+)
+from ..core.base import WebsetsBaseClient
+
+# Type alias for all event types
+Event = Union[
+    WebsetCreatedEvent,
+    WebsetDeletedEvent,
+    WebsetIdleEvent,
+    WebsetPausedEvent,
+    WebsetItemCreatedEvent,
+    WebsetItemEnrichedEvent,
+    WebsetSearchCreatedEvent,
+    WebsetSearchUpdatedEvent,
+    WebsetSearchCanceledEvent,
+    WebsetSearchCompletedEvent,
+]
+
+class EventsClient(WebsetsBaseClient):
+    """Client for managing Events."""
+    
+    def __init__(self, client):
+        super().__init__(client)
+
+    def list(self, *, cursor: Optional[str] = None, limit: Optional[int] = None, 
+             types: Optional[List[EventType]] = None) -> ListEventsResponse:
+        """List all Events.
+        
+        Args:
+            cursor (str, optional): The cursor to paginate through the results.
+            limit (int, optional): The number of results to return.
+            types (List[EventType], optional): The types of events to filter by.
+        
+        Returns:
+            ListEventsResponse: List of events.
+        """
+        params = {}
+        if cursor is not None:
+            params["cursor"] = cursor
+        if limit is not None:
+            params["limit"] = limit
+        if types is not None:
+            # Convert EventType enums to their string values
+            params["types"] = [t.value if hasattr(t, 'value') else t for t in types]
+            
+        response = self.request("/v0/events", params=params, method="GET")
+        return ListEventsResponse.model_validate(response)
+
+    def get(self, id: str) -> Event:
+        """Get an Event by ID.
+        
+        Args:
+            id (str): The ID of the Event.
+        
+        Returns:
+            Event: The retrieved event.
+        """
+        response = self.request(f"/v0/events/{id}", method="GET")
+        
+        # The response should contain a 'type' field that helps us determine
+        # which specific event class to use for validation
+        event_type = response.get('type')
+        
+        # Map event types to their corresponding classes
+        event_type_map = {
+            'webset.created': WebsetCreatedEvent,
+            'webset.deleted': WebsetDeletedEvent,
+            'webset.idle': WebsetIdleEvent,
+            'webset.paused': WebsetPausedEvent,
+            'webset.item.created': WebsetItemCreatedEvent,
+            'webset.item.enriched': WebsetItemEnrichedEvent,
+            'webset.search.created': WebsetSearchCreatedEvent,
+            'webset.search.updated': WebsetSearchUpdatedEvent,
+            'webset.search.canceled': WebsetSearchCanceledEvent,
+            'webset.search.completed': WebsetSearchCompletedEvent,
+        }
+        
+        event_class = event_type_map.get(event_type)
+        if event_class:
+            return event_class.model_validate(response)
+        else:
+            # Fallback - try each type until one validates
+            # This shouldn't happen in normal operation
+            for event_class in event_type_map.values():
+                try:
+                    return event_class.model_validate(response)
+                except Exception:
+                    continue
+            
+            raise ValueError(f"Unknown event type: {event_type}")

exa_py/websets/types.py

@@ -6,7 +6,7 @@ from __future__ import annotations
 
 from datetime import datetime
 from enum import Enum
-from typing import Any, Dict, List, Literal, Optional, Union
+from typing import Any, Dict, List, Literal, Optional, Union, Annotated
 
 from pydantic import AnyUrl, Field, PositiveInt, confloat, constr
 from .core.base import ExaBaseModel
@@ -287,20 +287,21 @@ class ImportSource(Enum):
 
 
 class ListEventsResponse(ExaBaseModel):
-    data: List[
-        Union[
-            WebsetCreatedEvent,
-            WebsetDeletedEvent,
-            WebsetIdleEvent,
-            WebsetPausedEvent,
-            WebsetItemCreatedEvent,
-            WebsetItemEnrichedEvent,
-            WebsetSearchCreatedEvent,
-            WebsetSearchUpdatedEvent,
-            WebsetSearchCanceledEvent,
-            WebsetSearchCompletedEvent,
-        ]
-    ] = Field(..., discriminator='type')
+    data: List[Annotated[
+      Union[
+          WebsetCreatedEvent,
+          WebsetDeletedEvent,
+          WebsetIdleEvent,
+          WebsetPausedEvent,
+          WebsetItemCreatedEvent,
+          WebsetItemEnrichedEvent,
+          WebsetSearchCreatedEvent,
+          WebsetSearchUpdatedEvent,
+          WebsetSearchCanceledEvent,
+          WebsetSearchCompletedEvent,
+      ],
+      Field(discriminator='type')
+  ]]
     """
     The list of events
     """
@@ -1440,6 +1441,17 @@ class WebsetItemPersonProperties(ExaBaseModel):
     """
 
 
+class WebsetItemPersonCompanyPropertiesFields(ExaBaseModel):
+    name: str
+    """
+    The name of the company
+    """
+    location: Optional[str] = None
+    """
+    The location the person is working at the company
+    """
+
+
 class WebsetItemPersonPropertiesFields(ExaBaseModel):
     name: str
     """
@@ -1453,6 +1465,10 @@ class WebsetItemPersonPropertiesFields(ExaBaseModel):
     """
     The current work position of the person
     """
+    company: Optional[WebsetItemPersonCompanyPropertiesFields] = None
+    """
+    The company the person is working at
+    """
     picture_url: Optional[AnyUrl] = Field(None, alias='pictureUrl')
     """
     The URL of the person's picture

{exa_py-1.14.10.dist-info → exa_py-1.14.12.dist-info}/METADATA

@@ -1,24 +1,20 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: exa-py
-Version: 1.14.10
+Version: 1.14.12
 Summary: Python SDK for Exa API.
+Home-page: https://github.com/exa-labs/exa-py
+Author: Exa
+Author-email: Exa AI <hello@exa.ai>
 License: MIT
-Author: Exa AI
-Author-email: hello@exa.ai
 Requires-Python: >=3.9
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Programming Language :: Python :: 3.13
-Requires-Dist: httpx (>=0.28.1)
-Requires-Dist: openai (>=1.48)
-Requires-Dist: pydantic (>=2.10.6)
-Requires-Dist: requests (>=2.32.3)
-Requires-Dist: typing-extensions (>=4.12.2)
 Description-Content-Type: text/markdown
+Requires-Dist: requests>=2.32.3
+Requires-Dist: typing-extensions>=4.12.2
+Requires-Dist: openai>=1.48
+Requires-Dist: pydantic>=2.10.6
+Requires-Dist: httpx>=0.28.1
+Dynamic: author
+Dynamic: home-page
 
 # Exa
 
@@ -130,4 +126,3 @@ exa = Exa(api_key="your-api-key")
       output_schema=OUTPUT_SCHEMA,
   )
 ```
-

{exa_py-1.14.10.dist-info → exa_py-1.14.12.dist-info}/RECORD

@@ -1,17 +1,19 @@
 exa_py/__init__.py,sha256=M2GC9oSdoV6m2msboW0vMWWl8wrth4o6gmEV4MYLGG8,66
-exa_py/api.py,sha256=qcEmAuPaP2B6890OKIvAJRG0qofTu4i4TGXbQlqzDoU,86367
+exa_py/api.py,sha256=IrToa0zN39SREpwwcyuFvnoE_-pIc9uWVDkEw07IN9I,99737
 exa_py/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+exa_py/utils.py,sha256=sq1KOajuMWI1lygYeb9MqjXn8yqVyK0BtFZZmTwSaMY,2580
 exa_py/research/__init__.py,sha256=QeY-j6bP4QP5tF9ytX0IeQhJvd0Wn4cJCD69U8pP7kA,271
-exa_py/research/client.py,sha256=C2ukFq_dE1xUfhMlHwpD9cY5rDClgn8N92pH4_FEVpE,11901
+exa_py/research/client.py,sha256=x9b299ROfbhdMrdto6jZCHGRJE5U5V2fWHsSlnnNkWo,12471
 exa_py/research/models.py,sha256=j7YgRoMRp2MLgnaij7775x_hJEeV5gksKpfLwmawqxY,3704
-exa_py/utils.py,sha256=Rc1FJjoR9LQ7L_OJM91Sd1GNkbHjcLyEvJENhRix6gc,2405
-exa_py/websets/__init__.py,sha256=6HQWR8_ABPeZx2sHfwGV4QQf1Eh8MRaO-kzoIO_1ua8,126
-exa_py/websets/_generator/pydantic/BaseModel.jinja2,sha256=RUDCmPZVamoVx1WudylscYFfDhGoNNtRYlpTvKjAiuA,1276
-exa_py/websets/client.py,sha256=nP0XZAEMIFvinb1DJ6gNF-8jCnKMUmBun5wZ9EgeZ0M,4891
+exa_py/websets/__init__.py,sha256=x7Dc0MS8raRXA7Ud6alKgnsUmLi6X9GTqfB8kOwC9iQ,179
+exa_py/websets/client.py,sha256=v8Y0p5PosjLkb7EYQ83g3nmoIIHmKaXF7JQVT8K5h2E,4967
+exa_py/websets/types.py,sha256=ykJHPXNiqr2fbRYYprshgBcG9X5IRRwi2mu56g7XCZA,42085
 exa_py/websets/core/__init__.py,sha256=xOyrFaqtBocMUu321Jpbk7IzIQRNZufSIGJXrKoG-Bg,323
 exa_py/websets/core/base.py,sha256=thVIeRtlabbvueP0dAni5Nwtl9AWYv1I1Mmyc_jlYO0,4086
 exa_py/websets/enrichments/__init__.py,sha256=5dJIEKKceUost3RnI6PpCSB3VjUCBzxseEsIXu-ZY-Y,83
 exa_py/websets/enrichments/client.py,sha256=obUjn4vH6tKBMtHEBVdMzlN8in0Fx3sCP-bXx-Le1zM,2338
+exa_py/websets/events/__init__.py,sha256=aFJ9O5UudtQQzndVmdB96IaM2l07qyM1B_8xKY7rp58,60
+exa_py/websets/events/client.py,sha256=Hzatqp3X-K0ZGe36cjFMgbhnsErcDLdGWQVirhmHjvY,3622
 exa_py/websets/imports/__init__.py,sha256=iEl-fZZSdcvKaqLgjMES_0RwYn7hZDCMf6BZriCrjgw,64
 exa_py/websets/imports/client.py,sha256=nJs46hxlSkZm7qjboYHNBuJ62gLmA_Yzr9fc-NDky0Y,6795
 exa_py/websets/items/__init__.py,sha256=DCWZJVtRmUjnMEkKdb5gW1LT9cHcb-J8lENMnyyBeKU,71
@@ -22,9 +24,9 @@ exa_py/websets/monitors/runs/__init__.py,sha256=TmcETf3zdQouA_vAeLiosCNL1MYJnZ0y
 exa_py/websets/monitors/runs/client.py,sha256=WnwcWCf7UKk68VCNUp8mRXBtlU8vglTSX-eoWVXzKIw,1229
 exa_py/websets/searches/__init__.py,sha256=_0Zx8ES5fFTEL3T8mhLxq_xK2t0JONx6ad6AtbvClsE,77
 exa_py/websets/searches/client.py,sha256=X3f7axWGfecmxf-2tBTX0Yf_--xToz1X8ZHbbudEzy0,1790
-exa_py/websets/types.py,sha256=UC41VqvBcUueSqUjxmb0nLb-c7qmScoNkcmdyp9npqY,41736
 exa_py/websets/webhooks/__init__.py,sha256=iTPBCxFd73z4RifLQMX6iRECx_6pwlI5qscLNjMOUHE,77
 exa_py/websets/webhooks/client.py,sha256=zsIRMTeJU65yj-zo7Zz-gG02Prtzgcx6utGFSoY4HQQ,4222
-exa_py-1.14.10.dist-info/METADATA,sha256=lBJuJsuRLqjtBfgrhrHsTKl8horGLXVT4KJZNMGjm-s,4001
-exa_py-1.14.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-exa_py-1.14.10.dist-info/RECORD,,
+exa_py-1.14.12.dist-info/METADATA,sha256=sbyg90b0KSXgCm2UwwQBm6M5So9-0eh1eFUm4i8Fa_0,3719
+exa_py-1.14.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+exa_py-1.14.12.dist-info/top_level.txt,sha256=Mfkmscdw9HWR1PtVhU1gAiVo6DHu_tyiVdb89gfZBVI,7
+exa_py-1.14.12.dist-info/RECORD,,

{exa_py-1.14.10.dist-info → exa_py-1.14.12.dist-info}/WHEEL

@@ -1,4 +1,5 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
+

exa_py-1.14.12.dist-info/top_level.txt

@@ -0,0 +1 @@
+exa_py

exa_py/websets/_generator/pydantic/BaseModel.jinja2

@@ -1,42 +0,0 @@
-{% for decorator in decorators -%}
-{{ decorator }}
-{% endfor -%}
-class {{ class_name }}({{ base_class }}):{% if comment is defined %}  # {{ comment }}{% endif %}
-{%- if description %}
-    """
-    {{ description | indent(4) }}
-    """
-{%- endif %}
-{%- if not fields and not description %}
-    pass
-{%- endif %}
-{%- if config %}
-{%- filter indent(4) %}
-{%- endfilter %}
-{%- endif %}
-{%- for field in fields -%}
-    {%- if field.name == "type" and field.field %}
-    type: Literal['{{ field.default }}']
-    {%- elif field.name == "object" and field.field %}
-    object: Literal['{{ field.default }}']
-    {%- elif not field.annotated and field.field %}
-    {{ field.name }}: {{ field.type_hint }} = {{ field.field }}
-    {%- else %}
-    {%- if field.annotated %}
-    {{ field.name }}: {{ field.annotated }}
-    {%- else %}
-    {{ field.name }}: {{ field.type_hint }}
-    {%- endif %}
-    {%- if not (field.required or (field.represented_default == 'None' and field.strip_default_none)) or field.data_type.is_optional
-            %} = {{ field.represented_default }}
-    {%- endif -%}
-    {%- endif %}
-    {%- if field.docstring %}
-    """
-    {{ field.docstring | indent(4) }}
-    """
-    {%- endif %}
-{%- for method in methods -%}
-    {{ method }}
-{%- endfor -%}
-{%- endfor -%}