llama-cloud 0.1.12__py3-none-any.whl → 0.1.14__py3-none-any.whl

llama_cloud/resources/llama_extract/client.py

@@ -10,17 +10,16 @@ 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_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
 
 try:
     import pydantic
@@ -52,7 +51,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 +71,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 +79,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 +120,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 +176,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 +209,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 +224,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 +244,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 +288,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 +319,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 +363,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 +394,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,108 +408,6 @@ 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(
-        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
-    ) -> ExtractResultset:
-        """
-        Parameters:
-            - job_create: ExtractJobCreate.
-
-            - extract_settings: typing.Optional[LlamaExtractSettings].
-        ---
-        from llama_cloud import (
-            ChunkMode,
-            ExtractConfig,
-            ExtractJobCreate,
-            ExtractMode,
-            ExtractTarget,
-            LlamaExtractSettings,
-            LlamaParseParameters,
-        )
-        from llama_cloud.client import LlamaCloud
-
-        client = LlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        client.llama_extract.run_job_with_parsed_file_test(
-            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(),
-            ),
-        )
-        """
-        _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/parsed/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
-        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 run_job_with_parsed_file(self, *, request: ExtractJobCreate) -> ExtractResultset:
-        """
-        Parameters:
-            - request: ExtractJobCreate.
-        ---
-        from llama_cloud import (
-            ExtractConfig,
-            ExtractJobCreate,
-            ExtractMode,
-            ExtractTarget,
-        )
-        from llama_cloud.client import LlamaCloud
-
-        client = LlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        client.llama_extract.run_job_with_parsed_file(
-            request=ExtractJobCreate(
-                extraction_agent_id="string",
-                file_id="string",
-                config_override=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/jobs/parsed"),
-            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
-        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 run_job_test_user(
         self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
     ) -> ExtractJob:
@@ -526,6 +425,7 @@ class LlamaExtractClient:
             ExtractTarget,
             LlamaExtractSettings,
             LlamaParseParameters,
+            ParsingMode,
         )
         from llama_cloud.client import LlamaCloud
 
@@ -543,7 +443,9 @@ class LlamaExtractClient:
             ),
             extract_settings=LlamaExtractSettings(
                 chunk_mode=ChunkMode.PAGE,
-                llama_parse_params=LlamaParseParameters(),
+                llama_parse_params=LlamaParseParameters(
+                    parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
+                ),
             ),
         )
         """
@@ -552,7 +454,7 @@ 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/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,
@@ -583,9 +485,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}/result"
-            ),
+            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,
         )
@@ -615,7 +515,7 @@ class LlamaExtractClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/runs"),
+            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}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -646,9 +546,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/runs/by-job/{job_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,
         )
@@ -678,7 +576,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/runs/{run_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,
         )
@@ -711,7 +609,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,
@@ -731,9 +629,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:
@@ -741,31 +637,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,
         )
@@ -780,28 +679,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,
         )
@@ -834,7 +736,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(),
@@ -867,8 +769,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,
@@ -883,18 +784,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(
@@ -902,19 +804,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,
         )
@@ -945,8 +848,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,
@@ -977,7 +879,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,
@@ -1021,7 +923,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,
@@ -1052,7 +954,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,
         )
@@ -1066,108 +968,6 @@ 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(
-        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
-    ) -> ExtractResultset:
-        """
-        Parameters:
-            - job_create: ExtractJobCreate.
-
-            - extract_settings: typing.Optional[LlamaExtractSettings].
-        ---
-        from llama_cloud import (
-            ChunkMode,
-            ExtractConfig,
-            ExtractJobCreate,
-            ExtractMode,
-            ExtractTarget,
-            LlamaExtractSettings,
-            LlamaParseParameters,
-        )
-        from llama_cloud.client import AsyncLlamaCloud
-
-        client = AsyncLlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        await client.llama_extract.run_job_with_parsed_file_test(
-            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(),
-            ),
-        )
-        """
-        _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/parsed/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
-        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 run_job_with_parsed_file(self, *, request: ExtractJobCreate) -> ExtractResultset:
-        """
-        Parameters:
-            - request: ExtractJobCreate.
-        ---
-        from llama_cloud import (
-            ExtractConfig,
-            ExtractJobCreate,
-            ExtractMode,
-            ExtractTarget,
-        )
-        from llama_cloud.client import AsyncLlamaCloud
-
-        client = AsyncLlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        await client.llama_extract.run_job_with_parsed_file(
-            request=ExtractJobCreate(
-                extraction_agent_id="string",
-                file_id="string",
-                config_override=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/jobs/parsed"),
-            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
-        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 run_job_test_user(
         self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
     ) -> ExtractJob:
@@ -1185,6 +985,7 @@ class AsyncLlamaExtractClient:
             ExtractTarget,
             LlamaExtractSettings,
             LlamaParseParameters,
+            ParsingMode,
         )
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1202,7 +1003,9 @@ class AsyncLlamaExtractClient:
             ),
             extract_settings=LlamaExtractSettings(
                 chunk_mode=ChunkMode.PAGE,
-                llama_parse_params=LlamaParseParameters(),
+                llama_parse_params=LlamaParseParameters(
+                    parse_mode=ParsingMode.PARSE_PAGE_WITHOUT_LLM,
+                ),
             ),
         )
         """
@@ -1211,7 +1014,7 @@ 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/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,
@@ -1242,9 +1045,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}/result"
-            ),
+            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,
         )
@@ -1274,7 +1075,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/runs"),
+            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}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1305,9 +1106,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/runs/by-job/{job_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,
         )
@@ -1337,7 +1136,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/runs/{run_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,
         )