llama-cloud 0.1.7a1__py3-none-any.whl → 0.1.9__py3-none-any.whl

llama_cloud/resources/llama_extract/client.py

@@ -14,7 +14,9 @@ from ...types.extract_config import ExtractConfig
 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.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
 
@@ -34,6 +36,39 @@ class LlamaExtractClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list_extraction_agents(
+        self, *, project_id: typing.Optional[str] = None, name: typing.Optional[str] = None
+    ) -> typing.List[ExtractAgent]:
+        """
+        Parameters:
+            - project_id: typing.Optional[str].
+
+            - name: 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, "name": name}),
+            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,
         *,
@@ -71,7 +106,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(),
@@ -87,55 +122,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_extraction_agents(
-        self, *, project_id: str, organization_id: typing.Optional[str] = None
-    ) -> typing.List[ExtractAgent]:
-        """
-        Parameters:
-            - project_id: str.
-
-            - organization_id: typing.Optional[str].
-        ---
-        from llama_cloud.client import LlamaCloud
-
-        client = LlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        client.llama_extract.list_extraction_agents(
-            project_id="string",
-        )
-        """
-        _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}),
-            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 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
 
@@ -150,9 +140,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,
         )
@@ -170,8 +159,6 @@ class LlamaExtractClient:
         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,
     ) -> ExtractAgent:
@@ -179,10 +166,6 @@ class LlamaExtractClient:
         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
 
             - config: ExtractConfig. The configuration parameters for the extraction agent.
@@ -205,9 +188,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,
@@ -222,20 +204,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
 
@@ -250,9 +222,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,
         )
@@ -266,20 +237,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
 
@@ -293,13 +254,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,
         )
@@ -313,19 +268,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
@@ -347,7 +292,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,
@@ -362,16 +306,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
 
@@ -385,7 +323,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,
         )
@@ -399,19 +336,60 @@ 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_test(
+        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
+    ) -> ExtractResultset:
         """
         Parameters:
-            - project_id: typing.Optional[str].
+            - job_create: ExtractJobCreate.
 
-            - organization_id: typing.Optional[str].
+            - extract_settings: typing.Optional[LlamaExtractSettings].
+        ---
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreate,
+            ExtractMode,
+            LlamaExtractSettings,
+        )
+        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_mode=ExtractMode.PER_DOC,
+                ),
+            ),
+            extract_settings=LlamaExtractSettings(),
+        )
+        """
+        _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
@@ -433,13 +411,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:
@@ -448,20 +425,60 @@ 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 run_job_test_user(
+        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
+    ) -> ExtractJob:
         """
         Parameters:
-            - project_id: typing.Optional[str].
+            - job_create: ExtractJobCreate.
 
-            - organization_id: typing.Optional[str].
+            - extract_settings: typing.Optional[LlamaExtractSettings].
+        ---
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreate,
+            ExtractMode,
+            LlamaExtractSettings,
+        )
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.llama_extract.run_job_test_user(
+            job_create=ExtractJobCreate(
+                extraction_agent_id="string",
+                file_id="string",
+                config_override=ExtractConfig(
+                    extraction_mode=ExtractMode.PER_DOC,
+                ),
+            ),
+            extract_settings=LlamaExtractSettings(),
+        )
+        """
+        _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
+        if extract_settings is not OMIT:
+            _request["extract_settings"] = extract_settings
+        _response = self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/test"),
+            json=jsonable_encoder(_request),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractJob, _response.json())  # type: ignore
+        if _response.status_code == 422:
+            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+        try:
+            _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_jobs_in_batch(self, *, extraction_agent_id: str, file_ids: typing.List[str]) -> typing.List[ExtractJob]:
+        """
+        Parameters:
             - extraction_agent_id: str. The id of the extraction agent
 
             - file_ids: typing.List[str]. The ids of the files
