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

llama_cloud/__init__.py

@@ -112,12 +112,9 @@ from .types import (
     ExtractResultsetExtractionMetadataValue,
     ExtractRun,
     ExtractRunDataSchemaValue,
+    ExtractRunDataValue,
+    ExtractRunExtractionMetadataValue,
     ExtractState,
-    ExtractionJob,
-    ExtractionResult,
-    ExtractionResultDataValue,
-    ExtractionSchema,
-    ExtractionSchemaDataSchemaValue,
     File,
     FilePermissionInfoValue,
     FileResourceInfoValue,
@@ -304,8 +301,6 @@ from .resources import (
     EmbeddingModelConfigCreateEmbeddingConfig_VertexaiEmbedding,
     ExtractAgentCreateDataSchemaValue,
     ExtractAgentUpdateDataSchemaValue,
-    ExtractionSchemaCreateDataSchemaValue,
-    ExtractionSchemaUpdateDataSchemaValue,
     FileCreateFromUrlResourceInfoValue,
     FileCreatePermissionInfoValue,
     FileCreateResourceInfoValue,
@@ -326,7 +321,6 @@ from .resources import (
     data_sources,
     embedding_model_configs,
     evals,
-    extraction,
     files,
     jobs,
     llama_extract,
@@ -464,14 +458,9 @@ __all__ = [
     "ExtractResultsetExtractionMetadataValue",
     "ExtractRun",
     "ExtractRunDataSchemaValue",
+    "ExtractRunDataValue",
+    "ExtractRunExtractionMetadataValue",
     "ExtractState",
-    "ExtractionJob",
-    "ExtractionResult",
-    "ExtractionResultDataValue",
-    "ExtractionSchema",
-    "ExtractionSchemaCreateDataSchemaValue",
-    "ExtractionSchemaDataSchemaValue",
-    "ExtractionSchemaUpdateDataSchemaValue",
     "File",
     "FileCreateFromUrlResourceInfoValue",
     "FileCreatePermissionInfoValue",
@@ -664,7 +653,6 @@ __all__ = [
     "data_sources",
     "embedding_model_configs",
     "evals",
-    "extraction",
     "files",
     "jobs",
     "llama_extract",

llama_cloud/client.py

@@ -12,7 +12,6 @@ from .resources.data_sinks.client import AsyncDataSinksClient, DataSinksClient
 from .resources.data_sources.client import AsyncDataSourcesClient, DataSourcesClient
 from .resources.embedding_model_configs.client import AsyncEmbeddingModelConfigsClient, EmbeddingModelConfigsClient
 from .resources.evals.client import AsyncEvalsClient, EvalsClient
-from .resources.extraction.client import AsyncExtractionClient, ExtractionClient
 from .resources.files.client import AsyncFilesClient, FilesClient
 from .resources.jobs.client import AsyncJobsClient, JobsClient
 from .resources.llama_extract.client import AsyncLlamaExtractClient, LlamaExtractClient
@@ -52,7 +51,6 @@ class LlamaCloud:
         self.parsing = ParsingClient(client_wrapper=self._client_wrapper)
         self.component_definitions = ComponentDefinitionsClient(client_wrapper=self._client_wrapper)
         self.chat_apps = ChatAppsClient(client_wrapper=self._client_wrapper)
-        self.extraction = ExtractionClient(client_wrapper=self._client_wrapper)
         self.llama_extract = LlamaExtractClient(client_wrapper=self._client_wrapper)
         self.reports = ReportsClient(client_wrapper=self._client_wrapper)
 
@@ -85,7 +83,6 @@ class AsyncLlamaCloud:
         self.parsing = AsyncParsingClient(client_wrapper=self._client_wrapper)
         self.component_definitions = AsyncComponentDefinitionsClient(client_wrapper=self._client_wrapper)
         self.chat_apps = AsyncChatAppsClient(client_wrapper=self._client_wrapper)
-        self.extraction = AsyncExtractionClient(client_wrapper=self._client_wrapper)
         self.llama_extract = AsyncLlamaExtractClient(client_wrapper=self._client_wrapper)
         self.reports = AsyncReportsClient(client_wrapper=self._client_wrapper)
 

llama_cloud/resources/__init__.py

@@ -7,7 +7,6 @@ from . import (
     data_sources,
     embedding_model_configs,
     evals,
-    extraction,
     files,
     jobs,
     llama_extract,
@@ -30,7 +29,6 @@ from .embedding_model_configs import (
     EmbeddingModelConfigCreateEmbeddingConfig_OpenaiEmbedding,
     EmbeddingModelConfigCreateEmbeddingConfig_VertexaiEmbedding,
 )
-from .extraction import ExtractionSchemaCreateDataSchemaValue, ExtractionSchemaUpdateDataSchemaValue
 from .files import FileCreateFromUrlResourceInfoValue, FileCreatePermissionInfoValue, FileCreateResourceInfoValue
 from .llama_extract import ExtractAgentCreateDataSchemaValue, ExtractAgentUpdateDataSchemaValue
 from .pipelines import (
@@ -61,8 +59,6 @@ __all__ = [
     "EmbeddingModelConfigCreateEmbeddingConfig_VertexaiEmbedding",
     "ExtractAgentCreateDataSchemaValue",
     "ExtractAgentUpdateDataSchemaValue",
-    "ExtractionSchemaCreateDataSchemaValue",
-    "ExtractionSchemaUpdateDataSchemaValue",
     "FileCreateFromUrlResourceInfoValue",
     "FileCreatePermissionInfoValue",
     "FileCreateResourceInfoValue",
@@ -83,7 +79,6 @@ __all__ = [
     "data_sources",
     "embedding_model_configs",
     "evals",
-    "extraction",
     "files",
     "jobs",
     "llama_extract",

llama_cloud/resources/files/client.py

@@ -187,6 +187,7 @@ class FilesClient:
     def generate_presigned_url(
         self,
         *,
+        expires_at_seconds: typing.Optional[int] = None,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
         name: str,
@@ -201,6 +202,8 @@ class FilesClient:
         Create a presigned url for uploading a file.
 
         Parameters:
+            - expires_at_seconds: typing.Optional[int].
+
             - project_id: typing.Optional[str].
 
             - organization_id: typing.Optional[str].
@@ -244,7 +247,9 @@ class FilesClient:
         _response = self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/files"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict(
+                {"expires_at_seconds": expires_at_seconds, "project_id": project_id, "organization_id": organization_id}
+            ),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -370,7 +375,12 @@ class FilesClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def read_file_content(
-        self, id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+        self,
+        id: str,
+        *,
+        expires_at_seconds: typing.Optional[int] = None,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
     ) -> PresignedUrl:
         """
         Returns a presigned url to read the file content.
@@ -378,6 +388,8 @@ class FilesClient:
         Parameters:
             - id: str.
 
+            - expires_at_seconds: typing.Optional[int].
+
             - project_id: typing.Optional[str].
 
             - organization_id: typing.Optional[str].
@@ -394,7 +406,9 @@ class FilesClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/files/{id}/content"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict(
+                {"expires_at_seconds": expires_at_seconds, "project_id": project_id, "organization_id": organization_id}
+            ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -788,6 +802,7 @@ class AsyncFilesClient:
     async def generate_presigned_url(
         self,
         *,
+        expires_at_seconds: typing.Optional[int] = None,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
         name: str,
@@ -802,6 +817,8 @@ class AsyncFilesClient:
         Create a presigned url for uploading a file.
 
         Parameters:
+            - expires_at_seconds: typing.Optional[int].
+
             - project_id: typing.Optional[str].
 
             - organization_id: typing.Optional[str].
@@ -845,7 +862,9 @@ class AsyncFilesClient:
         _response = await self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/files"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict(
+                {"expires_at_seconds": expires_at_seconds, "project_id": project_id, "organization_id": organization_id}
+            ),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -971,7 +990,12 @@ class AsyncFilesClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def read_file_content(
-        self, id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+        self,
+        id: str,
+        *,
+        expires_at_seconds: typing.Optional[int] = None,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
     ) -> PresignedUrl:
         """
         Returns a presigned url to read the file content.
@@ -979,6 +1003,8 @@ class AsyncFilesClient:
         Parameters:
             - id: str.
 
+            - expires_at_seconds: typing.Optional[int].
+
             - project_id: typing.Optional[str].
 
             - organization_id: typing.Optional[str].
@@ -995,7 +1021,9 @@ class AsyncFilesClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/files/{id}/content"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict(
+                {"expires_at_seconds": expires_at_seconds, "project_id": project_id, "organization_id": organization_id}
+            ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )