athena-intelligence 0.1.86__py3-none-any.whl → 0.1.88__py3-none-any.whl

athena/tools/client.py

@@ -1,15 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-import urllib.parse
 from json.decoder import JSONDecodeError
 
 from ..core.api_error import ApiError
 from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from ..core.jsonable_encoder import jsonable_encoder
 from ..core.pydantic_utilities import pydantic_v1
-from ..core.query_encoder import encode_query
-from ..core.remove_none_from_dict import remove_none_from_dict
 from ..core.request_options import RequestOptions
 from ..errors.internal_server_error import InternalServerError
 from ..errors.not_found_error import NotFoundError
@@ -45,7 +41,7 @@ class ToolsClient:
         *,
         url: str,
         params: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> FirecrawlScrapeUrlDataReponseDto:
         """
         Parameters
@@ -74,36 +70,12 @@ class ToolsClient:
             params={"key": "value"},
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"url": url}
-        if params is not OMIT:
-            _request["params"] = params
         _response = self._client_wrapper.httpx_client.request(
+            "api/v0/tools/firecrawl/scrape-url",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/firecrawl/scrape-url"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"url": url, "params": params},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(FirecrawlScrapeUrlDataReponseDto, _response.json())  # type: ignore
@@ -123,7 +95,7 @@ class ToolsClient:
         document_id: str,
         pagination_limit: typing.Optional[int] = OMIT,
         pagination_offset: typing.Optional[int] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> LangchainDocumentsRequestOut:
         """
         Parameters
@@ -155,40 +127,16 @@ class ToolsClient:
             pagination_offset=0,
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"document_id": document_id}
-        if pagination_limit is not OMIT:
-            _request["pagination_limit"] = pagination_limit
-        if pagination_offset is not OMIT:
-            _request["pagination_offset"] = pagination_offset
         _response = self._client_wrapper.httpx_client.request(
+            "api/v0/tools/file/langchain-documents",
             method="POST",
-            url=urllib.parse.urljoin(
-                f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/langchain-documents"
-            ),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
+            json={
+                "document_id": document_id,
+                "pagination_limit": pagination_limit,
+                "pagination_offset": pagination_offset,
             },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(LangchainDocumentsRequestOut, _response.json())  # type: ignore
@@ -213,7 +161,7 @@ class ToolsClient:
         ] = None,
         sheet_name: typing.Optional[int] = None,
         separator: typing.Optional[str] = None,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> DataFrameRequestOut:
         """
         Parameters
@@ -253,40 +201,17 @@ class ToolsClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
+            "api/v0/tools/file/data-frame",
             method="GET",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/data-frame"),
-            params=encode_query(
-                jsonable_encoder(
-                    remove_none_from_dict(
-                        {
-                            "document_id": document_id,
-                            "row_limit": row_limit,
-                            "index_column": index_column,
-                            "columns": columns,
-                            "sheet_name": sheet_name,
-                            "separator": separator,
-                            **(
-                                request_options.get("additional_query_parameters", {})
-                                if request_options is not None
-                                else {}
-                            ),
-                        }
-                    )
-                )
-            ),
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            params={
+                "document_id": document_id,
+                "row_limit": row_limit,
+                "index_column": index_column,
+                "columns": columns,
+                "sheet_name": sheet_name,
+                "separator": separator,
+            },
+            request_options=request_options,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(DataFrameRequestOut, _response.json())  # type: ignore
@@ -336,35 +261,10 @@ class ToolsClient:
         )
         """
         with self._client_wrapper.httpx_client.stream(
+            "api/v0/tools/file/raw-data",
             method="GET",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/raw-data"),
-            params=encode_query(
-                jsonable_encoder(
-                    remove_none_from_dict(
-                        {
-                            "document_id": document_id,
-                            **(
-                                request_options.get("additional_query_parameters", {})
-                                if request_options is not None
-                                else {}
-                            ),
-                        }
-                    )
-                )
-            ),
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            params={"document_id": document_id},
+            request_options=request_options,
         ) as _response:
             if 200 <= _response.status_code < 300:
                 for _chunk in _response.iter_bytes():
@@ -390,7 +290,7 @@ class ToolsClient:
         content: str,
         model: typing.Optional[LlmModel] = OMIT,
         tool_kwargs: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> ExcecuteToolFirstWorkflowOut:
         """
         Parameters
@@ -426,38 +326,12 @@ class ToolsClient:
             tool_kwargs={"query": "website: www.athenaintelligence.ai"},
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"tool_name": tool_name, "content": content}
-        if model is not OMIT:
-            _request["model"] = model
-        if tool_kwargs is not OMIT:
-            _request["tool_kwargs"] = tool_kwargs
         _response = self._client_wrapper.httpx_client.request(
+            "api/v0/tools/first-agent",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/first-agent"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"model": model, "tool_name": tool_name, "content": content, "tool_kwargs": tool_kwargs},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(ExcecuteToolFirstWorkflowOut, _response.json())  # type: ignore
@@ -480,7 +354,7 @@ class ToolsClient:
         publish_formats: typing.Optional[PublishFormats] = OMIT,
         source: typing.Optional[str] = OMIT,
         athena_document_ids: typing.Optional[typing.Sequence[str]] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> ResearcherOut:
         """
         Parameters
@@ -530,44 +404,19 @@ class ToolsClient:
             athena_document_ids=["doc_1", "doc_2"],
         )
         """
-        _request: typing.Dict[str, typing.Any] = {
-            "query": query,
-            "max_sections": max_sections,
-            "guidelines": guidelines,
-        }
-        if publish_formats is not OMIT:
-            _request["publish_formats"] = publish_formats
-        if source is not OMIT:
-            _request["source"] = source
-        if athena_document_ids is not OMIT:
-            _request["athena_document_ids"] = athena_document_ids
         _response = self._client_wrapper.httpx_client.request(
+            "api/v0/tools/researcher",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/researcher"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
+            json={
+                "query": query,
+                "max_sections": max_sections,
+                "guidelines": guidelines,
+                "publish_formats": publish_formats,
+                "source": source,
+                "athena_document_ids": athena_document_ids,
             },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(ResearcherOut, _response.json())  # type: ignore
@@ -609,32 +458,11 @@ class ToolsClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
+            "api/v0/tools/convert-pdf-to-sheet",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/convert-pdf-to-sheet"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder({"document_id": document_id})
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder({"document_id": document_id}),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"document_id": document_id},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(ConvertPdfToSheetOut, _response.json())  # type: ignore
@@ -653,7 +481,7 @@ class ToolsClient:
         *,
         query: QueryModel,
         table_name: typing.Optional[str] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> SemanticQueryOut:
         """
         Parameters
@@ -699,36 +527,12 @@ class ToolsClient:
             ),
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"query": query}
-        if table_name is not OMIT:
-            _request["table_name"] = table_name
         _response = self._client_wrapper.httpx_client.request(
+            "api/v0/tools/strict-semantic-query",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/strict-semantic-query"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"query": query, "table_name": table_name},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(SemanticQueryOut, _response.json())  # type: ignore
@@ -770,32 +574,11 @@ class ToolsClient:
         )
         """
         _response = self._client_wrapper.httpx_client.request(
+            "api/v0/tools/athena-document-v2",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/athena-document-v2"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder({"document_id": document_id})
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder({"document_id": document_id}),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"document_id": document_id},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(AthenaDocumentV2Out, _response.json())  # type: ignore
@@ -819,7 +602,7 @@ class AsyncToolsClient:
         *,
         url: str,
         params: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> FirecrawlScrapeUrlDataReponseDto:
         """
         Parameters
