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

llama_cloud/resources/llama_extract/client.py

@@ -15,10 +15,12 @@ from ...types.extract_job import ExtractJob
 from ...types.extract_job_create import ExtractJobCreate
 from ...types.extract_resultset import ExtractResultset
 from ...types.extract_run import ExtractRun
+from ...types.extract_schema_validate_response import ExtractSchemaValidateResponse
 from ...types.http_validation_error import HttpValidationError
 from ...types.llama_extract_settings import LlamaExtractSettings
-from .types.extract_agent_create_data_schema_value import ExtractAgentCreateDataSchemaValue
-from .types.extract_agent_update_data_schema_value import ExtractAgentUpdateDataSchemaValue
+from .types.extract_agent_create_data_schema import ExtractAgentCreateDataSchema
+from .types.extract_agent_update_data_schema import ExtractAgentUpdateDataSchema
+from .types.extract_schema_validate_request_data_schema import ExtractSchemaValidateRequestDataSchema
 
 try:
     import pydantic
@@ -36,14 +38,10 @@ class LlamaExtractClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def list_extraction_agents(
-        self, *, project_id: typing.Optional[str] = None, name: typing.Optional[str] = None
-    ) -> typing.List[ExtractAgent]:
+    def list_extraction_agents(self, *, project_id: typing.Optional[str] = None) -> typing.List[ExtractAgent]:
         """
         Parameters:
             - project_id: typing.Optional[str].
-
-            - name: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -55,7 +53,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction-agents"),
-            params=remove_none_from_dict({"project_id": project_id, "name": name}),
+            params=remove_none_from_dict({"project_id": project_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -75,7 +73,7 @@ class LlamaExtractClient:
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
         name: str,
-        data_schema: typing.Dict[str, typing.Optional[ExtractAgentCreateDataSchemaValue]],
+        data_schema: ExtractAgentCreateDataSchema,
         config: ExtractConfig,
     ) -> ExtractAgent:
         """
@@ -86,11 +84,11 @@ class LlamaExtractClient:
 
             - name: str. The name of the extraction schema
 
-            - data_schema: typing.Dict[str, typing.Optional[ExtractAgentCreateDataSchemaValue]]. The schema of the data.
+            - data_schema: ExtractAgentCreateDataSchema. The schema of the data.
 
             - config: ExtractConfig. The configuration parameters for the extraction agent.
         ---
-        from llama_cloud import ExtractConfig, ExtractMode
+        from llama_cloud import ExtractConfig, ExtractMode, ExtractTarget
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
@@ -98,9 +96,9 @@ class LlamaExtractClient:
         )
         client.llama_extract.create_extraction_agent(
             name="string",
-            data_schema={},
             config=ExtractConfig(
-                extraction_mode=ExtractMode.PER_DOC,
+                extraction_target=ExtractTarget.PER_DOC,
+                extraction_mode=ExtractMode.FAST,
             ),
         )
         """
@@ -122,6 +120,77 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def validate_extraction_schema(
+        self, *, data_schema: ExtractSchemaValidateRequestDataSchema
+    ) -> ExtractSchemaValidateResponse:
+        """
+        Validates an extraction agent's schema definition.
+        Returns the normalized and validated schema if valid, otherwise raises an HTTP 400.
+
+        Parameters:
+            - data_schema: ExtractSchemaValidateRequestDataSchema.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.llama_extract.validate_extraction_schema()
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction-agents/schema/validation"
+            ),
+            json=jsonable_encoder({"data_schema": data_schema}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractSchemaValidateResponse, _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_extraction_agent_by_name(self, name: str, *, project_id: typing.Optional[str] = None) -> ExtractAgent:
+        """
+        Parameters:
+            - name: str.
+
+            - project_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.llama_extract.get_extraction_agent_by_name(
+            name="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/extraction-agents/by-name/{name}"
+            ),
+            params=remove_none_from_dict({"project_id": project_id}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractAgent, _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_extraction_agent(self, extraction_agent_id: str) -> ExtractAgent:
         """
         Parameters:
@@ -156,21 +225,17 @@ class LlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def update_extraction_agent(
-        self,
-        extraction_agent_id: str,
-        *,
-        data_schema: typing.Dict[str, typing.Optional[ExtractAgentUpdateDataSchemaValue]],
-        config: ExtractConfig,
+        self, extraction_agent_id: str, *, data_schema: ExtractAgentUpdateDataSchema, config: ExtractConfig
     ) -> ExtractAgent:
         """
         Parameters:
             - extraction_agent_id: str.
 
-            - data_schema: typing.Dict[str, typing.Optional[ExtractAgentUpdateDataSchemaValue]]. The schema of the data
+            - data_schema: ExtractAgentUpdateDataSchema. The schema of the data
 
             - config: ExtractConfig. The configuration parameters for the extraction agent.
         ---
-        from llama_cloud import ExtractConfig, ExtractMode
+        from llama_cloud import ExtractConfig, ExtractMode, ExtractTarget
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
@@ -178,9 +243,9 @@ class LlamaExtractClient:
         )
         client.llama_extract.update_extraction_agent(
             extraction_agent_id="string",
-            data_schema={},
             config=ExtractConfig(
-                extraction_mode=ExtractMode.PER_DOC,
+                extraction_target=ExtractTarget.PER_DOC,
+                extraction_mode=ExtractMode.FAST,
             ),
         )
         """
@@ -273,7 +338,12 @@ class LlamaExtractClient:
         Parameters:
             - request: ExtractJobCreate.
         ---
-        from llama_cloud import ExtractConfig, ExtractJobCreate, ExtractMode
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreate,
+            ExtractMode,
+            ExtractTarget,
+        )
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
@@ -284,7 +354,8 @@ class LlamaExtractClient:
                 extraction_agent_id="string",
                 file_id="string",
                 config_override=ExtractConfig(
-                    extraction_mode=ExtractMode.PER_DOC,
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
                 ),
             ),
         )
@@ -349,7 +420,9 @@ class LlamaExtractClient:
             ExtractConfig,
             ExtractJobCreate,
             ExtractMode,
+            ExtractTarget,
             LlamaExtractSettings,
+            LlamaParseParameters,
         )
         from llama_cloud.client import LlamaCloud
 
@@ -361,10 +434,13 @@ class LlamaExtractClient:
                 extraction_agent_id="string",
                 file_id="string",
                 config_override=ExtractConfig(
-                    extraction_mode=ExtractMode.PER_DOC,
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
                 ),
             ),
-            extract_settings=LlamaExtractSettings(),
+            extract_settings=LlamaExtractSettings(
+                llama_parse_params=LlamaParseParameters(),
+            ),
         )
         """
         _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
@@ -392,7 +468,12 @@ class LlamaExtractClient:
         Parameters:
             - request: ExtractJobCreate.
         ---
-        from llama_cloud import ExtractConfig, ExtractJobCreate, ExtractMode
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreate,
+            ExtractMode,
+            ExtractTarget,
+        )
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
@@ -403,7 +484,8 @@ class LlamaExtractClient:
                 extraction_agent_id="string",
                 file_id="string",
                 config_override=ExtractConfig(
-                    extraction_mode=ExtractMode.PER_DOC,
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
                 ),
             ),
         )
@@ -438,7 +520,9 @@ class LlamaExtractClient:
             ExtractConfig,
             ExtractJobCreate,
             ExtractMode,
+            ExtractTarget,
             LlamaExtractSettings,
+            LlamaParseParameters,
         )
         from llama_cloud.client import LlamaCloud
 
@@ -450,10 +534,13 @@ class LlamaExtractClient:
                 extraction_agent_id="string",
                 file_id="string",
                 config_override=ExtractConfig(
-                    extraction_mode=ExtractMode.PER_DOC,
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
                 ),
             ),
-            extract_settings=LlamaExtractSettings(),
+            extract_settings=LlamaExtractSettings(
+                llama_parse_params=LlamaParseParameters(),
+            ),
         )
         """
         _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
@@ -476,32 +563,61 @@ class LlamaExtractClient:
             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, *, extraction_agent_id: str, file_ids: typing.List[str]) -> typing.List[ExtractJob]:
+    def get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
-            - extraction_agent_id: str. The id of the extraction agent
+            - job_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
 
-            - file_ids: typing.List[str]. The ids of the files
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.llama_extract.get_job_result(
+            job_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/jobs/{job_id}/result"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractResultset, _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 list_extract_runs(self, *, extraction_agent_id: str) -> typing.List[ExtractRun]:
+        """
+        Parameters:
+            - extraction_agent_id: str.
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.run_jobs_in_batch(
+        client.llama_extract.list_extract_runs(
             extraction_agent_id="string",
-            file_ids=[],
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/batch"),
-            json=jsonable_encoder({"extraction_agent_id": extraction_agent_id, "file_ids": file_ids}),
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/runs"),
+            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractJob], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(typing.List[ExtractRun], _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -510,7 +626,7 @@ 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_run_by_job_id(self, job_id: str) -> ExtractRun:
         """
         Parameters:
             - job_id: str.
@@ -520,20 +636,20 @@ class LlamaExtractClient:
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.get_job_result(
+        client.llama_extract.get_run_by_job_id(
             job_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(
-                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/jobs/{job_id}/result"
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/runs/by-job/{job_id}"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractResultset, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(ExtractRun, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -542,39 +658,28 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_extract_runs(
-        self,
-        *,
-        extraction_agent_id: typing.Optional[str] = None,
-        run_id: typing.Optional[str] = None,
-        job_id: typing.Optional[str] = None,
-    ) -> typing.List[ExtractRun]:
+    def get_run(self, run_id: str) -> ExtractRun:
         """
         Parameters:
-            - extraction_agent_id: typing.Optional[str].
-
-            - run_id: typing.Optional[str].
-
-            - job_id: typing.Optional[str].
+            - run_id: str.
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.list_extract_runs()
+        client.llama_extract.get_run(
+            run_id="string",
+        )
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/runs"),
-            params=remove_none_from_dict(
-                {"extraction_agent_id": extraction_agent_id, "run_id": run_id, "job_id": job_id}
-            ),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/runs/{run_id}"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractRun], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(ExtractRun, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -588,14 +693,10 @@ class AsyncLlamaExtractClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def list_extraction_agents(
-        self, *, project_id: typing.Optional[str] = None, name: typing.Optional[str] = None
-    ) -> typing.List[ExtractAgent]:
+    async def list_extraction_agents(self, *, project_id: typing.Optional[str] = None) -> typing.List[ExtractAgent]:
         """
         Parameters:
             - project_id: typing.Optional[str].
-
-            - name: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -607,7 +708,7 @@ class AsyncLlamaExtractClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction-agents"),
-            params=remove_none_from_dict({"project_id": project_id, "name": name}),
+            params=remove_none_from_dict({"project_id": project_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -627,7 +728,7 @@ class AsyncLlamaExtractClient:
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
         name: str,
-        data_schema: typing.Dict[str, typing.Optional[ExtractAgentCreateDataSchemaValue]],
+        data_schema: ExtractAgentCreateDataSchema,
         config: ExtractConfig,
     ) -> ExtractAgent:
         """
@@ -638,11 +739,11 @@ class AsyncLlamaExtractClient:
 
             - name: str. The name of the extraction schema
 
-            - data_schema: typing.Dict[str, typing.Optional[ExtractAgentCreateDataSchemaValue]]. The schema of the data.
+            - data_schema: ExtractAgentCreateDataSchema. The schema of the data.
 
             - config: ExtractConfig. The configuration parameters for the extraction agent.
         ---
-        from llama_cloud import ExtractConfig, ExtractMode
+        from llama_cloud import ExtractConfig, ExtractMode, ExtractTarget
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
@@ -650,9 +751,9 @@ class AsyncLlamaExtractClient:
         )
         await client.llama_extract.create_extraction_agent(
             name="string",
-            data_schema={},
             config=ExtractConfig(
-                extraction_mode=ExtractMode.PER_DOC,
+                extraction_target=ExtractTarget.PER_DOC,
+                extraction_mode=ExtractMode.FAST,
             ),
         )
         """
@@ -674,6 +775,77 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    async def validate_extraction_schema(
+        self, *, data_schema: ExtractSchemaValidateRequestDataSchema
+    ) -> ExtractSchemaValidateResponse:
+        """
+        Validates an extraction agent's schema definition.
+        Returns the normalized and validated schema if valid, otherwise raises an HTTP 400.
+
+        Parameters:
+            - data_schema: ExtractSchemaValidateRequestDataSchema.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.validate_extraction_schema()
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction-agents/schema/validation"
+            ),
+            json=jsonable_encoder({"data_schema": data_schema}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractSchemaValidateResponse, _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_extraction_agent_by_name(self, name: str, *, project_id: typing.Optional[str] = None) -> ExtractAgent:
+        """
+        Parameters:
+            - name: str.
+
+            - project_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.get_extraction_agent_by_name(
+            name="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/extraction-agents/by-name/{name}"
+            ),
+            params=remove_none_from_dict({"project_id": project_id}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractAgent, _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_extraction_agent(self, extraction_agent_id: str) -> ExtractAgent:
         """
         Parameters:
@@ -708,21 +880,17 @@ class AsyncLlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def update_extraction_agent(
-        self,
-        extraction_agent_id: str,
-        *,
-        data_schema: typing.Dict[str, typing.Optional[ExtractAgentUpdateDataSchemaValue]],
-        config: ExtractConfig,
+        self, extraction_agent_id: str, *, data_schema: ExtractAgentUpdateDataSchema, config: ExtractConfig
     ) -> ExtractAgent:
         """
         Parameters:
             - extraction_agent_id: str.
 
-            - data_schema: typing.Dict[str, typing.Optional[ExtractAgentUpdateDataSchemaValue]]. The schema of the data
+            - data_schema: ExtractAgentUpdateDataSchema. The schema of the data
 
             - config: ExtractConfig. The configuration parameters for the extraction agent.
         ---
-        from llama_cloud import ExtractConfig, ExtractMode
+        from llama_cloud import ExtractConfig, ExtractMode, ExtractTarget
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
@@ -730,9 +898,9 @@ class AsyncLlamaExtractClient:
         )
         await client.llama_extract.update_extraction_agent(
             extraction_agent_id="string",
-            data_schema={},
             config=ExtractConfig(
-                extraction_mode=ExtractMode.PER_DOC,
+                extraction_target=ExtractTarget.PER_DOC,
+                extraction_mode=ExtractMode.FAST,
             ),
         )
         """
@@ -825,7 +993,12 @@ class AsyncLlamaExtractClient:
         Parameters:
             - request: ExtractJobCreate.
         ---
-        from llama_cloud import ExtractConfig, ExtractJobCreate, ExtractMode
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreate,
+            ExtractMode,
+            ExtractTarget,
+        )
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
@@ -836,7 +1009,8 @@ class AsyncLlamaExtractClient:
                 extraction_agent_id="string",
                 file_id="string",
                 config_override=ExtractConfig(
-                    extraction_mode=ExtractMode.PER_DOC,
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
                 ),
             ),
         )
@@ -901,7 +1075,9 @@ class AsyncLlamaExtractClient:
             ExtractConfig,
             ExtractJobCreate,
             ExtractMode,
+            ExtractTarget,
             LlamaExtractSettings,
+            LlamaParseParameters,
         )
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -913,10 +1089,13 @@ class AsyncLlamaExtractClient:
                 extraction_agent_id="string",
                 file_id="string",
                 config_override=ExtractConfig(
-                    extraction_mode=ExtractMode.PER_DOC,
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
                 ),
             ),
-            extract_settings=LlamaExtractSettings(),
+            extract_settings=LlamaExtractSettings(
+                llama_parse_params=LlamaParseParameters(),
+            ),
         )
         """
         _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
@@ -944,7 +1123,12 @@ class AsyncLlamaExtractClient:
         Parameters:
             - request: ExtractJobCreate.
         ---
-        from llama_cloud import ExtractConfig, ExtractJobCreate, ExtractMode
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreate,
+            ExtractMode,
+            ExtractTarget,
+        )
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
@@ -955,7 +1139,8 @@ class AsyncLlamaExtractClient:
                 extraction_agent_id="string",
                 file_id="string",
                 config_override=ExtractConfig(
-                    extraction_mode=ExtractMode.PER_DOC,
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
                 ),
             ),
         )
@@ -990,7 +1175,9 @@ class AsyncLlamaExtractClient:
             ExtractConfig,
             ExtractJobCreate,
             ExtractMode,
+            ExtractTarget,
             LlamaExtractSettings,
+            LlamaParseParameters,
         )
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1002,10 +1189,13 @@ class AsyncLlamaExtractClient:
                 extraction_agent_id="string",
                 file_id="string",
                 config_override=ExtractConfig(
-                    extraction_mode=ExtractMode.PER_DOC,
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
                 ),
             ),
-            extract_settings=LlamaExtractSettings(),
+            extract_settings=LlamaExtractSettings(
+                llama_parse_params=LlamaParseParameters(),
+            ),
         )
         """
         _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
@@ -1028,34 +1218,61 @@ class AsyncLlamaExtractClient:
             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, *, extraction_agent_id: str, file_ids: typing.List[str]
-    ) -> typing.List[ExtractJob]:
+    async def get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
-            - extraction_agent_id: str. The id of the extraction agent
+            - job_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
 
-            - file_ids: typing.List[str]. The ids of the files
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.get_job_result(
+            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/extractionv2/jobs/{job_id}/result"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractResultset, _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 list_extract_runs(self, *, extraction_agent_id: str) -> typing.List[ExtractRun]:
+        """
+        Parameters:
+            - extraction_agent_id: str.
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.run_jobs_in_batch(
+        await client.llama_extract.list_extract_runs(
             extraction_agent_id="string",
-            file_ids=[],
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/batch"),
-            json=jsonable_encoder({"extraction_agent_id": extraction_agent_id, "file_ids": file_ids}),
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/runs"),
+            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractJob], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(typing.List[ExtractRun], _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -1064,7 +1281,7 @@ 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_run_by_job_id(self, job_id: str) -> ExtractRun:
         """
         Parameters:
             - job_id: str.
@@ -1074,20 +1291,20 @@ class AsyncLlamaExtractClient:
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.get_job_result(
+        await client.llama_extract.get_run_by_job_id(
             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/extractionv2/jobs/{job_id}/result"
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/runs/by-job/{job_id}"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractResultset, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(ExtractRun, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -1096,39 +1313,28 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def list_extract_runs(
-        self,
-        *,
-        extraction_agent_id: typing.Optional[str] = None,
-        run_id: typing.Optional[str] = None,
-        job_id: typing.Optional[str] = None,
-    ) -> typing.List[ExtractRun]:
+    async def get_run(self, run_id: str) -> ExtractRun:
         """
         Parameters:
-            - extraction_agent_id: typing.Optional[str].
-
-            - run_id: typing.Optional[str].
-
-            - job_id: typing.Optional[str].
+            - run_id: str.
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.list_extract_runs()
+        await client.llama_extract.get_run(
+            run_id="string",
+        )
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/runs"),
-            params=remove_none_from_dict(
-                {"extraction_agent_id": extraction_agent_id, "run_id": run_id, "job_id": job_id}
-            ),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/runs/{run_id}"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractRun], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(ExtractRun, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try: