llama-cloud 0.0.2__tar.gz → 0.0.4__tar.gz

{llama_cloud-0.0.2 → llama_cloud-0.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-cloud
-Version: 0.0.2
+Version: 0.0.4
 Summary: 
 Author: Logan Markewich
 Author-email: logan@runllama.ai

{llama_cloud-0.0.2 → llama_cloud-0.0.4}/llama_cloud/__init__.py

@@ -147,6 +147,7 @@ from .resources import (
     pipelines,
     projects,
 )
+from .environment import LlamaCloudEnvironment
 
 __all__ = [
     "ApiKey",
@@ -218,6 +219,7 @@ __all__ = [
     "HuggingFaceInferenceApiEmbedding",
     "HuggingFaceInferenceApiEmbeddingToken",
     "JsonNodeParser",
+    "LlamaCloudEnvironment",
     "LlamaParseSupportedFileExtensions",
     "Llm",
     "LocalEval",

{llama_cloud-0.0.2 → llama_cloud-0.0.4}/llama_cloud/client.py

@@ -5,6 +5,7 @@ import typing
 import httpx
 
 from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from .environment import LlamaCloudEnvironment
 from .resources.api_keys.client import ApiKeysClient, AsyncApiKeysClient
 from .resources.billing.client import AsyncBillingClient, BillingClient
 from .resources.component_definitions.client import AsyncComponentDefinitionsClient, ComponentDefinitionsClient
@@ -22,13 +23,14 @@ class LlamaCloud:
     def __init__(
         self,
         *,
-        base_url: str,
+        base_url: typing.Optional[str] = None,
+        environment: LlamaCloudEnvironment = LlamaCloudEnvironment.DEFAULT,
         token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
         timeout: typing.Optional[float] = 60,
         httpx_client: typing.Optional[httpx.Client] = None
     ):
         self._client_wrapper = SyncClientWrapper(
-            base_url=base_url,
+            base_url=_get_base_url(base_url=base_url, environment=environment),
             token=token,
             httpx_client=httpx.Client(timeout=timeout) if httpx_client is None else httpx_client,
         )
@@ -49,13 +51,14 @@ class AsyncLlamaCloud:
     def __init__(
         self,
         *,
-        base_url: str,
+        base_url: typing.Optional[str] = None,
+        environment: LlamaCloudEnvironment = LlamaCloudEnvironment.DEFAULT,
         token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
         timeout: typing.Optional[float] = 60,
         httpx_client: typing.Optional[httpx.AsyncClient] = None
     ):
         self._client_wrapper = AsyncClientWrapper(
-            base_url=base_url,
+            base_url=_get_base_url(base_url=base_url, environment=environment),
             token=token,
             httpx_client=httpx.AsyncClient(timeout=timeout) if httpx_client is None else httpx_client,
         )
@@ -70,3 +73,12 @@ class AsyncLlamaCloud:
         self.component_definitions = AsyncComponentDefinitionsClient(client_wrapper=self._client_wrapper)
         self.billing = AsyncBillingClient(client_wrapper=self._client_wrapper)
         self.deprecated = AsyncDeprecatedClient(client_wrapper=self._client_wrapper)
+
+
+def _get_base_url(*, base_url: typing.Optional[str] = None, environment: LlamaCloudEnvironment) -> str:
+    if base_url is not None:
+        return base_url
+    elif environment is not None:
+        return environment.value
+    else:
+        raise Exception("Please pass in either base_url or environment to construct the client")

{llama_cloud-0.0.2 → llama_cloud-0.0.4}/llama_cloud/core/jsonable_encoder.py

@@ -17,6 +17,9 @@ from types import GeneratorType
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union
 
 try:
+    import pydantic
+    if pydantic.__version__.startswith("1."):
+        raise ImportError
     import pydantic.v1 as pydantic  # type: ignore
 except ImportError:
     import pydantic  # type: ignore

llama_cloud-0.0.4/llama_cloud/environment.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import enum
+
+
+class LlamaCloudEnvironment(enum.Enum):
+    DEFAULT = "https://api.cloud.llamaindex.ai/"

{llama_cloud-0.0.2 → llama_cloud-0.0.4}/llama_cloud/resources/api_keys/client.py

@@ -12,6 +12,9 @@ from ...types.api_key import ApiKey
 from ...types.http_validation_error import HttpValidationError
 
 try:
+    import pydantic
+    if pydantic.__version__.startswith("1."):
+        raise ImportError
     import pydantic.v1 as pydantic  # type: ignore
 except ImportError:
     import pydantic  # type: ignore
@@ -29,11 +32,10 @@ class ApiKeysClient:
         Get all API Keys for a user.
 
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.api_keys.get_keys()
         """
@@ -60,11 +62,10 @@ class ApiKeysClient:
         Parameters:
             - name: typing.Optional[str].
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.api_keys.generate_key()
         """
@@ -97,11 +98,10 @@ class ApiKeysClient:
 
             - name: typing.Optional[str].
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.api_keys.update_existing_api_key(
             api_key_id="string",
@@ -134,11 +134,10 @@ class ApiKeysClient:
         Parameters:
             - api_key_id: str.
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.api_keys.delete_api_key(
             api_key_id="string",
@@ -170,11 +169,10 @@ class AsyncApiKeysClient:
         Get all API Keys for a user.
 
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.api_keys.get_keys()
         """
@@ -201,11 +199,10 @@ class AsyncApiKeysClient:
         Parameters:
             - name: typing.Optional[str].
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.api_keys.generate_key()
         """
@@ -238,11 +235,10 @@ class AsyncApiKeysClient:
 
             - name: typing.Optional[str].
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.api_keys.update_existing_api_key(
             api_key_id="string",
@@ -275,11 +271,10 @@ class AsyncApiKeysClient:
         Parameters:
             - api_key_id: str.
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.api_keys.delete_api_key(
             api_key_id="string",

{llama_cloud-0.0.2 → llama_cloud-0.0.4}/llama_cloud/resources/billing/client.py

@@ -12,6 +12,9 @@ from ...errors.unprocessable_entity_error import UnprocessableEntityError
 from ...types.http_validation_error import HttpValidationError
 
 try:
+    import pydantic
+    if pydantic.__version__.startswith("1."):
+        raise ImportError
     import pydantic.v1 as pydantic  # type: ignore
 except ImportError:
     import pydantic  # type: ignore
@@ -33,11 +36,10 @@ class BillingClient:
 
             - cancel_url: str.
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.billing.create_checkout_session(
             success_url="string",
@@ -68,11 +70,10 @@ class BillingClient:
         Parameters:
             - return_url: str.
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.billing.create_customer_portal_session(
             return_url="string",
@@ -102,11 +103,10 @@ class BillingClient:
         Parameters:
             - stripe_signature: typing.Optional[str].
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.billing.stripe_webhook()
         """
@@ -140,11 +140,10 @@ class AsyncBillingClient:
 
             - cancel_url: str.
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.billing.create_checkout_session(
             success_url="string",
@@ -175,11 +174,10 @@ class AsyncBillingClient:
         Parameters:
             - return_url: str.
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.billing.create_customer_portal_session(
             return_url="string",
@@ -209,11 +207,10 @@ class AsyncBillingClient:
         Parameters:
             - stripe_signature: typing.Optional[str].
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.billing.stripe_webhook()
         """

{llama_cloud-0.0.2 → llama_cloud-0.0.4}/llama_cloud/resources/component_definitions/client.py

@@ -11,6 +11,9 @@ from ...types.data_sink_definition import DataSinkDefinition
 from ...types.data_source_definition import DataSourceDefinition
 
 try:
+    import pydantic
+    if pydantic.__version__.startswith("1."):
+        raise ImportError
     import pydantic.v1 as pydantic  # type: ignore
 except ImportError:
     import pydantic  # type: ignore
@@ -25,11 +28,10 @@ class ComponentDefinitionsClient:
         Get all configurable transformation component definitions.
 
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.component_definitions.get_all_transformation_definitions()
         """
@@ -54,11 +56,10 @@ class ComponentDefinitionsClient:
         Get all data source component definitions.
 
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.component_definitions.get_all_data_source_definitions()
         """
@@ -81,11 +82,10 @@ class ComponentDefinitionsClient:
         Get all data sink component definitions.
 
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.component_definitions.get_all_data_sink_definitions()
         """
@@ -113,11 +113,10 @@ class AsyncComponentDefinitionsClient:
         Get all configurable transformation component definitions.
 
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.component_definitions.get_all_transformation_definitions()
         """
@@ -142,11 +141,10 @@ class AsyncComponentDefinitionsClient:
         Get all data source component definitions.
 
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.component_definitions.get_all_data_source_definitions()
         """
@@ -169,11 +167,10 @@ class AsyncComponentDefinitionsClient:
         Get all data sink component definitions.
 
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.component_definitions.get_all_data_sink_definitions()
         """

{llama_cloud-0.0.2 → llama_cloud-0.0.4}/llama_cloud/resources/data_sinks/client.py

@@ -16,6 +16,9 @@ from ...types.http_validation_error import HttpValidationError
 from .types.data_sink_update_component import DataSinkUpdateComponent
 
 try:
+    import pydantic
+    if pydantic.__version__.startswith("1."):
+        raise ImportError
     import pydantic.v1 as pydantic  # type: ignore
 except ImportError:
     import pydantic  # type: ignore
@@ -36,11 +39,10 @@ class DataSinksClient:
         Parameters:
             - project_id: typing.Optional[str].
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.list_data_sinks()
         """
@@ -70,12 +72,11 @@ class DataSinksClient:
 
             - request: DataSinkCreate.
         ---
-        from platform import ConfigurableDataSinkNames, DataSinkCreate
-        from platform.client import LlamaCloud
+        from llama_cloud import ConfigurableDataSinkNames, DataSinkCreate
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.create_data_sink(
             request=DataSinkCreate(
@@ -112,12 +113,11 @@ class DataSinksClient:
 
             - request: DataSinkCreate.
         ---
-        from platform import ConfigurableDataSinkNames, DataSinkCreate
-        from platform.client import LlamaCloud
+        from llama_cloud import ConfigurableDataSinkNames, DataSinkCreate
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.upsert_data_sink(
             request=DataSinkCreate(
@@ -151,11 +151,10 @@ class DataSinksClient:
         Parameters:
             - data_sink_id: str.
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.get_data_sink(
             data_sink_id="string",
@@ -197,12 +196,11 @@ class DataSinksClient:
 
             - component: typing.Optional[DataSinkUpdateComponent].
         ---
-        from platform import ConfigurableDataSinkNames
-        from platform.client import LlamaCloud
+        from llama_cloud import ConfigurableDataSinkNames
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.update_data_sink(
             data_sink_id="string",
@@ -238,11 +236,10 @@ class DataSinksClient:
         Parameters:
             - data_sink_id: str.
         ---
-        from platform.client import LlamaCloud
+        from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.delete_data_sink(
             data_sink_id="string",
@@ -277,11 +274,10 @@ class AsyncDataSinksClient:
         Parameters:
             - project_id: typing.Optional[str].
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.list_data_sinks()
         """
@@ -311,12 +307,11 @@ class AsyncDataSinksClient:
 
             - request: DataSinkCreate.
         ---
-        from platform import ConfigurableDataSinkNames, DataSinkCreate
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud import ConfigurableDataSinkNames, DataSinkCreate
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.create_data_sink(
             request=DataSinkCreate(
@@ -353,12 +348,11 @@ class AsyncDataSinksClient:
 
             - request: DataSinkCreate.
         ---
-        from platform import ConfigurableDataSinkNames, DataSinkCreate
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud import ConfigurableDataSinkNames, DataSinkCreate
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.upsert_data_sink(
             request=DataSinkCreate(
@@ -392,11 +386,10 @@ class AsyncDataSinksClient:
         Parameters:
             - data_sink_id: str.
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.get_data_sink(
             data_sink_id="string",
@@ -438,12 +431,11 @@ class AsyncDataSinksClient:
 
             - component: typing.Optional[DataSinkUpdateComponent].
         ---
-        from platform import ConfigurableDataSinkNames
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud import ConfigurableDataSinkNames
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.update_data_sink(
             data_sink_id="string",
@@ -479,11 +471,10 @@ class AsyncDataSinksClient:
         Parameters:
             - data_sink_id: str.
         ---
-        from platform.client import AsyncLlamaCloud
+        from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.delete_data_sink(
             data_sink_id="string",