@@ -479,7 +496,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/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}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -494,16 +510,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_result(
-        self, job_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractResultset:
+    def get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
             - job_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -519,7 +529,6 @@ class LlamaExtractClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/jobs/{job_id}/result"
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -533,56 +542,39 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-
-class AsyncLlamaExtractClient:
-    def __init__(self, *, client_wrapper: AsyncClientWrapper):
-        self._client_wrapper = client_wrapper
-
-    async def create_extraction_agent(
+    def list_extract_runs(
         self,
         *,
-        project_id: typing.Optional[str] = None,
-        organization_id: typing.Optional[str] = None,
-        name: str,
-        data_schema: typing.Dict[str, typing.Optional[ExtractAgentCreateDataSchemaValue]],
-        config: ExtractConfig,
-    ) -> ExtractAgent:
+        extraction_agent_id: typing.Optional[str] = None,
+        run_id: typing.Optional[str] = None,
+        job_id: typing.Optional[str] = None,
+    ) -> typing.List[ExtractRun]:
         """
         Parameters:
-            - project_id: typing.Optional[str].
+            - extraction_agent_id: typing.Optional[str].
 
-            - organization_id: typing.Optional[str].
+            - run_id: typing.Optional[str].
 
-            - name: str. The name of the extraction schema
-
-            - data_schema: typing.Dict[str, typing.Optional[ExtractAgentCreateDataSchemaValue]]. The schema of the data.
-
-            - config: ExtractConfig. The configuration parameters for the extraction agent.
+            - job_id: typing.Optional[str].
         ---
-        from llama_cloud import ExtractConfig, ExtractMode
-        from llama_cloud.client import AsyncLlamaCloud
+        from llama_cloud.client import LlamaCloud
 
-        client = AsyncLlamaCloud(
+        client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.create_extraction_agent(
-            name="string",
-            data_schema={},
-            config=ExtractConfig(
-                extraction_mode=ExtractMode.PER_DOC,
-            ),
-        )
+        client.llama_extract.list_extract_runs()
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            "POST",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction_agent"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
-            json=jsonable_encoder({"name": name, "data_schema": data_schema, "config": config}),
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/runs"),
+            params=remove_none_from_dict(
+                {"extraction_agent_id": extraction_agent_id, "run_id": run_id, "job_id": job_id}
+            ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ExtractAgent, _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:
@@ -591,28 +583,31 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+
+class AsyncLlamaExtractClient:
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
     async def list_extraction_agents(
-        self, *, project_id: str, organization_id: typing.Optional[str] = None
+        self, *, project_id: typing.Optional[str] = None, name: typing.Optional[str] = None
     ) -> typing.List[ExtractAgent]:
         """
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
 
-            - organization_id: typing.Optional[str].
+            - name: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.llama_extract.list_extraction_agents(
-            project_id="string",
-        )
+        await client.llama_extract.list_extraction_agents()
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction_agents"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/extraction-agents"),
+            params=remove_none_from_dict({"project_id": project_id, "name": name}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -626,20 +621,63 @@ 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(
+    async def create_extraction_agent(
         self,
-        extraction_agent_id: str,
         *,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
+        name: str,
+        data_schema: typing.Dict[str, typing.Optional[ExtractAgentCreateDataSchemaValue]],
+        config: ExtractConfig,
     ) -> ExtractAgent:
         """
         Parameters:
-            - extraction_agent_id: str.
-
             - project_id: typing.Optional[str].
 
             - organization_id: typing.Optional[str].
+
+            - name: str. The name of the extraction schema
+
+            - data_schema: typing.Dict[str, typing.Optional[ExtractAgentCreateDataSchemaValue]]. The schema of the data.
+
+            - config: ExtractConfig. The configuration parameters for the extraction agent.
+        ---
+        from llama_cloud import ExtractConfig, ExtractMode
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.create_extraction_agent(
+            name="string",
+            data_schema={},
+            config=ExtractConfig(
+                extraction_mode=ExtractMode.PER_DOC,
+            ),
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "POST",
+            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(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractAgent, _response.json())  # type: ignore
+        if _response.status_code == 422:
+            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+        try:
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    async def get_extraction_agent(self, extraction_agent_id: str) -> ExtractAgent:
+        """
+        Parameters:
+            - extraction_agent_id: str.
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -654,9 +692,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,
         )
@@ -674,8 +711,6 @@ class AsyncLlamaExtractClient:
         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,
     ) -> ExtractAgent:
@@ -683,10 +718,6 @@ class AsyncLlamaExtractClient:
         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
 
             - config: ExtractConfig. The configuration parameters for the extraction agent.
@@ -709,9 +740,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,
@@ -726,20 +756,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
 
@@ -754,9 +774,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,
         )
@@ -770,20 +789,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
 
@@ -797,13 +806,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,
         )
@@ -817,19 +820,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
@@ -851,7 +844,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,
@@ -866,16 +858,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
 
@@ -889,7 +875,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,
         )
@@ -903,19 +888,60 @@ 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_test(
+        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
+    ) -> ExtractResultset:
         """
         Parameters:
-            - project_id: typing.Optional[str].
+            - job_create: ExtractJobCreate.
 
-            - organization_id: typing.Optional[str].
+            - extract_settings: typing.Optional[LlamaExtractSettings].
+        ---
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreate,
+            ExtractMode,
+            LlamaExtractSettings,
+        )
+        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_mode=ExtractMode.PER_DOC,
+                ),
+            ),
+            extract_settings=LlamaExtractSettings(),
+        )
+        """
+        _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
@@ -937,13 +963,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:
@@ -952,20 +977,62 @@ 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 run_job_test_user(
+        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
+    ) -> ExtractJob:
         """
         Parameters:
-            - project_id: typing.Optional[str].
+            - job_create: ExtractJobCreate.
 
-            - organization_id: typing.Optional[str].
+            - extract_settings: typing.Optional[LlamaExtractSettings].
+        ---
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreate,
+            ExtractMode,
+            LlamaExtractSettings,
+        )
+        from llama_cloud.client import AsyncLlamaCloud
 
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.run_job_test_user(
+            job_create=ExtractJobCreate(
+                extraction_agent_id="string",
+                file_id="string",
+                config_override=ExtractConfig(
+                    extraction_mode=ExtractMode.PER_DOC,
+                ),
+            ),
+            extract_settings=LlamaExtractSettings(),
+        )
+        """
+        _request: typing.Dict[str, typing.Any] = {"job_create": job_create}
+        if extract_settings is not OMIT:
+            _request["extract_settings"] = extract_settings
+        _response = await self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/jobs/test"),
+            json=jsonable_encoder(_request),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(ExtractJob, _response.json())  # type: ignore
+        if _response.status_code == 422:
+            raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
+        try:
+            _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_jobs_in_batch(
+        self, *, extraction_agent_id: str, file_ids: typing.List[str]
+    ) -> typing.List[ExtractJob]:
+        """
+        Parameters:
             - extraction_agent_id: str. The id of the extraction agent
 
             - file_ids: typing.List[str]. The ids of the files
@@ -983,7 +1050,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/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}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -998,16 +1064,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_result(
-        self, job_id: str, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
-    ) -> ExtractResultset:
+    async def get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
             - job_id: str.
-
-            - project_id: typing.Optional[str].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1023,7 +1083,6 @@ class AsyncLlamaExtractClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/extractionv2/jobs/{job_id}/result"
             ),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1036,3 +1095,44 @@ class AsyncLlamaExtractClient:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    async def list_extract_runs(
+        self,
+        *,
+        extraction_agent_id: typing.Optional[str] = None,
+        run_id: typing.Optional[str] = None,
+        job_id: typing.Optional[str] = None,
+    ) -> typing.List[ExtractRun]:
+        """
+        Parameters:
+            - extraction_agent_id: typing.Optional[str].
+
+            - run_id: typing.Optional[str].
+
+            - job_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.list_extract_runs()
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extractionv2/runs"),
+            params=remove_none_from_dict(
+                {"extraction_agent_id": extraction_agent_id, "run_id": run_id, "job_id": job_id}
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.List[ExtractRun], _response.json())  # type: ignore
+        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)