llama-cloud 0.1.11__py3-none-any.whl → 0.1.13__py3-none-any.whl

llama_cloud/__init__.py

@@ -16,7 +16,6 @@ from .types import (
     AutoTransformConfig,
     AzureOpenAiEmbedding,
     AzureOpenAiEmbeddingConfig,
-    Base,
     BasePromptTemplate,
     BedrockEmbedding,
     BedrockEmbeddingConfig,
@@ -26,6 +25,7 @@ from .types import (
     ChatApp,
     ChatAppResponse,
     ChatData,
+    ChunkMode,
     CloudAzStorageBlobDataSource,
     CloudAzureAiSearchVectorStore,
     CloudBoxDataSource,
@@ -190,6 +190,7 @@ from .types import (
     ParsingJobMarkdownResult,
     ParsingJobStructuredResult,
     ParsingJobTextResult,
+    ParsingMode,
     ParsingUsage,
     PartitionNames,
     Permission,
@@ -239,6 +240,7 @@ from .types import (
     ProgressEventStatus,
     Project,
     ProjectCreate,
+    PromptConf,
     PromptMixinPrompts,
     PromptSpec,
     PydanticProgramMode,
@@ -254,7 +256,6 @@ from .types import (
     ReportEventItemEventData_ReportBlockUpdate,
     ReportEventItemEventData_ReportStateUpdate,
     ReportEventType,
-    ReportFileInfo,
     ReportMetadata,
     ReportPlan,
     ReportPlanBlock,
@@ -269,10 +270,13 @@ from .types import (
     RetrieverCreate,
     RetrieverPipeline,
     Role,
+    SchemaRelaxMode,
     SemanticChunkingConfig,
     SentenceChunkingConfig,
     SentenceSplitter,
     StatusEnum,
+    StructMode,
+    StructParseConf,
     SupportedLlmModel,
     SupportedLlmModelNames,
     TextBlock,
@@ -362,7 +366,6 @@ __all__ = [
     "AutoTransformConfig",
     "AzureOpenAiEmbedding",
     "AzureOpenAiEmbeddingConfig",
-    "Base",
     "BasePromptTemplate",
     "BedrockEmbedding",
     "BedrockEmbeddingConfig",
@@ -372,6 +375,7 @@ __all__ = [
     "ChatApp",
     "ChatAppResponse",
     "ChatData",
+    "ChunkMode",
     "CloudAzStorageBlobDataSource",
     "CloudAzureAiSearchVectorStore",
     "CloudBoxDataSource",
@@ -557,6 +561,7 @@ __all__ = [
     "ParsingJobMarkdownResult",
     "ParsingJobStructuredResult",
     "ParsingJobTextResult",
+    "ParsingMode",
     "ParsingUsage",
     "PartitionNames",
     "Permission",
@@ -616,6 +621,7 @@ __all__ = [
     "ProgressEventStatus",
     "Project",
     "ProjectCreate",
+    "PromptConf",
     "PromptMixinPrompts",
     "PromptSpec",
     "PydanticProgramMode",
@@ -631,7 +637,6 @@ __all__ = [
     "ReportEventItemEventData_ReportBlockUpdate",
     "ReportEventItemEventData_ReportStateUpdate",
     "ReportEventType",
-    "ReportFileInfo",
     "ReportMetadata",
     "ReportPlan",
     "ReportPlanBlock",
@@ -646,10 +651,13 @@ __all__ = [
     "RetrieverCreate",
     "RetrieverPipeline",
     "Role",
+    "SchemaRelaxMode",
     "SemanticChunkingConfig",
     "SentenceChunkingConfig",
     "SentenceSplitter",
     "StatusEnum",
+    "StructMode",
+    "StructParseConf",
     "SupportedLlmModel",
     "SupportedLlmModelNames",
     "TextBlock",

llama_cloud/resources/files/client.py

@@ -151,6 +151,7 @@ class FilesClient:
     def upload_file(
         self,
         *,
+        external_file_id: typing.Optional[str] = None,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
         upload_file: typing.IO,
@@ -159,6 +160,8 @@ class FilesClient:
         Upload a file to S3.
 
         Parameters:
+            - external_file_id: typing.Optional[str].
+
             - project_id: typing.Optional[str].
 
             - organization_id: typing.Optional[str].
@@ -168,7 +171,9 @@ class FilesClient:
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             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(
+                {"external_file_id": external_file_id, "project_id": project_id, "organization_id": organization_id}
+            ),
             data=jsonable_encoder({}),
             files={"upload_file": upload_file},
             headers=self._client_wrapper.get_headers(),
@@ -766,6 +771,7 @@ class AsyncFilesClient:
     async def upload_file(
         self,
         *,
+        external_file_id: typing.Optional[str] = None,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
         upload_file: typing.IO,
@@ -774,6 +780,8 @@ class AsyncFilesClient:
         Upload a file to S3.
 
         Parameters:
+            - external_file_id: typing.Optional[str].
+
             - project_id: typing.Optional[str].
 
             - organization_id: typing.Optional[str].
@@ -783,7 +791,9 @@ class AsyncFilesClient:
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             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(
+                {"external_file_id": external_file_id, "project_id": project_id, "organization_id": organization_id}
+            ),
             data=jsonable_encoder({}),
             files={"upload_file": upload_file},
             headers=self._client_wrapper.get_headers(),

llama_cloud/resources/llama_extract/client.py

@@ -417,12 +417,14 @@ class LlamaExtractClient:
             - extract_settings: typing.Optional[LlamaExtractSettings].
         ---
         from llama_cloud import (
+            ChunkMode,
             ExtractConfig,
             ExtractJobCreate,
             ExtractMode,
             ExtractTarget,
             LlamaExtractSettings,
             LlamaParseParameters,
+            ParsingMode,
         )
         from llama_cloud.client import LlamaCloud
 
@@ -439,7 +441,10 @@ class LlamaExtractClient:
                 ),
             ),
             extract_settings=LlamaExtractSettings(
-                llama_parse_params=LlamaParseParameters(),
+                chunk_mode=ChunkMode.PAGE,
+                llama_parse_params=LlamaParseParameters(
+                    parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
+                ),
             ),
         )
         """
@@ -517,12 +522,14 @@ class LlamaExtractClient:
             - extract_settings: typing.Optional[LlamaExtractSettings].
         ---
         from llama_cloud import (
+            ChunkMode,
             ExtractConfig,
             ExtractJobCreate,
             ExtractMode,
             ExtractTarget,
             LlamaExtractSettings,
             LlamaParseParameters,
+            ParsingMode,
         )
         from llama_cloud.client import LlamaCloud
 
@@ -539,7 +546,10 @@ class LlamaExtractClient:
                 ),
             ),
             extract_settings=LlamaExtractSettings(
-                llama_parse_params=LlamaParseParameters(),
+                chunk_mode=ChunkMode.PAGE,
+                llama_parse_params=LlamaParseParameters(
+                    parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
+                ),
             ),
         )
         """
@@ -1072,12 +1082,14 @@ class AsyncLlamaExtractClient:
             - extract_settings: typing.Optional[LlamaExtractSettings].
         ---
         from llama_cloud import (
+            ChunkMode,
             ExtractConfig,
             ExtractJobCreate,
             ExtractMode,
             ExtractTarget,
             LlamaExtractSettings,
             LlamaParseParameters,
+            ParsingMode,
         )
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1094,7 +1106,10 @@ class AsyncLlamaExtractClient:
                 ),
             ),
             extract_settings=LlamaExtractSettings(
-                llama_parse_params=LlamaParseParameters(),
+                chunk_mode=ChunkMode.PAGE,
+                llama_parse_params=LlamaParseParameters(
+                    parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
+                ),
             ),
         )
         """
@@ -1172,12 +1187,14 @@ class AsyncLlamaExtractClient:
             - extract_settings: typing.Optional[LlamaExtractSettings].
         ---
         from llama_cloud import (
+            ChunkMode,
             ExtractConfig,
             ExtractJobCreate,
             ExtractMode,
             ExtractTarget,
             LlamaExtractSettings,
             LlamaParseParameters,
+            ParsingMode,
         )
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1194,7 +1211,10 @@ class AsyncLlamaExtractClient:
                 ),
             ),
             extract_settings=LlamaExtractSettings(
-                llama_parse_params=LlamaParseParameters(),
+                chunk_mode=ChunkMode.PAGE,
+                llama_parse_params=LlamaParseParameters(
+                    parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
+                ),
             ),
         )
         """