@@ -848,36 +631,12 @@ class AsyncToolsClient:
             params={"key": "value"},
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"url": url}
-        if params is not OMIT:
-            _request["params"] = params
         _response = await self._client_wrapper.httpx_client.request(
+            "api/v0/tools/firecrawl/scrape-url",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/firecrawl/scrape-url"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"url": url, "params": params},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(FirecrawlScrapeUrlDataReponseDto, _response.json())  # type: ignore
@@ -897,7 +656,7 @@ class AsyncToolsClient:
         document_id: str,
         pagination_limit: typing.Optional[int] = OMIT,
         pagination_offset: typing.Optional[int] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> LangchainDocumentsRequestOut:
         """
         Parameters
@@ -929,40 +688,16 @@ class AsyncToolsClient:
             pagination_offset=0,
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"document_id": document_id}
-        if pagination_limit is not OMIT:
-            _request["pagination_limit"] = pagination_limit
-        if pagination_offset is not OMIT:
-            _request["pagination_offset"] = pagination_offset
         _response = await self._client_wrapper.httpx_client.request(
+            "api/v0/tools/file/langchain-documents",
             method="POST",
-            url=urllib.parse.urljoin(
-                f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/langchain-documents"
-            ),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
+            json={
+                "document_id": document_id,
+                "pagination_limit": pagination_limit,
+                "pagination_offset": pagination_offset,
             },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(LangchainDocumentsRequestOut, _response.json())  # type: ignore
@@ -987,7 +722,7 @@ class AsyncToolsClient:
         ] = None,
         sheet_name: typing.Optional[int] = None,
         separator: typing.Optional[str] = None,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> DataFrameRequestOut:
         """
         Parameters
@@ -1027,40 +762,17 @@ class AsyncToolsClient:
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
+            "api/v0/tools/file/data-frame",
             method="GET",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/data-frame"),
-            params=encode_query(
-                jsonable_encoder(
-                    remove_none_from_dict(
-                        {
-                            "document_id": document_id,
-                            "row_limit": row_limit,
-                            "index_column": index_column,
-                            "columns": columns,
-                            "sheet_name": sheet_name,
-                            "separator": separator,
-                            **(
-                                request_options.get("additional_query_parameters", {})
-                                if request_options is not None
-                                else {}
-                            ),
-                        }
-                    )
-                )
-            ),
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            params={
+                "document_id": document_id,
+                "row_limit": row_limit,
+                "index_column": index_column,
+                "columns": columns,
+                "sheet_name": sheet_name,
+                "separator": separator,
+            },
+            request_options=request_options,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(DataFrameRequestOut, _response.json())  # type: ignore
@@ -1110,35 +822,10 @@ class AsyncToolsClient:
         )
         """
         async with self._client_wrapper.httpx_client.stream(
+            "api/v0/tools/file/raw-data",
             method="GET",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/file/raw-data"),
-            params=encode_query(
-                jsonable_encoder(
-                    remove_none_from_dict(
-                        {
-                            "document_id": document_id,
-                            **(
-                                request_options.get("additional_query_parameters", {})
-                                if request_options is not None
-                                else {}
-                            ),
-                        }
-                    )
-                )
-            ),
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            params={"document_id": document_id},
+            request_options=request_options,
         ) as _response:
             if 200 <= _response.status_code < 300:
                 async for _chunk in _response.aiter_bytes():
@@ -1164,7 +851,7 @@ class AsyncToolsClient:
         content: str,
         model: typing.Optional[LlmModel] = OMIT,
         tool_kwargs: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> ExcecuteToolFirstWorkflowOut:
         """
         Parameters
@@ -1200,38 +887,12 @@ class AsyncToolsClient:
             tool_kwargs={"query": "website: www.athenaintelligence.ai"},
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"tool_name": tool_name, "content": content}
-        if model is not OMIT:
-            _request["model"] = model
-        if tool_kwargs is not OMIT:
-            _request["tool_kwargs"] = tool_kwargs
         _response = await self._client_wrapper.httpx_client.request(
+            "api/v0/tools/first-agent",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/first-agent"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"model": model, "tool_name": tool_name, "content": content, "tool_kwargs": tool_kwargs},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(ExcecuteToolFirstWorkflowOut, _response.json())  # type: ignore
@@ -1254,7 +915,7 @@ class AsyncToolsClient:
         publish_formats: typing.Optional[PublishFormats] = OMIT,
         source: typing.Optional[str] = OMIT,
         athena_document_ids: typing.Optional[typing.Sequence[str]] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> ResearcherOut:
         """
         Parameters
@@ -1304,44 +965,19 @@ class AsyncToolsClient:
             athena_document_ids=["doc_1", "doc_2"],
         )
         """
-        _request: typing.Dict[str, typing.Any] = {
-            "query": query,
-            "max_sections": max_sections,
-            "guidelines": guidelines,
-        }
-        if publish_formats is not OMIT:
-            _request["publish_formats"] = publish_formats
-        if source is not OMIT:
-            _request["source"] = source
-        if athena_document_ids is not OMIT:
-            _request["athena_document_ids"] = athena_document_ids
         _response = await self._client_wrapper.httpx_client.request(
+            "api/v0/tools/researcher",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/researcher"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
+            json={
+                "query": query,
+                "max_sections": max_sections,
+                "guidelines": guidelines,
+                "publish_formats": publish_formats,
+                "source": source,
+                "athena_document_ids": athena_document_ids,
             },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(ResearcherOut, _response.json())  # type: ignore
@@ -1383,32 +1019,11 @@ class AsyncToolsClient:
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
+            "api/v0/tools/convert-pdf-to-sheet",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/convert-pdf-to-sheet"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder({"document_id": document_id})
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder({"document_id": document_id}),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"document_id": document_id},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(ConvertPdfToSheetOut, _response.json())  # type: ignore
@@ -1427,7 +1042,7 @@ class AsyncToolsClient:
         *,
         query: QueryModel,
         table_name: typing.Optional[str] = OMIT,
-        request_options: typing.Optional[RequestOptions] = None,
+        request_options: typing.Optional[RequestOptions] = None
     ) -> SemanticQueryOut:
         """
         Parameters
@@ -1473,36 +1088,12 @@ class AsyncToolsClient:
             ),
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"query": query}
-        if table_name is not OMIT:
-            _request["table_name"] = table_name
         _response = await self._client_wrapper.httpx_client.request(
+            "api/v0/tools/strict-semantic-query",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/strict-semantic-query"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder(_request)
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder(_request),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"query": query, "table_name": table_name},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(SemanticQueryOut, _response.json())  # type: ignore
@@ -1544,32 +1135,11 @@ class AsyncToolsClient:
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
+            "api/v0/tools/athena-document-v2",
             method="POST",
-            url=urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v0/tools/athena-document-v2"),
-            params=encode_query(
-                jsonable_encoder(
-                    request_options.get("additional_query_parameters") if request_options is not None else None
-                )
-            ),
-            json=jsonable_encoder({"document_id": document_id})
-            if request_options is None or request_options.get("additional_body_parameters") is None
-            else {
-                **jsonable_encoder({"document_id": document_id}),
-                **(jsonable_encoder(remove_none_from_dict(request_options.get("additional_body_parameters", {})))),
-            },
-            headers=jsonable_encoder(
-                remove_none_from_dict(
-                    {
-                        **self._client_wrapper.get_headers(),
-                        **(request_options.get("additional_headers", {}) if request_options is not None else {}),
-                    }
-                )
-            ),
-            timeout=request_options.get("timeout_in_seconds")
-            if request_options is not None and request_options.get("timeout_in_seconds") is not None
-            else self._client_wrapper.get_timeout(),
-            retries=0,
-            max_retries=request_options.get("max_retries") if request_options is not None else 0,  # type: ignore
+            json={"document_id": document_id},
+            request_options=request_options,
+            omit=OMIT,
         )
         if 200 <= _response.status_code < 300:
             return pydantic_v1.parse_obj_as(AthenaDocumentV2Out, _response.json())  # type: ignore