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

llama_cloud/__init__.py

@@ -70,6 +70,7 @@ from .types import (
     DataSourceCustomMetadataValue,
     DataSourceDefinition,
     EditSuggestion,
+    EditSuggestionBlocksItem,
     ElementSegmentationConfig,
     EmbeddingModelConfig,
     EmbeddingModelConfigEmbeddingConfig,
@@ -103,7 +104,8 @@ from .types import (
     ExtractConfig,
     ExtractJob,
     ExtractJobCreate,
-    ExtractJobCreateDataSchemaOverrideValue,
+    ExtractJobCreateDataSchemaOverride,
+    ExtractJobCreateDataSchemaOverrideZeroValue,
     ExtractMode,
     ExtractResultset,
     ExtractResultsetData,
@@ -111,10 +113,15 @@ from .types import (
     ExtractResultsetDataZeroValue,
     ExtractResultsetExtractionMetadataValue,
     ExtractRun,
+    ExtractRunData,
+    ExtractRunDataItemValue,
     ExtractRunDataSchemaValue,
-    ExtractRunDataValue,
+    ExtractRunDataZeroValue,
     ExtractRunExtractionMetadataValue,
+    ExtractSchemaValidateResponse,
+    ExtractSchemaValidateResponseDataSchemaValue,
     ExtractState,
+    ExtractTarget,
     File,
     FilePermissionInfoValue,
     FileResourceInfoValue,
@@ -225,6 +232,7 @@ from .types import (
     Plan,
     PlaygroundSession,
     Pooling,
+    PresetCompositeRetrievalParams,
     PresetRetrievalParams,
     PresignedUrl,
     ProgressEvent,
@@ -246,6 +254,7 @@ from .types import (
     ReportEventItemEventData_ReportBlockUpdate,
     ReportEventItemEventData_ReportStateUpdate,
     ReportEventType,
+    ReportFileInfo,
     ReportMetadata,
     ReportPlan,
     ReportPlanBlock,
@@ -299,8 +308,12 @@ from .resources import (
     EmbeddingModelConfigCreateEmbeddingConfig_HuggingfaceApiEmbedding,
     EmbeddingModelConfigCreateEmbeddingConfig_OpenaiEmbedding,
     EmbeddingModelConfigCreateEmbeddingConfig_VertexaiEmbedding,
-    ExtractAgentCreateDataSchemaValue,
-    ExtractAgentUpdateDataSchemaValue,
+    ExtractAgentCreateDataSchema,
+    ExtractAgentCreateDataSchemaZeroValue,
+    ExtractAgentUpdateDataSchema,
+    ExtractAgentUpdateDataSchemaZeroValue,
+    ExtractSchemaValidateRequestDataSchema,
+    ExtractSchemaValidateRequestDataSchemaZeroValue,
     FileCreateFromUrlResourceInfoValue,
     FileCreatePermissionInfoValue,
     FileCreateResourceInfoValue,
@@ -406,6 +419,7 @@ __all__ = [
     "DataSourceUpdateComponent",
     "DataSourceUpdateCustomMetadataValue",
     "EditSuggestion",
+    "EditSuggestionBlocksItem",
     "ElementSegmentationConfig",
     "EmbeddingModelConfig",
     "EmbeddingModelConfigCreateEmbeddingConfig",
@@ -443,13 +457,16 @@ __all__ = [
     "EvalQuestionCreate",
     "EvalQuestionResult",
     "ExtractAgent",
-    "ExtractAgentCreateDataSchemaValue",
+    "ExtractAgentCreateDataSchema",
+    "ExtractAgentCreateDataSchemaZeroValue",
     "ExtractAgentDataSchemaValue",
-    "ExtractAgentUpdateDataSchemaValue",
+    "ExtractAgentUpdateDataSchema",
+    "ExtractAgentUpdateDataSchemaZeroValue",
     "ExtractConfig",
     "ExtractJob",
     "ExtractJobCreate",
-    "ExtractJobCreateDataSchemaOverrideValue",
+    "ExtractJobCreateDataSchemaOverride",
+    "ExtractJobCreateDataSchemaOverrideZeroValue",
     "ExtractMode",
     "ExtractResultset",
     "ExtractResultsetData",
@@ -457,10 +474,17 @@ __all__ = [
     "ExtractResultsetDataZeroValue",
     "ExtractResultsetExtractionMetadataValue",
     "ExtractRun",
+    "ExtractRunData",
+    "ExtractRunDataItemValue",
     "ExtractRunDataSchemaValue",
-    "ExtractRunDataValue",
+    "ExtractRunDataZeroValue",
     "ExtractRunExtractionMetadataValue",
+    "ExtractSchemaValidateRequestDataSchema",
+    "ExtractSchemaValidateRequestDataSchemaZeroValue",
+    "ExtractSchemaValidateResponse",
+    "ExtractSchemaValidateResponseDataSchemaValue",
     "ExtractState",
+    "ExtractTarget",
     "File",
     "FileCreateFromUrlResourceInfoValue",
     "FileCreatePermissionInfoValue",
@@ -585,6 +609,7 @@ __all__ = [
     "Plan",
     "PlaygroundSession",
     "Pooling",
+    "PresetCompositeRetrievalParams",
     "PresetRetrievalParams",
     "PresignedUrl",
     "ProgressEvent",
@@ -606,6 +631,7 @@ __all__ = [
     "ReportEventItemEventData_ReportBlockUpdate",
     "ReportEventItemEventData_ReportStateUpdate",
     "ReportEventType",
+    "ReportFileInfo",
     "ReportMetadata",
     "ReportPlan",
     "ReportPlanBlock",

llama_cloud/resources/__init__.py

@@ -30,7 +30,14 @@ from .embedding_model_configs import (
     EmbeddingModelConfigCreateEmbeddingConfig_VertexaiEmbedding,
 )
 from .files import FileCreateFromUrlResourceInfoValue, FileCreatePermissionInfoValue, FileCreateResourceInfoValue
-from .llama_extract import ExtractAgentCreateDataSchemaValue, ExtractAgentUpdateDataSchemaValue
+from .llama_extract import (
+    ExtractAgentCreateDataSchema,
+    ExtractAgentCreateDataSchemaZeroValue,
+    ExtractAgentUpdateDataSchema,
+    ExtractAgentUpdateDataSchemaZeroValue,
+    ExtractSchemaValidateRequestDataSchema,
+    ExtractSchemaValidateRequestDataSchemaZeroValue,
+)
 from .pipelines import (
     PipelineFileUpdateCustomMetadataValue,
     PipelineUpdateEmbeddingConfig,
@@ -57,8 +64,12 @@ __all__ = [
     "EmbeddingModelConfigCreateEmbeddingConfig_HuggingfaceApiEmbedding",
     "EmbeddingModelConfigCreateEmbeddingConfig_OpenaiEmbedding",
     "EmbeddingModelConfigCreateEmbeddingConfig_VertexaiEmbedding",
-    "ExtractAgentCreateDataSchemaValue",
-    "ExtractAgentUpdateDataSchemaValue",
+    "ExtractAgentCreateDataSchema",
+    "ExtractAgentCreateDataSchemaZeroValue",
+    "ExtractAgentUpdateDataSchema",
+    "ExtractAgentUpdateDataSchemaZeroValue",
+    "ExtractSchemaValidateRequestDataSchema",
+    "ExtractSchemaValidateRequestDataSchemaZeroValue",
     "FileCreateFromUrlResourceInfoValue",
     "FileCreatePermissionInfoValue",
     "FileCreateResourceInfoValue",

llama_cloud/resources/chat_apps/client.py

@@ -14,7 +14,7 @@ from ...types.chat_app_response import ChatAppResponse
 from ...types.http_validation_error import HttpValidationError
 from ...types.input_message import InputMessage
 from ...types.llm_parameters import LlmParameters
-from ...types.preset_retrieval_params import PresetRetrievalParams
+from ...types.preset_composite_retrieval_params import PresetCompositeRetrievalParams
 
 try:
     import pydantic
@@ -71,10 +71,9 @@ class ChatAppsClient:
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
         name: str,
-        pipeline_id: str,
+        retriever_id: str,
         llm_config: LlmParameters,
-        retrieval_config: PresetRetrievalParams,
-        chat_app_create_project_id: str,
+        retrieval_config: PresetCompositeRetrievalParams,
     ) -> ChatApp:
         """
         Create a new chat app.
@@ -84,22 +83,18 @@ class ChatAppsClient:
 
             - organization_id: typing.Optional[str].
 
-            - name: str.
+            - name: str. Name of the chat app
 
-            - pipeline_id: str.
+            - retriever_id: str. ID of the retriever to use for the chat app
 
-            - llm_config: LlmParameters.
+            - llm_config: LlmParameters. Configuration for the LLM model to use for the chat app
 
-            - retrieval_config: PresetRetrievalParams.
-
-            - chat_app_create_project_id: str.
+            - retrieval_config: PresetCompositeRetrievalParams. Configuration for the retrieval model to use for the chat app
         ---
         from llama_cloud import (
-            FilterCondition,
+            CompositeRetrievalMode,
             LlmParameters,
-            MetadataFilters,
-            PresetRetrievalParams,
-            RetrievalMode,
+            PresetCompositeRetrievalParams,
             SupportedLlmModelNames,
         )
         from llama_cloud.client import LlamaCloud
@@ -109,18 +104,13 @@ class ChatAppsClient:
         )
         client.chat_apps.create_chat_app_api_v_1_apps_post(
             name="string",
-            pipeline_id="string",
+            retriever_id="string",
             llm_config=LlmParameters(
                 model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
             ),
-            retrieval_config=PresetRetrievalParams(
-                search_filters=MetadataFilters(
-                    filters=[],
-                    condition=FilterCondition.AND,
-                ),
-                retrieval_mode=RetrievalMode.CHUNKS,
+            retrieval_config=PresetCompositeRetrievalParams(
+                mode=CompositeRetrievalMode.ROUTING,
             ),
-            chat_app_create_project_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -130,10 +120,9 @@ class ChatAppsClient:
             json=jsonable_encoder(
                 {
                     "name": name,
-                    "pipeline_id": pipeline_id,
+                    "retriever_id": retriever_id,
                     "llm_config": llm_config,
                     "retrieval_config": retrieval_config,
-                    "project_id": chat_app_create_project_id,
                 }
             ),
             headers=self._client_wrapper.get_headers(),
@@ -181,36 +170,6 @@ class ChatAppsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def delete_chat_app(self, id: str) -> typing.Any:
-        """
-        Parameters:
-            - id: str.
-        ---
-        from llama_cloud.client import LlamaCloud
-
-        client = LlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        client.chat_apps.delete_chat_app(
-            id="string",
-        )
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "DELETE",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/apps/{id}"),
-            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 update_chat_app(
         self,
         id: str,
@@ -219,7 +178,7 @@ class ChatAppsClient:
         organization_id: typing.Optional[str] = None,
         name: typing.Optional[str] = OMIT,
         llm_config: typing.Optional[LlmParameters] = OMIT,
-        retrieval_config: typing.Optional[PresetRetrievalParams] = OMIT,
+        retrieval_config: typing.Optional[PresetCompositeRetrievalParams] = OMIT,
     ) -> ChatApp:
         """
         Update a chat app.
@@ -235,14 +194,12 @@ class ChatAppsClient:
 
             - llm_config: typing.Optional[LlmParameters].
 
-            - retrieval_config: typing.Optional[PresetRetrievalParams].
+            - retrieval_config: typing.Optional[PresetCompositeRetrievalParams].
         ---
         from llama_cloud import (
-            FilterCondition,
+            CompositeRetrievalMode,
             LlmParameters,
-            MetadataFilters,
-            PresetRetrievalParams,
-            RetrievalMode,
+            PresetCompositeRetrievalParams,
             SupportedLlmModelNames,
         )
         from llama_cloud.client import LlamaCloud
@@ -255,12 +212,8 @@ class ChatAppsClient:
             llm_config=LlmParameters(
                 model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
             ),
-            retrieval_config=PresetRetrievalParams(
-                search_filters=MetadataFilters(
-                    filters=[],
-                    condition=FilterCondition.AND,
-                ),
-                retrieval_mode=RetrievalMode.CHUNKS,
+            retrieval_config=PresetCompositeRetrievalParams(
+                mode=CompositeRetrievalMode.ROUTING,
             ),
         )
         """
@@ -272,7 +225,7 @@ class ChatAppsClient:
         if retrieval_config is not OMIT:
             _request["retrieval_config"] = retrieval_config
         _response = self._client_wrapper.httpx_client.request(
-            "PATCH",
+            "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/apps/{id}"),
             params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(_request),
@@ -289,6 +242,36 @@ class ChatAppsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def delete_chat_app(self, id: str) -> typing.Any:
+        """
+        Parameters:
+            - id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.chat_apps.delete_chat_app(
+            id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "DELETE",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/apps/{id}"),
+            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 chat_with_chat_app(self, id: str, *, messages: typing.Optional[typing.List[InputMessage]] = OMIT) -> typing.Any:
         """
         Chat with a chat app.
@@ -371,10 +354,9 @@ class AsyncChatAppsClient:
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
         name: str,
-        pipeline_id: str,
+        retriever_id: str,
         llm_config: LlmParameters,
-        retrieval_config: PresetRetrievalParams,
-        chat_app_create_project_id: str,
+        retrieval_config: PresetCompositeRetrievalParams,
     ) -> ChatApp:
         """
         Create a new chat app.
@@ -384,22 +366,18 @@ class AsyncChatAppsClient:
 
             - organization_id: typing.Optional[str].
 
-            - name: str.
+            - name: str. Name of the chat app
 
-            - pipeline_id: str.
+            - retriever_id: str. ID of the retriever to use for the chat app
 
-            - llm_config: LlmParameters.
+            - llm_config: LlmParameters. Configuration for the LLM model to use for the chat app
 
-            - retrieval_config: PresetRetrievalParams.
-
-            - chat_app_create_project_id: str.
+            - retrieval_config: PresetCompositeRetrievalParams. Configuration for the retrieval model to use for the chat app
         ---
         from llama_cloud import (
-            FilterCondition,
+            CompositeRetrievalMode,
             LlmParameters,
-            MetadataFilters,
-            PresetRetrievalParams,
-            RetrievalMode,
+            PresetCompositeRetrievalParams,
             SupportedLlmModelNames,
         )
         from llama_cloud.client import AsyncLlamaCloud
@@ -409,18 +387,13 @@ class AsyncChatAppsClient:
         )
         await client.chat_apps.create_chat_app_api_v_1_apps_post(
             name="string",
-            pipeline_id="string",
+            retriever_id="string",
             llm_config=LlmParameters(
                 model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
             ),
-            retrieval_config=PresetRetrievalParams(
-                search_filters=MetadataFilters(
-                    filters=[],
-                    condition=FilterCondition.AND,
-                ),
-                retrieval_mode=RetrievalMode.CHUNKS,
+            retrieval_config=PresetCompositeRetrievalParams(
+                mode=CompositeRetrievalMode.ROUTING,
             ),
-            chat_app_create_project_id="string",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -430,10 +403,9 @@ class AsyncChatAppsClient:
             json=jsonable_encoder(
                 {
                     "name": name,
-                    "pipeline_id": pipeline_id,
+                    "retriever_id": retriever_id,
                     "llm_config": llm_config,
                     "retrieval_config": retrieval_config,
-                    "project_id": chat_app_create_project_id,
                 }
             ),
             headers=self._client_wrapper.get_headers(),
@@ -481,36 +453,6 @@ class AsyncChatAppsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def delete_chat_app(self, id: str) -> typing.Any:
-        """
-        Parameters:
-            - id: str.
-        ---
-        from llama_cloud.client import AsyncLlamaCloud
-
-        client = AsyncLlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        await client.chat_apps.delete_chat_app(
-            id="string",
-        )
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            "DELETE",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/apps/{id}"),
-            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 update_chat_app(
         self,
         id: str,
@@ -519,7 +461,7 @@ class AsyncChatAppsClient:
         organization_id: typing.Optional[str] = None,
         name: typing.Optional[str] = OMIT,
         llm_config: typing.Optional[LlmParameters] = OMIT,
-        retrieval_config: typing.Optional[PresetRetrievalParams] = OMIT,
+        retrieval_config: typing.Optional[PresetCompositeRetrievalParams] = OMIT,
     ) -> ChatApp:
         """
         Update a chat app.
@@ -535,14 +477,12 @@ class AsyncChatAppsClient:
 
             - llm_config: typing.Optional[LlmParameters].
 
-            - retrieval_config: typing.Optional[PresetRetrievalParams].
+            - retrieval_config: typing.Optional[PresetCompositeRetrievalParams].
         ---
         from llama_cloud import (
-            FilterCondition,
+            CompositeRetrievalMode,
             LlmParameters,
-            MetadataFilters,
-            PresetRetrievalParams,
-            RetrievalMode,
+            PresetCompositeRetrievalParams,
             SupportedLlmModelNames,
         )
         from llama_cloud.client import AsyncLlamaCloud
@@ -555,12 +495,8 @@ class AsyncChatAppsClient:
             llm_config=LlmParameters(
                 model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
             ),
-            retrieval_config=PresetRetrievalParams(
-                search_filters=MetadataFilters(
-                    filters=[],
-                    condition=FilterCondition.AND,
-                ),
-                retrieval_mode=RetrievalMode.CHUNKS,
+            retrieval_config=PresetCompositeRetrievalParams(
+                mode=CompositeRetrievalMode.ROUTING,
             ),
         )
         """
@@ -572,7 +508,7 @@ class AsyncChatAppsClient:
         if retrieval_config is not OMIT:
             _request["retrieval_config"] = retrieval_config
         _response = await self._client_wrapper.httpx_client.request(
-            "PATCH",
+            "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/apps/{id}"),
             params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(_request),
@@ -589,6 +525,36 @@ class AsyncChatAppsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    async def delete_chat_app(self, id: str) -> typing.Any:
+        """
+        Parameters:
+            - id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.chat_apps.delete_chat_app(
+            id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "DELETE",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/apps/{id}"),
+            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 chat_with_chat_app(
         self, id: str, *, messages: typing.Optional[typing.List[InputMessage]] = OMIT
     ) -> typing.Any:

llama_cloud/resources/llama_extract/__init__.py

@@ -1,5 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from .types import ExtractAgentCreateDataSchemaValue, ExtractAgentUpdateDataSchemaValue
+from .types import (
+    ExtractAgentCreateDataSchema,
+    ExtractAgentCreateDataSchemaZeroValue,
+    ExtractAgentUpdateDataSchema,
+    ExtractAgentUpdateDataSchemaZeroValue,
+    ExtractSchemaValidateRequestDataSchema,
+    ExtractSchemaValidateRequestDataSchemaZeroValue,
+)
 
-__all__ = ["ExtractAgentCreateDataSchemaValue", "ExtractAgentUpdateDataSchemaValue"]
+__all__ = [
+    "ExtractAgentCreateDataSchema",
+    "ExtractAgentCreateDataSchemaZeroValue",
+    "ExtractAgentUpdateDataSchema",
+    "ExtractAgentUpdateDataSchemaZeroValue",
+    "ExtractSchemaValidateRequestDataSchema",
+    "ExtractSchemaValidateRequestDataSchemaZeroValue",
+]