llama-cloud 0.1.22__py3-none-any.whl → 0.1.24__py3-none-any.whl

llama_cloud/resources/llama_extract/client.py

@@ -40,24 +40,26 @@ class LlamaExtractClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def list_extraction_agents(self, *, project_id: str) -> typing.List[ExtractAgent]:
+    def list_extraction_agents(
+        self, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> typing.List[ExtractAgent]:
         """
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.list_extraction_agents(
-            project_id="string",
-        )
+        client.llama_extract.list_extraction_agents()
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/extraction-agents"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -166,12 +168,16 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_extraction_agent_by_name(self, name: str, *, project_id: typing.Optional[str] = None) -> ExtractAgent:
+    def get_extraction_agent_by_name(
+        self, name: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> ExtractAgent:
         """
         Parameters:
             - name: str.
 
             - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -187,7 +193,7 @@ class LlamaExtractClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/extraction-agents/by-name/{name}"
             ),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -608,10 +614,16 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_job_result(self, job_id: str) -> ExtractResultset:
+    def get_job_result(
+        self, job_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> ExtractResultset:
         """
         Parameters:
             - job_id: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -625,6 +637,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/jobs/{job_id}/result"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -706,10 +719,16 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_run_by_job_id(self, job_id: str) -> ExtractRun:
+    def get_run_by_job_id(
+        self, job_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> ExtractRun:
         """
         Parameters:
             - job_id: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -723,6 +742,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/by-job/{job_id}"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -736,10 +756,16 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_run(self, run_id: str) -> ExtractRun:
+    def get_run(
+        self, run_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> ExtractRun:
         """
         Parameters:
             - run_id: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -753,6 +779,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -766,10 +793,16 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def delete_extraction_run(self, run_id: str) -> typing.Any:
+    def delete_extraction_run(
+        self, run_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> typing.Any:
         """
         Parameters:
             - run_id: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -783,6 +816,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "DELETE",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -801,24 +835,26 @@ class AsyncLlamaExtractClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def list_extraction_agents(self, *, project_id: str) -> typing.List[ExtractAgent]:
+    async def list_extraction_agents(
+        self, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> typing.List[ExtractAgent]:
         """
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.list_extraction_agents(
-            project_id="string",
-        )
+        await client.llama_extract.list_extraction_agents()
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/extraction-agents"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -927,12 +963,16 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_extraction_agent_by_name(self, name: str, *, project_id: typing.Optional[str] = None) -> ExtractAgent:
+    async def get_extraction_agent_by_name(
+        self, name: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> ExtractAgent:
         """
         Parameters:
             - name: str.
 
             - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -948,7 +988,7 @@ class AsyncLlamaExtractClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/extraction-agents/by-name/{name}"
             ),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1369,10 +1409,16 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_job_result(self, job_id: str) -> ExtractResultset:
+    async def get_job_result(
+        self, job_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> ExtractResultset:
         """
         Parameters:
             - job_id: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1386,6 +1432,7 @@ class AsyncLlamaExtractClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/jobs/{job_id}/result"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1467,10 +1514,16 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_run_by_job_id(self, job_id: str) -> ExtractRun:
+    async def get_run_by_job_id(
+        self, job_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> ExtractRun:
         """
         Parameters:
             - job_id: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1484,6 +1537,7 @@ class AsyncLlamaExtractClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/by-job/{job_id}"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1497,10 +1551,16 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_run(self, run_id: str) -> ExtractRun:
+    async def get_run(
+        self, run_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> ExtractRun:
         """
         Parameters:
             - run_id: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1514,6 +1574,7 @@ class AsyncLlamaExtractClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1527,10 +1588,16 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def delete_extraction_run(self, run_id: str) -> typing.Any:
+    async def delete_extraction_run(
+        self, run_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> typing.Any:
         """
         Parameters:
             - run_id: str.
+
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1544,6 +1611,7 @@ class AsyncLlamaExtractClient:
         _response = await self._client_wrapper.httpx_client.request(
             "DELETE",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )

llama_cloud/resources/llama_extract/types/__init__.py

@@ -1,21 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from .extract_agent_create_data_schema import ExtractAgentCreateDataSchema
-from .extract_agent_create_data_schema_zero_value import ExtractAgentCreateDataSchemaZeroValue
 from .extract_agent_update_data_schema import ExtractAgentUpdateDataSchema
-from .extract_agent_update_data_schema_zero_value import ExtractAgentUpdateDataSchemaZeroValue
 from .extract_job_create_batch_data_schema_override import ExtractJobCreateBatchDataSchemaOverride
-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
 
 __all__ = [
     "ExtractAgentCreateDataSchema",
-    "ExtractAgentCreateDataSchemaZeroValue",
     "ExtractAgentUpdateDataSchema",
-    "ExtractAgentUpdateDataSchemaZeroValue",
     "ExtractJobCreateBatchDataSchemaOverride",
-    "ExtractJobCreateBatchDataSchemaOverrideZeroValue",
     "ExtractSchemaValidateRequestDataSchema",
-    "ExtractSchemaValidateRequestDataSchemaZeroValue",
 ]

llama_cloud/resources/llama_extract/types/extract_agent_create_data_schema.py

@@ -2,8 +2,6 @@
 
 import typing
 
-from .extract_agent_create_data_schema_zero_value import ExtractAgentCreateDataSchemaZeroValue
+from ....types.json_type import JsonType
 
-ExtractAgentCreateDataSchema = typing.Union[
-    typing.Dict[str, typing.Optional[ExtractAgentCreateDataSchemaZeroValue]], str
-]
+ExtractAgentCreateDataSchema = typing.Union[typing.Dict[str, typing.Optional[JsonType]], str]

llama_cloud/resources/llama_extract/types/extract_agent_update_data_schema.py

@@ -2,8 +2,6 @@
 
 import typing
 
-from .extract_agent_update_data_schema_zero_value import ExtractAgentUpdateDataSchemaZeroValue
+from ....types.json_type import JsonType
 
-ExtractAgentUpdateDataSchema = typing.Union[
-    typing.Dict[str, typing.Optional[ExtractAgentUpdateDataSchemaZeroValue]], str
-]
+ExtractAgentUpdateDataSchema = typing.Union[typing.Dict[str, typing.Optional[JsonType]], str]

llama_cloud/resources/llama_extract/types/extract_job_create_batch_data_schema_override.py

@@ -2,8 +2,6 @@
 
 import typing
 
-from .extract_job_create_batch_data_schema_override_zero_value import ExtractJobCreateBatchDataSchemaOverrideZeroValue
+from ....types.json_type import JsonType
 
-ExtractJobCreateBatchDataSchemaOverride = typing.Union[
-    typing.Dict[str, typing.Optional[ExtractJobCreateBatchDataSchemaOverrideZeroValue]], str
-]
+ExtractJobCreateBatchDataSchemaOverride = typing.Union[typing.Dict[str, typing.Optional[JsonType]], str]

llama_cloud/resources/llama_extract/types/extract_schema_validate_request_data_schema.py

@@ -2,8 +2,6 @@
 
 import typing
 
-from .extract_schema_validate_request_data_schema_zero_value import ExtractSchemaValidateRequestDataSchemaZeroValue
+from ....types.json_type import JsonType
 
-ExtractSchemaValidateRequestDataSchema = typing.Union[
-    typing.Dict[str, typing.Optional[ExtractSchemaValidateRequestDataSchemaZeroValue]], str
-]
+ExtractSchemaValidateRequestDataSchema = typing.Union[typing.Dict[str, typing.Optional[JsonType]], str]

llama_cloud/resources/organizations/client.py

@@ -408,14 +408,18 @@ class OrganizationsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def remove_users_from_organization(self, organization_id: str, member_user_id: str) -> None:
+    def remove_users_from_organization(
+        self, organization_id: str, member_user_id: str, *, request: typing.Optional[typing.List[str]] = None
+    ) -> None:
         """
-        Remove users from an organization by email.
+        Remove users from an organization.
 
         Parameters:
             - organization_id: str.
 
             - member_user_id: str.
+
+            - request: typing.Optional[typing.List[str]].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -433,6 +437,7 @@ class OrganizationsClient:
                 f"{self._client_wrapper.get_base_url()}/",
                 f"api/v1/organizations/{organization_id}/users/{member_user_id}",
             ),
+            json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1109,14 +1114,18 @@ class AsyncOrganizationsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def remove_users_from_organization(self, organization_id: str, member_user_id: str) -> None:
+    async def remove_users_from_organization(
+        self, organization_id: str, member_user_id: str, *, request: typing.Optional[typing.List[str]] = None
+    ) -> None:
         """
-        Remove users from an organization by email.
+        Remove users from an organization.
 
         Parameters:
             - organization_id: str.
 
             - member_user_id: str.
+
+            - request: typing.Optional[typing.List[str]].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1134,6 +1143,7 @@ class AsyncOrganizationsClient:
                 f"{self._client_wrapper.get_base_url()}/",
                 f"api/v1/organizations/{organization_id}/users/{member_user_id}",
             ),
+            json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )

llama_cloud/resources/parsing/client.py

@@ -232,6 +232,7 @@ class ParsingClient:
         language: typing.List[ParserLanguages],
         extract_layout: bool,
         max_pages: typing.Optional[int] = OMIT,
+        outlined_table_extraction: bool,
         output_pdf_of_document: bool,
         output_s_3_path_prefix: str,
         output_s_3_region: str,
@@ -360,6 +361,8 @@ class ParsingClient:
 
             - max_pages: typing.Optional[int].
 
+            - outlined_table_extraction: bool.
+
             - output_pdf_of_document: bool.
 
             - output_s_3_path_prefix: str.
@@ -493,6 +496,7 @@ class ParsingClient:
             "invalidate_cache": invalidate_cache,
             "language": language,
             "extract_layout": extract_layout,
+            "outlined_table_extraction": outlined_table_extraction,
             "output_pdf_of_document": output_pdf_of_document,
             "output_s3_path_prefix": output_s_3_path_prefix,
             "output_s3_region": output_s_3_region,
@@ -1258,6 +1262,7 @@ class AsyncParsingClient:
         language: typing.List[ParserLanguages],
         extract_layout: bool,
         max_pages: typing.Optional[int] = OMIT,
+        outlined_table_extraction: bool,
         output_pdf_of_document: bool,
         output_s_3_path_prefix: str,
         output_s_3_region: str,
@@ -1386,6 +1391,8 @@ class AsyncParsingClient:
 
             - max_pages: typing.Optional[int].
 
+            - outlined_table_extraction: bool.
+
             - output_pdf_of_document: bool.
 
             - output_s_3_path_prefix: str.
@@ -1519,6 +1526,7 @@ class AsyncParsingClient:
             "invalidate_cache": invalidate_cache,
             "language": language,
             "extract_layout": extract_layout,
+            "outlined_table_extraction": outlined_table_extraction,
             "output_pdf_of_document": output_pdf_of_document,
             "output_s3_path_prefix": output_s_3_path_prefix,
             "output_s3_region": output_s_3_region,

llama_cloud/resources/pipelines/__init__.py

@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from .types import (
-    PipelineFileUpdateCustomMetadataValue,
     PipelineUpdateEmbeddingConfig,
     PipelineUpdateEmbeddingConfig_AzureEmbedding,
     PipelineUpdateEmbeddingConfig_BedrockEmbedding,
@@ -14,7 +13,6 @@ from .types import (
 )
 
 __all__ = [
-    "PipelineFileUpdateCustomMetadataValue",
     "PipelineUpdateEmbeddingConfig",
     "PipelineUpdateEmbeddingConfig_AzureEmbedding",
     "PipelineUpdateEmbeddingConfig_BedrockEmbedding",