llama-cloud 0.1.1__tar.gz → 0.1.3__tar.gz

{llama_cloud-0.1.1 → llama_cloud-0.1.3}/PKG-INFO

@@ -1,10 +1,12 @@
 Metadata-Version: 2.1
 Name: llama-cloud
-Version: 0.1.1
+Version: 0.1.3
 Summary: 
+License: MIT
 Author: Logan Markewich
 Author-email: logan@runllama.ai
 Requires-Python: >=3.8,<4
+Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9

{llama_cloud-0.1.1 → llama_cloud-0.1.3}/llama_cloud/__init__.py

@@ -131,6 +131,7 @@ from .types import (
     ParsingJobTextResult,
     ParsingUsage,
     PartitionNames,
+    Permission,
     Pipeline,
     PipelineConfigurationHashes,
     PipelineCreate,
@@ -178,6 +179,7 @@ from .types import (
     RelatedNodeInfo,
     RetrievalMode,
     RetrieveResults,
+    Role,
     SemanticChunkingConfig,
     SentenceChunkingConfig,
     SentenceSplitter,
@@ -193,6 +195,7 @@ from .types import (
     UserOrganization,
     UserOrganizationCreate,
     UserOrganizationDelete,
+    UserOrganizationRole,
     ValidationError,
     ValidationErrorLocItem,
     VertexAiEmbeddingConfig,
@@ -368,6 +371,7 @@ __all__ = [
     "ParsingJobTextResult",
     "ParsingUsage",
     "PartitionNames",
+    "Permission",
     "Pipeline",
     "PipelineConfigurationHashes",
     "PipelineCreate",
@@ -425,6 +429,7 @@ __all__ = [
     "RelatedNodeInfo",
     "RetrievalMode",
     "RetrieveResults",
+    "Role",
     "SemanticChunkingConfig",
     "SentenceChunkingConfig",
     "SentenceSplitter",
@@ -441,6 +446,7 @@ __all__ = [
     "UserOrganization",
     "UserOrganizationCreate",
     "UserOrganizationDelete",
+    "UserOrganizationRole",
     "ValidationError",
     "ValidationErrorLocItem",
     "VertexAiEmbeddingConfig",

{llama_cloud-0.1.1 → llama_cloud-0.1.3}/llama_cloud/resources/organizations/client.py

@@ -7,13 +7,17 @@ from json.decoder import JSONDecodeError
 from ...core.api_error import ApiError
 from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.jsonable_encoder import jsonable_encoder
+from ...core.remove_none_from_dict import remove_none_from_dict
 from ...errors.unprocessable_entity_error import UnprocessableEntityError
 from ...types.http_validation_error import HttpValidationError
 from ...types.organization import Organization
 from ...types.organization_create import OrganizationCreate
+from ...types.project import Project
+from ...types.role import Role
 from ...types.user_organization import UserOrganization
 from ...types.user_organization_create import UserOrganizationCreate
 from ...types.user_organization_delete import UserOrganizationDelete
+from ...types.user_organization_role import UserOrganizationRole
 
 try:
     import pydantic
@@ -446,6 +450,247 @@ class OrganizationsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def list_roles(self, organization_id: str) -> typing.List[Role]:
+        """
+        List all roles in an organization.
+
+        Parameters:
+            - organization_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.organizations.list_roles(
+            organization_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/roles"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.List[Role], _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_user_role(self, organization_id: str) -> UserOrganizationRole:
+        """
+        Get the role of a user in an organization.
+
+        Parameters:
+            - organization_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.organizations.get_user_role(
+            organization_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/users/roles"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(UserOrganizationRole, _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 assign_role_to_user_in_organization(
+        self, organization_id: str, *, user_id: str, user_organization_role_create_organization_id: str, role_id: str
+    ) -> UserOrganizationRole:
+        """
+        Assign a role to a user in an organization.
+
+        Parameters:
+            - organization_id: str.
+
+            - user_id: str. The user's ID.
+
+            - user_organization_role_create_organization_id: str. The organization's ID.
+
+            - role_id: str. The role's ID.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.organizations.assign_role_to_user_in_organization(
+            organization_id="string",
+            user_id="string",
+            user_organization_role_create_organization_id="string",
+            role_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "PUT",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/users/roles"
+            ),
+            json=jsonable_encoder(
+                {
+                    "user_id": user_id,
+                    "organization_id": user_organization_role_create_organization_id,
+                    "role_id": role_id,
+                }
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(UserOrganizationRole, _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 list_projects_by_user(self, organization_id: str, user_id: str) -> typing.List[Project]:
+        """
+        List all projects for a user in an organization.
+
+        Parameters:
+            - organization_id: str.
+
+            - user_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.organizations.list_projects_by_user(
+            organization_id="string",
+            user_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/organizations/{organization_id}/users/{user_id}/projects",
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.List[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 add_user_to_project(self, organization_id: str, user_id: str, *, project_id: str) -> typing.Any:
+        """
+        Add a user to a project.
+
+        Parameters:
+            - organization_id: str.
+
+            - user_id: str.
+
+            - project_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.organizations.add_user_to_project(
+            organization_id="string",
+            user_id="string",
+            project_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "PUT",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/organizations/{organization_id}/users/{user_id}/projects",
+            ),
+            params=remove_none_from_dict({"project_id": project_id}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _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 remove_user_from_project(self, organization_id: str, user_id: str, project_id: str) -> typing.Any:
+        """
+        Remove a user from a project.
+
+        Parameters:
+            - organization_id: str.
+
+            - user_id: str.
+
+            - project_id: str.
+        ---
+        from llama_cloud.client import LlamaCloud
+
+        client = LlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        client.organizations.remove_user_from_project(
+            organization_id="string",
+            user_id="string",
+            project_id="string",
+        )
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "DELETE",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/organizations/{organization_id}/users/{user_id}/projects/{project_id}",
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _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)
+
 
 class AsyncOrganizationsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
@@ -865,3 +1110,244 @@ class AsyncOrganizationsClient:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    async def list_roles(self, organization_id: str) -> typing.List[Role]:
+        """
+        List all roles in an organization.
+
+        Parameters:
+            - organization_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.organizations.list_roles(
+            organization_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/roles"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.List[Role], _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_user_role(self, organization_id: str) -> UserOrganizationRole:
+        """
+        Get the role of a user in an organization.
+
+        Parameters:
+            - organization_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.organizations.get_user_role(
+            organization_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/users/roles"
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(UserOrganizationRole, _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 assign_role_to_user_in_organization(
+        self, organization_id: str, *, user_id: str, user_organization_role_create_organization_id: str, role_id: str
+    ) -> UserOrganizationRole:
+        """
+        Assign a role to a user in an organization.
+
+        Parameters:
+            - organization_id: str.
+
+            - user_id: str. The user's ID.
+
+            - user_organization_role_create_organization_id: str. The organization's ID.
+
+            - role_id: str. The role's ID.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.organizations.assign_role_to_user_in_organization(
+            organization_id="string",
+            user_id="string",
+            user_organization_role_create_organization_id="string",
+            role_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "PUT",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/v1/organizations/{organization_id}/users/roles"
+            ),
+            json=jsonable_encoder(
+                {
+                    "user_id": user_id,
+                    "organization_id": user_organization_role_create_organization_id,
+                    "role_id": role_id,
+                }
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(UserOrganizationRole, _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 list_projects_by_user(self, organization_id: str, user_id: str) -> typing.List[Project]:
+        """
+        List all projects for a user in an organization.
+
+        Parameters:
+            - organization_id: str.
+
+            - user_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.organizations.list_projects_by_user(
+            organization_id="string",
+            user_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/organizations/{organization_id}/users/{user_id}/projects",
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.List[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 add_user_to_project(self, organization_id: str, user_id: str, *, project_id: str) -> typing.Any:
+        """
+        Add a user to a project.
+
+        Parameters:
+            - organization_id: str.
+
+            - user_id: str.
+
+            - project_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.organizations.add_user_to_project(
+            organization_id="string",
+            user_id="string",
+            project_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "PUT",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/organizations/{organization_id}/users/{user_id}/projects",
+            ),
+            params=remove_none_from_dict({"project_id": project_id}),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _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 remove_user_from_project(self, organization_id: str, user_id: str, project_id: str) -> typing.Any:
+        """
+        Remove a user from a project.
+
+        Parameters:
+            - organization_id: str.
+
+            - user_id: str.
+
+            - project_id: str.
+        ---
+        from llama_cloud.client import AsyncLlamaCloud
+
+        client = AsyncLlamaCloud(
+            token="YOUR_TOKEN",
+        )
+        await client.organizations.remove_user_from_project(
+            organization_id="string",
+            user_id="string",
+            project_id="string",
+        )
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "DELETE",
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/",
+                f"api/v1/organizations/{organization_id}/users/{user_id}/projects/{project_id}",
+            ),
+            headers=self._client_wrapper.get_headers(),
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(typing.Any, _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)

{llama_cloud-0.1.1 → llama_cloud-0.1.3}/llama_cloud/resources/parsing/client.py

@@ -109,6 +109,7 @@ class ParsingClient:
         gpt_4_o_mode: bool,
         fast_mode: bool,
         premium_mode: bool,
+        continuous_mode: bool,
         gpt_4_o_api_key: str,
         do_not_unroll_columns: bool,
         page_separator: str,
@@ -121,7 +122,9 @@ class ParsingClient:
         page_suffix: str,
         webhook_url: str,
         take_screenshot: bool,
+        is_formatting_instruction: bool,
         disable_ocr: bool,
+        annotate_links: bool,
         disable_reconstruction: bool,
         input_s_3_path: str,
         output_s_3_path_prefix: str,
@@ -151,6 +154,8 @@ class ParsingClient:
 
             - premium_mode: bool.
 
+            - continuous_mode: bool.
+
             - gpt_4_o_api_key: str.
 
             - do_not_unroll_columns: bool.
@@ -175,8 +180,12 @@ class ParsingClient:
 
             - take_screenshot: bool.
 
+            - is_formatting_instruction: bool.
+
             - disable_ocr: bool.
 
+            - annotate_links: bool.
+
             - disable_reconstruction: bool.
 
             - input_s_3_path: str.
@@ -202,6 +211,7 @@ class ParsingClient:
             "gpt4o_mode": gpt_4_o_mode,
             "fast_mode": fast_mode,
             "premium_mode": premium_mode,
+            "continuous_mode": continuous_mode,
             "gpt4o_api_key": gpt_4_o_api_key,
             "do_not_unroll_columns": do_not_unroll_columns,
             "page_separator": page_separator,
@@ -214,7 +224,9 @@ class ParsingClient:
             "page_suffix": page_suffix,
             "webhook_url": webhook_url,
             "take_screenshot": take_screenshot,
+            "is_formatting_instruction": is_formatting_instruction,
             "disable_ocr": disable_ocr,
+            "annotate_links": annotate_links,
             "disable_reconstruction": disable_reconstruction,
             "input_s3_path": input_s_3_path,
             "output_s3_path_prefix": output_s_3_path_prefix,
@@ -678,6 +690,7 @@ class AsyncParsingClient:
         gpt_4_o_mode: bool,
         fast_mode: bool,
         premium_mode: bool,
+        continuous_mode: bool,
         gpt_4_o_api_key: str,
         do_not_unroll_columns: bool,
         page_separator: str,
@@ -690,7 +703,9 @@ class AsyncParsingClient:
         page_suffix: str,
         webhook_url: str,
         take_screenshot: bool,
+        is_formatting_instruction: bool,
         disable_ocr: bool,
+        annotate_links: bool,
         disable_reconstruction: bool,
         input_s_3_path: str,
         output_s_3_path_prefix: str,
@@ -720,6 +735,8 @@ class AsyncParsingClient:
 
             - premium_mode: bool.
 
+            - continuous_mode: bool.
+
             - gpt_4_o_api_key: str.
 
             - do_not_unroll_columns: bool.
@@ -744,8 +761,12 @@ class AsyncParsingClient:
 
             - take_screenshot: bool.
 
+            - is_formatting_instruction: bool.
+
             - disable_ocr: bool.
 
+            - annotate_links: bool.
+
             - disable_reconstruction: bool.
 
             - input_s_3_path: str.
@@ -771,6 +792,7 @@ class AsyncParsingClient:
             "gpt4o_mode": gpt_4_o_mode,
             "fast_mode": fast_mode,
             "premium_mode": premium_mode,
+            "continuous_mode": continuous_mode,
             "gpt4o_api_key": gpt_4_o_api_key,
             "do_not_unroll_columns": do_not_unroll_columns,
             "page_separator": page_separator,
@@ -783,7 +805,9 @@ class AsyncParsingClient:
             "page_suffix": page_suffix,
             "webhook_url": webhook_url,
             "take_screenshot": take_screenshot,
+            "is_formatting_instruction": is_formatting_instruction,
             "disable_ocr": disable_ocr,
+            "annotate_links": annotate_links,
             "disable_reconstruction": disable_reconstruction,
             "input_s3_path": input_s_3_path,
             "output_s3_path_prefix": output_s_3_path_prefix,