llama-cloud 0.1.8__py3-none-any.whl → 0.1.10__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,13 +38,42 @@ class LlamaExtractClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list_extraction_agents(self, *, project_id: typing.Optional[str] = None) -> typing.List[ExtractAgent]:
+        """
+        Parameters:
+            - project_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.llama_extract.list_extraction_agents()
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction-agents"),
+            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(typing.List[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 create_extraction_agent(
         self,
         *,
         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:
         """
@@ -53,7 +84,7 @@ 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.
         ---
@@ -65,7 +96,6 @@ class LlamaExtractClient:
         )
         client.llama_extract.create_extraction_agent(
             name="string",
-            data_schema={},
             config=ExtractConfig(
                 extraction_mode=ExtractMode.PER_DOC,
             ),
@@ -73,7 +103,7 @@ class LlamaExtractClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction_agent"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/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}),
             headers=self._client_wrapper.get_headers(),
@@ -89,33 +119,34 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_extraction_agents(
-        self, *, project_id: str, organization_id: typing.Optional[str] = None
-    ) -> typing.List[ExtractAgent]:
+    def validate_extraction_schema(
+        self, *, data_schema: ExtractSchemaValidateRequestDataSchema
+    ) -> ExtractSchemaValidateResponse:
         """
-        Parameters:
-            - project_id: str.
+        Validates an extraction agent's schema definition.
+        Returns the normalized and validated schema if valid, otherwise raises an HTTP 400.
 
-            - organization_id: typing.Optional[str].
+        Parameters:
+            - data_schema: ExtractSchemaValidateRequestDataSchema.
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.list_extraction_agents(
-            project_id="string",
-        )
+        client.llama_extract.validate_extraction_schema()
         """
         _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, "organization_id": organization_id}),
+            "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(typing.List[ExtractAgent], _response.json())  # type: ignore
+            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:
@@ -124,16 +155,12 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_extraction_agent_by_name(
-        self, *, name: str, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractAgent:
+    def get_extraction_agent_by_name(self, name: str, *, project_id: typing.Optional[str] = None) -> ExtractAgent:
         """
         Parameters:
             - name: str.
 
             - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -147,9 +174,9 @@ 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/by_name"
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/extraction-agents/by-name/{name}"
             ),
-            params=remove_none_from_dict({"name": name, "project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict({"project_id": project_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -163,20 +190,10 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_extraction_agent(
-        self,
-        extraction_agent_id: str,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-    ) -> ExtractAgent:
+    def get_extraction_agent(self, extraction_agent_id: str) -> ExtractAgent:
         """
         Parameters:
             - extraction_agent_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -191,9 +208,8 @@ class LlamaExtractClient:
             "GET",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction_agents/{extraction_agent_id}",
+                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -208,23 +224,13 @@ class LlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def update_extraction_agent(
-        self,
-        extraction_agent_id: str,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        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.
 
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[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.
         ---
@@ -236,7 +242,6 @@ class LlamaExtractClient:
         )
         client.llama_extract.update_extraction_agent(
             extraction_agent_id="string",
-            data_schema={},
             config=ExtractConfig(
                 extraction_mode=ExtractMode.PER_DOC,
             ),
@@ -246,9 +251,8 @@ class LlamaExtractClient:
             "PUT",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction_agents/{extraction_agent_id}",
+                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder({"data_schema": data_schema, "config": config}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -263,20 +267,10 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def delete_extraction_agent(
-        self,
-        extraction_agent_id: str,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-    ) -> typing.Any:
+    def delete_extraction_agent(self, extraction_agent_id: str) -> typing.Any:
         """
         Parameters:
             - extraction_agent_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -291,9 +285,8 @@ class LlamaExtractClient:
             "DELETE",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction_agents/{extraction_agent_id}",
+                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -307,20 +300,10 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_jobs(
-        self,
-        *,
-        extraction_agent_id: str,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-    ) -> typing.List[ExtractJob]:
+    def list_jobs(self, *, extraction_agent_id: str) -> typing.List[ExtractJob]:
         """
         Parameters:
             - extraction_agent_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -334,13 +317,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"),
-            params=remove_none_from_dict(
-                {
-                    "extraction_agent_id": extraction_agent_id,
-                    "project_id": project_id,
-                    "organization_id": organization_id,
-                }
-            ),
+            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -354,19 +331,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(
-        self,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        request: ExtractJobCreate,
-    ) -> ExtractJob:
+    def run_job(self, *, request: ExtractJobCreate) -> ExtractJob:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
-
             - request: ExtractJobCreate.
         ---
         from llama_cloud import ExtractConfig, ExtractJobCreate, ExtractMode
@@ -388,7 +355,6 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -403,16 +369,10 @@ 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(
-        self, job_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractJob:
+    def get_job(self, job_id: str) -> ExtractJob:
         """
         Parameters:
             - job_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -426,7 +386,6 @@ 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}"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -441,19 +400,10 @@ class LlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def run_job_with_parsed_file_test(
-        self,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        job_create: ExtractJobCreate,
-        extract_settings: typing.Optional[LlamaExtractSettings] = OMIT,
-    ) -> typing.Optional[ExtractResultset]:
+        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
+    ) -> ExtractResultset:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
-
             - job_create: ExtractJobCreate.
 
             - extract_settings: typing.Optional[LlamaExtractSettings].
@@ -463,6 +413,7 @@ class LlamaExtractClient:
             ExtractJobCreate,
             ExtractMode,
             LlamaExtractSettings,
+            LlamaParseParameters,
         )
         from llama_cloud.client import LlamaCloud
 
@@ -477,7 +428,9 @@ class LlamaExtractClient:
                     extraction_mode=ExtractMode.PER_DOC,
                 ),
             ),
-            extract_settings=LlamaExtractSettings(),
+            extract_settings=LlamaExtractSettings(
+                llama_parse_params=LlamaParseParameters(),
+            ),
         )
         """
         _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
@@ -486,13 +439,12 @@ 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/test"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Optional[ExtractResultset], _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:
@@ -501,19 +453,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(
-        self,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        request: ExtractJobCreate,
-    ) -> typing.Optional[ExtractResultset]:
+    def run_job_with_parsed_file(self, *, request: ExtractJobCreate) -> ExtractResultset:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
-
             - request: ExtractJobCreate.
         ---
         from llama_cloud import ExtractConfig, ExtractJobCreate, ExtractMode
@@ -535,13 +477,12 @@ 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"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Optional[ExtractResultset], _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:
@@ -551,19 +492,10 @@ class LlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def run_job_test_user(
-        self,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        job_create: ExtractJobCreate,
-        extract_settings: typing.Optional[LlamaExtractSettings] = OMIT,
+        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
     ) -> ExtractJob:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
-
             - job_create: ExtractJobCreate.
 
             - extract_settings: typing.Optional[LlamaExtractSettings].
@@ -573,6 +505,7 @@ class LlamaExtractClient:
             ExtractJobCreate,
             ExtractMode,
             LlamaExtractSettings,
+            LlamaParseParameters,
         )
         from llama_cloud.client import LlamaCloud
 
@@ -587,7 +520,9 @@ class LlamaExtractClient:
                     extraction_mode=ExtractMode.PER_DOC,
                 ),
             ),
-            extract_settings=LlamaExtractSettings(),
+            extract_settings=LlamaExtractSettings(
+                llama_parse_params=LlamaParseParameters(),
+            ),
         )
         """
         _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
@@ -596,7 +531,6 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/test"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -611,44 +545,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,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        extraction_agent_id: str,
-        file_ids: typing.List[str],
-    ) -> typing.List[ExtractJob]:
+    def get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
+            - job_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
 
-            - extraction_agent_id: str. The id of the extraction agent
+        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)
 
-            - file_ids: typing.List[str]. The ids of the files
+    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"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
-            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:
@@ -657,37 +608,30 @@ 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, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractResultset:
+    def get_run_by_job_id(self, job_id: str) -> ExtractRun:
         """
         Parameters:
             - job_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.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}"
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_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:
@@ -696,30 +640,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_extract_run_api_v_1_extractionv_2_runs_run_id_get(
-        self, run_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractRun:
+    def get_run(self, run_id: str) -> ExtractRun:
         """
         Parameters:
             - run_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.llama_extract.get_extract_run_api_v_1_extractionv_2_runs_run_id_get(
+        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/{run_id}"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -738,13 +675,42 @@ 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) -> typing.List[ExtractAgent]:
+        """
+        Parameters:
+            - project_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.list_extraction_agents()
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction-agents"),
+            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(typing.List[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 create_extraction_agent(
         self,
         *,
         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:
         """
@@ -755,7 +721,7 @@ 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.
         ---
@@ -767,7 +733,6 @@ class AsyncLlamaExtractClient:
         )
         await client.llama_extract.create_extraction_agent(
             name="string",
-            data_schema={},
             config=ExtractConfig(
                 extraction_mode=ExtractMode.PER_DOC,
             ),
@@ -775,7 +740,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/extraction_agent"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/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}),
             headers=self._client_wrapper.get_headers(),
@@ -791,33 +756,34 @@ 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_extraction_agents(
-        self, *, project_id: str, organization_id: typing.Optional[str] = None
-    ) -> typing.List[ExtractAgent]:
+    async def validate_extraction_schema(
+        self, *, data_schema: ExtractSchemaValidateRequestDataSchema
+    ) -> ExtractSchemaValidateResponse:
         """
-        Parameters:
-            - project_id: str.
+        Validates an extraction agent's schema definition.
+        Returns the normalized and validated schema if valid, otherwise raises an HTTP 400.
 
-            - organization_id: typing.Optional[str].
+        Parameters:
+            - data_schema: ExtractSchemaValidateRequestDataSchema.
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.list_extraction_agents(
-            project_id="string",
-        )
+        await client.llama_extract.validate_extraction_schema()
         """
         _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, "organization_id": organization_id}),
+            "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(typing.List[ExtractAgent], _response.json())  # type: ignore
+            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:
@@ -826,16 +792,12 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_extraction_agent_by_name(
-        self, *, name: str, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractAgent:
+    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].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -849,9 +811,9 @@ 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/by_name"
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/extraction-agents/by-name/{name}"
             ),
-            params=remove_none_from_dict({"name": name, "project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict({"project_id": project_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -865,20 +827,10 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def get_extraction_agent(
-        self,
-        extraction_agent_id: str,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-    ) -> ExtractAgent:
+    async def get_extraction_agent(self, extraction_agent_id: str) -> ExtractAgent:
         """
         Parameters:
             - extraction_agent_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -893,9 +845,8 @@ class AsyncLlamaExtractClient:
             "GET",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction_agents/{extraction_agent_id}",
+                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -910,23 +861,13 @@ class AsyncLlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def update_extraction_agent(
-        self,
-        extraction_agent_id: str,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        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.
 
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[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.
         ---
@@ -938,7 +879,6 @@ class AsyncLlamaExtractClient:
         )
         await client.llama_extract.update_extraction_agent(
             extraction_agent_id="string",
-            data_schema={},
             config=ExtractConfig(
                 extraction_mode=ExtractMode.PER_DOC,
             ),
@@ -948,9 +888,8 @@ class AsyncLlamaExtractClient:
             "PUT",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction_agents/{extraction_agent_id}",
+                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder({"data_schema": data_schema, "config": config}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -965,20 +904,10 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def delete_extraction_agent(
-        self,
-        extraction_agent_id: str,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-    ) -> typing.Any:
+    async def delete_extraction_agent(self, extraction_agent_id: str) -> typing.Any:
         """
         Parameters:
             - extraction_agent_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -993,9 +922,8 @@ class AsyncLlamaExtractClient:
             "DELETE",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/",
-                f"api/v1/extractionv2/extraction_agents/{extraction_agent_id}",
+                f"api/v1/extractionv2/extraction-agents/{extraction_agent_id}",
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1009,20 +937,10 @@ 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_jobs(
-        self,
-        *,
-        extraction_agent_id: str,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-    ) -> typing.List[ExtractJob]:
+    async def list_jobs(self, *, extraction_agent_id: str) -> typing.List[ExtractJob]:
         """
         Parameters:
             - extraction_agent_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1036,13 +954,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"),
-            params=remove_none_from_dict(
-                {
-                    "extraction_agent_id": extraction_agent_id,
-                    "project_id": project_id,
-                    "organization_id": organization_id,
-                }
-            ),
+            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1056,19 +968,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(
-        self,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        request: ExtractJobCreate,
-    ) -> ExtractJob:
+    async def run_job(self, *, request: ExtractJobCreate) -> ExtractJob:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
-
             - request: ExtractJobCreate.
         ---
         from llama_cloud import ExtractConfig, ExtractJobCreate, ExtractMode
@@ -1090,7 +992,6 @@ 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"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1105,16 +1006,10 @@ 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(
-        self, job_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractJob:
+    async def get_job(self, job_id: str) -> ExtractJob:
         """
         Parameters:
             - job_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1128,7 +1023,6 @@ 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}"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1143,19 +1037,10 @@ class AsyncLlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def run_job_with_parsed_file_test(
-        self,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        job_create: ExtractJobCreate,
-        extract_settings: typing.Optional[LlamaExtractSettings] = OMIT,
-    ) -> typing.Optional[ExtractResultset]:
+        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
+    ) -> ExtractResultset:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
-
             - job_create: ExtractJobCreate.
 
             - extract_settings: typing.Optional[LlamaExtractSettings].
@@ -1165,6 +1050,7 @@ class AsyncLlamaExtractClient:
             ExtractJobCreate,
             ExtractMode,
             LlamaExtractSettings,
+            LlamaParseParameters,
         )
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1179,7 +1065,9 @@ class AsyncLlamaExtractClient:
                     extraction_mode=ExtractMode.PER_DOC,
                 ),
             ),
-            extract_settings=LlamaExtractSettings(),
+            extract_settings=LlamaExtractSettings(
+                llama_parse_params=LlamaParseParameters(),
+            ),
         )
         """
         _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
@@ -1188,13 +1076,12 @@ 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/test"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Optional[ExtractResultset], _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:
@@ -1203,19 +1090,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(
-        self,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        request: ExtractJobCreate,
-    ) -> typing.Optional[ExtractResultset]:
+    async def run_job_with_parsed_file(self, *, request: ExtractJobCreate) -> ExtractResultset:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
-
             - request: ExtractJobCreate.
         ---
         from llama_cloud import ExtractConfig, ExtractJobCreate, ExtractMode
@@ -1237,13 +1114,12 @@ 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"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.Optional[ExtractResultset], _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:
@@ -1253,19 +1129,10 @@ class AsyncLlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def run_job_test_user(
-        self,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        job_create: ExtractJobCreate,
-        extract_settings: typing.Optional[LlamaExtractSettings] = OMIT,
+        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
     ) -> ExtractJob:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
-
             - job_create: ExtractJobCreate.
 
             - extract_settings: typing.Optional[LlamaExtractSettings].
@@ -1275,6 +1142,7 @@ class AsyncLlamaExtractClient:
             ExtractJobCreate,
             ExtractMode,
             LlamaExtractSettings,
+            LlamaParseParameters,
         )
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1289,7 +1157,9 @@ class AsyncLlamaExtractClient:
                     extraction_mode=ExtractMode.PER_DOC,
                 ),
             ),
-            extract_settings=LlamaExtractSettings(),
+            extract_settings=LlamaExtractSettings(
+                llama_parse_params=LlamaParseParameters(),
+            ),
         )
         """
         _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
@@ -1298,7 +1168,6 @@ 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/test"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1313,44 +1182,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,
-        *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        extraction_agent_id: str,
-        file_ids: typing.List[str],
-    ) -> typing.List[ExtractJob]:
+    async def get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
+            - job_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
 
-            - extraction_agent_id: str. The id of the extraction agent
+        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)
 
-            - file_ids: typing.List[str]. The ids of the files
+    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"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
-            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:
@@ -1359,37 +1245,30 @@ 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, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractResultset:
+    async def get_run_by_job_id(self, job_id: str) -> ExtractRun:
         """
         Parameters:
             - job_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.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}"
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_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:
@@ -1398,30 +1277,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_extract_run_api_v_1_extractionv_2_runs_run_id_get(
-        self, run_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractRun:
+    async def get_run(self, run_id: str) -> ExtractRun:
         """
         Parameters:
             - run_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.get_extract_run_api_v_1_extractionv_2_runs_run_id_get(
+        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/{run_id}"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )