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

llama_cloud/resources/llama_extract/client.py

@@ -10,17 +10,18 @@ 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.extract_agent import ExtractAgent
-from ...types.extract_config import ExtractConfig
+from ...types.extract_agent_create import ExtractAgentCreate
+from ...types.extract_agent_update import ExtractAgentUpdate
 from ...types.extract_job import ExtractJob
 from ...types.extract_job_create import ExtractJobCreate
+from ...types.extract_job_create_batch import ExtractJobCreateBatch
 from ...types.extract_resultset import ExtractResultset
 from ...types.extract_run import ExtractRun
+from ...types.extract_schema_validate_request import ExtractSchemaValidateRequest
 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 import ExtractAgentCreateDataSchema
-from .types.extract_agent_update_data_schema import ExtractAgentUpdateDataSchema
-from .types.extract_schema_validate_request_data_schema import ExtractSchemaValidateRequestDataSchema
+from ...types.paginated_extract_runs_response import PaginatedExtractRunsResponse
 
 try:
     import pydantic
@@ -52,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"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/extraction-agents"),
             params=remove_none_from_dict({"project_id": project_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -72,9 +73,7 @@ class LlamaExtractClient:
         *,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
-        name: str,
-        data_schema: ExtractAgentCreateDataSchema,
-        config: ExtractConfig,
+        request: ExtractAgentCreate,
     ) -> ExtractAgent:
         """
         Parameters:
@@ -82,31 +81,34 @@ class LlamaExtractClient:
 
             - organization_id: typing.Optional[str].
 
-            - name: str. The name of the extraction schema
-
-            - data_schema: ExtractAgentCreateDataSchema. The schema of the data.
-
-            - config: ExtractConfig. The configuration parameters for the extraction agent.
+            - request: ExtractAgentCreate.
         ---
-        from llama_cloud import ExtractConfig, ExtractMode, ExtractTarget
+        from llama_cloud import (
+            ExtractAgentCreate,
+            ExtractConfig,
+            ExtractMode,
+            ExtractTarget,
+        )
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
         client.llama_extract.create_extraction_agent(
-            name="string",
-            config=ExtractConfig(
-                extraction_target=ExtractTarget.PER_DOC,
-                extraction_mode=ExtractMode.FAST,
+            request=ExtractAgentCreate(
+                name="string",
+                config=ExtractConfig(
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
+                ),
             ),
         )
         """
         _response = self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction-agents"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/extraction-agents"),
             params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
-            json=jsonable_encoder({"name": name, "data_schema": data_schema, "config": config}),
+            json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -120,29 +122,30 @@ 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:
+    def validate_extraction_schema(self, *, request: ExtractSchemaValidateRequest) -> 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.
+            - request: ExtractSchemaValidateRequest.
         ---
+        from llama_cloud import ExtractSchemaValidateRequest
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.validate_extraction_schema()
+        client.llama_extract.validate_extraction_schema(
+            request=ExtractSchemaValidateRequest(),
+        )
         """
         _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"
+                f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/extraction-agents/schema/validation"
             ),
-            json=jsonable_encoder({"data_schema": data_schema}),
+            json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -175,7 +178,7 @@ class LlamaExtractClient:
         _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}"
+                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}),
             headers=self._client_wrapper.get_headers(),
@@ -208,8 +211,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(
-                f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/extraction-agents/{extraction_agent_id}"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -224,18 +226,19 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def update_extraction_agent(
-        self, extraction_agent_id: str, *, data_schema: ExtractAgentUpdateDataSchema, config: ExtractConfig
-    ) -> ExtractAgent:
+    def update_extraction_agent(self, extraction_agent_id: str, *, request: ExtractAgentUpdate) -> ExtractAgent:
         """
         Parameters:
             - extraction_agent_id: str.
 
-            - data_schema: ExtractAgentUpdateDataSchema. The schema of the data
-
-            - config: ExtractConfig. The configuration parameters for the extraction agent.
+            - request: ExtractAgentUpdate.
         ---
-        from llama_cloud import ExtractConfig, ExtractMode, ExtractTarget
+        from llama_cloud import (
+            ExtractAgentUpdate,
+            ExtractConfig,
+            ExtractMode,
+            ExtractTarget,
+        )
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
@@ -243,19 +246,20 @@ class LlamaExtractClient:
         )
         client.llama_extract.update_extraction_agent(
             extraction_agent_id="string",
-            config=ExtractConfig(
-                extraction_target=ExtractTarget.PER_DOC,
-                extraction_mode=ExtractMode.FAST,
+            request=ExtractAgentUpdate(
+                config=ExtractConfig(
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
+                ),
             ),
         )
         """
         _response = self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(
-                f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/extraction-agents/{extraction_agent_id}"
             ),
-            json=jsonable_encoder({"data_schema": data_schema, "config": config}),
+            json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -286,8 +290,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "DELETE",
             urllib.parse.urljoin(
-                f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/extraction-agents/{extraction_agent_id}"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -318,7 +321,7 @@ class LlamaExtractClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs"),
             params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -362,7 +365,7 @@ class LlamaExtractClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs"),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -393,7 +396,7 @@ class LlamaExtractClient:
         """
         _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}"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/jobs/{job_id}"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -407,9 +410,9 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def run_job_with_parsed_file_test(
+    def run_job_test_user(
         self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
-    ) -> ExtractResultset:
+    ) -> ExtractJob:
         """
         Parameters:
             - job_create: ExtractJobCreate.
@@ -431,7 +434,7 @@ class LlamaExtractClient:
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.run_job_with_parsed_file_test(
+        client.llama_extract.run_job_test_user(
             job_create=ExtractJobCreate(
                 extraction_agent_id="string",
                 file_id="string",
@@ -453,13 +456,13 @@ class LlamaExtractClient:
             _request["extract_settings"] = extract_settings
         _response = self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/parsed/test"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/test"),
             json=jsonable_encoder(_request),
             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(ExtractJob, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -468,14 +471,14 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def run_job_with_parsed_file(self, *, request: ExtractJobCreate) -> ExtractResultset:
+    def run_batch_jobs(self, *, request: ExtractJobCreateBatch) -> typing.List[ExtractJob]:
         """
         Parameters:
-            - request: ExtractJobCreate.
+            - request: ExtractJobCreateBatch.
         ---
         from llama_cloud import (
             ExtractConfig,
-            ExtractJobCreate,
+            ExtractJobCreateBatch,
             ExtractMode,
             ExtractTarget,
         )
@@ -484,10 +487,10 @@ class LlamaExtractClient:
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.run_job_with_parsed_file(
-            request=ExtractJobCreate(
+        client.llama_extract.run_batch_jobs(
+            request=ExtractJobCreateBatch(
                 extraction_agent_id="string",
-                file_id="string",
+                file_ids=[],
                 config_override=ExtractConfig(
                     extraction_target=ExtractTarget.PER_DOC,
                     extraction_mode=ExtractMode.FAST,
@@ -497,13 +500,13 @@ class LlamaExtractClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/parsed"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/batch"),
             json=jsonable_encoder(request),
             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(typing.List[ExtractJob], _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -512,59 +515,28 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def run_job_test_user(
-        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
-    ) -> ExtractJob:
+    def get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
-            - job_create: ExtractJobCreate.
-
-            - extract_settings: typing.Optional[LlamaExtractSettings].
+            - job_id: str.
         ---
-        from llama_cloud import (
-            ChunkMode,
-            ExtractConfig,
-            ExtractJobCreate,
-            ExtractMode,
-            ExtractTarget,
-            LlamaExtractSettings,
-            LlamaParseParameters,
-            ParsingMode,
-        )
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.run_job_test_user(
-            job_create=ExtractJobCreate(
-                extraction_agent_id="string",
-                file_id="string",
-                config_override=ExtractConfig(
-                    extraction_target=ExtractTarget.PER_DOC,
-                    extraction_mode=ExtractMode.FAST,
-                ),
-            ),
-            extract_settings=LlamaExtractSettings(
-                chunk_mode=ChunkMode.PAGE,
-                llama_parse_params=LlamaParseParameters(
-                    parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
-                ),
-            ),
+        client.llama_extract.get_job_result(
+            job_id="string",
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
-        if extract_settings is not OMIT:
-            _request["extract_settings"] = extract_settings
         _response = self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/test"),
-            json=jsonable_encoder(_request),
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/jobs/{job_id}/result"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractJob, _response.json())  # type: ignore
+            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:
@@ -573,30 +545,35 @@ 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 list_extract_runs(
+        self, *, extraction_agent_id: str, skip: typing.Optional[int] = None, limit: typing.Optional[int] = None
+    ) -> PaginatedExtractRunsResponse:
         """
         Parameters:
-            - job_id: str.
+            - extraction_agent_id: str.
+
+            - skip: typing.Optional[int].
+
+            - limit: typing.Optional[int].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.get_job_result(
-            job_id="string",
+        client.llama_extract.list_extract_runs(
+            extraction_agent_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"
-            ),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/runs"),
+            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id, "skip": skip, "limit": limit}),
             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(PaginatedExtractRunsResponse, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -605,29 +582,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: str) -> typing.List[ExtractRun]:
+    def get_run_by_job_id(self, job_id: str) -> ExtractRun:
         """
         Parameters:
-            - extraction_agent_id: str.
+            - job_id: str.
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.list_extract_runs(
-            extraction_agent_id="string",
+        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()}/", "api/v1/extractionv2/runs"),
-            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/by-job/{job_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:
@@ -636,25 +612,23 @@ 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(self, run_id: str) -> ExtractRun:
         """
         Parameters:
-            - job_id: str.
+            - run_id: str.
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.get_run_by_job_id(
-            job_id="string",
+        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()}/", f"api/v1/extractionv2/runs/by-job/{job_id}"
-            ),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -668,7 +642,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_run(self, run_id: str) -> ExtractRun:
+    def delete_extraction_run(self, run_id: str) -> typing.Any:
         """
         Parameters:
             - run_id: str.
@@ -678,18 +652,18 @@ class LlamaExtractClient:
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.get_run(
+        client.llama_extract.delete_extraction_run(
             run_id="string",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
-            "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/runs/{run_id}"),
+            "DELETE",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractRun, _response.json())  # type: ignore
+            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:
@@ -717,7 +691,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"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/extraction-agents"),
             params=remove_none_from_dict({"project_id": project_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -737,9 +711,7 @@ class AsyncLlamaExtractClient:
         *,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
-        name: str,
-        data_schema: ExtractAgentCreateDataSchema,
-        config: ExtractConfig,
+        request: ExtractAgentCreate,
     ) -> ExtractAgent:
         """
         Parameters:
@@ -747,31 +719,34 @@ class AsyncLlamaExtractClient:
 
             - organization_id: typing.Optional[str].
 
-            - name: str. The name of the extraction schema
-
-            - data_schema: ExtractAgentCreateDataSchema. The schema of the data.
-
-            - config: ExtractConfig. The configuration parameters for the extraction agent.
+            - request: ExtractAgentCreate.
         ---
-        from llama_cloud import ExtractConfig, ExtractMode, ExtractTarget
+        from llama_cloud import (
+            ExtractAgentCreate,
+            ExtractConfig,
+            ExtractMode,
+            ExtractTarget,
+        )
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
         await client.llama_extract.create_extraction_agent(
-            name="string",
-            config=ExtractConfig(
-                extraction_target=ExtractTarget.PER_DOC,
-                extraction_mode=ExtractMode.FAST,
+            request=ExtractAgentCreate(
+                name="string",
+                config=ExtractConfig(
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
+                ),
             ),
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction-agents"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/extraction-agents"),
             params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
-            json=jsonable_encoder({"name": name, "data_schema": data_schema, "config": config}),
+            json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -786,28 +761,31 @@ class AsyncLlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def validate_extraction_schema(
-        self, *, data_schema: ExtractSchemaValidateRequestDataSchema
+        self, *, request: ExtractSchemaValidateRequest
     ) -> 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.
+            - request: ExtractSchemaValidateRequest.
         ---
+        from llama_cloud import ExtractSchemaValidateRequest
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.validate_extraction_schema()
+        await client.llama_extract.validate_extraction_schema(
+            request=ExtractSchemaValidateRequest(),
+        )
         """
         _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"
+                f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/extraction-agents/schema/validation"
             ),
-            json=jsonable_encoder({"data_schema": data_schema}),
+            json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -840,7 +818,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/extractionv2/extraction-agents/by-name/{name}"
+                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}),
             headers=self._client_wrapper.get_headers(),
@@ -873,8 +851,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/extractionv2/extraction-agents/{extraction_agent_id}",
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/extraction-agents/{extraction_agent_id}"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -889,18 +866,19 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def update_extraction_agent(
-        self, extraction_agent_id: str, *, data_schema: ExtractAgentUpdateDataSchema, config: ExtractConfig
-    ) -> ExtractAgent:
+    async def update_extraction_agent(self, extraction_agent_id: str, *, request: ExtractAgentUpdate) -> ExtractAgent:
         """
         Parameters:
             - extraction_agent_id: str.
 
-            - data_schema: ExtractAgentUpdateDataSchema. The schema of the data
-
-            - config: ExtractConfig. The configuration parameters for the extraction agent.
+            - request: ExtractAgentUpdate.
         ---
-        from llama_cloud import ExtractConfig, ExtractMode, ExtractTarget
+        from llama_cloud import (
+            ExtractAgentUpdate,
+            ExtractConfig,
+            ExtractMode,
+            ExtractTarget,
+        )
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
@@ -908,19 +886,20 @@ class AsyncLlamaExtractClient:
         )
         await client.llama_extract.update_extraction_agent(
             extraction_agent_id="string",
-            config=ExtractConfig(
-                extraction_target=ExtractTarget.PER_DOC,
-                extraction_mode=ExtractMode.FAST,
+            request=ExtractAgentUpdate(
+                config=ExtractConfig(
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
+                ),
             ),
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(
-                f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/extraction-agents/{extraction_agent_id}"
             ),
-            json=jsonable_encoder({"data_schema": data_schema, "config": config}),
+            json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -951,8 +930,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/extractionv2/extraction-agents/{extraction_agent_id}",
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/extraction-agents/{extraction_agent_id}"
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -983,7 +961,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/jobs"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs"),
             params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1027,7 +1005,7 @@ class AsyncLlamaExtractClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs"),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1058,7 +1036,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/extractionv2/jobs/{job_id}"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/jobs/{job_id}"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1072,9 +1050,9 @@ 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_job_with_parsed_file_test(
+    async def run_job_test_user(
         self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
-    ) -> ExtractResultset:
+    ) -> ExtractJob:
         """
         Parameters:
             - job_create: ExtractJobCreate.
@@ -1096,7 +1074,7 @@ class AsyncLlamaExtractClient:
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.run_job_with_parsed_file_test(
+        await client.llama_extract.run_job_test_user(
             job_create=ExtractJobCreate(
                 extraction_agent_id="string",
                 file_id="string",
@@ -1118,13 +1096,13 @@ class AsyncLlamaExtractClient:
             _request["extract_settings"] = extract_settings
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/parsed/test"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/test"),
             json=jsonable_encoder(_request),
             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(ExtractJob, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -1133,14 +1111,14 @@ 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_job_with_parsed_file(self, *, request: ExtractJobCreate) -> ExtractResultset:
+    async def run_batch_jobs(self, *, request: ExtractJobCreateBatch) -> typing.List[ExtractJob]:
         """
         Parameters:
-            - request: ExtractJobCreate.
+            - request: ExtractJobCreateBatch.
         ---
         from llama_cloud import (
             ExtractConfig,
-            ExtractJobCreate,
+            ExtractJobCreateBatch,
             ExtractMode,
             ExtractTarget,
         )
@@ -1149,10 +1127,10 @@ class AsyncLlamaExtractClient:
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.run_job_with_parsed_file(
-            request=ExtractJobCreate(
+        await client.llama_extract.run_batch_jobs(
+            request=ExtractJobCreateBatch(
                 extraction_agent_id="string",
-                file_id="string",
+                file_ids=[],
                 config_override=ExtractConfig(
                     extraction_target=ExtractTarget.PER_DOC,
                     extraction_mode=ExtractMode.FAST,
@@ -1162,13 +1140,13 @@ class AsyncLlamaExtractClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/parsed"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/batch"),
             json=jsonable_encoder(request),
             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(typing.List[ExtractJob], _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -1177,59 +1155,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 run_job_test_user(
-        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
-    ) -> ExtractJob:
+    async def get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
-            - job_create: ExtractJobCreate.
-
-            - extract_settings: typing.Optional[LlamaExtractSettings].
+            - job_id: str.
         ---
-        from llama_cloud import (
-            ChunkMode,
-            ExtractConfig,
-            ExtractJobCreate,
-            ExtractMode,
-            ExtractTarget,
-            LlamaExtractSettings,
-            LlamaParseParameters,
-            ParsingMode,
-        )
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.run_job_test_user(
-            job_create=ExtractJobCreate(
-                extraction_agent_id="string",
-                file_id="string",
-                config_override=ExtractConfig(
-                    extraction_target=ExtractTarget.PER_DOC,
-                    extraction_mode=ExtractMode.FAST,
-                ),
-            ),
-            extract_settings=LlamaExtractSettings(
-                chunk_mode=ChunkMode.PAGE,
-                llama_parse_params=LlamaParseParameters(
-                    parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
-                ),
-            ),
+        await client.llama_extract.get_job_result(
+            job_id="string",
         )
         """
-        _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
-        if extract_settings is not OMIT:
-            _request["extract_settings"] = extract_settings
         _response = await self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/test"),
-            json=jsonable_encoder(_request),
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/jobs/{job_id}/result"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractJob, _response.json())  # type: ignore
+            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:
@@ -1238,30 +1185,35 @@ 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 list_extract_runs(
+        self, *, extraction_agent_id: str, skip: typing.Optional[int] = None, limit: typing.Optional[int] = None
+    ) -> PaginatedExtractRunsResponse:
         """
         Parameters:
-            - job_id: str.
+            - extraction_agent_id: str.
+
+            - skip: typing.Optional[int].
+
+            - limit: typing.Optional[int].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.get_job_result(
-            job_id="string",
+        await client.llama_extract.list_extract_runs(
+            extraction_agent_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"
-            ),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/runs"),
+            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id, "skip": skip, "limit": limit}),
             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(PaginatedExtractRunsResponse, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -1270,29 +1222,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: str) -> typing.List[ExtractRun]:
+    async def get_run_by_job_id(self, job_id: str) -> ExtractRun:
         """
         Parameters:
-            - extraction_agent_id: str.
+            - job_id: str.
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.list_extract_runs(
-            extraction_agent_id="string",
+        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()}/", "api/v1/extractionv2/runs"),
-            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/by-job/{job_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:
@@ -1301,25 +1252,23 @@ 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(self, run_id: str) -> ExtractRun:
         """
         Parameters:
-            - job_id: str.
+            - run_id: str.
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.get_run_by_job_id(
-            job_id="string",
+        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()}/", f"api/v1/extractionv2/runs/by-job/{job_id}"
-            ),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1333,7 +1282,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_run(self, run_id: str) -> ExtractRun:
+    async def delete_extraction_run(self, run_id: str) -> typing.Any:
         """
         Parameters:
             - run_id: str.
@@ -1343,18 +1292,18 @@ class AsyncLlamaExtractClient:
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.get_run(
+        await client.llama_extract.delete_extraction_run(
             run_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/runs/{run_id}"),
+            "DELETE",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractRun, _response.json())  # type: ignore
+            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: