llama-cloud 0.1.6__py3-none-any.whl → 0.1.7a1__py3-none-any.whl

llama_cloud/resources/parsing/client.py

@@ -37,7 +37,7 @@ class ParsingClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def get_job_image_result(self, job_id: str, name: str) -> typing.Iterator[bytes]:
+    def get_job_image_result(self, job_id: str, name: str) -> None:
         """
         Get a job by id
 
@@ -45,29 +45,34 @@ class ParsingClient:
             - job_id: str.
 
             - name: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.parsing.get_job_image_result(
+            job_id="string",
+            name="string",
+        )
         """
-        with self._client_wrapper.httpx_client.stream(
+        _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/image/{name}"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
-        ) as _response:
-            if 200 <= _response.status_code < 300:
-                for _chunk in _response.iter_bytes():
-                    yield _chunk
-                return
-            _response.read()
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    pydantic.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
-                )
-            try:
-                _response_json = _response.json()
-            except JSONDecodeError:
-                raise ApiError(status_code=_response.status_code, body=_response.text)
-            raise ApiError(status_code=_response.status_code, body=_response_json)
+        )
+        if 200 <= _response.status_code < 300:
+            return
+        if _response.status_code == 422:
+            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+        try:
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get_supported_file_extensions(self) -> typing.List[LlamaParseSupportedFileExtensions]:
         """
@@ -100,58 +105,61 @@ class ParsingClient:
         *,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
-        language: typing.Optional[typing.List[ParserLanguages]] = None,
-        parsing_instruction: typing.Optional[str] = None,
-        skip_diagonal_text: typing.Optional[bool] = None,
-        invalidate_cache: typing.Optional[bool] = None,
-        output_pdf_of_document: typing.Optional[bool] = None,
-        do_not_cache: typing.Optional[bool] = None,
-        gpt_4_o_mode: typing.Optional[bool] = None,
-        fast_mode: typing.Optional[bool] = None,
-        premium_mode: typing.Optional[bool] = None,
-        continuous_mode: typing.Optional[bool] = None,
-        gpt_4_o_api_key: typing.Optional[str] = None,
-        do_not_unroll_columns: typing.Optional[bool] = None,
-        html_make_all_elements_visible: typing.Optional[bool] = None,
-        html_remove_fixed_elements: typing.Optional[bool] = None,
-        guess_xlsx_sheet_name: typing.Optional[bool] = None,
-        page_separator: typing.Optional[str] = None,
-        bounding_box: typing.Optional[str] = None,
-        bbox_top: typing.Optional[float] = None,
-        bbox_right: typing.Optional[float] = None,
-        bbox_bottom: typing.Optional[float] = None,
-        bbox_left: typing.Optional[float] = None,
-        target_pages: typing.Optional[str] = None,
-        use_vendor_multimodal_model: typing.Optional[bool] = None,
-        vendor_multimodal_model_name: typing.Optional[str] = None,
-        vendor_multimodal_api_key: typing.Optional[str] = None,
-        page_prefix: typing.Optional[str] = None,
-        page_suffix: typing.Optional[str] = None,
-        webhook_url: typing.Optional[str] = None,
-        take_screenshot: typing.Optional[bool] = None,
-        is_formatting_instruction: typing.Optional[bool] = None,
-        disable_ocr: typing.Optional[bool] = None,
-        annotate_links: typing.Optional[bool] = None,
-        disable_reconstruction: typing.Optional[bool] = None,
-        disable_image_extraction: typing.Optional[bool] = None,
-        input_s_3_path: typing.Optional[str] = None,
-        output_s_3_path_prefix: typing.Optional[str] = None,
-        azure_openai_deployment_name: typing.Optional[str] = None,
-        azure_openai_endpoint: typing.Optional[str] = None,
-        azure_openai_api_version: typing.Optional[str] = None,
-        azure_openai_key: typing.Optional[str] = None,
-        auto_mode: typing.Optional[bool] = None,
-        auto_mode_trigger_on_regexp_in_page: typing.Optional[str] = None,
-        auto_mode_trigger_on_text_in_page: typing.Optional[str] = None,
-        auto_mode_trigger_on_table_in_page: typing.Optional[bool] = None,
-        auto_mode_trigger_on_image_in_page: typing.Optional[bool] = None,
-        file: typing.Optional[str] = None,
-        input_url: typing.Optional[str] = None,
-        http_proxy: typing.Optional[str] = None,
-        structured_output: typing.Optional[bool] = None,
-        structured_output_json_schema: typing.Optional[str] = None,
-        structured_output_json_schema_name: typing.Optional[str] = None,
-        max_pages: typing.Optional[int] = None,
+        file: typing.Optional[str] = OMIT,
+        annotate_links: bool,
+        auto_mode: bool,
+        auto_mode_trigger_on_image_in_page: bool,
+        auto_mode_trigger_on_table_in_page: bool,
+        auto_mode_trigger_on_text_in_page: str,
+        auto_mode_trigger_on_regexp_in_page: str,
+        azure_openai_api_version: str,
+        azure_openai_deployment_name: str,
+        azure_openai_endpoint: str,
+        azure_openai_key: str,
+        bbox_bottom: float,
+        bbox_left: float,
+        bbox_right: float,
+        bbox_top: float,
+        continuous_mode: bool,
+        disable_ocr: bool,
+        disable_reconstruction: bool,
+        disable_image_extraction: bool,
+        do_not_cache: bool,
+        do_not_unroll_columns: bool,
+        extract_charts: bool,
+        fast_mode: bool,
+        guess_xlsx_sheet_name: bool,
+        html_make_all_elements_visible: bool,
+        html_remove_fixed_elements: bool,
+        html_remove_navigation_elements: bool,
+        http_proxy: str,
+        input_s_3_path: str,
+        input_url: str,
+        invalidate_cache: bool,
+        is_formatting_instruction: bool,
+        language: typing.List[ParserLanguages],
+        extract_layout: bool,
+        max_pages: typing.Optional[int] = OMIT,
+        output_pdf_of_document: bool,
+        output_s_3_path_prefix: str,
+        page_prefix: str,
+        page_separator: str,
+        page_suffix: str,
+        parsing_instruction: str,
+        premium_mode: bool,
+        skip_diagonal_text: bool,
+        structured_output: bool,
+        structured_output_json_schema: str,
+        structured_output_json_schema_name: str,
+        take_screenshot: bool,
+        target_pages: str,
+        use_vendor_multimodal_model: bool,
+        vendor_multimodal_api_key: str,
+        vendor_multimodal_model_name: str,
+        webhook_url: str,
+        bounding_box: str,
+        gpt_4_o_mode: bool,
+        gpt_4_o_api_key: str,
     ) -> ParsingJob:
         """
         Upload a file to s3 and create a job. return a job id
@@ -161,178 +169,180 @@ class ParsingClient:
 
             - organization_id: typing.Optional[str].
 
-            - language: typing.Optional[typing.List[ParserLanguages]].
-
-            - parsing_instruction: typing.Optional[str].
-
-            - skip_diagonal_text: typing.Optional[bool].
-
-            - invalidate_cache: typing.Optional[bool].
-
-            - output_pdf_of_document: typing.Optional[bool].
-
-            - do_not_cache: typing.Optional[bool].
-
-            - gpt_4_o_mode: typing.Optional[bool].
-
-            - fast_mode: typing.Optional[bool].
-
-            - premium_mode: typing.Optional[bool].
-
-            - continuous_mode: typing.Optional[bool].
-
-            - gpt_4_o_api_key: typing.Optional[str].
-
-            - do_not_unroll_columns: typing.Optional[bool].
-
-            - html_make_all_elements_visible: typing.Optional[bool].
-
-            - html_remove_fixed_elements: typing.Optional[bool].
-
-            - guess_xlsx_sheet_name: typing.Optional[bool].
-
-            - page_separator: typing.Optional[str].
-
-            - bounding_box: typing.Optional[str].
-
-            - bbox_top: typing.Optional[float].
+            - file: typing.Optional[str].
 
-            - bbox_right: typing.Optional[float].
+            - annotate_links: bool.
 
-            - bbox_bottom: typing.Optional[float].
+            - auto_mode: bool.
 
-            - bbox_left: typing.Optional[float].
+            - auto_mode_trigger_on_image_in_page: bool.
 
-            - target_pages: typing.Optional[str].
+            - auto_mode_trigger_on_table_in_page: bool.
 
-            - use_vendor_multimodal_model: typing.Optional[bool].
+            - auto_mode_trigger_on_text_in_page: str.
 
-            - vendor_multimodal_model_name: typing.Optional[str].
+            - auto_mode_trigger_on_regexp_in_page: str.
 
-            - vendor_multimodal_api_key: typing.Optional[str].
+            - azure_openai_api_version: str.
 
-            - page_prefix: typing.Optional[str].
+            - azure_openai_deployment_name: str.
 
-            - page_suffix: typing.Optional[str].
+            - azure_openai_endpoint: str.
 
-            - webhook_url: typing.Optional[str].
+            - azure_openai_key: str.
 
-            - take_screenshot: typing.Optional[bool].
+            - bbox_bottom: float.
 
-            - is_formatting_instruction: typing.Optional[bool].
+            - bbox_left: float.
 
-            - disable_ocr: typing.Optional[bool].
+            - bbox_right: float.
 
-            - annotate_links: typing.Optional[bool].
+            - bbox_top: float.
 
-            - disable_reconstruction: typing.Optional[bool].
+            - continuous_mode: bool.
 
-            - disable_image_extraction: typing.Optional[bool].
+            - disable_ocr: bool.
 
-            - input_s_3_path: typing.Optional[str].
+            - disable_reconstruction: bool.
 
-            - output_s_3_path_prefix: typing.Optional[str].
+            - disable_image_extraction: bool.
 
-            - azure_openai_deployment_name: typing.Optional[str].
+            - do_not_cache: bool.
 
-            - azure_openai_endpoint: typing.Optional[str].
+            - do_not_unroll_columns: bool.
 
-            - azure_openai_api_version: typing.Optional[str].
+            - extract_charts: bool.
 
-            - azure_openai_key: typing.Optional[str].
+            - fast_mode: bool.
 
-            - auto_mode: typing.Optional[bool].
+            - guess_xlsx_sheet_name: bool.
 
-            - auto_mode_trigger_on_regexp_in_page: typing.Optional[str].
+            - html_make_all_elements_visible: bool.
 
-            - auto_mode_trigger_on_text_in_page: typing.Optional[str].
+            - html_remove_fixed_elements: bool.
 
-            - auto_mode_trigger_on_table_in_page: typing.Optional[bool].
+            - html_remove_navigation_elements: bool.
 
-            - auto_mode_trigger_on_image_in_page: typing.Optional[bool].
+            - http_proxy: str.
 
-            - file: typing.Optional[str].
+            - input_s_3_path: str.
 
-            - input_url: typing.Optional[str].
+            - input_url: str.
 
-            - http_proxy: typing.Optional[str].
+            - invalidate_cache: bool.
 
-            - structured_output: typing.Optional[bool].
+            - is_formatting_instruction: bool.
 
-            - structured_output_json_schema: typing.Optional[str].
+            - language: typing.List[ParserLanguages].
 
-            - structured_output_json_schema_name: typing.Optional[str].
+            - extract_layout: bool.
 
             - max_pages: typing.Optional[int].
-        ---
-        from llama_cloud.client import LlamaCloud
 
-        client = LlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        client.parsing.upload_file()
-        """
+            - output_pdf_of_document: bool.
+
+            - output_s_3_path_prefix: str.
+
+            - page_prefix: str.
+
+            - page_separator: str.
+
+            - page_suffix: str.
+
+            - parsing_instruction: str.
+
+            - premium_mode: bool.
+
+            - skip_diagonal_text: bool.
+
+            - structured_output: bool.
+
+            - structured_output_json_schema: str.
+
+            - structured_output_json_schema_name: str.
+
+            - take_screenshot: bool.
+
+            - target_pages: str.
+
+            - use_vendor_multimodal_model: bool.
+
+            - vendor_multimodal_api_key: str.
+
+            - vendor_multimodal_model_name: str.
+
+            - webhook_url: str.
+
+            - bounding_box: str.
+
+            - gpt_4_o_mode: bool.
+
+            - gpt_4_o_api_key: str.
+        """
+        _request: typing.Dict[str, typing.Any] = {
+            "annotate_links": annotate_links,
+            "auto_mode": auto_mode,
+            "auto_mode_trigger_on_image_in_page": auto_mode_trigger_on_image_in_page,
+            "auto_mode_trigger_on_table_in_page": auto_mode_trigger_on_table_in_page,
+            "auto_mode_trigger_on_text_in_page": auto_mode_trigger_on_text_in_page,
+            "auto_mode_trigger_on_regexp_in_page": auto_mode_trigger_on_regexp_in_page,
+            "azure_openai_api_version": azure_openai_api_version,
+            "azure_openai_deployment_name": azure_openai_deployment_name,
+            "azure_openai_endpoint": azure_openai_endpoint,
+            "azure_openai_key": azure_openai_key,
+            "bbox_bottom": bbox_bottom,
+            "bbox_left": bbox_left,
+            "bbox_right": bbox_right,
+            "bbox_top": bbox_top,
+            "continuous_mode": continuous_mode,
+            "disable_ocr": disable_ocr,
+            "disable_reconstruction": disable_reconstruction,
+            "disable_image_extraction": disable_image_extraction,
+            "do_not_cache": do_not_cache,
+            "do_not_unroll_columns": do_not_unroll_columns,
+            "extract_charts": extract_charts,
+            "fast_mode": fast_mode,
+            "guess_xlsx_sheet_name": guess_xlsx_sheet_name,
+            "html_make_all_elements_visible": html_make_all_elements_visible,
+            "html_remove_fixed_elements": html_remove_fixed_elements,
+            "html_remove_navigation_elements": html_remove_navigation_elements,
+            "http_proxy": http_proxy,
+            "input_s3_path": input_s_3_path,
+            "input_url": input_url,
+            "invalidate_cache": invalidate_cache,
+            "is_formatting_instruction": is_formatting_instruction,
+            "language": language,
+            "extract_layout": extract_layout,
+            "output_pdf_of_document": output_pdf_of_document,
+            "output_s3_path_prefix": output_s_3_path_prefix,
+            "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,
+            "structured_output": structured_output,
+            "structured_output_json_schema": structured_output_json_schema,
+            "structured_output_json_schema_name": structured_output_json_schema_name,
+            "take_screenshot": take_screenshot,
+            "target_pages": target_pages,
+            "use_vendor_multimodal_model": use_vendor_multimodal_model,
+            "vendor_multimodal_api_key": vendor_multimodal_api_key,
+            "vendor_multimodal_model_name": vendor_multimodal_model_name,
+            "webhook_url": webhook_url,
+            "bounding_box": bounding_box,
+            "gpt4o_mode": gpt_4_o_mode,
+            "gpt4o_api_key": gpt_4_o_api_key,
+        }
+        if file is not OMIT:
+            _request["file"] = file
+        if max_pages is not OMIT:
+            _request["max_pages"] = max_pages
         _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}),
-            data=jsonable_encoder(
-                {
-                    "language": language,
-                    "parsing_instruction": parsing_instruction,
-                    "skip_diagonal_text": skip_diagonal_text,
-                    "invalidate_cache": invalidate_cache,
-                    "output_pdf_of_document": output_pdf_of_document,
-                    "do_not_cache": do_not_cache,
-                    "gpt4o_mode": gpt_4_o_mode,
-                    "fast_mode": fast_mode,
-                    "premium_mode": premium_mode,
-                    "continuous_mode": continuous_mode,
-                    "gpt4o_api_key": gpt_4_o_api_key,
-                    "do_not_unroll_columns": do_not_unroll_columns,
-                    "html_make_all_elements_visible": html_make_all_elements_visible,
-                    "html_remove_fixed_elements": html_remove_fixed_elements,
-                    "guess_xlsx_sheet_name": guess_xlsx_sheet_name,
-                    "page_separator": page_separator,
-                    "bounding_box": bounding_box,
-                    "bbox_top": bbox_top,
-                    "bbox_right": bbox_right,
-                    "bbox_bottom": bbox_bottom,
-                    "bbox_left": bbox_left,
-                    "target_pages": target_pages,
-                    "use_vendor_multimodal_model": use_vendor_multimodal_model,
-                    "vendor_multimodal_model_name": vendor_multimodal_model_name,
-                    "vendor_multimodal_api_key": vendor_multimodal_api_key,
-                    "page_prefix": page_prefix,
-                    "page_suffix": page_suffix,
-                    "webhook_url": webhook_url,
-                    "take_screenshot": take_screenshot,
-                    "is_formatting_instruction": is_formatting_instruction,
-                    "disable_ocr": disable_ocr,
-                    "annotate_links": annotate_links,
-                    "disable_reconstruction": disable_reconstruction,
-                    "disable_image_extraction": disable_image_extraction,
-                    "input_s3_path": input_s_3_path,
-                    "output_s3_path_prefix": output_s_3_path_prefix,
-                    "azure_openai_deployment_name": azure_openai_deployment_name,
-                    "azure_openai_endpoint": azure_openai_endpoint,
-                    "azure_openai_api_version": azure_openai_api_version,
-                    "azure_openai_key": azure_openai_key,
-                    "auto_mode": auto_mode,
-                    "auto_mode_trigger_on_regexp_in_page": auto_mode_trigger_on_regexp_in_page,
-                    "auto_mode_trigger_on_text_in_page": auto_mode_trigger_on_text_in_page,
-                    "auto_mode_trigger_on_table_in_page": auto_mode_trigger_on_table_in_page,
-                    "auto_mode_trigger_on_image_in_page": auto_mode_trigger_on_image_in_page,
-                    "file": file,
-                    "input_url": input_url,
-                    "http_proxy": http_proxy,
-                    "structured_output": structured_output,
-                    "structured_output_json_schema": structured_output_json_schema,
-                    "structured_output_json_schema_name": structured_output_json_schema_name,
-                    "max_pages": max_pages,
-                }
-            ),
-            files={},
+            json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -388,7 +398,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -420,7 +430,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_parsing_job_details(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -452,7 +462,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_text_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -484,7 +494,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_raw_text_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -518,7 +528,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_structured_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -552,7 +562,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_raw_structured_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -586,7 +596,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_raw_xlsx_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -620,7 +630,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -654,7 +664,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_raw_md_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -688,7 +698,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_json_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -720,7 +730,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_json_raw_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -784,8 +794,8 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.generate_presigned_url(
-            job_id="job_id",
-            filename="filename",
+            job_id="string",
+            filename="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -811,7 +821,7 @@ class AsyncParsingClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def get_job_image_result(self, job_id: str, name: str) -> typing.AsyncIterator[bytes]:
+    async def get_job_image_result(self, job_id: str, name: str) -> None:
         """
         Get a job by id
 
@@ -819,29 +829,34 @@ class AsyncParsingClient:
             - job_id: str.
 
             - name: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.parsing.get_job_image_result(
+            job_id="string",
+            name="string",
+        )
         """
-        async with self._client_wrapper.httpx_client.stream(
+        _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/image/{name}"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
-        ) as _response:
-            if 200 <= _response.status_code < 300:
-                async for _chunk in _response.aiter_bytes():
-                    yield _chunk
-                return
-            await _response.aread()
-            if _response.status_code == 422:
-                raise UnprocessableEntityError(
-                    pydantic.parse_obj_as(HttpValidationError, _response.json())  # type: ignore
-                )
-            try:
-                _response_json = _response.json()
-            except JSONDecodeError:
-                raise ApiError(status_code=_response.status_code, body=_response.text)
-            raise ApiError(status_code=_response.status_code, body=_response_json)
+        )
+        if 200 <= _response.status_code < 300:
+            return
+        if _response.status_code == 422:
+            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+        try:
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get_supported_file_extensions(self) -> typing.List[LlamaParseSupportedFileExtensions]:
         """
@@ -874,58 +889,61 @@ class AsyncParsingClient:
         *,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
-        language: typing.Optional[typing.List[ParserLanguages]] = None,
-        parsing_instruction: typing.Optional[str] = None,
-        skip_diagonal_text: typing.Optional[bool] = None,
-        invalidate_cache: typing.Optional[bool] = None,
-        output_pdf_of_document: typing.Optional[bool] = None,
-        do_not_cache: typing.Optional[bool] = None,
-        gpt_4_o_mode: typing.Optional[bool] = None,
-        fast_mode: typing.Optional[bool] = None,
-        premium_mode: typing.Optional[bool] = None,
-        continuous_mode: typing.Optional[bool] = None,
-        gpt_4_o_api_key: typing.Optional[str] = None,
-        do_not_unroll_columns: typing.Optional[bool] = None,
-        html_make_all_elements_visible: typing.Optional[bool] = None,
-        html_remove_fixed_elements: typing.Optional[bool] = None,
-        guess_xlsx_sheet_name: typing.Optional[bool] = None,
-        page_separator: typing.Optional[str] = None,
-        bounding_box: typing.Optional[str] = None,
-        bbox_top: typing.Optional[float] = None,
-        bbox_right: typing.Optional[float] = None,
-        bbox_bottom: typing.Optional[float] = None,
-        bbox_left: typing.Optional[float] = None,
-        target_pages: typing.Optional[str] = None,
-        use_vendor_multimodal_model: typing.Optional[bool] = None,
-        vendor_multimodal_model_name: typing.Optional[str] = None,
-        vendor_multimodal_api_key: typing.Optional[str] = None,
-        page_prefix: typing.Optional[str] = None,
-        page_suffix: typing.Optional[str] = None,
-        webhook_url: typing.Optional[str] = None,
-        take_screenshot: typing.Optional[bool] = None,
-        is_formatting_instruction: typing.Optional[bool] = None,
-        disable_ocr: typing.Optional[bool] = None,
-        annotate_links: typing.Optional[bool] = None,
-        disable_reconstruction: typing.Optional[bool] = None,
-        disable_image_extraction: typing.Optional[bool] = None,
-        input_s_3_path: typing.Optional[str] = None,
-        output_s_3_path_prefix: typing.Optional[str] = None,
-        azure_openai_deployment_name: typing.Optional[str] = None,
-        azure_openai_endpoint: typing.Optional[str] = None,
-        azure_openai_api_version: typing.Optional[str] = None,
-        azure_openai_key: typing.Optional[str] = None,
-        auto_mode: typing.Optional[bool] = None,
-        auto_mode_trigger_on_regexp_in_page: typing.Optional[str] = None,
-        auto_mode_trigger_on_text_in_page: typing.Optional[str] = None,
-        auto_mode_trigger_on_table_in_page: typing.Optional[bool] = None,
-        auto_mode_trigger_on_image_in_page: typing.Optional[bool] = None,
-        file: typing.Optional[str] = None,
-        input_url: typing.Optional[str] = None,
-        http_proxy: typing.Optional[str] = None,
-        structured_output: typing.Optional[bool] = None,
-        structured_output_json_schema: typing.Optional[str] = None,
-        structured_output_json_schema_name: typing.Optional[str] = None,
-        max_pages: typing.Optional[int] = None,
+        file: typing.Optional[str] = OMIT,
+        annotate_links: bool,
+        auto_mode: bool,
+        auto_mode_trigger_on_image_in_page: bool,
+        auto_mode_trigger_on_table_in_page: bool,
+        auto_mode_trigger_on_text_in_page: str,
+        auto_mode_trigger_on_regexp_in_page: str,
+        azure_openai_api_version: str,
+        azure_openai_deployment_name: str,
+        azure_openai_endpoint: str,
+        azure_openai_key: str,
+        bbox_bottom: float,
+        bbox_left: float,
+        bbox_right: float,
+        bbox_top: float,
+        continuous_mode: bool,
+        disable_ocr: bool,
+        disable_reconstruction: bool,
+        disable_image_extraction: bool,
+        do_not_cache: bool,
+        do_not_unroll_columns: bool,
+        extract_charts: bool,
+        fast_mode: bool,
+        guess_xlsx_sheet_name: bool,
+        html_make_all_elements_visible: bool,
+        html_remove_fixed_elements: bool,
+        html_remove_navigation_elements: bool,
+        http_proxy: str,
+        input_s_3_path: str,
+        input_url: str,
+        invalidate_cache: bool,
+        is_formatting_instruction: bool,
+        language: typing.List[ParserLanguages],
+        extract_layout: bool,
+        max_pages: typing.Optional[int] = OMIT,
+        output_pdf_of_document: bool,
+        output_s_3_path_prefix: str,
+        page_prefix: str,
+        page_separator: str,
+        page_suffix: str,
+        parsing_instruction: str,
+        premium_mode: bool,
+        skip_diagonal_text: bool,
+        structured_output: bool,
+        structured_output_json_schema: str,
+        structured_output_json_schema_name: str,
+        take_screenshot: bool,
+        target_pages: str,
+        use_vendor_multimodal_model: bool,
+        vendor_multimodal_api_key: str,
+        vendor_multimodal_model_name: str,
+        webhook_url: str,
+        bounding_box: str,
+        gpt_4_o_mode: bool,
+        gpt_4_o_api_key: str,
     ) -> ParsingJob:
         """
         Upload a file to s3 and create a job. return a job id
@@ -935,178 +953,180 @@ class AsyncParsingClient:
 
             - organization_id: typing.Optional[str].
 
-            - language: typing.Optional[typing.List[ParserLanguages]].
-
-            - parsing_instruction: typing.Optional[str].
-
-            - skip_diagonal_text: typing.Optional[bool].
-
-            - invalidate_cache: typing.Optional[bool].
-
-            - output_pdf_of_document: typing.Optional[bool].
-
-            - do_not_cache: typing.Optional[bool].
-
-            - gpt_4_o_mode: typing.Optional[bool].
-
-            - fast_mode: typing.Optional[bool].
-
-            - premium_mode: typing.Optional[bool].
-
-            - continuous_mode: typing.Optional[bool].
-
-            - gpt_4_o_api_key: typing.Optional[str].
-
-            - do_not_unroll_columns: typing.Optional[bool].
-
-            - html_make_all_elements_visible: typing.Optional[bool].
-
-            - html_remove_fixed_elements: typing.Optional[bool].
-
-            - guess_xlsx_sheet_name: typing.Optional[bool].
-
-            - page_separator: typing.Optional[str].
-
-            - bounding_box: typing.Optional[str].
-
-            - bbox_top: typing.Optional[float].
+            - file: typing.Optional[str].
 
-            - bbox_right: typing.Optional[float].
+            - annotate_links: bool.
 
-            - bbox_bottom: typing.Optional[float].
+            - auto_mode: bool.
 
-            - bbox_left: typing.Optional[float].
+            - auto_mode_trigger_on_image_in_page: bool.
 
-            - target_pages: typing.Optional[str].
+            - auto_mode_trigger_on_table_in_page: bool.
 
-            - use_vendor_multimodal_model: typing.Optional[bool].
+            - auto_mode_trigger_on_text_in_page: str.
 
-            - vendor_multimodal_model_name: typing.Optional[str].
+            - auto_mode_trigger_on_regexp_in_page: str.
 
-            - vendor_multimodal_api_key: typing.Optional[str].
+            - azure_openai_api_version: str.
 
-            - page_prefix: typing.Optional[str].
+            - azure_openai_deployment_name: str.
 
-            - page_suffix: typing.Optional[str].
+            - azure_openai_endpoint: str.
 
-            - webhook_url: typing.Optional[str].
+            - azure_openai_key: str.
 
-            - take_screenshot: typing.Optional[bool].
+            - bbox_bottom: float.
 
-            - is_formatting_instruction: typing.Optional[bool].
+            - bbox_left: float.
 
-            - disable_ocr: typing.Optional[bool].
+            - bbox_right: float.
 
-            - annotate_links: typing.Optional[bool].
+            - bbox_top: float.
 
-            - disable_reconstruction: typing.Optional[bool].
+            - continuous_mode: bool.
 
-            - disable_image_extraction: typing.Optional[bool].
+            - disable_ocr: bool.
 
-            - input_s_3_path: typing.Optional[str].
+            - disable_reconstruction: bool.
 
-            - output_s_3_path_prefix: typing.Optional[str].
+            - disable_image_extraction: bool.
 
-            - azure_openai_deployment_name: typing.Optional[str].
+            - do_not_cache: bool.
 
-            - azure_openai_endpoint: typing.Optional[str].
+            - do_not_unroll_columns: bool.
 
-            - azure_openai_api_version: typing.Optional[str].
+            - extract_charts: bool.
 
-            - azure_openai_key: typing.Optional[str].
+            - fast_mode: bool.
 
-            - auto_mode: typing.Optional[bool].
+            - guess_xlsx_sheet_name: bool.
 
-            - auto_mode_trigger_on_regexp_in_page: typing.Optional[str].
+            - html_make_all_elements_visible: bool.
 
-            - auto_mode_trigger_on_text_in_page: typing.Optional[str].
+            - html_remove_fixed_elements: bool.
 
-            - auto_mode_trigger_on_table_in_page: typing.Optional[bool].
+            - html_remove_navigation_elements: bool.
 
-            - auto_mode_trigger_on_image_in_page: typing.Optional[bool].
+            - http_proxy: str.
 
-            - file: typing.Optional[str].
+            - input_s_3_path: str.
 
-            - input_url: typing.Optional[str].
+            - input_url: str.
 
-            - http_proxy: typing.Optional[str].
+            - invalidate_cache: bool.
 
-            - structured_output: typing.Optional[bool].
+            - is_formatting_instruction: bool.
 
-            - structured_output_json_schema: typing.Optional[str].
+            - language: typing.List[ParserLanguages].
 
-            - structured_output_json_schema_name: typing.Optional[str].
+            - extract_layout: bool.
 
             - max_pages: typing.Optional[int].
-        ---
-        from llama_cloud.client import AsyncLlamaCloud
 
-        client = AsyncLlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        await client.parsing.upload_file()
-        """
+            - output_pdf_of_document: bool.
+
+            - output_s_3_path_prefix: str.
+
+            - page_prefix: str.
+
+            - page_separator: str.
+
+            - page_suffix: str.
+
+            - parsing_instruction: str.
+
+            - premium_mode: bool.
+
+            - skip_diagonal_text: bool.
+
+            - structured_output: bool.
+
+            - structured_output_json_schema: str.
+
+            - structured_output_json_schema_name: str.
+
+            - take_screenshot: bool.
+
+            - target_pages: str.
+
+            - use_vendor_multimodal_model: bool.
+
+            - vendor_multimodal_api_key: str.
+
+            - vendor_multimodal_model_name: str.
+
+            - webhook_url: str.
+
+            - bounding_box: str.
+
+            - gpt_4_o_mode: bool.
+
+            - gpt_4_o_api_key: str.
+        """
+        _request: typing.Dict[str, typing.Any] = {
+            "annotate_links": annotate_links,
+            "auto_mode": auto_mode,
+            "auto_mode_trigger_on_image_in_page": auto_mode_trigger_on_image_in_page,
+            "auto_mode_trigger_on_table_in_page": auto_mode_trigger_on_table_in_page,
+            "auto_mode_trigger_on_text_in_page": auto_mode_trigger_on_text_in_page,
+            "auto_mode_trigger_on_regexp_in_page": auto_mode_trigger_on_regexp_in_page,
+            "azure_openai_api_version": azure_openai_api_version,
+            "azure_openai_deployment_name": azure_openai_deployment_name,
+            "azure_openai_endpoint": azure_openai_endpoint,
+            "azure_openai_key": azure_openai_key,
+            "bbox_bottom": bbox_bottom,
+            "bbox_left": bbox_left,
+            "bbox_right": bbox_right,
+            "bbox_top": bbox_top,
+            "continuous_mode": continuous_mode,
+            "disable_ocr": disable_ocr,
+            "disable_reconstruction": disable_reconstruction,
+            "disable_image_extraction": disable_image_extraction,
+            "do_not_cache": do_not_cache,
+            "do_not_unroll_columns": do_not_unroll_columns,
+            "extract_charts": extract_charts,
+            "fast_mode": fast_mode,
+            "guess_xlsx_sheet_name": guess_xlsx_sheet_name,
+            "html_make_all_elements_visible": html_make_all_elements_visible,
+            "html_remove_fixed_elements": html_remove_fixed_elements,
+            "html_remove_navigation_elements": html_remove_navigation_elements,
+            "http_proxy": http_proxy,
+            "input_s3_path": input_s_3_path,
+            "input_url": input_url,
+            "invalidate_cache": invalidate_cache,
+            "is_formatting_instruction": is_formatting_instruction,
+            "language": language,
+            "extract_layout": extract_layout,
+            "output_pdf_of_document": output_pdf_of_document,
+            "output_s3_path_prefix": output_s_3_path_prefix,
+            "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,
+            "structured_output": structured_output,
+            "structured_output_json_schema": structured_output_json_schema,
+            "structured_output_json_schema_name": structured_output_json_schema_name,
+            "take_screenshot": take_screenshot,
+            "target_pages": target_pages,
+            "use_vendor_multimodal_model": use_vendor_multimodal_model,
+            "vendor_multimodal_api_key": vendor_multimodal_api_key,
+            "vendor_multimodal_model_name": vendor_multimodal_model_name,
+            "webhook_url": webhook_url,
+            "bounding_box": bounding_box,
+            "gpt4o_mode": gpt_4_o_mode,
+            "gpt4o_api_key": gpt_4_o_api_key,
+        }
+        if file is not OMIT:
+            _request["file"] = file
+        if max_pages is not OMIT:
+            _request["max_pages"] = max_pages
         _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}),
-            data=jsonable_encoder(
-                {
-                    "language": language,
-                    "parsing_instruction": parsing_instruction,
-                    "skip_diagonal_text": skip_diagonal_text,
-                    "invalidate_cache": invalidate_cache,
-                    "output_pdf_of_document": output_pdf_of_document,
-                    "do_not_cache": do_not_cache,
-                    "gpt4o_mode": gpt_4_o_mode,
-                    "fast_mode": fast_mode,
-                    "premium_mode": premium_mode,
-                    "continuous_mode": continuous_mode,
-                    "gpt4o_api_key": gpt_4_o_api_key,
-                    "do_not_unroll_columns": do_not_unroll_columns,
-                    "html_make_all_elements_visible": html_make_all_elements_visible,
-                    "html_remove_fixed_elements": html_remove_fixed_elements,
-                    "guess_xlsx_sheet_name": guess_xlsx_sheet_name,
-                    "page_separator": page_separator,
-                    "bounding_box": bounding_box,
-                    "bbox_top": bbox_top,
-                    "bbox_right": bbox_right,
-                    "bbox_bottom": bbox_bottom,
-                    "bbox_left": bbox_left,
-                    "target_pages": target_pages,
-                    "use_vendor_multimodal_model": use_vendor_multimodal_model,
-                    "vendor_multimodal_model_name": vendor_multimodal_model_name,
-                    "vendor_multimodal_api_key": vendor_multimodal_api_key,
-                    "page_prefix": page_prefix,
-                    "page_suffix": page_suffix,
-                    "webhook_url": webhook_url,
-                    "take_screenshot": take_screenshot,
-                    "is_formatting_instruction": is_formatting_instruction,
-                    "disable_ocr": disable_ocr,
-                    "annotate_links": annotate_links,
-                    "disable_reconstruction": disable_reconstruction,
-                    "disable_image_extraction": disable_image_extraction,
-                    "input_s3_path": input_s_3_path,
-                    "output_s3_path_prefix": output_s_3_path_prefix,
-                    "azure_openai_deployment_name": azure_openai_deployment_name,
-                    "azure_openai_endpoint": azure_openai_endpoint,
-                    "azure_openai_api_version": azure_openai_api_version,
-                    "azure_openai_key": azure_openai_key,
-                    "auto_mode": auto_mode,
-                    "auto_mode_trigger_on_regexp_in_page": auto_mode_trigger_on_regexp_in_page,
-                    "auto_mode_trigger_on_text_in_page": auto_mode_trigger_on_text_in_page,
-                    "auto_mode_trigger_on_table_in_page": auto_mode_trigger_on_table_in_page,
-                    "auto_mode_trigger_on_image_in_page": auto_mode_trigger_on_image_in_page,
-                    "file": file,
-                    "input_url": input_url,
-                    "http_proxy": http_proxy,
-                    "structured_output": structured_output,
-                    "structured_output_json_schema": structured_output_json_schema,
-                    "structured_output_json_schema_name": structured_output_json_schema_name,
-                    "max_pages": max_pages,
-                }
-            ),
-            files={},
+            json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1162,7 +1182,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1194,7 +1214,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_parsing_job_details(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1226,7 +1246,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_text_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1258,7 +1278,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_raw_text_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1292,7 +1312,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_structured_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1326,7 +1346,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_raw_structured_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1360,7 +1380,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_raw_xlsx_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1394,7 +1414,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1428,7 +1448,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_raw_md_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1462,7 +1482,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_json_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1494,7 +1514,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_json_raw_result(
-            job_id="job_id",
+            job_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1558,8 +1578,8 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.generate_presigned_url(
-            job_id="job_id",
-            filename="filename",
+            job_id="string",
+            filename="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(