llama-cloud 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

llama_cloud/resources/retrievers/client.py

@@ -33,12 +33,18 @@ class RetrieversClient:
         self._client_wrapper = client_wrapper
 
     def list_retrievers(
-        self, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+        self,
+        *,
+        name: typing.Optional[str] = None,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
     ) -> typing.List[Retriever]:
         """
         List Retrievers for a project.
 
         Parameters:
+            - name: typing.Optional[str].
+
             - project_id: typing.Optional[str].
 
             - organization_id: typing.Optional[str].
@@ -53,7 +59,7 @@ class RetrieversClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/retrievers"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict({"name": name, "project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -346,12 +352,18 @@ class AsyncRetrieversClient:
         self._client_wrapper = client_wrapper
 
     async def list_retrievers(
-        self, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+        self,
+        *,
+        name: typing.Optional[str] = None,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
     ) -> typing.List[Retriever]:
         """
         List Retrievers for a project.
 
         Parameters:
+            - name: typing.Optional[str].
+
             - project_id: typing.Optional[str].
 
             - organization_id: typing.Optional[str].
@@ -366,7 +378,7 @@ class AsyncRetrieversClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/retrievers"),
-            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
+            params=remove_none_from_dict({"name": name, "project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )

llama_cloud/types/__init__.py

@@ -110,7 +110,8 @@ from .extract_agent_data_schema_value import ExtractAgentDataSchemaValue
 from .extract_config import ExtractConfig
 from .extract_job import ExtractJob
 from .extract_job_create import ExtractJobCreate
-from .extract_job_create_data_schema_override_value import ExtractJobCreateDataSchemaOverrideValue
+from .extract_job_create_data_schema_override import ExtractJobCreateDataSchemaOverride
+from .extract_job_create_data_schema_override_zero_value import ExtractJobCreateDataSchemaOverrideZeroValue
 from .extract_mode import ExtractMode
 from .extract_resultset import ExtractResultset
 from .extract_resultset_data import ExtractResultsetData
@@ -118,13 +119,14 @@ from .extract_resultset_data_item_value import ExtractResultsetDataItemValue
 from .extract_resultset_data_zero_value import ExtractResultsetDataZeroValue
 from .extract_resultset_extraction_metadata_value import ExtractResultsetExtractionMetadataValue
 from .extract_run import ExtractRun
+from .extract_run_data import ExtractRunData
+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_response import ExtractSchemaValidateResponse
+from .extract_schema_validate_response_data_schema_value import ExtractSchemaValidateResponseDataSchemaValue
 from .extract_state import ExtractState
-from .extraction_job import ExtractionJob
-from .extraction_result import ExtractionResult
-from .extraction_result_data_value import ExtractionResultDataValue
-from .extraction_schema import ExtractionSchema
-from .extraction_schema_data_schema_value import ExtractionSchemaDataSchemaValue
 from .file import File
 from .file_permission_info_value import FilePermissionInfoValue
 from .file_resource_info_value import FileResourceInfoValue
@@ -243,6 +245,7 @@ from .pipeline_type import PipelineType
 from .plan import Plan
 from .playground_session import PlaygroundSession
 from .pooling import Pooling
+from .preset_composite_retrieval_params import PresetCompositeRetrievalParams
 from .preset_retrieval_params import PresetRetrievalParams
 from .presigned_url import PresignedUrl
 from .progress_event import ProgressEvent
@@ -266,6 +269,7 @@ from .report_event_item_event_data import (
     ReportEventItemEventData_ReportStateUpdate,
 )
 from .report_event_type import ReportEventType
+from .report_file_info import ReportFileInfo
 from .report_metadata import ReportMetadata
 from .report_plan import ReportPlan
 from .report_plan_block import ReportPlanBlock
@@ -409,7 +413,8 @@ __all__ = [
     "ExtractConfig",
     "ExtractJob",
     "ExtractJobCreate",
-    "ExtractJobCreateDataSchemaOverrideValue",
+    "ExtractJobCreateDataSchemaOverride",
+    "ExtractJobCreateDataSchemaOverrideZeroValue",
     "ExtractMode",
     "ExtractResultset",
     "ExtractResultsetData",
@@ -417,13 +422,14 @@ __all__ = [
     "ExtractResultsetDataZeroValue",
     "ExtractResultsetExtractionMetadataValue",
     "ExtractRun",
+    "ExtractRunData",
+    "ExtractRunDataItemValue",
     "ExtractRunDataSchemaValue",
+    "ExtractRunDataZeroValue",
+    "ExtractRunExtractionMetadataValue",
+    "ExtractSchemaValidateResponse",
+    "ExtractSchemaValidateResponseDataSchemaValue",
     "ExtractState",
-    "ExtractionJob",
-    "ExtractionResult",
-    "ExtractionResultDataValue",
-    "ExtractionSchema",
-    "ExtractionSchemaDataSchemaValue",
     "File",
     "FilePermissionInfoValue",
     "FileResourceInfoValue",
@@ -534,6 +540,7 @@ __all__ = [
     "Plan",
     "PlaygroundSession",
     "Pooling",
+    "PresetCompositeRetrievalParams",
     "PresetRetrievalParams",
     "PresignedUrl",
     "ProgressEvent",
@@ -555,6 +562,7 @@ __all__ = [
     "ReportEventItemEventData_ReportBlockUpdate",
     "ReportEventItemEventData_ReportStateUpdate",
     "ReportEventType",
+    "ReportFileInfo",
     "ReportMetadata",
     "ReportPlan",
     "ReportPlanBlock",

llama_cloud/types/chat_app.py

@@ -5,7 +5,7 @@ import typing
 
 from ..core.datetime_utils import serialize_datetime
 from .llm_parameters import LlmParameters
-from .preset_retrieval_params import PresetRetrievalParams
+from .preset_composite_retrieval_params import PresetCompositeRetrievalParams
 
 try:
     import pydantic
@@ -21,14 +21,16 @@ class ChatApp(pydantic.BaseModel):
     Schema for a chat app
     """
 
-    id: str
-    name: str
-    pipeline_id: str
-    project_id: str
-    llm_config: LlmParameters
-    retrieval_config: PresetRetrievalParams
-    created_at: dt.datetime
-    updated_at: dt.datetime
+    id: str = pydantic.Field(description="Unique identifier")
+    created_at: typing.Optional[dt.datetime]
+    updated_at: typing.Optional[dt.datetime]
+    name: str = pydantic.Field(description="Name of the chat app")
+    retriever_id: str = pydantic.Field(description="ID of the retriever to use for the chat app")
+    llm_config: LlmParameters = pydantic.Field(description="Configuration for the LLM model to use for the chat app")
+    retrieval_config: PresetCompositeRetrievalParams = pydantic.Field(
+        description="Configuration for the retrieval model to use for the chat app"
+    )
+    project_id: str = pydantic.Field(description="ID of the project the chat app belongs to")
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

llama_cloud/types/chat_app_response.py

@@ -5,7 +5,7 @@ import typing
 
 from ..core.datetime_utils import serialize_datetime
 from .llm_parameters import LlmParameters
-from .preset_retrieval_params import PresetRetrievalParams
+from .preset_composite_retrieval_params import PresetCompositeRetrievalParams
 
 try:
     import pydantic
@@ -17,15 +17,17 @@ except ImportError:
 
 
 class ChatAppResponse(pydantic.BaseModel):
-    id: str
-    name: str
-    pipeline_id: str
-    project_id: str
-    llm_config: LlmParameters
-    retrieval_config: PresetRetrievalParams
-    created_at: dt.datetime
-    updated_at: dt.datetime
-    pipeline_name: str
+    id: str = pydantic.Field(description="Unique identifier")
+    created_at: typing.Optional[dt.datetime]
+    updated_at: typing.Optional[dt.datetime]
+    name: str = pydantic.Field(description="Name of the chat app")
+    retriever_id: str = pydantic.Field(description="ID of the retriever to use for the chat app")
+    llm_config: LlmParameters = pydantic.Field(description="Configuration for the LLM model to use for the chat app")
+    retrieval_config: PresetCompositeRetrievalParams = pydantic.Field(
+        description="Configuration for the retrieval model to use for the chat app"
+    )
+    project_id: str = pydantic.Field(description="ID of the project the chat app belongs to")
+    retriever_name: str
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

llama_cloud/types/cloud_mongo_db_atlas_vector_search.py

@@ -35,6 +35,7 @@ class CloudMongoDbAtlasVectorSearch(pydantic.BaseModel):
     collection_name: str
     vector_index_name: typing.Optional[str]
     fulltext_index_name: typing.Optional[str]
+    embedding_dimension: typing.Optional[int]
     class_name: typing.Optional[str]
 
     def json(self, **kwargs: typing.Any) -> str:

llama_cloud/types/extract_job.py

@@ -4,6 +4,7 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from .extract_agent import ExtractAgent
 from .file import File
 from .status_enum import StatusEnum
 
@@ -18,8 +19,9 @@ except ImportError:
 
 class ExtractJob(pydantic.BaseModel):
     id: str = pydantic.Field(description="The id of the extraction job")
-    run_id: str = pydantic.Field(description="The id of the extraction run")
+    extraction_agent: ExtractAgent = pydantic.Field(description="The agent that the job was run on.")
     status: StatusEnum = pydantic.Field(description="The status of the extraction job")
+    error: typing.Optional[str]
     file: File = pydantic.Field(description="The file that the extract was extracted from")
 
     def json(self, **kwargs: typing.Any) -> str:

llama_cloud/types/extract_job_create.py

@@ -5,7 +5,7 @@ import typing
 
 from ..core.datetime_utils import serialize_datetime
 from .extract_config import ExtractConfig
-from .extract_job_create_data_schema_override_value import ExtractJobCreateDataSchemaOverrideValue
+from .extract_job_create_data_schema_override import ExtractJobCreateDataSchemaOverride
 
 try:
     import pydantic
@@ -23,7 +23,9 @@ class ExtractJobCreate(pydantic.BaseModel):
 
     extraction_agent_id: str = pydantic.Field(description="The id of the extraction agent")
     file_id: str = pydantic.Field(description="The id of the file")
-    data_schema_override: typing.Optional[typing.Dict[str, typing.Optional[ExtractJobCreateDataSchemaOverrideValue]]]
+    data_schema_override: typing.Optional[ExtractJobCreateDataSchemaOverride] = pydantic.Field(
+        description="The data schema to override the extraction agent's data schema with"
+    )
     config_override: typing.Optional[ExtractConfig]
 
     def json(self, **kwargs: typing.Any) -> str:

llama_cloud/types/extract_job_create_data_schema_override.py

@@ -0,0 +1,9 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+from .extract_job_create_data_schema_override_zero_value import ExtractJobCreateDataSchemaOverrideZeroValue
+
+ExtractJobCreateDataSchemaOverride = typing.Union[
+    typing.Dict[str, typing.Optional[ExtractJobCreateDataSchemaOverrideZeroValue]], str
+]

llama_cloud/{resources/extraction/types/extraction_schema_update_data_schema_value.py → types/extract_job_create_data_schema_override_zero_value.py}

@@ -2,6 +2,6 @@
 
 import typing
 
-ExtractionSchemaUpdateDataSchemaValue = typing.Union[
+ExtractJobCreateDataSchemaOverrideZeroValue = typing.Union[
     typing.Dict[str, typing.Any], typing.List[typing.Any], str, int, float, bool
 ]

llama_cloud/types/extract_resultset.py

@@ -6,7 +6,6 @@ import typing
 from ..core.datetime_utils import serialize_datetime
 from .extract_resultset_data import ExtractResultsetData
 from .extract_resultset_extraction_metadata_value import ExtractResultsetExtractionMetadataValue
-from .extract_run import ExtractRun
 
 try:
     import pydantic
@@ -19,18 +18,15 @@ except ImportError:
 
 class ExtractResultset(pydantic.BaseModel):
     """
-    Schema for an extraction result.
+    Schema for an extraction resultset.
     """
 
-    id: str = pydantic.Field(description="Unique identifier")
-    created_at: typing.Optional[dt.datetime]
-    updated_at: typing.Optional[dt.datetime]
+    run_id: str = pydantic.Field(description="The id of the extraction run")
     extraction_agent_id: str = pydantic.Field(description="The id of the extraction agent")
     data: typing.Optional[ExtractResultsetData] = pydantic.Field(description="The data extracted from the file")
     extraction_metadata: typing.Dict[str, typing.Optional[ExtractResultsetExtractionMetadataValue]] = pydantic.Field(
         description="The metadata extracted from the file"
     )
-    extraction_run: ExtractRun = pydantic.Field(description="The extraction run that produced the resultset.")
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

llama_cloud/types/extract_run.py

@@ -5,7 +5,9 @@ import typing
 
 from ..core.datetime_utils import serialize_datetime
 from .extract_config import ExtractConfig
+from .extract_run_data import ExtractRunData
 from .extract_run_data_schema_value import ExtractRunDataSchemaValue
+from .extract_run_extraction_metadata_value import ExtractRunExtractionMetadataValue
 from .extract_state import ExtractState
 from .file import File
 
@@ -34,6 +36,9 @@ class ExtractRun(pydantic.BaseModel):
     file: File = pydantic.Field(description="The file that the extract was extracted from")
     status: ExtractState = pydantic.Field(description="The status of the extraction run")
     error: typing.Optional[str]
+    job_id: typing.Optional[str]
+    data: typing.Optional[ExtractRunData] = pydantic.Field(description="The data extracted from the file")
+    extraction_metadata: typing.Optional[typing.Dict[str, typing.Optional[ExtractRunExtractionMetadataValue]]]
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

llama_cloud/types/extract_run_data.py

@@ -0,0 +1,11 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+from .extract_run_data_item_value import ExtractRunDataItemValue
+from .extract_run_data_zero_value import ExtractRunDataZeroValue
+
+ExtractRunData = typing.Union[
+    typing.Dict[str, typing.Optional[ExtractRunDataZeroValue]],
+    typing.List[typing.Dict[str, typing.Optional[ExtractRunDataItemValue]]],
+]

llama_cloud/types/extract_run_data_item_value.py

@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+ExtractRunDataItemValue = typing.Union[typing.Dict[str, typing.Any], typing.List[typing.Any], str, int, float, bool]

llama_cloud/types/extract_run_data_zero_value.py

@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+ExtractRunDataZeroValue = typing.Union[typing.Dict[str, typing.Any], typing.List[typing.Any], str, int, float, bool]

llama_cloud/{resources/llama_extract/types/extract_agent_update_data_schema_value.py → types/extract_run_extraction_metadata_value.py}

@@ -2,6 +2,6 @@
 
 import typing
 
-ExtractAgentUpdateDataSchemaValue = typing.Union[
+ExtractRunExtractionMetadataValue = typing.Union[
     typing.Dict[str, typing.Any], typing.List[typing.Any], str, int, float, bool
 ]

llama_cloud/types/{extraction_job.py → extract_schema_validate_response.py}

@@ -4,8 +4,7 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
-from .file import File
-from .status_enum import StatusEnum
+from .extract_schema_validate_response_data_schema_value import ExtractSchemaValidateResponseDataSchemaValue
 
 try:
     import pydantic
@@ -16,10 +15,8 @@ except ImportError:
     import pydantic  # type: ignore
 
 
-class ExtractionJob(pydantic.BaseModel):
-    id: str = pydantic.Field(description="The id of the extraction job")
-    status: StatusEnum = pydantic.Field(description="The status of the extraction job")
-    file: File = pydantic.Field(description="The file that the extract was extracted from")
+class ExtractSchemaValidateResponse(pydantic.BaseModel):
+    data_schema: typing.Dict[str, typing.Optional[ExtractSchemaValidateResponseDataSchemaValue]]
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

llama_cloud/types/extract_schema_validate_response_data_schema_value.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+ExtractSchemaValidateResponseDataSchemaValue = typing.Union[
+    typing.Dict[str, typing.Any], typing.List[typing.Any], str, int, float, bool
+]

llama_cloud/types/extract_state.py

@@ -8,21 +8,21 @@ T_Result = typing.TypeVar("T_Result")
 
 class ExtractState(str, enum.Enum):
     CREATED = "CREATED"
-    RUNNING = "RUNNING"
+    PENDING = "PENDING"
     SUCCESS = "SUCCESS"
     ERROR = "ERROR"
 
     def visit(
         self,
         created: typing.Callable[[], T_Result],
-        running: typing.Callable[[], T_Result],
+        pending: typing.Callable[[], T_Result],
         success: typing.Callable[[], T_Result],
         error: typing.Callable[[], T_Result],
     ) -> T_Result:
         if self is ExtractState.CREATED:
             return created()
-        if self is ExtractState.RUNNING:
-            return running()
+        if self is ExtractState.PENDING:
+            return pending()
         if self is ExtractState.SUCCESS:
             return success()
         if self is ExtractState.ERROR:

llama_cloud/types/llama_extract_settings.py

@@ -4,6 +4,7 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from .llama_parse_parameters import LlamaParseParameters
 
 try:
     import pydantic
@@ -30,6 +31,9 @@ class LlamaExtractSettings(pydantic.BaseModel):
     )
     extraction_prompt: typing.Optional[str] = pydantic.Field(description="The prompt to use for the extraction.")
     error_handling_prompt: typing.Optional[str] = pydantic.Field(description="The prompt to use for error handling.")
+    llama_parse_params: typing.Optional[LlamaParseParameters] = pydantic.Field(
+        description="LlamaParse related settings."
+    )
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

llama_cloud/types/llama_parse_parameters.py

@@ -57,7 +57,9 @@ class LlamaParseParameters(pydantic.BaseModel):
     premium_mode: typing.Optional[bool]
     continuous_mode: typing.Optional[bool]
     s_3_input_path: typing.Optional[str] = pydantic.Field(alias="s3_input_path")
+    input_s_3_region: typing.Optional[str] = pydantic.Field(alias="input_s3_region")
     s_3_output_path_prefix: typing.Optional[str] = pydantic.Field(alias="s3_output_path_prefix")
+    output_s_3_region: typing.Optional[str] = pydantic.Field(alias="output_s3_region")
     project_id: typing.Optional[str]
     azure_openai_deployment_name: typing.Optional[str]
     azure_openai_endpoint: typing.Optional[str]
@@ -79,6 +81,15 @@ class LlamaParseParameters(pydantic.BaseModel):
     formatting_instruction: typing.Optional[str]
     complemental_formatting_instruction: typing.Optional[str]
     content_guideline_instruction: typing.Optional[str]
+    spreadsheet_extract_sub_tables: typing.Optional[bool]
+    job_timeout_in_seconds: typing.Optional[float]
+    job_timeout_extra_time_per_page_in_seconds: typing.Optional[float]
+    strict_mode_image_extraction: typing.Optional[bool]
+    strict_mode_image_ocr: typing.Optional[bool]
+    strict_mode_reconstruction: typing.Optional[bool]
+    strict_mode_buggy_font: typing.Optional[bool]
+    ignore_document_elements_for_layout_detection: typing.Optional[bool]
+    output_tables_as_html: typing.Optional[bool] = pydantic.Field(alias="output_tables_as_HTML")
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

llama_cloud/types/plan.py

@@ -15,6 +15,8 @@ except ImportError:
 
 
 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]
@@ -25,6 +27,8 @@ class Plan(pydantic.BaseModel):
     allowed_external_index: typing.Optional[bool] = pydantic.Field(
         description="If is allowed to use external data sources or sinks in indexes"
     )
+    starting_on: typing.Optional[dt.datetime]
+    ending_before: typing.Optional[dt.datetime]
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

llama_cloud/types/{extraction_result.py → preset_composite_retrieval_params.py}

@@ -4,8 +4,7 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
-from .extraction_result_data_value import ExtractionResultDataValue
-from .file import File
+from .composite_retrieval_mode import CompositeRetrievalMode
 
 try:
     import pydantic
@@ -16,19 +15,11 @@ except ImportError:
     import pydantic  # type: ignore
 
 
-class ExtractionResult(pydantic.BaseModel):
-    """
-    Schema for an extraction result.
-    """
-
-    id: str = pydantic.Field(description="Unique identifier")
-    created_at: typing.Optional[dt.datetime]
-    updated_at: typing.Optional[dt.datetime]
-    schema_id: str = pydantic.Field(description="The id of the schema")
-    data: typing.Dict[str, typing.Optional[ExtractionResultDataValue]] = pydantic.Field(
-        description="The data extracted from the file"
+class PresetCompositeRetrievalParams(pydantic.BaseModel):
+    mode: typing.Optional[CompositeRetrievalMode] = pydantic.Field(description="The mode of composite retrieval.")
+    rerank_top_n: typing.Optional[int] = pydantic.Field(
+        description="The number of nodes to retrieve after reranking over retrieved nodes from all retrieval tools."
     )
-    file: File = pydantic.Field(description="The file that the extract was extracted from")
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

llama_cloud/types/{extraction_schema.py → report_file_info.py}

@@ -4,7 +4,6 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
-from .extraction_schema_data_schema_value import ExtractionSchemaDataSchemaValue
 
 try:
     import pydantic
@@ -15,17 +14,13 @@ except ImportError:
     import pydantic  # type: ignore
 
 
-class ExtractionSchema(pydantic.BaseModel):
+class ReportFileInfo(pydantic.BaseModel):
     """
-    Schema for extraction schema.
+    Information about a file stored in S3
     """
 
-    id: str = pydantic.Field(description="Unique identifier")
-    created_at: typing.Optional[dt.datetime]
-    updated_at: typing.Optional[dt.datetime]
-    name: str = pydantic.Field(description="The name of the extraction schema")
-    project_id: str = pydantic.Field(description="The ID of the project that the extraction schema belongs to")
-    data_schema: typing.Optional[typing.Dict[str, typing.Optional[ExtractionSchemaDataSchemaValue]]]
+    original_name: str = pydantic.Field(description="Original filename uploaded by user")
+    s_3_path: str = pydantic.Field(alias="s3_path", description="Path to file in S3")
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
@@ -38,4 +33,5 @@ class ExtractionSchema(pydantic.BaseModel):
     class Config:
         frozen = True
         smart_union = True
+        allow_population_by_field_name = True
         json_encoders = {dt.datetime: serialize_datetime}

llama_cloud/types/report_metadata.py

@@ -4,6 +4,7 @@ import datetime as dt
 import typing
 
 from ..core.datetime_utils import serialize_datetime
+from .report_file_info import ReportFileInfo
 from .report_state import ReportState
 
 try:
@@ -25,7 +26,7 @@ class ReportMetadata(pydantic.BaseModel):
     report_metadata: typing.Dict[str, typing.Any] = pydantic.Field(description="The metadata for the report")
     state: ReportState = pydantic.Field(description="The state of the report")
     input_files: typing.Optional[typing.List[str]]
-    template_file: typing.Optional[str]
+    template_file: typing.Optional[ReportFileInfo]
     template_text: typing.Optional[str]
     template_instructions: typing.Optional[str]
 

{llama_cloud-0.1.8.dist-info → llama_cloud-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-cloud
-Version: 0.1.8
+Version: 0.1.10
 Summary: 
 License: MIT
 Author: Logan Markewich
@@ -13,6 +13,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: certifi (>=2024.7.4,<2025.0.0)
 Requires-Dist: httpx (>=0.20.0)
 Requires-Dist: pydantic (>=1.10)