llama-cloud 0.0.3__tar.gz → 0.0.5__tar.gz

{llama_cloud-0.0.3 → llama_cloud-0.0.5}/PKG-INFO

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

{llama_cloud-0.0.3 → llama_cloud-0.0.5}/llama_cloud/__init__.py

@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from .types import (
-    ApiKey,
     AzureOpenAiEmbedding,
     Base,
     BasePromptTemplate,
@@ -135,21 +134,18 @@ from .resources import (
     DataSourceUpdateCustomMetadataValue,
     FileCreateResourceInfoValue,
     PipelineFileUpdateCustomMetadataValue,
-    api_keys,
-    billing,
     component_definitions,
     data_sinks,
     data_sources,
-    deprecated,
     evals,
     files,
     parsing,
     pipelines,
     projects,
 )
+from .environment import LlamaCloudEnvironment
 
 __all__ = [
-    "ApiKey",
     "AzureOpenAiEmbedding",
     "Base",
     "BasePromptTemplate",
@@ -218,6 +214,7 @@ __all__ = [
     "HuggingFaceInferenceApiEmbedding",
     "HuggingFaceInferenceApiEmbeddingToken",
     "JsonNodeParser",
+    "LlamaCloudEnvironment",
     "LlamaParseSupportedFileExtensions",
     "Llm",
     "LocalEval",
@@ -281,12 +278,9 @@ __all__ = [
     "UnprocessableEntityError",
     "ValidationError",
     "ValidationErrorLocItem",
-    "api_keys",
-    "billing",
     "component_definitions",
     "data_sinks",
     "data_sources",
-    "deprecated",
     "evals",
     "files",
     "parsing",

{llama_cloud-0.0.3 → llama_cloud-0.0.5}/llama_cloud/client.py

@@ -5,12 +5,10 @@ import typing
 import httpx
 
 from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from .resources.api_keys.client import ApiKeysClient, AsyncApiKeysClient
-from .resources.billing.client import AsyncBillingClient, BillingClient
+from .environment import LlamaCloudEnvironment
 from .resources.component_definitions.client import AsyncComponentDefinitionsClient, ComponentDefinitionsClient
 from .resources.data_sinks.client import AsyncDataSinksClient, DataSinksClient
 from .resources.data_sources.client import AsyncDataSourcesClient, DataSourcesClient
-from .resources.deprecated.client import AsyncDeprecatedClient, DeprecatedClient
 from .resources.evals.client import AsyncEvalsClient, EvalsClient
 from .resources.files.client import AsyncFilesClient, FilesClient
 from .resources.parsing.client import AsyncParsingClient, ParsingClient
@@ -22,17 +20,17 @@ 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,
         )
-        self.api_keys = ApiKeysClient(client_wrapper=self._client_wrapper)
         self.data_sinks = DataSinksClient(client_wrapper=self._client_wrapper)
         self.data_sources = DataSourcesClient(client_wrapper=self._client_wrapper)
         self.projects = ProjectsClient(client_wrapper=self._client_wrapper)
@@ -41,25 +39,23 @@ class LlamaCloud:
         self.evals = EvalsClient(client_wrapper=self._client_wrapper)
         self.parsing = ParsingClient(client_wrapper=self._client_wrapper)
         self.component_definitions = ComponentDefinitionsClient(client_wrapper=self._client_wrapper)
-        self.billing = BillingClient(client_wrapper=self._client_wrapper)
-        self.deprecated = DeprecatedClient(client_wrapper=self._client_wrapper)
 
 
 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,
         )
-        self.api_keys = AsyncApiKeysClient(client_wrapper=self._client_wrapper)
         self.data_sinks = AsyncDataSinksClient(client_wrapper=self._client_wrapper)
         self.data_sources = AsyncDataSourcesClient(client_wrapper=self._client_wrapper)
         self.projects = AsyncProjectsClient(client_wrapper=self._client_wrapper)
@@ -68,5 +64,12 @@ class AsyncLlamaCloud:
         self.evals = AsyncEvalsClient(client_wrapper=self._client_wrapper)
         self.parsing = AsyncParsingClient(client_wrapper=self._client_wrapper)
         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.5/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.3 → llama_cloud-0.0.5}/llama_cloud/resources/__init__.py

@@ -1,18 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from . import (
-    api_keys,
-    billing,
-    component_definitions,
-    data_sinks,
-    data_sources,
-    deprecated,
-    evals,
-    files,
-    parsing,
-    pipelines,
-    projects,
-)
+from . import component_definitions, data_sinks, data_sources, evals, files, parsing, pipelines, projects
 from .data_sinks import DataSinkUpdateComponent, DataSinkUpdateComponentOne
 from .data_sources import DataSourceUpdateComponent, DataSourceUpdateComponentOne, DataSourceUpdateCustomMetadataValue
 from .files import FileCreateResourceInfoValue
@@ -26,12 +14,9 @@ __all__ = [
     "DataSourceUpdateCustomMetadataValue",
     "FileCreateResourceInfoValue",
     "PipelineFileUpdateCustomMetadataValue",
-    "api_keys",
-    "billing",
     "component_definitions",
     "data_sinks",
     "data_sources",
-    "deprecated",
     "evals",
     "files",
     "parsing",

{llama_cloud-0.0.3 → llama_cloud-0.0.5}/llama_cloud/resources/component_definitions/client.py

@@ -32,7 +32,6 @@ class ComponentDefinitionsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.component_definitions.get_all_transformation_definitions()
         """
@@ -61,7 +60,6 @@ class ComponentDefinitionsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.component_definitions.get_all_data_source_definitions()
         """
@@ -88,7 +86,6 @@ class ComponentDefinitionsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.component_definitions.get_all_data_sink_definitions()
         """
@@ -120,7 +117,6 @@ class AsyncComponentDefinitionsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.component_definitions.get_all_transformation_definitions()
         """
@@ -149,7 +145,6 @@ class AsyncComponentDefinitionsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.component_definitions.get_all_data_source_definitions()
         """
@@ -176,7 +171,6 @@ class AsyncComponentDefinitionsClient:
 
         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.3 → llama_cloud-0.0.5}/llama_cloud/resources/data_sinks/client.py

@@ -43,7 +43,6 @@ class DataSinksClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.list_data_sinks()
         """
@@ -78,7 +77,6 @@ class DataSinksClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.create_data_sink(
             request=DataSinkCreate(
@@ -120,7 +118,6 @@ class DataSinksClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.upsert_data_sink(
             request=DataSinkCreate(
@@ -158,7 +155,6 @@ class DataSinksClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.get_data_sink(
             data_sink_id="string",
@@ -205,7 +201,6 @@ class DataSinksClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.update_data_sink(
             data_sink_id="string",
@@ -245,7 +240,6 @@ class DataSinksClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sinks.delete_data_sink(
             data_sink_id="string",
@@ -284,7 +278,6 @@ class AsyncDataSinksClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.list_data_sinks()
         """
@@ -319,7 +312,6 @@ class AsyncDataSinksClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.create_data_sink(
             request=DataSinkCreate(
@@ -361,7 +353,6 @@ class AsyncDataSinksClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.upsert_data_sink(
             request=DataSinkCreate(
@@ -399,7 +390,6 @@ class AsyncDataSinksClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.get_data_sink(
             data_sink_id="string",
@@ -446,7 +436,6 @@ class AsyncDataSinksClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.update_data_sink(
             data_sink_id="string",
@@ -486,7 +475,6 @@ class AsyncDataSinksClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sinks.delete_data_sink(
             data_sink_id="string",

{llama_cloud-0.0.3 → llama_cloud-0.0.5}/llama_cloud/resources/data_sources/client.py

@@ -44,7 +44,6 @@ class DataSourcesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sources.list_data_sources()
         """
@@ -79,7 +78,6 @@ class DataSourcesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sources.create_data_source(
             request=DataSourceCreate(
@@ -121,7 +119,6 @@ class DataSourcesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sources.upsert_data_source(
             request=DataSourceCreate(
@@ -159,7 +156,6 @@ class DataSourcesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sources.get_data_source(
             data_source_id="string",
@@ -209,7 +205,6 @@ class DataSourcesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sources.update_data_source(
             data_source_id="string",
@@ -251,7 +246,6 @@ class DataSourcesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.data_sources.delete_data_source(
             data_source_id="string",
@@ -290,7 +284,6 @@ class AsyncDataSourcesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sources.list_data_sources()
         """
@@ -327,7 +320,6 @@ class AsyncDataSourcesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sources.create_data_source(
             request=DataSourceCreate(
@@ -371,7 +363,6 @@ class AsyncDataSourcesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sources.upsert_data_source(
             request=DataSourceCreate(
@@ -409,7 +400,6 @@ class AsyncDataSourcesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sources.get_data_source(
             data_source_id="string",
@@ -459,7 +449,6 @@ class AsyncDataSourcesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sources.update_data_source(
             data_source_id="string",
@@ -501,7 +490,6 @@ class AsyncDataSourcesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.data_sources.delete_data_source(
             data_source_id="string",

{llama_cloud-0.0.3 → llama_cloud-0.0.5}/llama_cloud/resources/evals/client.py

@@ -41,7 +41,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.get_dataset(
             dataset_id="string",
@@ -76,7 +75,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.update_dataset(
             dataset_id="string",
@@ -111,7 +109,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.delete_dataset(
             dataset_id="string",
@@ -144,7 +141,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.get_questions(
             dataset_id="string",
@@ -182,7 +178,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.create_question(
             dataset_id="string",
@@ -225,7 +220,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.create_questions(
             dataset_id="string",
@@ -262,7 +256,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.get_question(
             question_id="string",
@@ -298,7 +291,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.replace_question(
             question_id="string",
@@ -335,7 +327,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.delete_question(
             question_id="string",
@@ -366,7 +357,6 @@ class EvalsClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.evals.get_supported_models()
         """
@@ -402,7 +392,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.get_dataset(
             dataset_id="string",
@@ -437,7 +426,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.update_dataset(
             dataset_id="string",
@@ -472,7 +460,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.delete_dataset(
             dataset_id="string",
@@ -505,7 +492,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.get_questions(
             dataset_id="string",
@@ -543,7 +529,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.create_question(
             dataset_id="string",
@@ -586,7 +571,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.create_questions(
             dataset_id="string",
@@ -623,7 +607,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.get_question(
             question_id="string",
@@ -659,7 +642,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.replace_question(
             question_id="string",
@@ -696,7 +678,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.delete_question(
             question_id="string",
@@ -727,7 +708,6 @@ class AsyncEvalsClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.evals.get_supported_models()
         """

{llama_cloud-0.0.3 → llama_cloud-0.0.5}/llama_cloud/resources/files/client.py

@@ -44,7 +44,6 @@ class FilesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.files.read_file(
             id="string",
@@ -80,7 +79,6 @@ class FilesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.files.delete_file(
             id="string",
@@ -114,7 +112,6 @@ class FilesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.files.read_files()
         """
@@ -193,7 +190,6 @@ class FilesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.files.generate_presigned_url(
             name="string",
@@ -237,7 +233,6 @@ class FilesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.files.sync_files()
         """
@@ -271,7 +266,6 @@ class FilesClient:
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         client.files.read_file_content(
             id="string",
@@ -312,7 +306,6 @@ class AsyncFilesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.files.read_file(
             id="string",
@@ -348,7 +341,6 @@ class AsyncFilesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.files.delete_file(
             id="string",
@@ -382,7 +374,6 @@ class AsyncFilesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.files.read_files()
         """
@@ -461,7 +452,6 @@ class AsyncFilesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.files.generate_presigned_url(
             name="string",
@@ -505,7 +495,6 @@ class AsyncFilesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.files.sync_files()
         """
@@ -539,7 +528,6 @@ class AsyncFilesClient:
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
-            base_url="https://yourhost.com/path/to/api",
         )
         await client.files.read_file_content(
             id="string",