llama-cloud 0.1.12__py3-none-any.whl → 0.1.14__py3-none-any.whl

llama_cloud/resources/organizations/client.py

@@ -10,11 +10,11 @@ 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.interval_usage_and_plan import IntervalUsageAndPlan
 from ...types.organization import Organization
 from ...types.organization_create import OrganizationCreate
 from ...types.project import Project
 from ...types.role import Role
+from ...types.usage_and_plan import UsageAndPlan
 from ...types.user_organization import UserOrganization
 from ...types.user_organization_create import UserOrganizationCreate
 from ...types.user_organization_delete import UserOrganizationDelete
@@ -297,12 +297,16 @@ class OrganizationsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_organization_usage(self, organization_id: typing.Optional[str]) -> IntervalUsageAndPlan:
+    def get_organization_usage(
+        self, organization_id: typing.Optional[str], *, get_current_invoice_total: typing.Optional[bool] = None
+    ) -> UsageAndPlan:
         """
         Get usage for a project
 
         Parameters:
             - organization_id: typing.Optional[str].
+
+            - get_current_invoice_total: typing.Optional[bool].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -316,11 +320,12 @@ class OrganizationsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/usage"
             ),
+            params=remove_none_from_dict({"get_current_invoice_total": get_current_invoice_total}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(IntervalUsageAndPlan, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(UsageAndPlan, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -988,12 +993,16 @@ class AsyncOrganizationsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_organization_usage(self, organization_id: typing.Optional[str]) -> IntervalUsageAndPlan:
+    async def get_organization_usage(
+        self, organization_id: typing.Optional[str], *, get_current_invoice_total: typing.Optional[bool] = None
+    ) -> UsageAndPlan:
         """
         Get usage for a project
 
         Parameters:
             - organization_id: typing.Optional[str].
+
+            - get_current_invoice_total: typing.Optional[bool].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1007,11 +1016,12 @@ class AsyncOrganizationsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/usage"
             ),
+            params=remove_none_from_dict({"get_current_invoice_total": get_current_invoice_total}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(IntervalUsageAndPlan, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(UsageAndPlan, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:

llama_cloud/resources/parsing/client.py

@@ -18,6 +18,7 @@ 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_mode import ParsingMode
 from ...types.parsing_usage import ParsingUsage
 from ...types.presigned_url import PresignedUrl
 
@@ -196,6 +197,7 @@ class ParsingClient:
         organization_id: typing.Optional[str] = None,
         project_id: typing.Optional[str] = None,
         file: typing.Optional[str] = OMIT,
+        adaptive_long_table: bool,
         annotate_links: bool,
         auto_mode: bool,
         auto_mode_trigger_on_image_in_page: bool,
@@ -210,17 +212,13 @@ class ParsingClient:
         bbox_left: float,
         bbox_right: float,
         bbox_top: float,
-        complemental_formatting_instruction: str,
-        content_guideline_instruction: str,
-        continuous_mode: bool,
+        compact_markdown_table: 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,
-        formatting_instruction: str,
         guess_xlsx_sheet_name: bool,
         html_make_all_elements_visible: bool,
         html_remove_fixed_elements: bool,
@@ -230,7 +228,6 @@ class ParsingClient:
         input_s_3_region: str,
         input_url: str,
         invalidate_cache: bool,
-        is_formatting_instruction: bool,
         language: typing.List[ParserLanguages],
         extract_layout: bool,
         max_pages: typing.Optional[int] = OMIT,
@@ -240,8 +237,7 @@ class ParsingClient:
         page_prefix: str,
         page_separator: str,
         page_suffix: str,
-        parsing_instruction: str,
-        premium_mode: bool,
+        preserve_layout_alignment_across_pages: bool,
         skip_diagonal_text: bool,
         spreadsheet_extract_sub_tables: bool,
         structured_output: bool,
@@ -249,13 +245,14 @@ class ParsingClient:
         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,
+        model: str,
         webhook_url: str,
-        bounding_box: str,
-        gpt_4_o_mode: bool,
-        gpt_4_o_api_key: str,
+        parse_mode: typing.Optional[ParsingMode] = OMIT,
+        system_prompt: str,
+        system_prompt_append: str,
+        user_prompt: str,
         job_timeout_in_seconds: float,
         job_timeout_extra_time_per_page_in_seconds: float,
         strict_mode_image_extraction: bool,
@@ -264,6 +261,18 @@ class ParsingClient:
         strict_mode_buggy_font: bool,
         ignore_document_elements_for_layout_detection: bool,
         output_tables_as_html: bool,
+        use_vendor_multimodal_model: bool,
+        bounding_box: str,
+        gpt_4_o_mode: bool,
+        gpt_4_o_api_key: str,
+        complemental_formatting_instruction: str,
+        content_guideline_instruction: str,
+        premium_mode: bool,
+        is_formatting_instruction: bool,
+        continuous_mode: bool,
+        parsing_instruction: str,
+        fast_mode: bool,
+        formatting_instruction: str,
     ) -> ParsingJob:
         """
         Upload a file to s3 and create a job. return a job id
@@ -275,6 +284,8 @@ class ParsingClient:
 
             - file: typing.Optional[str].
 
+            - adaptive_long_table: bool.
+
             - annotate_links: bool.
 
             - auto_mode: bool.
@@ -303,11 +314,7 @@ class ParsingClient:
 
             - bbox_top: float.
 
-            - complemental_formatting_instruction: str.
-
-            - content_guideline_instruction: str.
-
-            - continuous_mode: bool.
+            - compact_markdown_table: bool.
 
             - disable_ocr: bool.
 
@@ -321,10 +328,6 @@ class ParsingClient:
 
             - extract_charts: bool.
 
-            - fast_mode: bool.
-
-            - formatting_instruction: str.
-
             - guess_xlsx_sheet_name: bool.
 
             - html_make_all_elements_visible: bool.
@@ -343,8 +346,6 @@ class ParsingClient:
 
             - invalidate_cache: bool.
 
-            - is_formatting_instruction: bool.
-
             - language: typing.List[ParserLanguages].
 
             - extract_layout: bool.
@@ -363,9 +364,7 @@ class ParsingClient:
 
             - page_suffix: str.
 
-            - parsing_instruction: str.
-
-            - premium_mode: bool.
+            - preserve_layout_alignment_across_pages: bool.
 
             - skip_diagonal_text: bool.
 
@@ -381,19 +380,21 @@ class ParsingClient:
 
             - target_pages: str.
 
-            - use_vendor_multimodal_model: bool.
-
             - vendor_multimodal_api_key: str.
 
             - vendor_multimodal_model_name: str.
 
+            - model: str.
+
             - webhook_url: str.
 
-            - bounding_box: str.
+            - parse_mode: typing.Optional[ParsingMode].
 
-            - gpt_4_o_mode: bool.
+            - system_prompt: str.
 
-            - gpt_4_o_api_key: str.
+            - system_prompt_append: str.
+
+            - user_prompt: str.
 
             - job_timeout_in_seconds: float.
 
@@ -410,8 +411,33 @@ class ParsingClient:
             - ignore_document_elements_for_layout_detection: bool.
 
             - output_tables_as_html: bool.
+
+            - use_vendor_multimodal_model: bool.
+
+            - bounding_box: str.
+
+            - gpt_4_o_mode: bool.
+
+            - gpt_4_o_api_key: str.
+
+            - complemental_formatting_instruction: str.
+
+            - content_guideline_instruction: str.
+
+            - premium_mode: bool.
+
+            - is_formatting_instruction: bool.
+
+            - continuous_mode: bool.
+
+            - parsing_instruction: str.
+
+            - fast_mode: bool.
+
+            - formatting_instruction: str.
         """
         _request: typing.Dict[str, typing.Any] = {
+            "adaptive_long_table": adaptive_long_table,
             "annotate_links": annotate_links,
             "auto_mode": auto_mode,
             "auto_mode_trigger_on_image_in_page": auto_mode_trigger_on_image_in_page,
@@ -426,17 +452,13 @@ class ParsingClient:
             "bbox_left": bbox_left,
             "bbox_right": bbox_right,
             "bbox_top": bbox_top,
-            "complemental_formatting_instruction": complemental_formatting_instruction,
-            "content_guideline_instruction": content_guideline_instruction,
-            "continuous_mode": continuous_mode,
+            "compact_markdown_table": compact_markdown_table,
             "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,
-            "formatting_instruction": formatting_instruction,
             "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,
@@ -446,7 +468,6 @@ class ParsingClient:
             "input_s3_region": input_s_3_region,
             "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,
@@ -455,8 +476,7 @@ class ParsingClient:
             "page_prefix": page_prefix,
             "page_separator": page_separator,
             "page_suffix": page_suffix,
-            "parsing_instruction": parsing_instruction,
-            "premium_mode": premium_mode,
+            "preserve_layout_alignment_across_pages": preserve_layout_alignment_across_pages,
             "skip_diagonal_text": skip_diagonal_text,
             "spreadsheet_extract_sub_tables": spreadsheet_extract_sub_tables,
             "structured_output": structured_output,
@@ -464,13 +484,13 @@ class ParsingClient:
             "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,
+            "model": model,
             "webhook_url": webhook_url,
-            "bounding_box": bounding_box,
-            "gpt4o_mode": gpt_4_o_mode,
-            "gpt4o_api_key": gpt_4_o_api_key,
+            "system_prompt": system_prompt,
+            "system_prompt_append": system_prompt_append,
+            "user_prompt": user_prompt,
             "job_timeout_in_seconds": job_timeout_in_seconds,
             "job_timeout_extra_time_per_page_in_seconds": job_timeout_extra_time_per_page_in_seconds,
             "strict_mode_image_extraction": strict_mode_image_extraction,
@@ -479,11 +499,25 @@ class ParsingClient:
             "strict_mode_buggy_font": strict_mode_buggy_font,
             "ignore_document_elements_for_layout_detection": ignore_document_elements_for_layout_detection,
             "output_tables_as_HTML": output_tables_as_html,
+            "use_vendor_multimodal_model": use_vendor_multimodal_model,
+            "bounding_box": bounding_box,
+            "gpt4o_mode": gpt_4_o_mode,
+            "gpt4o_api_key": gpt_4_o_api_key,
+            "complemental_formatting_instruction": complemental_formatting_instruction,
+            "content_guideline_instruction": content_guideline_instruction,
+            "premium_mode": premium_mode,
+            "is_formatting_instruction": is_formatting_instruction,
+            "continuous_mode": continuous_mode,
+            "parsing_instruction": parsing_instruction,
+            "fast_mode": fast_mode,
+            "formatting_instruction": formatting_instruction,
         }
         if file is not OMIT:
             _request["file"] = file
         if max_pages is not OMIT:
             _request["max_pages"] = max_pages
+        if parse_mode is not OMIT:
+            _request["parse_mode"] = parse_mode
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/upload"),
@@ -1143,6 +1177,7 @@ class AsyncParsingClient:
         organization_id: typing.Optional[str] = None,
         project_id: typing.Optional[str] = None,
         file: typing.Optional[str] = OMIT,
+        adaptive_long_table: bool,
         annotate_links: bool,
         auto_mode: bool,
         auto_mode_trigger_on_image_in_page: bool,
@@ -1157,17 +1192,13 @@ class AsyncParsingClient:
         bbox_left: float,
         bbox_right: float,
         bbox_top: float,
-        complemental_formatting_instruction: str,
-        content_guideline_instruction: str,
-        continuous_mode: bool,
+        compact_markdown_table: 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,
-        formatting_instruction: str,
         guess_xlsx_sheet_name: bool,
         html_make_all_elements_visible: bool,
         html_remove_fixed_elements: bool,
@@ -1177,7 +1208,6 @@ class AsyncParsingClient:
         input_s_3_region: str,
         input_url: str,
         invalidate_cache: bool,
-        is_formatting_instruction: bool,
         language: typing.List[ParserLanguages],
         extract_layout: bool,
         max_pages: typing.Optional[int] = OMIT,
@@ -1187,8 +1217,7 @@ class AsyncParsingClient:
         page_prefix: str,
         page_separator: str,
         page_suffix: str,
-        parsing_instruction: str,
-        premium_mode: bool,
+        preserve_layout_alignment_across_pages: bool,
         skip_diagonal_text: bool,
         spreadsheet_extract_sub_tables: bool,
         structured_output: bool,
@@ -1196,13 +1225,14 @@ class AsyncParsingClient:
         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,
+        model: str,
         webhook_url: str,
-        bounding_box: str,
-        gpt_4_o_mode: bool,
-        gpt_4_o_api_key: str,
+        parse_mode: typing.Optional[ParsingMode] = OMIT,
+        system_prompt: str,
+        system_prompt_append: str,
+        user_prompt: str,
         job_timeout_in_seconds: float,
         job_timeout_extra_time_per_page_in_seconds: float,
         strict_mode_image_extraction: bool,
@@ -1211,6 +1241,18 @@ class AsyncParsingClient:
         strict_mode_buggy_font: bool,
         ignore_document_elements_for_layout_detection: bool,
         output_tables_as_html: bool,
+        use_vendor_multimodal_model: bool,
+        bounding_box: str,
+        gpt_4_o_mode: bool,
+        gpt_4_o_api_key: str,
+        complemental_formatting_instruction: str,
+        content_guideline_instruction: str,
+        premium_mode: bool,
+        is_formatting_instruction: bool,
+        continuous_mode: bool,
+        parsing_instruction: str,
+        fast_mode: bool,
+        formatting_instruction: str,
     ) -> ParsingJob:
         """
         Upload a file to s3 and create a job. return a job id
@@ -1222,6 +1264,8 @@ class AsyncParsingClient:
 
             - file: typing.Optional[str].
 
+            - adaptive_long_table: bool.
+
             - annotate_links: bool.
 
             - auto_mode: bool.
@@ -1250,11 +1294,7 @@ class AsyncParsingClient:
 
             - bbox_top: float.
 
-            - complemental_formatting_instruction: str.
-
-            - content_guideline_instruction: str.
-
-            - continuous_mode: bool.
+            - compact_markdown_table: bool.
 
             - disable_ocr: bool.
 
@@ -1268,10 +1308,6 @@ class AsyncParsingClient:
 
             - extract_charts: bool.
 
-            - fast_mode: bool.
-
-            - formatting_instruction: str.
-
             - guess_xlsx_sheet_name: bool.
 
             - html_make_all_elements_visible: bool.
@@ -1290,8 +1326,6 @@ class AsyncParsingClient:
 
             - invalidate_cache: bool.
 
-            - is_formatting_instruction: bool.
-
             - language: typing.List[ParserLanguages].
 
             - extract_layout: bool.
@@ -1310,9 +1344,7 @@ class AsyncParsingClient:
 
             - page_suffix: str.
 
-            - parsing_instruction: str.
-
-            - premium_mode: bool.
+            - preserve_layout_alignment_across_pages: bool.
 
             - skip_diagonal_text: bool.
 
@@ -1328,19 +1360,21 @@ class AsyncParsingClient:
 
             - target_pages: str.
 
-            - use_vendor_multimodal_model: bool.
-
             - vendor_multimodal_api_key: str.
 
             - vendor_multimodal_model_name: str.
 
+            - model: str.
+
             - webhook_url: str.
 
-            - bounding_box: str.
+            - parse_mode: typing.Optional[ParsingMode].
 
-            - gpt_4_o_mode: bool.
+            - system_prompt: str.
 
-            - gpt_4_o_api_key: str.
+            - system_prompt_append: str.
+
+            - user_prompt: str.
 
             - job_timeout_in_seconds: float.
 
@@ -1357,8 +1391,33 @@ class AsyncParsingClient:
             - ignore_document_elements_for_layout_detection: bool.
 
             - output_tables_as_html: bool.
+
+            - use_vendor_multimodal_model: bool.
+
+            - bounding_box: str.
+
+            - gpt_4_o_mode: bool.
+
+            - gpt_4_o_api_key: str.
+
+            - complemental_formatting_instruction: str.
+
+            - content_guideline_instruction: str.
+
+            - premium_mode: bool.
+
+            - is_formatting_instruction: bool.
+
+            - continuous_mode: bool.
+
+            - parsing_instruction: str.
+
+            - fast_mode: bool.
+
+            - formatting_instruction: str.
         """
         _request: typing.Dict[str, typing.Any] = {
+            "adaptive_long_table": adaptive_long_table,
             "annotate_links": annotate_links,
             "auto_mode": auto_mode,
             "auto_mode_trigger_on_image_in_page": auto_mode_trigger_on_image_in_page,
@@ -1373,17 +1432,13 @@ class AsyncParsingClient:
             "bbox_left": bbox_left,
             "bbox_right": bbox_right,
             "bbox_top": bbox_top,
-            "complemental_formatting_instruction": complemental_formatting_instruction,
-            "content_guideline_instruction": content_guideline_instruction,
-            "continuous_mode": continuous_mode,
+            "compact_markdown_table": compact_markdown_table,
             "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,
-            "formatting_instruction": formatting_instruction,
             "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,
@@ -1393,7 +1448,6 @@ class AsyncParsingClient:
             "input_s3_region": input_s_3_region,
             "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,
@@ -1402,8 +1456,7 @@ class AsyncParsingClient:
             "page_prefix": page_prefix,
             "page_separator": page_separator,
             "page_suffix": page_suffix,
-            "parsing_instruction": parsing_instruction,
-            "premium_mode": premium_mode,
+            "preserve_layout_alignment_across_pages": preserve_layout_alignment_across_pages,
             "skip_diagonal_text": skip_diagonal_text,
             "spreadsheet_extract_sub_tables": spreadsheet_extract_sub_tables,
             "structured_output": structured_output,
@@ -1411,13 +1464,13 @@ class AsyncParsingClient:
             "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,
+            "model": model,
             "webhook_url": webhook_url,
-            "bounding_box": bounding_box,
-            "gpt4o_mode": gpt_4_o_mode,
-            "gpt4o_api_key": gpt_4_o_api_key,
+            "system_prompt": system_prompt,
+            "system_prompt_append": system_prompt_append,
+            "user_prompt": user_prompt,
             "job_timeout_in_seconds": job_timeout_in_seconds,
             "job_timeout_extra_time_per_page_in_seconds": job_timeout_extra_time_per_page_in_seconds,
             "strict_mode_image_extraction": strict_mode_image_extraction,
@@ -1426,11 +1479,25 @@ class AsyncParsingClient:
             "strict_mode_buggy_font": strict_mode_buggy_font,
             "ignore_document_elements_for_layout_detection": ignore_document_elements_for_layout_detection,
             "output_tables_as_HTML": output_tables_as_html,
+            "use_vendor_multimodal_model": use_vendor_multimodal_model,
+            "bounding_box": bounding_box,
+            "gpt4o_mode": gpt_4_o_mode,
+            "gpt4o_api_key": gpt_4_o_api_key,
+            "complemental_formatting_instruction": complemental_formatting_instruction,
+            "content_guideline_instruction": content_guideline_instruction,
+            "premium_mode": premium_mode,
+            "is_formatting_instruction": is_formatting_instruction,
+            "continuous_mode": continuous_mode,
+            "parsing_instruction": parsing_instruction,
+            "fast_mode": fast_mode,
+            "formatting_instruction": formatting_instruction,
         }
         if file is not OMIT:
             _request["file"] = file
         if max_pages is not OMIT:
             _request["max_pages"] = max_pages
+        if parse_mode is not OMIT:
+            _request["parse_mode"] = parse_mode
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/upload"),