llama-cloud 0.1.33__py3-none-any.whl → 0.1.35__py3-none-any.whl

llama_cloud/resources/files/client.py

@@ -207,6 +207,9 @@ class FilesClient:
         """
         Create a presigned url for uploading a file.
 
+        The presigned url is valid for a limited time period, after which it will expire.
+        Be careful on accidental exposure of the presigned url, as it may allow unauthorized access to the file before the expiration.
+
         Parameters:
             - expires_at_seconds: typing.Optional[int].
 
@@ -658,6 +661,116 @@ class FilesClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def generate_file_page_screenshot_presigned_url(
+        self,
+        id: str,
+        page_index: int,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+    ) -> PresignedUrl:
+        """
+        Returns a presigned url to read a page screenshot.
+
+        The presigned url is valid for a limited time period, after which it will expire.
+        Be careful on accidental exposure of the presigned url, as it may allow unauthorized access to the file before the expiration.
+
+        Parameters:
+            - id: str.
+
+            - page_index: int.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.files.generate_file_page_screenshot_presigned_url(
+            id="string",
+            page_index=1,
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/files/{id}/page_screenshots/{page_index}/presigned_url",
+            ),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(PresignedUrl, _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 generate_file_page_figure_presigned_url(
+        self,
+        id: str,
+        page_index: int,
+        figure_name: str,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+    ) -> PresignedUrl:
+        """
+        Returns a presigned url to read a page figure.
+
+        The presigned url is valid for a limited time period, after which it will expire.
+        Be careful on accidental exposure of the presigned url, as it may allow unauthorized access to the file before the expiration.
+
+        Parameters:
+            - id: str.
+
+            - page_index: int.
+
+            - figure_name: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.files.generate_file_page_figure_presigned_url(
+            id="string",
+            page_index=1,
+            figure_name="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/files/{id}/page-figures/{page_index}/{figure_name}/presigned_url",
+            ),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(PresignedUrl, _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)
+
 
 class AsyncFilesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -834,6 +947,9 @@ class AsyncFilesClient:
         """
         Create a presigned url for uploading a file.
 
+        The presigned url is valid for a limited time period, after which it will expire.
+        Be careful on accidental exposure of the presigned url, as it may allow unauthorized access to the file before the expiration.
+
         Parameters:
             - expires_at_seconds: typing.Optional[int].
 
@@ -1284,3 +1400,113 @@ class AsyncFilesClient:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    async def generate_file_page_screenshot_presigned_url(
+        self,
+        id: str,
+        page_index: int,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+    ) -> PresignedUrl:
+        """
+        Returns a presigned url to read a page screenshot.
+
+        The presigned url is valid for a limited time period, after which it will expire.
+        Be careful on accidental exposure of the presigned url, as it may allow unauthorized access to the file before the expiration.
+
+        Parameters:
+            - id: str.
+
+            - page_index: int.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.files.generate_file_page_screenshot_presigned_url(
+            id="string",
+            page_index=1,
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/files/{id}/page_screenshots/{page_index}/presigned_url",
+            ),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(PresignedUrl, _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 generate_file_page_figure_presigned_url(
+        self,
+        id: str,
+        page_index: int,
+        figure_name: str,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+    ) -> PresignedUrl:
+        """
+        Returns a presigned url to read a page figure.
+
+        The presigned url is valid for a limited time period, after which it will expire.
+        Be careful on accidental exposure of the presigned url, as it may allow unauthorized access to the file before the expiration.
+
+        Parameters:
+            - id: str.
+
+            - page_index: int.
+
+            - figure_name: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.files.generate_file_page_figure_presigned_url(
+            id="string",
+            page_index=1,
+            figure_name="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/files/{id}/page-figures/{page_index}/{figure_name}/presigned_url",
+            ),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(PresignedUrl, _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)

llama_cloud/resources/llama_extract/__init__.py

@@ -9,6 +9,8 @@ from .types import (
     ExtractJobCreateBatchDataSchemaOverrideZeroValue,
     ExtractSchemaValidateRequestDataSchema,
     ExtractSchemaValidateRequestDataSchemaZeroValue,
+    ExtractStatelessRequestDataSchema,
+    ExtractStatelessRequestDataSchemaZeroValue,
 )
 
 __all__ = [
@@ -20,4 +22,6 @@ __all__ = [
     "ExtractJobCreateBatchDataSchemaOverrideZeroValue",
     "ExtractSchemaValidateRequestDataSchema",
     "ExtractSchemaValidateRequestDataSchemaZeroValue",
+    "ExtractStatelessRequestDataSchema",
+    "ExtractStatelessRequestDataSchemaZeroValue",
 ]

llama_cloud/resources/llama_extract/client.py

@@ -17,13 +17,16 @@ from ...types.extract_resultset import ExtractResultset
 from ...types.extract_run import ExtractRun
 from ...types.extract_schema_generate_response import ExtractSchemaGenerateResponse
 from ...types.extract_schema_validate_response import ExtractSchemaValidateResponse
+from ...types.file_data import FileData
 from ...types.http_validation_error import HttpValidationError
 from ...types.llama_extract_settings import LlamaExtractSettings
 from ...types.paginated_extract_runs_response import PaginatedExtractRunsResponse
+from ...types.webhook_configuration import WebhookConfiguration
 from .types.extract_agent_create_data_schema import ExtractAgentCreateDataSchema
 from .types.extract_agent_update_data_schema import ExtractAgentUpdateDataSchema
 from .types.extract_job_create_batch_data_schema_override import ExtractJobCreateBatchDataSchemaOverride
 from .types.extract_schema_validate_request_data_schema import ExtractSchemaValidateRequestDataSchema
+from .types.extract_stateless_request_data_schema import ExtractStatelessRequestDataSchema
 
 try:
     import pydantic
@@ -517,6 +520,7 @@ class LlamaExtractClient:
             LlamaExtractSettings,
             LlamaParseParameters,
             LlamaParseParametersPriority,
+            MultimodalParseResolution,
             ParsingMode,
         )
         from llama_cloud.client import LlamaCloud
@@ -542,6 +546,7 @@ class LlamaExtractClient:
                     parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
                     replace_failed_page_mode=FailPageMode.RAW_TEXT,
                 ),
+                multimodal_parse_resolution=MultimodalParseResolution.MEDIUM,
             ),
         )
         """
@@ -895,6 +900,92 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def extract_stateless(
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        webhook_configurations: typing.Optional[typing.List[WebhookConfiguration]] = OMIT,
+        data_schema: ExtractStatelessRequestDataSchema,
+        config: ExtractConfig,
+        file_id: typing.Optional[str] = OMIT,
+        text: typing.Optional[str] = OMIT,
+        file: typing.Optional[FileData] = OMIT,
+    ) -> ExtractJob:
+        """
+        Stateless extraction endpoint that uses a default extraction agent in the user's default project.
+        Requires data_schema, config, and either file_id, text, or base64 encoded file data.
+
+        Parameters:
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
+
+            - webhook_configurations: typing.Optional[typing.List[WebhookConfiguration]].
+
+            - data_schema: ExtractStatelessRequestDataSchema. The schema of the data to extract
+
+            - config: ExtractConfig. The configuration parameters for the extraction
+
+            - file_id: typing.Optional[str].
+
+            - text: typing.Optional[str].
+
+            - file: typing.Optional[FileData].
+        ---
+        from llama_cloud import (
+            DocumentChunkMode,
+            ExtractConfig,
+            ExtractConfigPriority,
+            ExtractMode,
+            ExtractTarget,
+            FileData,
+        )
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.llama_extract.extract_stateless(
+            config=ExtractConfig(
+                priority=ExtractConfigPriority.LOW,
+                extraction_target=ExtractTarget.PER_DOC,
+                extraction_mode=ExtractMode.FAST,
+                chunk_mode=DocumentChunkMode.PAGE,
+            ),
+            file=FileData(
+                data="string",
+                mime_type="string",
+            ),
+        )
+        """
+        _request: typing.Dict[str, typing.Any] = {"data_schema": data_schema, "config": config}
+        if webhook_configurations is not OMIT:
+            _request["webhook_configurations"] = webhook_configurations
+        if file_id is not OMIT:
+            _request["file_id"] = file_id
+        if text is not OMIT:
+            _request["text"] = text
+        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/extraction/run"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            json=jsonable_encoder(_request),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractJob, _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)
+
 
 class AsyncLlamaExtractClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -1376,6 +1467,7 @@ class AsyncLlamaExtractClient:
             LlamaExtractSettings,
             LlamaParseParameters,
             LlamaParseParametersPriority,
+            MultimodalParseResolution,
             ParsingMode,
         )
         from llama_cloud.client import AsyncLlamaCloud
@@ -1401,6 +1493,7 @@ class AsyncLlamaExtractClient:
                     parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
                     replace_failed_page_mode=FailPageMode.RAW_TEXT,
                 ),
+                multimodal_parse_resolution=MultimodalParseResolution.MEDIUM,
             ),
         )
         """
@@ -1753,3 +1846,89 @@ class AsyncLlamaExtractClient:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    async def extract_stateless(
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        webhook_configurations: typing.Optional[typing.List[WebhookConfiguration]] = OMIT,
+        data_schema: ExtractStatelessRequestDataSchema,
+        config: ExtractConfig,
+        file_id: typing.Optional[str] = OMIT,
+        text: typing.Optional[str] = OMIT,
+        file: typing.Optional[FileData] = OMIT,
+    ) -> ExtractJob:
+        """
+        Stateless extraction endpoint that uses a default extraction agent in the user's default project.
+        Requires data_schema, config, and either file_id, text, or base64 encoded file data.
+
+        Parameters:
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
+
+            - webhook_configurations: typing.Optional[typing.List[WebhookConfiguration]].
+
+            - data_schema: ExtractStatelessRequestDataSchema. The schema of the data to extract
+
+            - config: ExtractConfig. The configuration parameters for the extraction
+
+            - file_id: typing.Optional[str].
+
+            - text: typing.Optional[str].
+
+            - file: typing.Optional[FileData].
+        ---
+        from llama_cloud import (
+            DocumentChunkMode,
+            ExtractConfig,
+            ExtractConfigPriority,
+            ExtractMode,
+            ExtractTarget,
+            FileData,
+        )
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.extract_stateless(
+            config=ExtractConfig(
+                priority=ExtractConfigPriority.LOW,
+                extraction_target=ExtractTarget.PER_DOC,
+                extraction_mode=ExtractMode.FAST,
+                chunk_mode=DocumentChunkMode.PAGE,
+            ),
+            file=FileData(
+                data="string",
+                mime_type="string",
+            ),
+        )
+        """
+        _request: typing.Dict[str, typing.Any] = {"data_schema": data_schema, "config": config}
+        if webhook_configurations is not OMIT:
+            _request["webhook_configurations"] = webhook_configurations
+        if file_id is not OMIT:
+            _request["file_id"] = file_id
+        if text is not OMIT:
+            _request["text"] = text
+        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/extraction/run"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            json=jsonable_encoder(_request),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractJob, _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)

llama_cloud/resources/llama_extract/types/__init__.py

@@ -8,6 +8,8 @@ from .extract_job_create_batch_data_schema_override import ExtractJobCreateBatch
 from .extract_job_create_batch_data_schema_override_zero_value import ExtractJobCreateBatchDataSchemaOverrideZeroValue
 from .extract_schema_validate_request_data_schema import ExtractSchemaValidateRequestDataSchema
 from .extract_schema_validate_request_data_schema_zero_value import ExtractSchemaValidateRequestDataSchemaZeroValue
+from .extract_stateless_request_data_schema import ExtractStatelessRequestDataSchema
+from .extract_stateless_request_data_schema_zero_value import ExtractStatelessRequestDataSchemaZeroValue
 
 __all__ = [
     "ExtractAgentCreateDataSchema",
@@ -18,4 +20,6 @@ __all__ = [
     "ExtractJobCreateBatchDataSchemaOverrideZeroValue",
     "ExtractSchemaValidateRequestDataSchema",
     "ExtractSchemaValidateRequestDataSchemaZeroValue",
+    "ExtractStatelessRequestDataSchema",
+    "ExtractStatelessRequestDataSchemaZeroValue",
 ]

llama_cloud/resources/llama_extract/types/extract_stateless_request_data_schema.py

@@ -0,0 +1,9 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+from .extract_stateless_request_data_schema_zero_value import ExtractStatelessRequestDataSchemaZeroValue
+
+ExtractStatelessRequestDataSchema = typing.Union[
+    typing.Dict[str, typing.Optional[ExtractStatelessRequestDataSchemaZeroValue]], str
+]

llama_cloud/resources/llama_extract/types/extract_stateless_request_data_schema_zero_value.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+ExtractStatelessRequestDataSchemaZeroValue = typing.Union[
+    typing.Dict[str, typing.Any], typing.List[typing.Any], str, int, float, bool
+]

llama_cloud/resources/organizations/client.py

@@ -298,13 +298,13 @@ class OrganizationsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get_organization_usage(
-        self, organization_id: typing.Optional[str], *, get_current_invoice_total: typing.Optional[bool] = None
+        self, organization_id: str, *, get_current_invoice_total: typing.Optional[bool] = None
     ) -> UsageAndPlan:
         """
         Get usage for a specific organization.
 
         Parameters:
-            - organization_id: typing.Optional[str].
+            - organization_id: str.
 
             - get_current_invoice_total: typing.Optional[bool].
         ---
@@ -313,7 +313,9 @@ class OrganizationsClient:
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.organizations.get_organization_usage()
+        client.organizations.get_organization_usage(
+            organization_id="string",
+        )
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
@@ -1004,13 +1006,13 @@ class AsyncOrganizationsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get_organization_usage(
-        self, organization_id: typing.Optional[str], *, get_current_invoice_total: typing.Optional[bool] = None
+        self, organization_id: str, *, get_current_invoice_total: typing.Optional[bool] = None
     ) -> UsageAndPlan:
         """
         Get usage for a specific organization.
 
         Parameters:
-            - organization_id: typing.Optional[str].
+            - organization_id: str.
 
             - get_current_invoice_total: typing.Optional[bool].
         ---
@@ -1019,7 +1021,9 @@ class AsyncOrganizationsClient:
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.organizations.get_organization_usage()
+        await client.organizations.get_organization_usage(
+            organization_id="string",
+        )
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",