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

llama_cloud/resources/llama_extract/client.py

@@ -336,9 +336,11 @@ 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, *, request: ExtractJobCreate) -> ExtractJob:
+    def run_job(self, *, from_ui: typing.Optional[bool] = None, request: ExtractJobCreate) -> ExtractJob:
         """
         Parameters:
+            - from_ui: typing.Optional[bool].
+
             - request: ExtractJobCreate.
         ---
         from llama_cloud import (
@@ -366,6 +368,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs"),
+            params=remove_none_from_dict({"from_ui": from_ui}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -411,10 +414,16 @@ class LlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def run_job_test_user(
-        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
+        self,
+        *,
+        from_ui: typing.Optional[bool] = None,
+        job_create: ExtractJobCreate,
+        extract_settings: typing.Optional[LlamaExtractSettings] = OMIT,
     ) -> ExtractJob:
         """
         Parameters:
+            - from_ui: typing.Optional[bool].
+
             - job_create: ExtractJobCreate.
 
             - extract_settings: typing.Optional[LlamaExtractSettings].
@@ -457,6 +466,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/test"),
+            params=remove_none_from_dict({"from_ui": from_ui}),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -471,9 +481,13 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def run_batch_jobs(self, *, request: ExtractJobCreateBatch) -> typing.List[ExtractJob]:
+    def run_batch_jobs(
+        self, *, from_ui: typing.Optional[bool] = None, request: ExtractJobCreateBatch
+    ) -> typing.List[ExtractJob]:
         """
         Parameters:
+            - from_ui: typing.Optional[bool].
+
             - request: ExtractJobCreateBatch.
         ---
         from llama_cloud import (
@@ -501,6 +515,7 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/batch"),
+            params=remove_none_from_dict({"from_ui": from_ui}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -582,6 +597,37 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def get_latest_run_from_ui(self, *, extraction_agent_id: str) -> typing.Optional[ExtractRun]:
+        """
+        Parameters:
+            - extraction_agent_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.llama_extract.get_latest_run_from_ui(
+            extraction_agent_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/runs/latest-from-ui"),
+            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.Optional[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)
+
     def get_run_by_job_id(self, job_id: str) -> ExtractRun:
         """
         Parameters:
@@ -976,9 +1022,11 @@ 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, *, request: ExtractJobCreate) -> ExtractJob:
+    async def run_job(self, *, from_ui: typing.Optional[bool] = None, request: ExtractJobCreate) -> ExtractJob:
         """
         Parameters:
+            - from_ui: typing.Optional[bool].
+
             - request: ExtractJobCreate.
         ---
         from llama_cloud import (
@@ -1006,6 +1054,7 @@ class AsyncLlamaExtractClient:
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs"),
+            params=remove_none_from_dict({"from_ui": from_ui}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1051,10 +1100,16 @@ class AsyncLlamaExtractClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def run_job_test_user(
-        self, *, job_create: ExtractJobCreate, extract_settings: typing.Optional[LlamaExtractSettings] = OMIT
+        self,
+        *,
+        from_ui: typing.Optional[bool] = None,
+        job_create: ExtractJobCreate,
+        extract_settings: typing.Optional[LlamaExtractSettings] = OMIT,
     ) -> ExtractJob:
         """
         Parameters:
+            - from_ui: typing.Optional[bool].
+
             - job_create: ExtractJobCreate.
 
             - extract_settings: typing.Optional[LlamaExtractSettings].
@@ -1097,6 +1152,7 @@ class AsyncLlamaExtractClient:
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/test"),
+            params=remove_none_from_dict({"from_ui": from_ui}),
             json=jsonable_encoder(_request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1111,9 +1167,13 @@ 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_batch_jobs(self, *, request: ExtractJobCreateBatch) -> typing.List[ExtractJob]:
+    async def run_batch_jobs(
+        self, *, from_ui: typing.Optional[bool] = None, request: ExtractJobCreateBatch
+    ) -> typing.List[ExtractJob]:
         """
         Parameters:
+            - from_ui: typing.Optional[bool].
+
             - request: ExtractJobCreateBatch.
         ---
         from llama_cloud import (
@@ -1141,6 +1201,7 @@ class AsyncLlamaExtractClient:
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/batch"),
+            params=remove_none_from_dict({"from_ui": from_ui}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1222,6 +1283,37 @@ 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_latest_run_from_ui(self, *, extraction_agent_id: str) -> typing.Optional[ExtractRun]:
+        """
+        Parameters:
+            - extraction_agent_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.get_latest_run_from_ui(
+            extraction_agent_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/runs/latest-from-ui"),
+            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.Optional[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)
+
     async def get_run_by_job_id(self, job_id: str) -> ExtractRun:
         """
         Parameters:

llama_cloud/resources/parsing/client.py

@@ -248,6 +248,7 @@ class ParsingClient:
         vendor_multimodal_model_name: str,
         model: str,
         webhook_url: str,
+        preset: str,
         parse_mode: typing.Optional[ParsingMode] = OMIT,
         system_prompt: str,
         system_prompt_append: str,
@@ -385,6 +386,8 @@ class ParsingClient:
 
             - webhook_url: str.
 
+            - preset: str.
+
             - parse_mode: typing.Optional[ParsingMode].
 
             - system_prompt: str.
@@ -484,6 +487,7 @@ class ParsingClient:
             "vendor_multimodal_model_name": vendor_multimodal_model_name,
             "model": model,
             "webhook_url": webhook_url,
+            "preset": preset,
             "system_prompt": system_prompt,
             "system_prompt_append": system_prompt_append,
             "user_prompt": user_prompt,
@@ -1224,6 +1228,7 @@ class AsyncParsingClient:
         vendor_multimodal_model_name: str,
         model: str,
         webhook_url: str,
+        preset: str,
         parse_mode: typing.Optional[ParsingMode] = OMIT,
         system_prompt: str,
         system_prompt_append: str,
@@ -1361,6 +1366,8 @@ class AsyncParsingClient:
 
             - webhook_url: str.
 
+            - preset: str.
+
             - parse_mode: typing.Optional[ParsingMode].
 
             - system_prompt: str.
@@ -1460,6 +1467,7 @@ class AsyncParsingClient:
             "vendor_multimodal_model_name": vendor_multimodal_model_name,
             "model": model,
             "webhook_url": webhook_url,
+            "preset": preset,
             "system_prompt": system_prompt,
             "system_prompt_append": system_prompt_append,
             "user_prompt": user_prompt,