llama-cloud 0.0.8__tar.gz → 0.0.10__tar.gz

{llama_cloud-0.0.8 → llama_cloud-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: llama-cloud
-Version: 0.0.8
+Version: 0.0.10
 Summary: 
 Author: Logan Markewich
 Author-email: logan@runllama.ai
@@ -10,6 +10,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: httpx (>=0.20.0)
 Requires-Dist: pydantic (>=1.10)
 Description-Content-Type: text/markdown

{llama_cloud-0.0.8 → llama_cloud-0.0.10}/llama_cloud/__init__.py

@@ -5,12 +5,15 @@ from .types import (
     Base,
     BasePromptTemplate,
     BedrockEmbedding,
+    ChatData,
     ChatMessage,
     CloudAzStorageBlobDataSource,
     CloudAzureAiSearchVectorStore,
     CloudChromaVectorStore,
+    CloudConfluenceDataSource,
     CloudDocument,
     CloudDocumentCreate,
+    CloudJiraDataSource,
     CloudNotionPageDataSource,
     CloudOneDriveDataSource,
     CloudPineconeVectorStore,
@@ -54,6 +57,7 @@ from .types import (
     EvalQuestion,
     EvalQuestionCreate,
     EvalQuestionResult,
+    ExtractionJob,
     ExtractionResult,
     ExtractionResultDataValue,
     ExtractionSchema,
@@ -87,6 +91,8 @@ from .types import (
     NodeParser,
     ObjectType,
     OpenAiEmbedding,
+    Organization,
+    OrganizationCreate,
     ParserLanguages,
     ParsingHistoryItem,
     ParsingJob,
@@ -117,6 +123,7 @@ from .types import (
     PromptSpec,
     PydanticProgramMode,
     RelatedNodeInfo,
+    RetrievalMode,
     RetrieveResults,
     SentenceSplitter,
     SimpleFileNodeParser,
@@ -128,6 +135,9 @@ from .types import (
     TextNodeWithScore,
     TokenTextSplitter,
     TransformationCategoryNames,
+    UserOrganization,
+    UserOrganizationCreate,
+    UserOrganizationDelete,
     ValidationError,
     ValidationErrorLocItem,
 )
@@ -147,6 +157,7 @@ from .resources import (
     evals,
     extraction,
     files,
+    organizations,
     parsing,
     pipelines,
     projects,
@@ -158,12 +169,15 @@ __all__ = [
     "Base",
     "BasePromptTemplate",
     "BedrockEmbedding",
+    "ChatData",
     "ChatMessage",
     "CloudAzStorageBlobDataSource",
     "CloudAzureAiSearchVectorStore",
     "CloudChromaVectorStore",
+    "CloudConfluenceDataSource",
     "CloudDocument",
     "CloudDocumentCreate",
+    "CloudJiraDataSource",
     "CloudNotionPageDataSource",
     "CloudOneDriveDataSource",
     "CloudPineconeVectorStore",
@@ -212,6 +226,7 @@ __all__ = [
     "EvalQuestion",
     "EvalQuestionCreate",
     "EvalQuestionResult",
+    "ExtractionJob",
     "ExtractionResult",
     "ExtractionResultDataValue",
     "ExtractionSchema",
@@ -248,6 +263,8 @@ __all__ = [
     "NodeParser",
     "ObjectType",
     "OpenAiEmbedding",
+    "Organization",
+    "OrganizationCreate",
     "ParserLanguages",
     "ParsingHistoryItem",
     "ParsingJob",
@@ -279,6 +296,7 @@ __all__ = [
     "PromptSpec",
     "PydanticProgramMode",
     "RelatedNodeInfo",
+    "RetrievalMode",
     "RetrieveResults",
     "SentenceSplitter",
     "SimpleFileNodeParser",
@@ -291,6 +309,9 @@ __all__ = [
     "TokenTextSplitter",
     "TransformationCategoryNames",
     "UnprocessableEntityError",
+    "UserOrganization",
+    "UserOrganizationCreate",
+    "UserOrganizationDelete",
     "ValidationError",
     "ValidationErrorLocItem",
     "component_definitions",
@@ -299,6 +320,7 @@ __all__ = [
     "evals",
     "extraction",
     "files",
+    "organizations",
     "parsing",
     "pipelines",
     "projects",

{llama_cloud-0.0.8 → llama_cloud-0.0.10}/llama_cloud/client.py

@@ -12,6 +12,7 @@ from .resources.data_sources.client import AsyncDataSourcesClient, DataSourcesCl
 from .resources.evals.client import AsyncEvalsClient, EvalsClient
 from .resources.extraction.client import AsyncExtractionClient, ExtractionClient
 from .resources.files.client import AsyncFilesClient, FilesClient
+from .resources.organizations.client import AsyncOrganizationsClient, OrganizationsClient
 from .resources.parsing.client import AsyncParsingClient, ParsingClient
 from .resources.pipelines.client import AsyncPipelinesClient, PipelinesClient
 from .resources.projects.client import AsyncProjectsClient, ProjectsClient
@@ -34,6 +35,7 @@ class LlamaCloud:
         )
         self.data_sinks = DataSinksClient(client_wrapper=self._client_wrapper)
         self.data_sources = DataSourcesClient(client_wrapper=self._client_wrapper)
+        self.organizations = OrganizationsClient(client_wrapper=self._client_wrapper)
         self.projects = ProjectsClient(client_wrapper=self._client_wrapper)
         self.files = FilesClient(client_wrapper=self._client_wrapper)
         self.pipelines = PipelinesClient(client_wrapper=self._client_wrapper)
@@ -60,6 +62,7 @@ class AsyncLlamaCloud:
         )
         self.data_sinks = AsyncDataSinksClient(client_wrapper=self._client_wrapper)
         self.data_sources = AsyncDataSourcesClient(client_wrapper=self._client_wrapper)
+        self.organizations = AsyncOrganizationsClient(client_wrapper=self._client_wrapper)
         self.projects = AsyncProjectsClient(client_wrapper=self._client_wrapper)
         self.files = AsyncFilesClient(client_wrapper=self._client_wrapper)
         self.pipelines = AsyncPipelinesClient(client_wrapper=self._client_wrapper)

{llama_cloud-0.0.8 → llama_cloud-0.0.10}/llama_cloud/resources/__init__.py

@@ -1,6 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from . import component_definitions, data_sinks, data_sources, evals, extraction, files, parsing, pipelines, projects
+from . import (
+    component_definitions,
+    data_sinks,
+    data_sources,
+    evals,
+    extraction,
+    files,
+    organizations,
+    parsing,
+    pipelines,
+    projects,
+)
 from .data_sinks import DataSinkUpdateComponent, DataSinkUpdateComponentOne
 from .data_sources import DataSourceUpdateComponent, DataSourceUpdateComponentOne, DataSourceUpdateCustomMetadataValue
 from .extraction import ExtractionSchemaUpdateDataSchemaValue
@@ -22,6 +33,7 @@ __all__ = [
     "evals",
     "extraction",
     "files",
+    "organizations",
     "parsing",
     "pipelines",
     "projects",

{llama_cloud-0.0.8 → llama_cloud-0.0.10}/llama_cloud/resources/data_sinks/client.py

@@ -63,13 +63,21 @@ class DataSinksClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def create_data_sink(self, *, project_id: typing.Optional[str] = None, request: DataSinkCreate) -> DataSink:
+    def create_data_sink(
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        request: DataSinkCreate,
+    ) -> DataSink:
         """
         Create a new data sink.
 
         Parameters:
             - project_id: typing.Optional[str].
 
+            - organization_id: typing.Optional[str].
+
             - request: DataSinkCreate.
         ---
         from llama_cloud import ConfigurableDataSinkNames, DataSinkCreate
@@ -88,7 +96,7 @@ class DataSinksClient:
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sinks"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -103,7 +111,13 @@ class DataSinksClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def upsert_data_sink(self, *, project_id: typing.Optional[str] = None, request: DataSinkCreate) -> DataSink:
+    def upsert_data_sink(
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        request: DataSinkCreate,
+    ) -> DataSink:
         """
         Upserts a data sink.
         Updates if a data sink with the same name and project_id already exists. Otherwise, creates a new data sink.
@@ -111,6 +125,8 @@ class DataSinksClient:
         Parameters:
             - project_id: typing.Optional[str].
 
+            - organization_id: typing.Optional[str].
+
             - request: DataSinkCreate.
         ---
         from llama_cloud import ConfigurableDataSinkNames, DataSinkCreate
@@ -129,7 +145,7 @@ class DataSinksClient:
         _response = self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sinks"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -298,13 +314,21 @@ class AsyncDataSinksClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def create_data_sink(self, *, project_id: typing.Optional[str] = None, request: DataSinkCreate) -> DataSink:
+    async def create_data_sink(
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        request: DataSinkCreate,
+    ) -> DataSink:
         """
         Create a new data sink.
 
         Parameters:
             - project_id: typing.Optional[str].
 
+            - organization_id: typing.Optional[str].
+
             - request: DataSinkCreate.
         ---
         from llama_cloud import ConfigurableDataSinkNames, DataSinkCreate
@@ -323,7 +347,7 @@ class AsyncDataSinksClient:
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sinks"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -338,7 +362,13 @@ class AsyncDataSinksClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def upsert_data_sink(self, *, project_id: typing.Optional[str] = None, request: DataSinkCreate) -> DataSink:
+    async def upsert_data_sink(
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        request: DataSinkCreate,
+    ) -> DataSink:
         """
         Upserts a data sink.
         Updates if a data sink with the same name and project_id already exists. Otherwise, creates a new data sink.
@@ -346,6 +376,8 @@ class AsyncDataSinksClient:
         Parameters:
             - project_id: typing.Optional[str].
 
+            - organization_id: typing.Optional[str].
+
             - request: DataSinkCreate.
         ---
         from llama_cloud import ConfigurableDataSinkNames, DataSinkCreate
@@ -364,7 +396,7 @@ class AsyncDataSinksClient:
         _response = await self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sinks"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,

{llama_cloud-0.0.8 → llama_cloud-0.0.10}/llama_cloud/resources/data_sources/client.py

@@ -32,13 +32,17 @@ class DataSourcesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    def list_data_sources(self, *, project_id: typing.Optional[str] = None) -> typing.List[DataSource]:
+    def list_data_sources(
+        self, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> typing.List[DataSource]:
         """
         List data sources for a given project.
         If project_id is not provided, uses the default project.
 
         Parameters:
             - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -50,7 +54,7 @@ class DataSourcesClient:
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sources"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -64,13 +68,21 @@ class DataSourcesClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def create_data_source(self, *, project_id: typing.Optional[str] = None, request: DataSourceCreate) -> DataSource:
+    def create_data_source(
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        request: DataSourceCreate,
+    ) -> DataSource:
         """
         Create a new data source.
 
         Parameters:
             - project_id: typing.Optional[str].
 
+            - organization_id: typing.Optional[str].
+
             - request: DataSourceCreate.
         ---
         from llama_cloud import ConfigurableDataSourceNames, DataSourceCreate
@@ -89,7 +101,7 @@ class DataSourcesClient:
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sources"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -104,7 +116,13 @@ class DataSourcesClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def upsert_data_source(self, *, project_id: typing.Optional[str] = None, request: DataSourceCreate) -> DataSource:
+    def upsert_data_source(
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        request: DataSourceCreate,
+    ) -> DataSource:
         """
         Upserts a data source.
         Updates if a data source with the same name and project_id already exists. Otherwise, creates a new data source.
@@ -112,6 +130,8 @@ class DataSourcesClient:
         Parameters:
             - project_id: typing.Optional[str].
 
+            - organization_id: typing.Optional[str].
+
             - request: DataSourceCreate.
         ---
         from llama_cloud import ConfigurableDataSourceNames, DataSourceCreate
@@ -130,7 +150,7 @@ class DataSourcesClient:
         _response = self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sources"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -272,13 +292,17 @@ class AsyncDataSourcesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
-    async def list_data_sources(self, *, project_id: typing.Optional[str] = None) -> typing.List[DataSource]:
+    async def list_data_sources(
+        self, *, project_id: typing.Optional[str] = None, organization_id: typing.Optional[str] = None
+    ) -> typing.List[DataSource]:
         """
         List data sources for a given project.
         If project_id is not provided, uses the default project.
 
         Parameters:
             - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -290,7 +314,7 @@ class AsyncDataSourcesClient:
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sources"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -305,7 +329,11 @@ class AsyncDataSourcesClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create_data_source(
-        self, *, project_id: typing.Optional[str] = None, request: DataSourceCreate
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        request: DataSourceCreate,
     ) -> DataSource:
         """
         Create a new data source.
@@ -313,6 +341,8 @@ class AsyncDataSourcesClient:
         Parameters:
             - project_id: typing.Optional[str].
 
+            - organization_id: typing.Optional[str].
+
             - request: DataSourceCreate.
         ---
         from llama_cloud import ConfigurableDataSourceNames, DataSourceCreate
@@ -331,7 +361,7 @@ class AsyncDataSourcesClient:
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sources"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -347,7 +377,11 @@ class AsyncDataSourcesClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def upsert_data_source(
-        self, *, project_id: typing.Optional[str] = None, request: DataSourceCreate
+        self,
+        *,
+        project_id: typing.Optional[str] = None,
+        organization_id: typing.Optional[str] = None,
+        request: DataSourceCreate,
     ) -> DataSource:
         """
         Upserts a data source.
@@ -356,6 +390,8 @@ class AsyncDataSourcesClient:
         Parameters:
             - project_id: typing.Optional[str].
 
+            - organization_id: typing.Optional[str].
+
             - request: DataSourceCreate.
         ---
         from llama_cloud import ConfigurableDataSourceNames, DataSourceCreate
@@ -374,7 +410,7 @@ class AsyncDataSourcesClient:
         _response = await self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/v1/data-sources"),
-            params=remove_none_from_dict({"project_id": project_id}),
+            params=remove_none_from_dict({"project_id": project_id, "organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,

{llama_cloud-0.0.8 → llama_cloud-0.0.10}/llama_cloud/resources/data_sources/types/data_source_update_component_one.py

@@ -3,6 +3,8 @@
 import typing
 
 from ....types.cloud_az_storage_blob_data_source import CloudAzStorageBlobDataSource
+from ....types.cloud_confluence_data_source import CloudConfluenceDataSource
+from ....types.cloud_jira_data_source import CloudJiraDataSource
 from ....types.cloud_notion_page_data_source import CloudNotionPageDataSource
 from ....types.cloud_one_drive_data_source import CloudOneDriveDataSource
 from ....types.cloud_s_3_data_source import CloudS3DataSource
@@ -16,4 +18,6 @@ DataSourceUpdateComponentOne = typing.Union[
     CloudSharepointDataSource,
     CloudSlackDataSource,
     CloudNotionPageDataSource,
+    CloudConfluenceDataSource,
+    CloudJiraDataSource,
 ]