llama-cloud 0.0.9__tar.gz → 0.0.10__tar.gz

{llama_cloud-0.0.9 → llama_cloud-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-cloud
-Version: 0.0.9
+Version: 0.0.10
 Summary: 
 Author: Logan Markewich
 Author-email: logan@runllama.ai

{llama_cloud-0.0.9 → llama_cloud-0.0.10}/llama_cloud/__init__.py

@@ -5,11 +5,12 @@ from .types import (
     Base,
     BasePromptTemplate,
     BedrockEmbedding,
+    ChatData,
     ChatMessage,
-    ChatParams,
     CloudAzStorageBlobDataSource,
     CloudAzureAiSearchVectorStore,
     CloudChromaVectorStore,
+    CloudConfluenceDataSource,
     CloudDocument,
     CloudDocumentCreate,
     CloudJiraDataSource,
@@ -56,6 +57,7 @@ from .types import (
     EvalQuestion,
     EvalQuestionCreate,
     EvalQuestionResult,
+    ExtractionJob,
     ExtractionResult,
     ExtractionResultDataValue,
     ExtractionSchema,
@@ -135,6 +137,7 @@ from .types import (
     TransformationCategoryNames,
     UserOrganization,
     UserOrganizationCreate,
+    UserOrganizationDelete,
     ValidationError,
     ValidationErrorLocItem,
 )
@@ -166,11 +169,12 @@ __all__ = [
     "Base",
     "BasePromptTemplate",
     "BedrockEmbedding",
+    "ChatData",
     "ChatMessage",
-    "ChatParams",
     "CloudAzStorageBlobDataSource",
     "CloudAzureAiSearchVectorStore",
     "CloudChromaVectorStore",
+    "CloudConfluenceDataSource",
     "CloudDocument",
     "CloudDocumentCreate",
     "CloudJiraDataSource",
@@ -222,6 +226,7 @@ __all__ = [
     "EvalQuestion",
     "EvalQuestionCreate",
     "EvalQuestionResult",
+    "ExtractionJob",
     "ExtractionResult",
     "ExtractionResultDataValue",
     "ExtractionSchema",
@@ -306,6 +311,7 @@ __all__ = [
     "UnprocessableEntityError",
     "UserOrganization",
     "UserOrganizationCreate",
+    "UserOrganizationDelete",
     "ValidationError",
     "ValidationErrorLocItem",
     "component_definitions",

{llama_cloud-0.0.9 → llama_cloud-0.0.10}/llama_cloud/resources/data_sources/types/data_source_update_component_one.py

@@ -3,6 +3,7 @@
 import typing
 
 from ....types.cloud_az_storage_blob_data_source import CloudAzStorageBlobDataSource
+from ....types.cloud_confluence_data_source import CloudConfluenceDataSource
 from ....types.cloud_jira_data_source import CloudJiraDataSource
 from ....types.cloud_notion_page_data_source import CloudNotionPageDataSource
 from ....types.cloud_one_drive_data_source import CloudOneDriveDataSource
@@ -17,5 +18,6 @@ DataSourceUpdateComponentOne = typing.Union[
     CloudSharepointDataSource,
     CloudSlackDataSource,
     CloudNotionPageDataSource,
+    CloudConfluenceDataSource,
     CloudJiraDataSource,
 ]

{llama_cloud-0.0.9 → llama_cloud-0.0.10}/llama_cloud/resources/extraction/client.py

@@ -9,6 +9,7 @@ from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 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.extraction_job import ExtractionJob
 from ...types.extraction_result import ExtractionResult
 from ...types.extraction_schema import ExtractionSchema
 from ...types.http_validation_error import HttpValidationError
@@ -31,15 +32,25 @@ class ExtractionClient:
         self._client_wrapper = client_wrapper
 
     def infer_schema(
-        self, *, name: str, project_id: typing.Optional[str] = OMIT, file_ids: typing.List[str]
+        self,
+        *,
+        schema_id: typing.Optional[str] = OMIT,
+        name: str,
+        project_id: typing.Optional[str] = OMIT,
+        file_ids: typing.List[str],
+        stream: typing.Optional[bool] = OMIT,
     ) -> ExtractionSchema:
         """
         Parameters:
+            - schema_id: typing.Optional[str]. The ID of a schema to update with the new schema
+
             - name: str. The name of the extraction schema
 
             - project_id: typing.Optional[str]. The ID of the project that the extraction schema belongs to
 
             - file_ids: typing.List[str]. The IDs of the files that the extraction schema contains
+
+            - stream: typing.Optional[bool]. Whether to stream the results of the extraction schema
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -52,8 +63,12 @@ class ExtractionClient:
         )
         """
         _request: typing.Dict[str, typing.Any] = {"name": name, "file_ids": file_ids}
+        if schema_id is not OMIT:
+            _request["schema_id"] = schema_id
         if project_id is not OMIT:
             _request["project_id"] = project_id
+        if stream is not OMIT:
+            _request["stream"] = stream
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/schemas/infer"),
@@ -171,17 +186,19 @@ class ExtractionClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_jobs(self, *, schema_id: typing.Optional[str] = None) -> typing.List[ExtractionResult]:
+    def list_jobs(self, *, schema_id: str) -> typing.List[ExtractionJob]:
         """
         Parameters:
-            - schema_id: typing.Optional[str].
+            - schema_id: str.
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.extraction.list_jobs()
+        client.extraction.list_jobs(
+            schema_id="string",
+        )
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
@@ -191,7 +208,7 @@ class ExtractionClient:
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractionResult], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(typing.List[ExtractionJob], _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -200,7 +217,7 @@ class ExtractionClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def run_job(self, *, schema_id: str, file_id: str) -> ExtractionResult:
+    def run_job(self, *, schema_id: str, file_id: str) -> ExtractionJob:
         """
         Parameters:
             - schema_id: str. The id of the schema
@@ -225,7 +242,7 @@ class ExtractionClient:
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractionResult, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(ExtractionJob, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -234,7 +251,7 @@ class ExtractionClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_job(self, job_id: str) -> ExtractionResult:
+    def get_job(self, job_id: str) -> ExtractionJob:
         """
         Parameters:
             - job_id: str.
@@ -255,7 +272,7 @@ class ExtractionClient:
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractionResult, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(ExtractionJob, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -264,7 +281,7 @@ class ExtractionClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def run_jobs_in_batch(self, *, schema_id: str, file_ids: typing.List[str]) -> typing.List[ExtractionResult]:
+    def run_jobs_in_batch(self, *, schema_id: str, file_ids: typing.List[str]) -> typing.List[ExtractionJob]:
         """
         Parameters:
             - schema_id: str. The id of the schema
@@ -289,7 +306,7 @@ class ExtractionClient:
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractionResult], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(typing.List[ExtractionJob], _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -334,15 +351,25 @@ class AsyncExtractionClient:
         self._client_wrapper = client_wrapper
 
     async def infer_schema(
-        self, *, name: str, project_id: typing.Optional[str] = OMIT, file_ids: typing.List[str]
+        self,
+        *,
+        schema_id: typing.Optional[str] = OMIT,
+        name: str,
+        project_id: typing.Optional[str] = OMIT,
+        file_ids: typing.List[str],
+        stream: typing.Optional[bool] = OMIT,
     ) -> ExtractionSchema:
         """
         Parameters:
+            - schema_id: typing.Optional[str]. The ID of a schema to update with the new schema
+
             - name: str. The name of the extraction schema
 
             - project_id: typing.Optional[str]. The ID of the project that the extraction schema belongs to
 
             - file_ids: typing.List[str]. The IDs of the files that the extraction schema contains
+
+            - stream: typing.Optional[bool]. Whether to stream the results of the extraction schema
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -355,8 +382,12 @@ class AsyncExtractionClient:
         )
         """
         _request: typing.Dict[str, typing.Any] = {"name": name, "file_ids": file_ids}
+        if schema_id is not OMIT:
+            _request["schema_id"] = schema_id
         if project_id is not OMIT:
             _request["project_id"] = project_id
+        if stream is not OMIT:
+            _request["stream"] = stream
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/schemas/infer"),
@@ -474,17 +505,19 @@ class AsyncExtractionClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def list_jobs(self, *, schema_id: typing.Optional[str] = None) -> typing.List[ExtractionResult]:
+    async def list_jobs(self, *, schema_id: str) -> typing.List[ExtractionJob]:
         """
         Parameters:
-            - schema_id: typing.Optional[str].
+            - schema_id: str.
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.extraction.list_jobs()
+        await client.extraction.list_jobs(
+            schema_id="string",
+        )
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
@@ -494,7 +527,7 @@ class AsyncExtractionClient:
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractionResult], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(typing.List[ExtractionJob], _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -503,7 +536,7 @@ class AsyncExtractionClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def run_job(self, *, schema_id: str, file_id: str) -> ExtractionResult:
+    async def run_job(self, *, schema_id: str, file_id: str) -> ExtractionJob:
         """
         Parameters:
             - schema_id: str. The id of the schema
@@ -528,7 +561,7 @@ class AsyncExtractionClient:
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractionResult, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(ExtractionJob, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -537,7 +570,7 @@ class AsyncExtractionClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_job(self, job_id: str) -> ExtractionResult:
+    async def get_job(self, job_id: str) -> ExtractionJob:
         """
         Parameters:
             - job_id: str.
@@ -558,7 +591,7 @@ class AsyncExtractionClient:
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractionResult, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(ExtractionJob, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -567,7 +600,7 @@ class AsyncExtractionClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def run_jobs_in_batch(self, *, schema_id: str, file_ids: typing.List[str]) -> typing.List[ExtractionResult]:
+    async def run_jobs_in_batch(self, *, schema_id: str, file_ids: typing.List[str]) -> typing.List[ExtractionJob]:
         """
         Parameters:
             - schema_id: str. The id of the schema
@@ -592,7 +625,7 @@ class AsyncExtractionClient:
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractionResult], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(typing.List[ExtractionJob], _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:

{llama_cloud-0.0.9 → llama_cloud-0.0.10}/llama_cloud/resources/organizations/client.py

@@ -13,6 +13,7 @@ from ...types.organization import Organization
 from ...types.organization_create import OrganizationCreate
 from ...types.user_organization import UserOrganization
 from ...types.user_organization_create import UserOrganizationCreate
+from ...types.user_organization_delete import UserOrganizationDelete
 
 try:
     import pydantic
@@ -405,6 +406,46 @@ class OrganizationsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def batch_remove_users_from_organization(
+        self, organization_id: str, *, request: typing.List[UserOrganizationDelete]
+    ) -> None:
+        """
+        Remove a batch of users from an organization.
+
+        Parameters:
+            - organization_id: str.
+
+            - request: typing.List[UserOrganizationDelete].
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.organizations.batch_remove_users_from_organization(
+            organization_id="string",
+            request=[],
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "PUT",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/users/remove"
+            ),
+            json=jsonable_encoder(request),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return
+        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 AsyncOrganizationsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -784,3 +825,43 @@ class AsyncOrganizationsClient:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    async def batch_remove_users_from_organization(
+        self, organization_id: str, *, request: typing.List[UserOrganizationDelete]
+    ) -> None:
+        """
+        Remove a batch of users from an organization.
+
+        Parameters:
+            - organization_id: str.
+
+            - request: typing.List[UserOrganizationDelete].
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.organizations.batch_remove_users_from_organization(
+            organization_id="string",
+            request=[],
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "PUT",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/users/remove"
+            ),
+            json=jsonable_encoder(request),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return
+        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-0.0.9 → llama_cloud-0.0.10}/llama_cloud/resources/parsing/client.py

@@ -113,6 +113,11 @@ class ParsingClient:
         page_separator: str,
         bounding_box: str,
         target_pages: str,
+        use_vendor_multimodal_model: bool,
+        vendor_multimodal_model_name: str,
+        vendor_multimodal_api_key: str,
+        page_prefix: str,
+        page_suffix: str,
         file: typing.IO,
     ) -> ParsingJob:
         """
@@ -143,6 +148,16 @@ class ParsingClient:
 
             - target_pages: str.
 
+            - use_vendor_multimodal_model: bool.
+
+            - vendor_multimodal_model_name: str.
+
+            - vendor_multimodal_api_key: str.
+
+            - page_prefix: str.
+
+            - page_suffix: str.
+
             - file: typing.IO.
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -162,6 +177,11 @@ class ParsingClient:
                     "page_separator": page_separator,
                     "bounding_box": bounding_box,
                     "target_pages": target_pages,
+                    "use_vendor_multimodal_model": use_vendor_multimodal_model,
+                    "vendor_multimodal_model_name": vendor_multimodal_model_name,
+                    "vendor_multimodal_api_key": vendor_multimodal_api_key,
+                    "page_prefix": page_prefix,
+                    "page_suffix": page_suffix,
                 }
             ),
             files={"file": file},
@@ -238,6 +258,38 @@ class ParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def get_parsing_job_details(self, job_id: str) -> typing.Any:
+        """
+        Get a job by id
+
+        Parameters:
+            - job_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.parsing.get_parsing_job_details(
+            job_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/details"),
+            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 get_job_text_result(self, job_id: str) -> ParsingJobTextResult:
         """
         Get a job by id
@@ -586,6 +638,11 @@ class AsyncParsingClient:
         page_separator: str,
         bounding_box: str,
         target_pages: str,
+        use_vendor_multimodal_model: bool,
+        vendor_multimodal_model_name: str,
+        vendor_multimodal_api_key: str,
+        page_prefix: str,
+        page_suffix: str,
         file: typing.IO,
     ) -> ParsingJob:
         """
@@ -616,6 +673,16 @@ class AsyncParsingClient:
 
             - target_pages: str.
 
+            - use_vendor_multimodal_model: bool.
+
+            - vendor_multimodal_model_name: str.
+
+            - vendor_multimodal_api_key: str.
+
+            - page_prefix: str.
+
+            - page_suffix: str.
+
             - file: typing.IO.
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -635,6 +702,11 @@ class AsyncParsingClient:
                     "page_separator": page_separator,
                     "bounding_box": bounding_box,
                     "target_pages": target_pages,
+                    "use_vendor_multimodal_model": use_vendor_multimodal_model,
+                    "vendor_multimodal_model_name": vendor_multimodal_model_name,
+                    "vendor_multimodal_api_key": vendor_multimodal_api_key,
+                    "page_prefix": page_prefix,
+                    "page_suffix": page_suffix,
                 }
             ),
             files={"file": file},
@@ -711,6 +783,38 @@ class AsyncParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    async def get_parsing_job_details(self, job_id: str) -> typing.Any:
+        """
+        Get a job by id
+
+        Parameters:
+            - job_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.parsing.get_parsing_job_details(
+            job_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/parsing/job/{job_id}/details"),
+            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 get_job_text_result(self, job_id: str) -> ParsingJobTextResult:
         """
         Get a job by id