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

llama_cloud/resources/pipelines/client.py

@@ -23,6 +23,7 @@ from ...types.input_message import InputMessage
 from ...types.llama_parse_parameters import LlamaParseParameters
 from ...types.managed_ingestion_status_response import ManagedIngestionStatusResponse
 from ...types.metadata_filters import MetadataFilters
+from ...types.paginated_list_cloud_documents_response import PaginatedListCloudDocumentsResponse
 from ...types.paginated_list_pipeline_files_response import PaginatedListPipelineFilesResponse
 from ...types.pipeline import Pipeline
 from ...types.pipeline_create import PipelineCreate
@@ -64,7 +65,6 @@ class PipelinesClient:
         project_name: typing.Optional[str] = None,
         pipeline_name: typing.Optional[str] = None,
         pipeline_type: typing.Optional[PipelineType] = None,
-        organization_id: typing.Optional[str] = None,
     ) -> typing.List[Pipeline]:
         """
         Search for pipelines by various parameters.
@@ -77,8 +77,6 @@ class PipelinesClient:
             - pipeline_name: typing.Optional[str].
 
             - pipeline_type: typing.Optional[PipelineType].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud import PipelineType
         from llama_cloud.client import LlamaCloud
@@ -99,7 +97,6 @@ class PipelinesClient:
                     "project_name": project_name,
                     "pipeline_name": pipeline_name,
                     "pipeline_type": pipeline_type,
-                    "organization_id": organization_id,
                 }
             ),
             headers=self._client_wrapper.get_headers(),
@@ -1443,6 +1440,7 @@ class PipelinesClient:
         limit: typing.Optional[int] = None,
         file_id: typing.Optional[str] = None,
         only_direct_upload: typing.Optional[bool] = None,
+        only_api_data_source_documents: typing.Optional[bool] = None,
     ) -> typing.List[CloudDocument]:
         """
         Return a list of documents for a pipeline.
@@ -1457,6 +1455,8 @@ class PipelinesClient:
             - file_id: typing.Optional[str].
 
             - only_direct_upload: typing.Optional[bool].
+
+            - only_api_data_source_documents: typing.Optional[bool].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -1473,7 +1473,13 @@ class PipelinesClient:
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/pipelines/{pipeline_id}/documents"
             ),
             params=remove_none_from_dict(
-                {"skip": skip, "limit": limit, "file_id": file_id, "only_direct_upload": only_direct_upload}
+                {
+                    "skip": skip,
+                    "limit": limit,
+                    "file_id": file_id,
+                    "only_direct_upload": only_direct_upload,
+                    "only_api_data_source_documents": only_api_data_source_documents,
+                }
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1568,6 +1574,68 @@ class PipelinesClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def paginated_list_pipeline_documents(
+        self,
+        pipeline_id: str,
+        *,
+        skip: typing.Optional[int] = None,
+        limit: typing.Optional[int] = None,
+        file_id: typing.Optional[str] = None,
+        only_direct_upload: typing.Optional[bool] = None,
+        only_api_data_source_documents: typing.Optional[bool] = None,
+    ) -> PaginatedListCloudDocumentsResponse:
+        """
+        Return a list of documents for a pipeline.
+
+        Parameters:
+            - pipeline_id: str.
+
+            - skip: typing.Optional[int].
+
+            - limit: typing.Optional[int].
+
+            - file_id: typing.Optional[str].
+
+            - only_direct_upload: typing.Optional[bool].
+
+            - only_api_data_source_documents: typing.Optional[bool].
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.pipelines.paginated_list_pipeline_documents(
+            pipeline_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/pipelines/{pipeline_id}/documents/paginated"
+            ),
+            params=remove_none_from_dict(
+                {
+                    "skip": skip,
+                    "limit": limit,
+                    "file_id": file_id,
+                    "only_direct_upload": only_direct_upload,
+                    "only_api_data_source_documents": only_api_data_source_documents,
+                }
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(PaginatedListCloudDocumentsResponse, _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_pipeline_document(self, document_id: str, pipeline_id: str) -> CloudDocument:
         """
         Return a single document for a pipeline.
@@ -1730,7 +1798,6 @@ class AsyncPipelinesClient:
         project_name: typing.Optional[str] = None,
         pipeline_name: typing.Optional[str] = None,
         pipeline_type: typing.Optional[PipelineType] = None,
-        organization_id: typing.Optional[str] = None,
     ) -> typing.List[Pipeline]:
         """
         Search for pipelines by various parameters.
@@ -1743,8 +1810,6 @@ class AsyncPipelinesClient:
             - pipeline_name: typing.Optional[str].
 
             - pipeline_type: typing.Optional[PipelineType].
-
-            - organization_id: typing.Optional[str].
         ---
         from llama_cloud import PipelineType
         from llama_cloud.client import AsyncLlamaCloud
@@ -1765,7 +1830,6 @@ class AsyncPipelinesClient:
                     "project_name": project_name,
                     "pipeline_name": pipeline_name,
                     "pipeline_type": pipeline_type,
-                    "organization_id": organization_id,
                 }
             ),
             headers=self._client_wrapper.get_headers(),
@@ -3113,6 +3177,7 @@ class AsyncPipelinesClient:
         limit: typing.Optional[int] = None,
         file_id: typing.Optional[str] = None,
         only_direct_upload: typing.Optional[bool] = None,
+        only_api_data_source_documents: typing.Optional[bool] = None,
     ) -> typing.List[CloudDocument]:
         """
         Return a list of documents for a pipeline.
