llama-cloud 0.1.17__tar.gz → 0.1.18__tar.gz

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/PKG-INFO

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

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/__init__.py

@@ -199,7 +199,6 @@ from .types import (
     ParsingJobStructuredResult,
     ParsingJobTextResult,
     ParsingMode,
-    ParsingUsage,
     PartitionNames,
     Permission,
     Pipeline,
@@ -570,7 +569,6 @@ __all__ = [
     "ParsingJobStructuredResult",
     "ParsingJobTextResult",
     "ParsingMode",
-    "ParsingUsage",
     "PartitionNames",
     "Permission",
     "Pipeline",

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/resources/chat_apps/client.py

@@ -108,7 +108,7 @@ class ChatAppsClient:
             name="string",
             retriever_id="string",
             llm_config=LlmParameters(
-                model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
+                model_name=SupportedLlmModelNames.GPT_4_O,
             ),
             retrieval_config=PresetCompositeRetrievalParams(
                 mode=CompositeRetrievalMode.ROUTING,
@@ -217,7 +217,7 @@ class ChatAppsClient:
         client.chat_apps.update_chat_app(
             id="string",
             llm_config=LlmParameters(
-                model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
+                model_name=SupportedLlmModelNames.GPT_4_O,
             ),
             retrieval_config=PresetCompositeRetrievalParams(
                 mode=CompositeRetrievalMode.ROUTING,
@@ -401,7 +401,7 @@ class AsyncChatAppsClient:
             name="string",
             retriever_id="string",
             llm_config=LlmParameters(
-                model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
+                model_name=SupportedLlmModelNames.GPT_4_O,
             ),
             retrieval_config=PresetCompositeRetrievalParams(
                 mode=CompositeRetrievalMode.ROUTING,
@@ -510,7 +510,7 @@ class AsyncChatAppsClient:
         await client.chat_apps.update_chat_app(
             id="string",
             llm_config=LlmParameters(
-                model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
+                model_name=SupportedLlmModelNames.GPT_4_O,
             ),
             retrieval_config=PresetCompositeRetrievalParams(
                 mode=CompositeRetrievalMode.ROUTING,

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/resources/llama_extract/client.py

@@ -357,7 +357,6 @@ class LlamaExtractClient:
         client.llama_extract.run_job(
             request=ExtractJobCreate(
                 extraction_agent_id="string",
-                file_id="string",
                 config_override=ExtractConfig(
                     extraction_target=ExtractTarget.PER_DOC,
                     extraction_mode=ExtractMode.FAST,
@@ -446,7 +445,6 @@ class LlamaExtractClient:
         client.llama_extract.run_job_test_user(
             job_create=ExtractJobCreate(
                 extraction_agent_id="string",
-                file_id="string",
                 config_override=ExtractConfig(
                     extraction_target=ExtractTarget.PER_DOC,
                     extraction_mode=ExtractMode.FAST,
@@ -1043,7 +1041,6 @@ class AsyncLlamaExtractClient:
         await client.llama_extract.run_job(
             request=ExtractJobCreate(
                 extraction_agent_id="string",
-                file_id="string",
                 config_override=ExtractConfig(
                     extraction_target=ExtractTarget.PER_DOC,
                     extraction_mode=ExtractMode.FAST,
@@ -1132,7 +1129,6 @@ class AsyncLlamaExtractClient:
         await client.llama_extract.run_job_test_user(
             job_create=ExtractJobCreate(
                 extraction_agent_id="string",
-                file_id="string",
                 config_override=ExtractConfig(
                     extraction_target=ExtractTarget.PER_DOC,
                     extraction_mode=ExtractMode.FAST,

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/resources/parsing/client.py

@@ -19,7 +19,6 @@ from ...types.parsing_job_markdown_result import ParsingJobMarkdownResult
 from ...types.parsing_job_structured_result import ParsingJobStructuredResult
 from ...types.parsing_job_text_result import ParsingJobTextResult
 from ...types.parsing_mode import ParsingMode
-from ...types.parsing_usage import ParsingUsage
 from ...types.presigned_url import PresignedUrl
 
 try:
@@ -212,6 +211,7 @@ 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,6 +314,8 @@ class ParsingClient:
 
             - bbox_top: float.
 
+            - compact_markdown_table: bool.
+
             - disable_ocr: bool.
 
             - disable_reconstruction: bool.
@@ -452,6 +454,7 @@ 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,
@@ -536,38 +539,6 @@ class ParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def usage(self, *, organization_id: typing.Optional[str] = None) -> ParsingUsage:
-        """
-        DEPRECATED: use either /organizations/{organization_id}/usage or /projects/{project_id}/usage instead
-        Get parsing usage for user
-
-        Parameters:
-            - organization_id: typing.Optional[str].
-        ---
-        from llama_cloud.client import LlamaCloud
-
-        client = LlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        client.parsing.usage()
-        """
-        _response = self._client_wrapper.httpx_client.request(
-            "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/usage"),
-            params=remove_none_from_dict({"organization_id": organization_id}),
-            headers=self._client_wrapper.get_headers(),
-            timeout=60,
-        )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ParsingUsage, _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(self, job_id: str) -> ParsingJob:
         """
         Get a job by id
@@ -1192,6 +1163,7 @@ 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,6 +1266,8 @@ class AsyncParsingClient:
 
             - bbox_top: float.
 
+            - compact_markdown_table: bool.
+
             - disable_ocr: bool.
 
             - disable_reconstruction: bool.
@@ -1432,6 +1406,7 @@ 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,
@@ -1516,38 +1491,6 @@ class AsyncParsingClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def usage(self, *, organization_id: typing.Optional[str] = None) -> ParsingUsage:
-        """
-        DEPRECATED: use either /organizations/{organization_id}/usage or /projects/{project_id}/usage instead
-        Get parsing usage for user
-
-        Parameters:
-            - organization_id: typing.Optional[str].
-        ---
-        from llama_cloud.client import AsyncLlamaCloud
-
-        client = AsyncLlamaCloud(
-            token="YOUR_TOKEN",
-        )
-        await client.parsing.usage()
-        """
-        _response = await self._client_wrapper.httpx_client.request(
-            "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/parsing/usage"),
-            params=remove_none_from_dict({"organization_id": organization_id}),
-            headers=self._client_wrapper.get_headers(),
-            timeout=60,
-        )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(ParsingUsage, _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(self, job_id: str) -> ParsingJob:
         """
         Get a job by id

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/resources/pipelines/client.py

@@ -1218,7 +1218,7 @@ class PipelinesClient:
                     retrieval_mode=RetrievalMode.CHUNKS,
                 ),
                 llm_parameters=LlmParameters(
-                    model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
+                    model_name=SupportedLlmModelNames.GPT_4_O,
                 ),
             ),
         )
@@ -2775,7 +2775,7 @@ class AsyncPipelinesClient:
                     retrieval_mode=RetrievalMode.CHUNKS,
                 ),
                 llm_parameters=LlmParameters(
-                    model_name=SupportedLlmModelNames.GPT_3_5_TURBO,
+                    model_name=SupportedLlmModelNames.GPT_4_O,
                 ),
             ),
         )

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/resources/projects/client.py

@@ -250,6 +250,41 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def get_current_project(
+        self, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> Project:
+        """
+        Get the current project.
+
+        Parameters:
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.projects.get_current_project()
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/projects/current"),
+            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(Project, _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_project_usage(
         self,
         project_id: typing.Optional[str],
@@ -522,6 +557,41 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    async def get_current_project(
+        self, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> Project:
+        """
+        Get the current project.
+
+        Parameters:
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.projects.get_current_project()
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/projects/current"),
+            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(Project, _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_project_usage(
         self,
         project_id: typing.Optional[str],

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/types/__init__.py

@@ -208,7 +208,6 @@ 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
 from .pipeline import Pipeline
@@ -527,7 +526,6 @@ __all__ = [
     "ParsingJobStructuredResult",
     "ParsingJobTextResult",
     "ParsingMode",
-    "ParsingUsage",
     "PartitionNames",
     "Permission",
     "Pipeline",

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/types/extract_job_create.py

@@ -22,7 +22,8 @@ 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")
+    file_id: typing.Optional[str]
+    file: typing.Optional[str]
     data_schema_override: typing.Optional[ExtractJobCreateDataSchemaOverride] = pydantic.Field(
         description="The data schema to override the extraction agent's data schema with"
     )

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/types/llama_extract_settings.py

@@ -26,8 +26,8 @@ class LlamaExtractSettings(pydantic.BaseModel):
     max_file_size: typing.Optional[int] = pydantic.Field(
         description="The maximum file size (in bytes) allowed for the document."
     )
-    max_tokens: typing.Optional[int] = pydantic.Field(
-        description="The maximum number of tokens allowed for the document."
+    max_file_size_ui: typing.Optional[int] = pydantic.Field(
+        description="The maximum file size (in bytes) allowed for the document."
     )
     max_pages: typing.Optional[int] = pydantic.Field(
         description="The maximum number of pages allowed for the document."

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/types/llama_parse_parameters.py

@@ -26,6 +26,7 @@ class LlamaParseParameters(pydantic.BaseModel):
     disable_ocr: typing.Optional[bool]
     annotate_links: typing.Optional[bool]
     adaptive_long_table: typing.Optional[bool]
+    compact_markdown_table: typing.Optional[bool]
     disable_reconstruction: typing.Optional[bool]
     disable_image_extraction: typing.Optional[bool]
     invalidate_cache: typing.Optional[bool]
@@ -61,9 +62,9 @@ class LlamaParseParameters(pydantic.BaseModel):
     is_formatting_instruction: typing.Optional[bool]
     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_path: typing.Optional[str] = pydantic.Field(alias="input_s3_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_path_prefix: typing.Optional[str] = pydantic.Field(alias="output_s3_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]

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/llama_cloud/types/supported_llm_model_names.py

@@ -7,9 +7,6 @@ T_Result = typing.TypeVar("T_Result")
 
 
 class SupportedLlmModelNames(str, enum.Enum):
-    GPT_3_5_TURBO = "GPT_3_5_TURBO"
-    GPT_4 = "GPT_4"
-    GPT_4_TURBO = "GPT_4_TURBO"
     GPT_4_O = "GPT_4O"
     GPT_4_O_MINI = "GPT_4O_MINI"
     AZURE_OPENAI_GPT_3_5_TURBO = "AZURE_OPENAI_GPT_3_5_TURBO"
@@ -22,9 +19,6 @@ class SupportedLlmModelNames(str, enum.Enum):
 
     def visit(
         self,
-        gpt_3_5_turbo: typing.Callable[[], T_Result],
-        gpt_4: typing.Callable[[], T_Result],
-        gpt_4_turbo: typing.Callable[[], T_Result],
         gpt_4_o: typing.Callable[[], T_Result],
         gpt_4_o_mini: typing.Callable[[], T_Result],
         azure_openai_gpt_3_5_turbo: typing.Callable[[], T_Result],
@@ -35,12 +29,6 @@ class SupportedLlmModelNames(str, enum.Enum):
         bedrock_claude_3_5_sonnet: typing.Callable[[], T_Result],
         vertex_ai_claude_3_5_sonnet: typing.Callable[[], T_Result],
     ) -> T_Result:
-        if self is SupportedLlmModelNames.GPT_3_5_TURBO:
-            return gpt_3_5_turbo()
-        if self is SupportedLlmModelNames.GPT_4:
-            return gpt_4()
-        if self is SupportedLlmModelNames.GPT_4_TURBO:
-            return gpt_4_turbo()
         if self is SupportedLlmModelNames.GPT_4_O:
             return gpt_4_o()
         if self is SupportedLlmModelNames.GPT_4_O_MINI:

{llama_cloud-0.1.17 → llama_cloud-0.1.18}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "llama-cloud"
-version = "0.1.17"
+version = "0.1.18"
 description = ""
 authors = ["Logan Markewich <logan@runllama.ai>"]
 readme = "README.md"

llama_cloud-0.1.17/llama_cloud/types/parsing_usage.py

@@ -1,32 +0,0 @@
-# This file was auto-generated by Fern from our API Definition.
-
-import datetime as dt
-import typing
-
-from ..core.datetime_utils import serialize_datetime
-
-try:
-    import pydantic
-    if pydantic.__version__.startswith("1."):
-        raise ImportError
-    import pydantic.v1 as pydantic  # type: ignore
-except ImportError:
-    import pydantic  # type: ignore
-
-
-class ParsingUsage(pydantic.BaseModel):
-    usage_pdf_pages: int
-    max_pdf_pages: typing.Optional[int]
-
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().json(**kwargs_with_defaults)
-
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
-        kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}
-        return super().dict(**kwargs_with_defaults)
-
-    class Config:
-        frozen = True
-        smart_union = True
-        json_encoders = {dt.datetime: serialize_datetime}