llama-cloud 0.1.14__tar.gz → 0.1.16__tar.gz

{llama_cloud-0.1.14 → llama_cloud-0.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-cloud
-Version: 0.1.14
+Version: 0.1.16
 Summary: 
 License: MIT
 Author: Logan Markewich

{llama_cloud-0.1.14 → llama_cloud-0.1.16}/llama_cloud/__init__.py

@@ -96,15 +96,7 @@ from .types import (
     EmbeddingModelConfigUpdateEmbeddingConfig_HuggingfaceApiEmbedding,
     EmbeddingModelConfigUpdateEmbeddingConfig_OpenaiEmbedding,
     EmbeddingModelConfigUpdateEmbeddingConfig_VertexaiEmbedding,
-    EvalDataset,
-    EvalDatasetJobParams,
-    EvalDatasetJobRecord,
     EvalExecutionParams,
-    EvalExecutionParamsOverride,
-    EvalMetric,
-    EvalQuestion,
-    EvalQuestionCreate,
-    EvalQuestionResult,
     ExtractAgent,
     ExtractAgentCreate,
     ExtractAgentCreateDataSchema,
@@ -116,6 +108,9 @@ from .types import (
     ExtractConfig,
     ExtractJob,
     ExtractJobCreate,
+    ExtractJobCreateBatch,
+    ExtractJobCreateBatchDataSchemaOverride,
+    ExtractJobCreateBatchDataSchemaOverrideZeroValue,
     ExtractJobCreateDataSchemaOverride,
     ExtractJobCreateDataSchemaOverrideZeroValue,
     ExtractMode,
@@ -166,9 +161,6 @@ from .types import (
     Llm,
     LlmModelData,
     LlmParameters,
-    LocalEval,
-    LocalEvalResults,
-    LocalEvalSets,
     ManagedIngestionStatus,
     ManagedIngestionStatusResponse,
     MarkdownElementNodeParser,
@@ -179,7 +171,6 @@ from .types import (
     MetadataFilterValue,
     MetadataFilters,
     MetadataFiltersFiltersItem,
-    MetricResult,
     NodeParser,
     NodeRelationship,
     NoneChunkingConfig,
@@ -194,6 +185,7 @@ from .types import (
     PageScreenshotNodeWithScore,
     PageSegmentationConfig,
     PageSplitterNodeParser,
+    PaginatedExtractRunsResponse,
     PaginatedJobsHistoryWithMetrics,
     PaginatedListCloudDocumentsResponse,
     PaginatedListPipelineFilesResponse,
@@ -257,8 +249,6 @@ from .types import (
     Project,
     ProjectCreate,
     PromptConf,
-    PromptMixinPrompts,
-    PromptSpec,
     PydanticProgramMode,
     RecurringCreditGrant,
     RelatedNodeInfo,
@@ -470,15 +460,7 @@ __all__ = [
     "EmbeddingModelConfigUpdateEmbeddingConfig_HuggingfaceApiEmbedding",
     "EmbeddingModelConfigUpdateEmbeddingConfig_OpenaiEmbedding",
     "EmbeddingModelConfigUpdateEmbeddingConfig_VertexaiEmbedding",
-    "EvalDataset",
-    "EvalDatasetJobParams",
-    "EvalDatasetJobRecord",
     "EvalExecutionParams",
-    "EvalExecutionParamsOverride",
-    "EvalMetric",
-    "EvalQuestion",
-    "EvalQuestionCreate",
-    "EvalQuestionResult",
     "ExtractAgent",
     "ExtractAgentCreate",
     "ExtractAgentCreateDataSchema",
@@ -490,6 +472,9 @@ __all__ = [
     "ExtractConfig",
     "ExtractJob",
     "ExtractJobCreate",
+    "ExtractJobCreateBatch",
+    "ExtractJobCreateBatchDataSchemaOverride",
+    "ExtractJobCreateBatchDataSchemaOverrideZeroValue",
     "ExtractJobCreateDataSchemaOverride",
     "ExtractJobCreateDataSchemaOverrideZeroValue",
     "ExtractMode",
@@ -544,9 +529,6 @@ __all__ = [
     "Llm",
     "LlmModelData",
     "LlmParameters",
-    "LocalEval",
-    "LocalEvalResults",
-    "LocalEvalSets",
     "ManagedIngestionStatus",
     "ManagedIngestionStatusResponse",
     "MarkdownElementNodeParser",
@@ -557,7 +539,6 @@ __all__ = [
     "MetadataFilterValue",
     "MetadataFilters",
     "MetadataFiltersFiltersItem",
-    "MetricResult",
     "NodeParser",
     "NodeRelationship",
     "NoneChunkingConfig",
@@ -572,6 +553,7 @@ __all__ = [
     "PageScreenshotNodeWithScore",
     "PageSegmentationConfig",
     "PageSplitterNodeParser",
+    "PaginatedExtractRunsResponse",
     "PaginatedJobsHistoryWithMetrics",
     "PaginatedListCloudDocumentsResponse",
     "PaginatedListPipelineFilesResponse",
@@ -645,8 +627,6 @@ __all__ = [
     "Project",
     "ProjectCreate",
     "PromptConf",
-    "PromptMixinPrompts",
-    "PromptSpec",
     "PydanticProgramMode",
     "RecurringCreditGrant",
     "RelatedNodeInfo",

llama_cloud-0.1.16/llama_cloud/resources/evals/client.py

@@ -0,0 +1,85 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+import urllib.parse
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...errors.unprocessable_entity_error import UnprocessableEntityError
+from ...types.http_validation_error import HttpValidationError
+from ...types.supported_llm_model import SupportedLlmModel
+
+try:
+    import pydantic
+    if pydantic.__version__.startswith("1."):
+        raise ImportError
+    import pydantic.v1 as pydantic  # type: ignore
+except ImportError:
+    import pydantic  # type: ignore
+
+
+class EvalsClient:
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    def list_supported_models(self) -> typing.List[SupportedLlmModel]:
+        """
+        List supported models.
+
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.evals.list_supported_models()
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/evals/models"),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.List[SupportedLlmModel], _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)
+
+
+class AsyncEvalsClient:
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    async def list_supported_models(self) -> typing.List[SupportedLlmModel]:
+        """
+        List supported models.
+
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.evals.list_supported_models()
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/evals/models"),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.List[SupportedLlmModel], _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)

{llama_cloud-0.1.14 → llama_cloud-0.1.16}/llama_cloud/resources/llama_extract/client.py

@@ -14,12 +14,14 @@ from ...types.extract_agent_create import ExtractAgentCreate
 from ...types.extract_agent_update import ExtractAgentUpdate
 from ...types.extract_job import ExtractJob
 from ...types.extract_job_create import ExtractJobCreate
+from ...types.extract_job_create_batch import ExtractJobCreateBatch
 from ...types.extract_resultset import ExtractResultset
 from ...types.extract_run import ExtractRun
 from ...types.extract_schema_validate_request import ExtractSchemaValidateRequest
 from ...types.extract_schema_validate_response import ExtractSchemaValidateResponse
 from ...types.http_validation_error import HttpValidationError
 from ...types.llama_extract_settings import LlamaExtractSettings
+from ...types.paginated_extract_runs_response import PaginatedExtractRunsResponse
 
 try:
     import pydantic
@@ -469,6 +471,50 @@ 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]:
+        """
+        Parameters:
+            - request: ExtractJobCreateBatch.
+        ---
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreateBatch,
+            ExtractMode,
+            ExtractTarget,
+        )
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.llama_extract.run_batch_jobs(
+            request=ExtractJobCreateBatch(
+                extraction_agent_id="string",
+                file_ids=[],
+                config_override=ExtractConfig(
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
+                ),
+            ),
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/batch"),
+            json=jsonable_encoder(request),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.List[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 get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
@@ -499,10 +545,16 @@ class LlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_extract_runs(self, *, extraction_agent_id: str) -> typing.List[ExtractRun]:
+    def list_extract_runs(
+        self, *, extraction_agent_id: str, skip: typing.Optional[int] = None, limit: typing.Optional[int] = None
+    ) -> PaginatedExtractRunsResponse:
         """
         Parameters:
             - extraction_agent_id: str.
+
+            - skip: typing.Optional[int].
+
+            - limit: typing.Optional[int].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -516,12 +568,12 @@ class LlamaExtractClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/runs"),
-            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
+            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id, "skip": skip, "limit": limit}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractRun], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(PaginatedExtractRunsResponse, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -590,6 +642,36 @@ 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_run(self, run_id: str) -> typing.Any:
+        """
+        Parameters:
+            - run_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.llama_extract.delete_extraction_run(
+            run_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "DELETE",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _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)
+
 
 class AsyncLlamaExtractClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -1029,6 +1111,50 @@ 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]:
+        """
+        Parameters:
+            - request: ExtractJobCreateBatch.
+        ---
+        from llama_cloud import (
+            ExtractConfig,
+            ExtractJobCreateBatch,
+            ExtractMode,
+            ExtractTarget,
+        )
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.run_batch_jobs(
+            request=ExtractJobCreateBatch(
+                extraction_agent_id="string",
+                file_ids=[],
+                config_override=ExtractConfig(
+                    extraction_target=ExtractTarget.PER_DOC,
+                    extraction_mode=ExtractMode.FAST,
+                ),
+            ),
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "POST",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/jobs/batch"),
+            json=jsonable_encoder(request),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.List[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 get_job_result(self, job_id: str) -> ExtractResultset:
         """
         Parameters:
@@ -1059,10 +1185,16 @@ class AsyncLlamaExtractClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def list_extract_runs(self, *, extraction_agent_id: str) -> typing.List[ExtractRun]:
+    async def list_extract_runs(
+        self, *, extraction_agent_id: str, skip: typing.Optional[int] = None, limit: typing.Optional[int] = None
+    ) -> PaginatedExtractRunsResponse:
         """
         Parameters:
             - extraction_agent_id: str.
+
+            - skip: typing.Optional[int].
+
+            - limit: typing.Optional[int].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1076,12 +1208,12 @@ class AsyncLlamaExtractClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/extraction/runs"),
-            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id}),
+            params=remove_none_from_dict({"extraction_agent_id": extraction_agent_id, "skip": skip, "limit": limit}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(typing.List[ExtractRun], _response.json())  # type: ignore
+            return pydantic.parse_obj_as(PaginatedExtractRunsResponse, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -1149,3 +1281,33 @@ 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 delete_extraction_run(self, run_id: str) -> typing.Any:
+        """
+        Parameters:
+            - run_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.llama_extract.delete_extraction_run(
+            run_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "DELETE",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/extraction/runs/{run_id}"),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _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)

{llama_cloud-0.1.14 → llama_cloud-0.1.16}/llama_cloud/resources/parsing/client.py

@@ -212,7 +212,6 @@ class ParsingClient:
         bbox_left: float,
         bbox_right: float,
         bbox_top: float,
-        compact_markdown_table: bool,
         disable_ocr: bool,
         disable_reconstruction: bool,
         disable_image_extraction: bool,
@@ -314,8 +313,6 @@ class ParsingClient:
 
             - bbox_top: float.
 
-            - compact_markdown_table: bool.
-
             - disable_ocr: bool.
 
             - disable_reconstruction: bool.
@@ -452,7 +449,6 @@ class ParsingClient:
             "bbox_left": bbox_left,
             "bbox_right": bbox_right,
             "bbox_top": bbox_top,
-            "compact_markdown_table": compact_markdown_table,
             "disable_ocr": disable_ocr,
             "disable_reconstruction": disable_reconstruction,
             "disable_image_extraction": disable_image_extraction,
@@ -1192,7 +1188,6 @@ class AsyncParsingClient:
         bbox_left: float,
         bbox_right: float,
         bbox_top: float,
-        compact_markdown_table: bool,
         disable_ocr: bool,
         disable_reconstruction: bool,
         disable_image_extraction: bool,
@@ -1294,8 +1289,6 @@ class AsyncParsingClient:
 
             - bbox_top: float.
 
-            - compact_markdown_table: bool.
-
             - disable_ocr: bool.
 
             - disable_reconstruction: bool.
@@ -1432,7 +1425,6 @@ class AsyncParsingClient:
             "bbox_left": bbox_left,
             "bbox_right": bbox_right,
             "bbox_top": bbox_top,
-            "compact_markdown_table": compact_markdown_table,
             "disable_ocr": disable_ocr,
             "disable_reconstruction": disable_reconstruction,
             "disable_image_extraction": disable_image_extraction,