llama-cloud 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

llama_cloud/resources/parsing/client.py

@@ -103,8 +103,8 @@ class ParsingClient:
     def upload_file(
         self,
         *,
-        project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
+        project_id: typing.Optional[str] = None,
         file: typing.Optional[str] = OMIT,
         annotate_links: bool,
         auto_mode: bool,
@@ -137,6 +137,7 @@ class ParsingClient:
         html_remove_navigation_elements: bool,
         http_proxy: str,
         input_s_3_path: str,
+        input_s_3_region: str,
         input_url: str,
         invalidate_cache: bool,
         is_formatting_instruction: bool,
@@ -145,12 +146,14 @@ class ParsingClient:
         max_pages: typing.Optional[int] = OMIT,
         output_pdf_of_document: bool,
         output_s_3_path_prefix: str,
+        output_s_3_region: str,
         page_prefix: str,
         page_separator: str,
         page_suffix: str,
         parsing_instruction: str,
         premium_mode: bool,
         skip_diagonal_text: bool,
+        spreadsheet_extract_sub_tables: bool,
         structured_output: bool,
         structured_output_json_schema: str,
         structured_output_json_schema_name: str,
@@ -163,15 +166,23 @@ class ParsingClient:
         bounding_box: str,
         gpt_4_o_mode: bool,
         gpt_4_o_api_key: str,
+        job_timeout_in_seconds: float,
+        job_timeout_extra_time_per_page_in_seconds: float,
+        strict_mode_image_extraction: bool,
+        strict_mode_image_ocr: bool,
+        strict_mode_reconstruction: bool,
+        strict_mode_buggy_font: bool,
+        ignore_document_elements_for_layout_detection: bool,
+        output_tables_as_html: bool,
     ) -> ParsingJob:
         """
         Upload a file to s3 and create a job. return a job id
 
         Parameters:
-            - project_id: typing.Optional[str].
-
             - organization_id: typing.Optional[str].
 
+            - project_id: typing.Optional[str].
+
             - file: typing.Optional[str].
 
             - annotate_links: bool.
@@ -236,6 +247,8 @@ class ParsingClient:
 
             - input_s_3_path: str.
 
+            - input_s_3_region: str.
+
             - input_url: str.
 
             - invalidate_cache: bool.
@@ -252,6 +265,8 @@ class ParsingClient:
 
             - output_s_3_path_prefix: str.
 
+            - output_s_3_region: str.
+
             - page_prefix: str.
 
             - page_separator: str.
@@ -264,6 +279,8 @@ class ParsingClient:
 
             - skip_diagonal_text: bool.
 
+            - spreadsheet_extract_sub_tables: bool.
+
             - structured_output: bool.
 
             - structured_output_json_schema: str.
@@ -287,6 +304,22 @@ class ParsingClient:
             - gpt_4_o_mode: bool.
 
             - gpt_4_o_api_key: str.
+
+            - job_timeout_in_seconds: float.
+
+            - job_timeout_extra_time_per_page_in_seconds: float.
+
+            - strict_mode_image_extraction: bool.
+
+            - strict_mode_image_ocr: bool.
+
+            - strict_mode_reconstruction: bool.
+
+            - strict_mode_buggy_font: bool.
+
+            - ignore_document_elements_for_layout_detection: bool.
+
+            - output_tables_as_html: bool.
         """
         _request: typing.Dict[str, typing.Any] = {
             "annotate_links": annotate_links,
@@ -320,6 +353,7 @@ class ParsingClient:
             "html_remove_navigation_elements": html_remove_navigation_elements,
             "http_proxy": http_proxy,
             "input_s3_path": input_s_3_path,
+            "input_s3_region": input_s_3_region,
             "input_url": input_url,
             "invalidate_cache": invalidate_cache,
             "is_formatting_instruction": is_formatting_instruction,
@@ -327,12 +361,14 @@ class ParsingClient:
             "extract_layout": extract_layout,
             "output_pdf_of_document": output_pdf_of_document,
             "output_s3_path_prefix": output_s_3_path_prefix,
+            "output_s3_region": output_s_3_region,
             "page_prefix": page_prefix,
             "page_separator": page_separator,
             "page_suffix": page_suffix,
             "parsing_instruction": parsing_instruction,
             "premium_mode": premium_mode,
             "skip_diagonal_text": skip_diagonal_text,
+            "spreadsheet_extract_sub_tables": spreadsheet_extract_sub_tables,
             "structured_output": structured_output,
             "structured_output_json_schema": structured_output_json_schema,
             "structured_output_json_schema_name": structured_output_json_schema_name,
@@ -345,6 +381,14 @@ class ParsingClient:
             "bounding_box": bounding_box,
             "gpt4o_mode": gpt_4_o_mode,
             "gpt4o_api_key": gpt_4_o_api_key,
+            "job_timeout_in_seconds": job_timeout_in_seconds,
+            "job_timeout_extra_time_per_page_in_seconds": job_timeout_extra_time_per_page_in_seconds,
+            "strict_mode_image_extraction": strict_mode_image_extraction,
+            "strict_mode_image_ocr": strict_mode_image_ocr,
+            "strict_mode_reconstruction": strict_mode_reconstruction,
+            "strict_mode_buggy_font": strict_mode_buggy_font,
+            "ignore_document_elements_for_layout_detection": ignore_document_elements_for_layout_detection,
+            "output_tables_as_HTML": output_tables_as_html,
         }
         if file is not OMIT:
             _request["file"] = file
@@ -353,7 +397,7 @@ class ParsingClient:
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/upload"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict({"organization_id": organization_id, "project_id": project_id}),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -368,11 +412,13 @@ class ParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def usage(self) -> ParsingUsage:
+    def usage(self, *, organization_id: typing.Optional[str] = None) -> ParsingUsage:
         """
         DEPRECATED: use either /organizations/{organization_id}/usage or /projects/{project_id}/usage instead
         Get parsing usage for user
 
+        Parameters:
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -384,6 +430,7 @@ class ParsingClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/usage"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -461,12 +508,14 @@ class ParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_job_text_result(self, job_id: str) -> ParsingJobTextResult:
+    def get_job_text_result(self, job_id: str, *, organization_id: typing.Optional[str] = None) -> ParsingJobTextResult:
         """
         Get a job by id
 
         Parameters:
             - job_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -480,6 +529,7 @@ class ParsingClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/text"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -527,12 +577,16 @@ class ParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_job_structured_result(self, job_id: str) -> ParsingJobStructuredResult:
+    def get_job_structured_result(
+        self, job_id: str, *, organization_id: typing.Optional[str] = None
+    ) -> ParsingJobStructuredResult:
         """
         Get a job by id
 
         Parameters:
             - job_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -548,6 +602,7 @@ class ParsingClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/structured"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -629,12 +684,14 @@ class ParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_job_result(self, job_id: str) -> ParsingJobMarkdownResult:
+    def get_job_result(self, job_id: str, *, organization_id: typing.Optional[str] = None) -> ParsingJobMarkdownResult:
         """
         Get a job by id
 
         Parameters:
             - job_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -650,6 +707,7 @@ class ParsingClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/markdown"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -697,12 +755,14 @@ class ParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_job_json_result(self, job_id: str) -> ParsingJobJsonResult:
+    def get_job_json_result(self, job_id: str, *, organization_id: typing.Optional[str] = None) -> ParsingJobJsonResult:
         """
         Get a job by id
 
         Parameters:
             - job_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -716,6 +776,7 @@ class ParsingClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/json"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -899,8 +960,8 @@ class AsyncParsingClient:
     async def upload_file(
         self,
         *,
-        project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
+        project_id: typing.Optional[str] = None,
         file: typing.Optional[str] = OMIT,
         annotate_links: bool,
         auto_mode: bool,
@@ -933,6 +994,7 @@ class AsyncParsingClient:
         html_remove_navigation_elements: bool,
         http_proxy: str,
         input_s_3_path: str,
+        input_s_3_region: str,
         input_url: str,
         invalidate_cache: bool,
         is_formatting_instruction: bool,
@@ -941,12 +1003,14 @@ class AsyncParsingClient:
         max_pages: typing.Optional[int] = OMIT,
         output_pdf_of_document: bool,
         output_s_3_path_prefix: str,
+        output_s_3_region: str,
         page_prefix: str,
         page_separator: str,
         page_suffix: str,
         parsing_instruction: str,
         premium_mode: bool,
         skip_diagonal_text: bool,
+        spreadsheet_extract_sub_tables: bool,
         structured_output: bool,
         structured_output_json_schema: str,
         structured_output_json_schema_name: str,
@@ -959,15 +1023,23 @@ class AsyncParsingClient:
         bounding_box: str,
         gpt_4_o_mode: bool,
         gpt_4_o_api_key: str,
+        job_timeout_in_seconds: float,
+        job_timeout_extra_time_per_page_in_seconds: float,
+        strict_mode_image_extraction: bool,
+        strict_mode_image_ocr: bool,
+        strict_mode_reconstruction: bool,
+        strict_mode_buggy_font: bool,
+        ignore_document_elements_for_layout_detection: bool,
+        output_tables_as_html: bool,
     ) -> ParsingJob:
         """
         Upload a file to s3 and create a job. return a job id
 
         Parameters:
-            - project_id: typing.Optional[str].
-
             - organization_id: typing.Optional[str].
 
+            - project_id: typing.Optional[str].
+
             - file: typing.Optional[str].
 
             - annotate_links: bool.
@@ -1032,6 +1104,8 @@ class AsyncParsingClient:
 
             - input_s_3_path: str.
 
+            - input_s_3_region: str.
+
             - input_url: str.
 
             - invalidate_cache: bool.
@@ -1048,6 +1122,8 @@ class AsyncParsingClient:
 
             - output_s_3_path_prefix: str.
 
+            - output_s_3_region: str.
+
             - page_prefix: str.
 
             - page_separator: str.
@@ -1060,6 +1136,8 @@ class AsyncParsingClient:
 
             - skip_diagonal_text: bool.
 
+            - spreadsheet_extract_sub_tables: bool.
+
             - structured_output: bool.
 
             - structured_output_json_schema: str.
@@ -1083,6 +1161,22 @@ class AsyncParsingClient:
             - gpt_4_o_mode: bool.
 
             - gpt_4_o_api_key: str.
+
+            - job_timeout_in_seconds: float.
+
+            - job_timeout_extra_time_per_page_in_seconds: float.
+
+            - strict_mode_image_extraction: bool.
+
+            - strict_mode_image_ocr: bool.
+
+            - strict_mode_reconstruction: bool.
+
+            - strict_mode_buggy_font: bool.
+
+            - ignore_document_elements_for_layout_detection: bool.
+
+            - output_tables_as_html: bool.
         """
         _request: typing.Dict[str, typing.Any] = {
             "annotate_links": annotate_links,
@@ -1116,6 +1210,7 @@ class AsyncParsingClient:
             "html_remove_navigation_elements": html_remove_navigation_elements,
             "http_proxy": http_proxy,
             "input_s3_path": input_s_3_path,
+            "input_s3_region": input_s_3_region,
             "input_url": input_url,
             "invalidate_cache": invalidate_cache,
             "is_formatting_instruction": is_formatting_instruction,
@@ -1123,12 +1218,14 @@ class AsyncParsingClient:
             "extract_layout": extract_layout,
             "output_pdf_of_document": output_pdf_of_document,
             "output_s3_path_prefix": output_s_3_path_prefix,
+            "output_s3_region": output_s_3_region,
             "page_prefix": page_prefix,
             "page_separator": page_separator,
             "page_suffix": page_suffix,
             "parsing_instruction": parsing_instruction,
             "premium_mode": premium_mode,
             "skip_diagonal_text": skip_diagonal_text,
+            "spreadsheet_extract_sub_tables": spreadsheet_extract_sub_tables,
             "structured_output": structured_output,
             "structured_output_json_schema": structured_output_json_schema,
             "structured_output_json_schema_name": structured_output_json_schema_name,
@@ -1141,6 +1238,14 @@ class AsyncParsingClient:
             "bounding_box": bounding_box,
             "gpt4o_mode": gpt_4_o_mode,
             "gpt4o_api_key": gpt_4_o_api_key,
+            "job_timeout_in_seconds": job_timeout_in_seconds,
+            "job_timeout_extra_time_per_page_in_seconds": job_timeout_extra_time_per_page_in_seconds,
+            "strict_mode_image_extraction": strict_mode_image_extraction,
+            "strict_mode_image_ocr": strict_mode_image_ocr,
+            "strict_mode_reconstruction": strict_mode_reconstruction,
+            "strict_mode_buggy_font": strict_mode_buggy_font,
+            "ignore_document_elements_for_layout_detection": ignore_document_elements_for_layout_detection,
+            "output_tables_as_HTML": output_tables_as_html,
         }
         if file is not OMIT:
             _request["file"] = file
@@ -1149,7 +1254,7 @@ class AsyncParsingClient:
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/upload"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict({"organization_id": organization_id, "project_id": project_id}),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1164,11 +1269,13 @@ class AsyncParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def usage(self) -> ParsingUsage:
+    async def usage(self, *, organization_id: typing.Optional[str] = None) -> ParsingUsage:
         """
         DEPRECATED: use either /organizations/{organization_id}/usage or /projects/{project_id}/usage instead
         Get parsing usage for user
 
+        Parameters:
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1180,6 +1287,7 @@ class AsyncParsingClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/usage"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1257,12 +1365,16 @@ class AsyncParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_job_text_result(self, job_id: str) -> ParsingJobTextResult:
+    async def get_job_text_result(
+        self, job_id: str, *, organization_id: typing.Optional[str] = None
+    ) -> ParsingJobTextResult:
         """
         Get a job by id
 
         Parameters:
             - job_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1276,6 +1388,7 @@ class AsyncParsingClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/text"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1323,12 +1436,16 @@ class AsyncParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_job_structured_result(self, job_id: str) -> ParsingJobStructuredResult:
+    async def get_job_structured_result(
+        self, job_id: str, *, organization_id: typing.Optional[str] = None
+    ) -> ParsingJobStructuredResult:
         """
         Get a job by id
 
         Parameters:
             - job_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1344,6 +1461,7 @@ class AsyncParsingClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/structured"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1425,12 +1543,16 @@ class AsyncParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_job_result(self, job_id: str) -> ParsingJobMarkdownResult:
+    async def get_job_result(
+        self, job_id: str, *, organization_id: typing.Optional[str] = None
+    ) -> ParsingJobMarkdownResult:
         """
         Get a job by id
 
         Parameters:
             - job_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1446,6 +1568,7 @@ class AsyncParsingClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/markdown"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1493,12 +1616,16 @@ class AsyncParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_job_json_result(self, job_id: str) -> ParsingJobJsonResult:
+    async def get_job_json_result(
+        self, job_id: str, *, organization_id: typing.Optional[str] = None
+    ) -> ParsingJobJsonResult:
         """
         Get a job by id
 
         Parameters:
             - job_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1512,6 +1639,7 @@ class AsyncParsingClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/json"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )

llama_cloud/resources/reports/client.py

@@ -47,9 +47,10 @@ class ReportsClient:
         organization_id: typing.Optional[str] = None,
         name: str,
         template_text: str,
-        template_instructions: str,
+        template_instructions: typing.Optional[str] = OMIT,
+        existing_retriever_id: typing.Optional[str] = OMIT,
         files: typing.List[str],
-        template_file: typing.IO,
+        template_file: typing.Optional[str] = OMIT,
     ) -> ReportCreateResponse:
         """
         Create a new report.
@@ -63,25 +64,26 @@ class ReportsClient:
 
             - template_text: str.
 
-            - template_instructions: str.
+            - template_instructions: typing.Optional[str].
+
+            - existing_retriever_id: typing.Optional[str].
 
             - files: typing.List[str].
 
-            - template_file: typing.IO.
+            - template_file: typing.Optional[str].
         """
+        _request: typing.Dict[str, typing.Any] = {"name": name, "template_text": template_text, "files": files}
+        if template_instructions is not OMIT:
+            _request["template_instructions"] = template_instructions
+        if existing_retriever_id is not OMIT:
+            _request["existing_retriever_id"] = existing_retriever_id
+        if template_file is not OMIT:
+            _request["template_file"] = template_file
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/reports"),
             params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
-            data=jsonable_encoder(
-                {
-                    "name": name,
-                    "template_text": template_text,
-                    "template_instructions": template_instructions,
-                    "files": files,
-                }
-            ),
-            files={"template_file": template_file},
+            json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -628,9 +630,10 @@ class AsyncReportsClient:
         organization_id: typing.Optional[str] = None,
         name: str,
         template_text: str,
-        template_instructions: str,
+        template_instructions: typing.Optional[str] = OMIT,
+        existing_retriever_id: typing.Optional[str] = OMIT,
         files: typing.List[str],
-        template_file: typing.IO,
+        template_file: typing.Optional[str] = OMIT,
     ) -> ReportCreateResponse:
         """
         Create a new report.
@@ -644,25 +647,26 @@ class AsyncReportsClient:
 
             - template_text: str.
 
-            - template_instructions: str.
+            - template_instructions: typing.Optional[str].
+
+            - existing_retriever_id: typing.Optional[str].
 
             - files: typing.List[str].
 
-            - template_file: typing.IO.
+            - template_file: typing.Optional[str].
         """
+        _request: typing.Dict[str, typing.Any] = {"name": name, "template_text": template_text, "files": files}
+        if template_instructions is not OMIT:
+            _request["template_instructions"] = template_instructions
+        if existing_retriever_id is not OMIT:
+            _request["existing_retriever_id"] = existing_retriever_id
+        if template_file is not OMIT:
+            _request["template_file"] = template_file
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/reports"),
             params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
-            data=jsonable_encoder(
-                {
-                    "name": name,
-                    "template_text": template_text,
-                    "template_instructions": template_instructions,
-                    "files": files,
-                }
-            ),
-            files={"template_file": template_file},
+            json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )