llama-cloud 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

llama_cloud/resources/parsing/client.py

@@ -7,6 +7,7 @@ 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.remove_none_from_dict import remove_none_from_dict
 from ...errors.unprocessable_entity_error import UnprocessableEntityError
 from ...types.http_validation_error import HttpValidationError
 from ...types.llama_parse_supported_file_extensions import LlamaParseSupportedFileExtensions
@@ -15,6 +16,7 @@ from ...types.parsing_history_item import ParsingHistoryItem
 from ...types.parsing_job import ParsingJob
 from ...types.parsing_job_json_result import ParsingJobJsonResult
 from ...types.parsing_job_markdown_result import ParsingJobMarkdownResult
+from ...types.parsing_job_structured_result import ParsingJobStructuredResult
 from ...types.parsing_job_text_result import ParsingJobTextResult
 from ...types.parsing_usage import ParsingUsage
 from ...types.presigned_url import PresignedUrl
@@ -35,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) -> None:
+    def get_job_image_result(self, job_id: str, name: str) -> typing.Iterator[bytes]:
         """
         Get a job by id
 
@@ -43,34 +45,29 @@ 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",
-        )
         """
-        _response = self._client_wrapper.httpx_client.request(
+        with self._client_wrapper.httpx_client.stream(
             "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,
-        )
-        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)
+        ) 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)
 
     def get_supported_file_extensions(self) -> typing.List[LlamaParseSupportedFileExtensions]:
         """
@@ -101,146 +98,241 @@ class ParsingClient:
     def upload_file(
         self,
         *,
-        language: typing.List[ParserLanguages],
-        parsing_instruction: str,
-        skip_diagonal_text: bool,
-        invalidate_cache: bool,
-        do_not_cache: bool,
-        gpt_4_o_mode: bool,
-        fast_mode: bool,
-        premium_mode: bool,
-        continuous_mode: bool,
-        gpt_4_o_api_key: str,
-        do_not_unroll_columns: bool,
-        page_separator: str,
-        bounding_box: str,
-        target_pages: str,
-        use_vendor_multimodal_model: bool,
-        vendor_multimodal_model_name: str,
-        vendor_multimodal_api_key: str,
-        page_prefix: str,
-        page_suffix: str,
-        webhook_url: str,
-        take_screenshot: bool,
-        is_formatting_instruction: bool,
-        disable_ocr: bool,
-        annotate_links: bool,
-        disable_reconstruction: bool,
-        input_s_3_path: str,
-        output_s_3_path_prefix: str,
-        azure_openai_deployment_name: str,
-        azure_openai_endpoint: str,
-        azure_openai_api_version: str,
-        azure_openai_key: str,
-        file: typing.Optional[str] = OMIT,
+        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,
     ) -> ParsingJob:
         """
         Upload a file to s3 and create a job. return a job id
 
         Parameters:
-            - language: typing.List[ParserLanguages].
+            - project_id: typing.Optional[str].
 
-            - parsing_instruction: str.
+            - organization_id: typing.Optional[str].
 
-            - skip_diagonal_text: bool.
+            - language: typing.Optional[typing.List[ParserLanguages]].
 
-            - invalidate_cache: bool.
+            - parsing_instruction: typing.Optional[str].
 
-            - do_not_cache: bool.
+            - skip_diagonal_text: typing.Optional[bool].
 
-            - gpt_4_o_mode: bool.
+            - invalidate_cache: typing.Optional[bool].
 
-            - fast_mode: bool.
+            - output_pdf_of_document: typing.Optional[bool].
 
-            - premium_mode: bool.
+            - do_not_cache: typing.Optional[bool].
 
-            - continuous_mode: bool.
+            - gpt_4_o_mode: typing.Optional[bool].
 
-            - gpt_4_o_api_key: str.
+            - fast_mode: typing.Optional[bool].
 
-            - do_not_unroll_columns: bool.
+            - premium_mode: typing.Optional[bool].
 
-            - page_separator: str.
+            - continuous_mode: typing.Optional[bool].
 
-            - bounding_box: str.
+            - gpt_4_o_api_key: typing.Optional[str].
 
-            - target_pages: str.
+            - do_not_unroll_columns: typing.Optional[bool].
 
-            - use_vendor_multimodal_model: bool.
+            - html_make_all_elements_visible: typing.Optional[bool].
 
-            - vendor_multimodal_model_name: str.
+            - html_remove_fixed_elements: typing.Optional[bool].
 
-            - vendor_multimodal_api_key: str.
+            - guess_xlsx_sheet_name: typing.Optional[bool].
 
-            - page_prefix: str.
+            - page_separator: typing.Optional[str].
 
-            - page_suffix: str.
+            - bounding_box: typing.Optional[str].
 
-            - webhook_url: str.
+            - bbox_top: typing.Optional[float].
 
-            - take_screenshot: bool.
+            - bbox_right: typing.Optional[float].
 
-            - is_formatting_instruction: bool.
+            - bbox_bottom: typing.Optional[float].
 
-            - disable_ocr: bool.
+            - bbox_left: typing.Optional[float].
 
-            - annotate_links: bool.
+            - target_pages: typing.Optional[str].
 
-            - disable_reconstruction: bool.
+            - use_vendor_multimodal_model: typing.Optional[bool].
 
-            - input_s_3_path: str.
+            - vendor_multimodal_model_name: typing.Optional[str].
 
-            - output_s_3_path_prefix: str.
+            - vendor_multimodal_api_key: typing.Optional[str].
 
-            - azure_openai_deployment_name: str.
+            - page_prefix: typing.Optional[str].
 
-            - azure_openai_endpoint: str.
+            - page_suffix: typing.Optional[str].
 
-            - azure_openai_api_version: str.
+            - webhook_url: typing.Optional[str].
 
-            - azure_openai_key: str.
+            - take_screenshot: typing.Optional[bool].
+
+            - is_formatting_instruction: typing.Optional[bool].
+
+            - disable_ocr: typing.Optional[bool].
+
+            - annotate_links: typing.Optional[bool].
+
+            - disable_reconstruction: typing.Optional[bool].
+
+            - disable_image_extraction: typing.Optional[bool].
+
+            - input_s_3_path: typing.Optional[str].
+
+            - output_s_3_path_prefix: typing.Optional[str].
+
+            - azure_openai_deployment_name: typing.Optional[str].
+
+            - azure_openai_endpoint: typing.Optional[str].
+
+            - azure_openai_api_version: typing.Optional[str].
+
+            - azure_openai_key: typing.Optional[str].
+
+            - auto_mode: typing.Optional[bool].
+
+            - auto_mode_trigger_on_regexp_in_page: typing.Optional[str].
+
+            - auto_mode_trigger_on_text_in_page: typing.Optional[str].
+
+            - auto_mode_trigger_on_table_in_page: typing.Optional[bool].
+
+            - auto_mode_trigger_on_image_in_page: typing.Optional[bool].
 
             - file: typing.Optional[str].
+
+            - input_url: typing.Optional[str].
+
+            - http_proxy: typing.Optional[str].
+
+            - structured_output: typing.Optional[bool].
+
+            - structured_output_json_schema: typing.Optional[str].
+
+            - structured_output_json_schema_name: typing.Optional[str].
+
+            - max_pages: typing.Optional[int].
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.parsing.upload_file()
         """
-        _request: typing.Dict[str, typing.Any] = {
-            "language": language,
-            "parsing_instruction": parsing_instruction,
-            "skip_diagonal_text": skip_diagonal_text,
-            "invalidate_cache": invalidate_cache,
-            "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,
-            "page_separator": page_separator,
-            "bounding_box": bounding_box,
-            "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,
-            "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,
-        }
-        if file is not OMIT:
-            _request["file"] = file
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/upload"),
-            json=jsonable_encoder(_request),
+            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={},
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -256,6 +348,7 @@ class ParsingClient:
 
     def usage(self) -> ParsingUsage:
         """
+        DEPRECATED: use either /organizations/{organization_id}/usage or /projects/{project_id}/usage instead
         Get parsing usage for user
 
         ---
@@ -295,7 +388,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -327,7 +420,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_parsing_job_details(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -359,7 +452,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_text_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -391,13 +484,115 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_raw_text_result(
-            job_id="string",
+            job_id="job_id",
+        )
+        """
+        _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/raw/pdf"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+        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_job_structured_result(self, job_id: str) -> ParsingJobStructuredResult:
+        """
+        Get a job by id
+
+        Parameters:
+            - job_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.parsing.get_job_structured_result(
+            job_id="job_id",
+        )
+        """
+        _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/structured"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ParsingJobStructuredResult, _response.json())  # type: ignore
+        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_job_raw_structured_result(self, job_id: str) -> typing.Any:
+        """
+        Get a job by id
+
+        Parameters:
+            - job_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.parsing.get_job_raw_structured_result(
+            job_id="job_id",
+        )
+        """
+        _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/raw/structured"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+        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_job_raw_xlsx_result(self, job_id: str) -> typing.Any:
+        """
+        Get a job by id
+
+        Parameters:
+            - job_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.parsing.get_job_raw_xlsx_result(
+            job_id="job_id",
         )
         """
         _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/raw/text"
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/raw/xlsx"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -425,7 +620,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -459,7 +654,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_raw_md_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -493,7 +688,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_json_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -525,7 +720,7 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.get_job_json_raw_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -589,8 +784,8 @@ class ParsingClient:
             token="YOUR_TOKEN",
         )
         client.parsing.generate_presigned_url(
-            job_id="string",
-            filename="string",
+            job_id="job_id",
+            filename="filename",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -616,7 +811,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) -> None:
+    async def get_job_image_result(self, job_id: str, name: str) -> typing.AsyncIterator[bytes]:
         """
         Get a job by id
 
@@ -624,34 +819,29 @@ 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",
-        )
         """
-        _response = await self._client_wrapper.httpx_client.request(
+        async with self._client_wrapper.httpx_client.stream(
             "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,
-        )
-        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)
+        ) 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)
 
     async def get_supported_file_extensions(self) -> typing.List[LlamaParseSupportedFileExtensions]:
         """
@@ -682,146 +872,241 @@ class AsyncParsingClient:
     async def upload_file(
         self,
         *,
-        language: typing.List[ParserLanguages],
-        parsing_instruction: str,
-        skip_diagonal_text: bool,
-        invalidate_cache: bool,
-        do_not_cache: bool,
-        gpt_4_o_mode: bool,
-        fast_mode: bool,
-        premium_mode: bool,
-        continuous_mode: bool,
-        gpt_4_o_api_key: str,
-        do_not_unroll_columns: bool,
-        page_separator: str,
-        bounding_box: str,
-        target_pages: str,
-        use_vendor_multimodal_model: bool,
-        vendor_multimodal_model_name: str,
-        vendor_multimodal_api_key: str,
-        page_prefix: str,
-        page_suffix: str,
-        webhook_url: str,
-        take_screenshot: bool,
-        is_formatting_instruction: bool,
-        disable_ocr: bool,
-        annotate_links: bool,
-        disable_reconstruction: bool,
-        input_s_3_path: str,
-        output_s_3_path_prefix: str,
-        azure_openai_deployment_name: str,
-        azure_openai_endpoint: str,
-        azure_openai_api_version: str,
-        azure_openai_key: str,
-        file: typing.Optional[str] = OMIT,
+        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,
     ) -> ParsingJob:
         """
         Upload a file to s3 and create a job. return a job id
 
         Parameters:
-            - language: typing.List[ParserLanguages].
+            - project_id: typing.Optional[str].
 
-            - parsing_instruction: str.
+            - organization_id: typing.Optional[str].
 
-            - skip_diagonal_text: bool.
+            - language: typing.Optional[typing.List[ParserLanguages]].
 
-            - invalidate_cache: bool.
+            - parsing_instruction: typing.Optional[str].
 
-            - do_not_cache: bool.
+            - skip_diagonal_text: typing.Optional[bool].
 
-            - gpt_4_o_mode: bool.
+            - invalidate_cache: typing.Optional[bool].
 
-            - fast_mode: bool.
+            - output_pdf_of_document: typing.Optional[bool].
 
-            - premium_mode: bool.
+            - do_not_cache: typing.Optional[bool].
 
-            - continuous_mode: bool.
+            - gpt_4_o_mode: typing.Optional[bool].
 
-            - gpt_4_o_api_key: str.
+            - fast_mode: typing.Optional[bool].
 
-            - do_not_unroll_columns: bool.
+            - premium_mode: typing.Optional[bool].
 
-            - page_separator: str.
+            - continuous_mode: typing.Optional[bool].
 
-            - bounding_box: str.
+            - gpt_4_o_api_key: typing.Optional[str].
 
-            - target_pages: str.
+            - do_not_unroll_columns: typing.Optional[bool].
 
-            - use_vendor_multimodal_model: bool.
+            - html_make_all_elements_visible: typing.Optional[bool].
 
-            - vendor_multimodal_model_name: str.
+            - html_remove_fixed_elements: typing.Optional[bool].
 
-            - vendor_multimodal_api_key: str.
+            - guess_xlsx_sheet_name: typing.Optional[bool].
 
-            - page_prefix: str.
+            - page_separator: typing.Optional[str].
 
-            - page_suffix: str.
+            - bounding_box: typing.Optional[str].
 
-            - webhook_url: str.
+            - bbox_top: typing.Optional[float].
 
-            - take_screenshot: bool.
+            - bbox_right: typing.Optional[float].
 
-            - is_formatting_instruction: bool.
+            - bbox_bottom: typing.Optional[float].
 
-            - disable_ocr: bool.
+            - bbox_left: typing.Optional[float].
 
-            - annotate_links: bool.
+            - target_pages: typing.Optional[str].
 
-            - disable_reconstruction: bool.
+            - use_vendor_multimodal_model: typing.Optional[bool].
 
-            - input_s_3_path: str.
+            - vendor_multimodal_model_name: typing.Optional[str].
 
-            - output_s_3_path_prefix: str.
+            - vendor_multimodal_api_key: typing.Optional[str].
 
-            - azure_openai_deployment_name: str.
+            - page_prefix: typing.Optional[str].
 
-            - azure_openai_endpoint: str.
+            - page_suffix: typing.Optional[str].
 
-            - azure_openai_api_version: str.
+            - webhook_url: typing.Optional[str].
 
-            - azure_openai_key: str.
+            - take_screenshot: typing.Optional[bool].
+
+            - is_formatting_instruction: typing.Optional[bool].
+
+            - disable_ocr: typing.Optional[bool].
+
+            - annotate_links: typing.Optional[bool].
+
+            - disable_reconstruction: typing.Optional[bool].
+
+            - disable_image_extraction: typing.Optional[bool].
+
+            - input_s_3_path: typing.Optional[str].
+
+            - output_s_3_path_prefix: typing.Optional[str].
+
+            - azure_openai_deployment_name: typing.Optional[str].
+
+            - azure_openai_endpoint: typing.Optional[str].
+
+            - azure_openai_api_version: typing.Optional[str].
+
+            - azure_openai_key: typing.Optional[str].
+
+            - auto_mode: typing.Optional[bool].
+
+            - auto_mode_trigger_on_regexp_in_page: typing.Optional[str].
+
+            - auto_mode_trigger_on_text_in_page: typing.Optional[str].
+
+            - auto_mode_trigger_on_table_in_page: typing.Optional[bool].
+
+            - auto_mode_trigger_on_image_in_page: typing.Optional[bool].
 
             - file: typing.Optional[str].
+
+            - input_url: typing.Optional[str].
+
+            - http_proxy: typing.Optional[str].
+
+            - structured_output: typing.Optional[bool].
+
+            - structured_output_json_schema: typing.Optional[str].
+
+            - structured_output_json_schema_name: typing.Optional[str].
+
+            - max_pages: typing.Optional[int].
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.parsing.upload_file()
         """
-        _request: typing.Dict[str, typing.Any] = {
-            "language": language,
-            "parsing_instruction": parsing_instruction,
-            "skip_diagonal_text": skip_diagonal_text,
-            "invalidate_cache": invalidate_cache,
-            "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,
-            "page_separator": page_separator,
-            "bounding_box": bounding_box,
-            "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,
-            "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,
-        }
-        if file is not OMIT:
-            _request["file"] = file
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/upload"),
-            json=jsonable_encoder(_request),
+            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={},
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -837,6 +1122,7 @@ class AsyncParsingClient:
 
     async def usage(self) -> ParsingUsage:
         """
+        DEPRECATED: use either /organizations/{organization_id}/usage or /projects/{project_id}/usage instead
         Get parsing usage for user
 
         ---
@@ -876,7 +1162,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -908,7 +1194,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_parsing_job_details(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -940,7 +1226,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_text_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -972,13 +1258,115 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_raw_text_result(
-            job_id="string",
+            job_id="job_id",
+        )
+        """
+        _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/raw/pdf"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+        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_job_structured_result(self, job_id: str) -> ParsingJobStructuredResult:
+        """
+        Get a job by id
+
+        Parameters:
+            - job_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.parsing.get_job_structured_result(
+            job_id="job_id",
+        )
+        """
+        _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/structured"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ParsingJobStructuredResult, _response.json())  # type: ignore
+        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_job_raw_structured_result(self, job_id: str) -> typing.Any:
+        """
+        Get a job by id
+
+        Parameters:
+            - job_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.parsing.get_job_raw_structured_result(
+            job_id="job_id",
+        )
+        """
+        _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/raw/structured"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _response.json())  # type: ignore
+        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_job_raw_xlsx_result(self, job_id: str) -> typing.Any:
+        """
+        Get a job by id
+
+        Parameters:
+            - job_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.parsing.get_job_raw_xlsx_result(
+            job_id="job_id",
         )
         """
         _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/raw/text"
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/result/raw/xlsx"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1006,7 +1394,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1040,7 +1428,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_raw_md_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1074,7 +1462,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_json_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1106,7 +1494,7 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.get_job_json_raw_result(
-            job_id="string",
+            job_id="job_id",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1170,8 +1558,8 @@ class AsyncParsingClient:
             token="YOUR_TOKEN",
         )
         await client.parsing.generate_presigned_url(
-            job_id="string",
-            filename="string",
+            job_id="job_id",
+            filename="filename",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(