@@ -3127,6 +3192,8 @@ class AsyncPipelinesClient:
             - file_id: typing.Optional[str].
 
             - only_direct_upload: typing.Optional[bool].
+
+            - only_api_data_source_documents: typing.Optional[bool].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -3143,7 +3210,13 @@ class AsyncPipelinesClient:
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/pipelines/{pipeline_id}/documents"
             ),
             params=remove_none_from_dict(
-                {"skip": skip, "limit": limit, "file_id": file_id, "only_direct_upload": only_direct_upload}
+                {
+                    "skip": skip,
+                    "limit": limit,
+                    "file_id": file_id,
+                    "only_direct_upload": only_direct_upload,
+                    "only_api_data_source_documents": only_api_data_source_documents,
+                }
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -3238,6 +3311,68 @@ class AsyncPipelinesClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    async def paginated_list_pipeline_documents(
+        self,
+        pipeline_id: str,
+        *,
+        skip: typing.Optional[int] = None,
+        limit: typing.Optional[int] = None,
+        file_id: typing.Optional[str] = None,
+        only_direct_upload: typing.Optional[bool] = None,
+        only_api_data_source_documents: typing.Optional[bool] = None,
+    ) -> PaginatedListCloudDocumentsResponse:
+        """
+        Return a list of documents for a pipeline.
+
+        Parameters:
+            - pipeline_id: str.
+
+            - skip: typing.Optional[int].
+
+            - limit: typing.Optional[int].
+
+            - file_id: typing.Optional[str].
+
+            - only_direct_upload: typing.Optional[bool].
+
+            - only_api_data_source_documents: typing.Optional[bool].
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.pipelines.paginated_list_pipeline_documents(
+            pipeline_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/pipelines/{pipeline_id}/documents/paginated"
+            ),
+            params=remove_none_from_dict(
+                {
+                    "skip": skip,
+                    "limit": limit,
+                    "file_id": file_id,
+                    "only_direct_upload": only_direct_upload,
+                    "only_api_data_source_documents": only_api_data_source_documents,
+                }
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(PaginatedListCloudDocumentsResponse, _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_pipeline_document(self, document_id: str, pipeline_id: str) -> CloudDocument:
         """
         Return a single document for a pipeline.

llama_cloud/resources/projects/client.py

@@ -11,13 +11,13 @@ from ...core.remove_none_from_dict import remove_none_from_dict
 from ...errors.unprocessable_entity_error import UnprocessableEntityError
 from ...types.eval_dataset import EvalDataset
 from ...types.http_validation_error import HttpValidationError
-from ...types.interval_usage_and_plan import IntervalUsageAndPlan
 from ...types.local_eval import LocalEval
 from ...types.local_eval_results import LocalEvalResults
 from ...types.local_eval_sets import LocalEvalSets
 from ...types.project import Project
 from ...types.project_create import ProjectCreate
 from ...types.prompt_mixin_prompts import PromptMixinPrompts
+from ...types.usage_and_plan import UsageAndPlan
 
 try:
     import pydantic
@@ -256,14 +256,20 @@ class ProjectsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get_project_usage(
-        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
-    ) -> IntervalUsageAndPlan:
+        self,
+        project_id: typing.Optional[str],
+        *,
+        get_current_invoice_total: typing.Optional[bool] = None,
+        organization_id: typing.Optional[str] = None,
+    ) -> UsageAndPlan:
         """
         Get usage for a project
 
         Parameters:
             - project_id: typing.Optional[str].
 
+            - get_current_invoice_total: typing.Optional[bool].
+
             - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
@@ -276,12 +282,14 @@ class ProjectsClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/usage"),
-            params=remove_none_from_dict({"organization_id": organization_id}),
+            params=remove_none_from_dict(
+                {"get_current_invoice_total": get_current_invoice_total, "organization_id": organization_id}
+            ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(IntervalUsageAndPlan, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(UsageAndPlan, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:
@@ -943,14 +951,20 @@ class AsyncProjectsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get_project_usage(
-        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
-    ) -> IntervalUsageAndPlan:
+        self,
+        project_id: typing.Optional[str],
+        *,
+        get_current_invoice_total: typing.Optional[bool] = None,
+        organization_id: typing.Optional[str] = None,
+    ) -> UsageAndPlan:
         """
         Get usage for a project
 
         Parameters:
             - project_id: typing.Optional[str].
 
+            - get_current_invoice_total: typing.Optional[bool].
+
             - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
@@ -963,12 +977,14 @@ class AsyncProjectsClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/usage"),
-            params=remove_none_from_dict({"organization_id": organization_id}),
+            params=remove_none_from_dict(
+                {"get_current_invoice_total": get_current_invoice_total, "organization_id": organization_id}
+            ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
         if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(IntervalUsageAndPlan, _response.json())  # type: ignore
+            return pydantic.parse_obj_as(UsageAndPlan, _response.json())  # type: ignore
         if _response.status_code == 422:
             raise UnprocessableEntityError(pydantic.parse_obj_as(HttpValidationError, _response.json()))  # type: ignore
         try:

llama_cloud/resources/reports/client.py

@@ -1,11 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import datetime as dt
 import typing
 import urllib.parse
 from json.decoder import JSONDecodeError
 
 from ...core.api_error import ApiError
 from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.datetime_utils import serialize_datetime
 from ...core.jsonable_encoder import jsonable_encoder
 from ...core.remove_none_from_dict import remove_none_from_dict
 from ...errors.unprocessable_entity_error import UnprocessableEntityError
@@ -451,7 +453,7 @@ class ReportsClient:
         self,
         report_id: str,
         *,
-        last_sequence: typing.Optional[int] = None,
+        after: typing.Optional[dt.datetime] = None,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
     ) -> typing.List[ReportEventItem]:
@@ -461,7 +463,7 @@ class ReportsClient:
         Parameters:
             - report_id: str.
 
-            - last_sequence: typing.Optional[int].
+            - after: typing.Optional[dt.datetime].
 
             - project_id: typing.Optional[str].
 
@@ -480,7 +482,11 @@ class ReportsClient:
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/reports/{report_id}/events"),
             params=remove_none_from_dict(
-                {"last_sequence": last_sequence, "project_id": project_id, "organization_id": organization_id}
+                {
+                    "after": serialize_datetime(after) if after is not None else None,
+                    "project_id": project_id,
+                    "organization_id": organization_id,
+                }
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1043,7 +1049,7 @@ class AsyncReportsClient:
         self,
         report_id: str,
         *,
-        last_sequence: typing.Optional[int] = None,
+        after: typing.Optional[dt.datetime] = None,
         project_id: typing.Optional[str] = None,
         organization_id: typing.Optional[str] = None,
     ) -> typing.List[ReportEventItem]:
@@ -1053,7 +1059,7 @@ class AsyncReportsClient:
         Parameters:
             - report_id: str.
 
-            - last_sequence: typing.Optional[int].
+            - after: typing.Optional[dt.datetime].
 
             - project_id: typing.Optional[str].
 
@@ -1072,7 +1078,11 @@ class AsyncReportsClient:
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/reports/{report_id}/events"),
             params=remove_none_from_dict(
-                {"last_sequence": last_sequence, "project_id": project_id, "organization_id": organization_id}
+                {
+                    "after": serialize_datetime(after) if after is not None else None,
+                    "project_id": project_id,
+                    "organization_id": organization_id,
+                }
             ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,

llama_cloud/types/__init__.py

@@ -19,10 +19,14 @@ from .app_schema_chat_chat_message import AppSchemaChatChatMessage
 from .auto_transform_config import AutoTransformConfig
 from .azure_open_ai_embedding import AzureOpenAiEmbedding
 from .azure_open_ai_embedding_config import AzureOpenAiEmbeddingConfig
-from .base import Base
+from .base_plan import BasePlan
+from .base_plan_metronome_plan_type import BasePlanMetronomePlanType
+from .base_plan_name import BasePlanName
+from .base_plan_plan_frequency import BasePlanPlanFrequency
 from .base_prompt_template import BasePromptTemplate
 from .bedrock_embedding import BedrockEmbedding
 from .bedrock_embedding_config import BedrockEmbeddingConfig
+from .billing_period import BillingPeriod
 from .box_auth_mechanism import BoxAuthMechanism
 from .character_chunking_config import CharacterChunkingConfig
 from .character_splitter import CharacterSplitter
@@ -61,6 +65,7 @@ from .configurable_transformation_definition import ConfigurableTransformationDe
 from .configurable_transformation_names import ConfigurableTransformationNames
 from .configured_transformation_item import ConfiguredTransformationItem
 from .configured_transformation_item_component import ConfiguredTransformationItemComponent
+from .credit_type import CreditType
 from .data_sink import DataSink
 from .data_sink_component import DataSinkComponent
 from .data_sink_create import DataSinkCreate
@@ -108,7 +113,13 @@ from .eval_question import EvalQuestion
 from .eval_question_create import EvalQuestionCreate
 from .eval_question_result import EvalQuestionResult
 from .extract_agent import ExtractAgent
+from .extract_agent_create import ExtractAgentCreate
+from .extract_agent_create_data_schema import ExtractAgentCreateDataSchema
+from .extract_agent_create_data_schema_zero_value import ExtractAgentCreateDataSchemaZeroValue
 from .extract_agent_data_schema_value import ExtractAgentDataSchemaValue
+from .extract_agent_update import ExtractAgentUpdate
+from .extract_agent_update_data_schema import ExtractAgentUpdateDataSchema
+from .extract_agent_update_data_schema_zero_value import ExtractAgentUpdateDataSchemaZeroValue
 from .extract_config import ExtractConfig
 from .extract_job import ExtractJob
 from .extract_job_create import ExtractJobCreate
@@ -126,6 +137,9 @@ from .extract_run_data_item_value import ExtractRunDataItemValue
 from .extract_run_data_schema_value import ExtractRunDataSchemaValue
 from .extract_run_data_zero_value import ExtractRunDataZeroValue
 from .extract_run_extraction_metadata_value import ExtractRunExtractionMetadataValue
+from .extract_schema_validate_request import ExtractSchemaValidateRequest
+from .extract_schema_validate_request_data_schema import ExtractSchemaValidateRequestDataSchema
+from .extract_schema_validate_request_data_schema_zero_value import ExtractSchemaValidateRequestDataSchemaZeroValue
 from .extract_schema_validate_response import ExtractSchemaValidateResponse
 from .extract_schema_validate_response_data_schema_value import ExtractSchemaValidateResponseDataSchemaValue
 from .extract_state import ExtractState
@@ -135,6 +149,7 @@ from .file_permission_info_value import FilePermissionInfoValue
 from .file_resource_info_value import FileResourceInfoValue
 from .filter_condition import FilterCondition
 from .filter_operator import FilterOperator
+from .free_credits_usage import FreeCreditsUsage
 from .gemini_embedding import GeminiEmbedding
 from .gemini_embedding_config import GeminiEmbeddingConfig
 from .http_validation_error import HttpValidationError
@@ -144,7 +159,6 @@ from .hugging_face_inference_api_embedding_token import HuggingFaceInferenceApiE
 from .image_block import ImageBlock
 from .ingestion_error_response import IngestionErrorResponse
 from .input_message import InputMessage
-from .interval_usage_and_plan import IntervalUsageAndPlan
 from .job_name_mapping import JobNameMapping
 from .job_names import JobNames
 from .job_record import JobRecord
@@ -190,6 +204,7 @@ from .page_screenshot_node_with_score import PageScreenshotNodeWithScore
 from .page_segmentation_config import PageSegmentationConfig
 from .page_splitter_node_parser import PageSplitterNodeParser
 from .paginated_jobs_history_with_metrics import PaginatedJobsHistoryWithMetrics
+from .paginated_list_cloud_documents_response import PaginatedListCloudDocumentsResponse
 from .paginated_list_pipeline_files_response import PaginatedListPipelineFilesResponse
 from .paginated_report_response import PaginatedReportResponse
 from .parse_plan_level import ParsePlanLevel
@@ -200,6 +215,7 @@ from .parsing_job_json_result import ParsingJobJsonResult
 from .parsing_job_markdown_result import ParsingJobMarkdownResult
 from .parsing_job_structured_result import ParsingJobStructuredResult
 from .parsing_job_text_result import ParsingJobTextResult
+from .parsing_mode import ParsingMode
 from .parsing_usage import ParsingUsage
 from .partition_names import PartitionNames
 from .permission import Permission
@@ -245,7 +261,7 @@ from .pipeline_transform_config import (
     PipelineTransformConfig_Auto,
 )
 from .pipeline_type import PipelineType
-from .plan import Plan
+from .plan_limits import PlanLimits
 from .playground_session import PlaygroundSession
 from .pooling import Pooling
 from .preset_composite_retrieval_params import PresetCompositeRetrievalParams
@@ -259,6 +275,7 @@ from .prompt_conf import PromptConf
 from .prompt_mixin_prompts import PromptMixinPrompts
 from .prompt_spec import PromptSpec
 from .pydantic_program_mode import PydanticProgramMode
+from .recurring_credit_grant import RecurringCreditGrant
 from .related_node_info import RelatedNodeInfo
 from .related_node_info_node_type import RelatedNodeInfoNodeType
 from .report import Report
@@ -304,6 +321,8 @@ from .token_chunking_config import TokenChunkingConfig
 from .token_text_splitter import TokenTextSplitter
 from .transformation_category_names import TransformationCategoryNames
 from .usage import Usage
+from .usage_active_alerts_item import UsageActiveAlertsItem
+from .usage_and_plan import UsageAndPlan
 from .usage_metric_response import UsageMetricResponse
 from .user_job_record import UserJobRecord
 from .user_organization import UserOrganization
@@ -332,10 +351,14 @@ __all__ = [
     "AutoTransformConfig",
     "AzureOpenAiEmbedding",
     "AzureOpenAiEmbeddingConfig",
-    "Base",
+    "BasePlan",
+    "BasePlanMetronomePlanType",
+    "BasePlanName",
+    "BasePlanPlanFrequency",
     "BasePromptTemplate",
     "BedrockEmbedding",
     "BedrockEmbeddingConfig",
+    "BillingPeriod",
     "BoxAuthMechanism",
     "CharacterChunkingConfig",
     "CharacterSplitter",
@@ -374,6 +397,7 @@ __all__ = [
     "ConfigurableTransformationNames",
     "ConfiguredTransformationItem",
     "ConfiguredTransformationItemComponent",
+    "CreditType",
     "DataSink",
     "DataSinkComponent",
     "DataSinkCreate",
@@ -417,7 +441,13 @@ __all__ = [
     "EvalQuestionCreate",
     "EvalQuestionResult",
     "ExtractAgent",
+    "ExtractAgentCreate",
+    "ExtractAgentCreateDataSchema",
+    "ExtractAgentCreateDataSchemaZeroValue",
     "ExtractAgentDataSchemaValue",
+    "ExtractAgentUpdate",
+    "ExtractAgentUpdateDataSchema",
+    "ExtractAgentUpdateDataSchemaZeroValue",
     "ExtractConfig",
     "ExtractJob",
     "ExtractJobCreate",
@@ -435,6 +465,9 @@ __all__ = [
     "ExtractRunDataSchemaValue",
     "ExtractRunDataZeroValue",
     "ExtractRunExtractionMetadataValue",
+    "ExtractSchemaValidateRequest",
+    "ExtractSchemaValidateRequestDataSchema",
+    "ExtractSchemaValidateRequestDataSchemaZeroValue",
     "ExtractSchemaValidateResponse",
     "ExtractSchemaValidateResponseDataSchemaValue",
     "ExtractState",
@@ -444,6 +477,7 @@ __all__ = [
     "FileResourceInfoValue",
     "FilterCondition",
     "FilterOperator",
+    "FreeCreditsUsage",
     "GeminiEmbedding",
     "GeminiEmbeddingConfig",
     "HttpValidationError",
@@ -453,7 +487,6 @@ __all__ = [
     "ImageBlock",
     "IngestionErrorResponse",
     "InputMessage",
-    "IntervalUsageAndPlan",
     "JobNameMapping",
     "JobNames",
     "JobRecord",
@@ -497,6 +530,7 @@ __all__ = [
     "PageSegmentationConfig",
     "PageSplitterNodeParser",
     "PaginatedJobsHistoryWithMetrics",
+    "PaginatedListCloudDocumentsResponse",
     "PaginatedListPipelineFilesResponse",
     "PaginatedReportResponse",
     "ParsePlanLevel",
@@ -507,6 +541,7 @@ __all__ = [
     "ParsingJobMarkdownResult",
     "ParsingJobStructuredResult",
     "ParsingJobTextResult",
+    "ParsingMode",
     "ParsingUsage",
     "PartitionNames",
     "Permission",
@@ -546,7 +581,7 @@ __all__ = [
     "PipelineTransformConfig_Advanced",
     "PipelineTransformConfig_Auto",
     "PipelineType",
-    "Plan",
+    "PlanLimits",
     "PlaygroundSession",
     "Pooling",
     "PresetCompositeRetrievalParams",
@@ -560,6 +595,7 @@ __all__ = [
     "PromptMixinPrompts",
     "PromptSpec",
     "PydanticProgramMode",
+    "RecurringCreditGrant",
     "RelatedNodeInfo",
     "RelatedNodeInfoNodeType",
     "Report",
@@ -603,6 +639,8 @@ __all__ = [
     "TokenTextSplitter",
     "TransformationCategoryNames",
     "Usage",
+    "UsageActiveAlertsItem",
+    "UsageAndPlan",
     "UsageMetricResponse",
     "UserJobRecord",
     "UserOrganization",

llama_cloud/types/{plan.py → base_plan.py}

@@ -4,6 +4,12 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from .base_plan_metronome_plan_type import BasePlanMetronomePlanType
+from .base_plan_name import BasePlanName
+from .base_plan_plan_frequency import BasePlanPlanFrequency
+from .billing_period import BillingPeriod
+from .plan_limits import PlanLimits
+from .recurring_credit_grant import RecurringCreditGrant
 
 try:
     import pydantic
@@ -14,21 +20,18 @@ except ImportError:
     import pydantic  # type: ignore
 
 
-class Plan(pydantic.BaseModel):
-    id: str = pydantic.Field(description="The ID of the plan")
-    name: typing.Optional[str]
-    total_users: typing.Optional[int]
-    total_indexes: typing.Optional[int]
-    total_indexed_pages: typing.Optional[int]
-    credits: typing.Optional[int]
-    has_payment_method: typing.Optional[bool]
-    free: typing.Optional[bool] = pydantic.Field(description="If is a free plan")
-    allowed_index: typing.Optional[bool] = pydantic.Field(description="If is allowed to use indexes")
-    allowed_external_index: typing.Optional[bool] = pydantic.Field(
-        description="If is allowed to use external data sources or sinks in indexes"
-    )
+class BasePlan(pydantic.BaseModel):
+    id: typing.Optional[str]
+    name: BasePlanName
+    metronome_plan_type: BasePlanMetronomePlanType
+    metronome_rate_card_alias: typing.Optional[str]
+    limits: PlanLimits
+    recurring_credits: typing.Optional[typing.List[RecurringCreditGrant]]
+    plan_frequency: BasePlanPlanFrequency
+    metronome_customer_id: typing.Optional[str]
     starting_on: typing.Optional[dt.datetime]
     ending_before: typing.Optional[dt.datetime]
+    current_billing_period: typing.Optional[BillingPeriod]
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}