llama-cloud 0.1.4__py3-none-any.whl → 0.1.6__py3-none-any.whl

llama_cloud/resources/projects/client.py

@@ -11,6 +11,7 @@ from ...core.remove_none_from_dict import remove_none_from_dict
 from ...errors.unprocessable_entity_error import UnprocessableEntityError
 from ...types.eval_dataset import EvalDataset
 from ...types.http_validation_error import HttpValidationError
+from ...types.interval_usage_and_plan import IntervalUsageAndPlan
 from ...types.local_eval import LocalEval
 from ...types.local_eval_results import LocalEvalResults
 from ...types.local_eval_sets import LocalEvalSets
@@ -86,7 +87,7 @@ class ProjectsClient:
         )
         client.projects.create_project(
             request=ProjectCreate(
-                name="string",
+                name="name",
             ),
         )
         """
@@ -126,7 +127,7 @@ class ProjectsClient:
         )
         client.projects.upsert_project(
             request=ProjectCreate(
-                name="string",
+                name="name",
             ),
         )
         """
@@ -148,25 +149,26 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get_project(self, project_id: str) -> Project:
+    def get_project(self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None) -> Project:
         """
         Get a project by ID.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.projects.get_project(
-            project_id="string",
-        )
+        client.projects.get_project()
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -180,12 +182,16 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def update_existing_project(self, project_id: str, *, name: str) -> Project:
+    def update_existing_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None, name: str
+    ) -> Project:
         """
         Update an existing project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
 
             - name: str.
         ---
@@ -195,13 +201,13 @@ class ProjectsClient:
             token="YOUR_TOKEN",
         )
         client.projects.update_existing_project(
-            project_id="string",
-            name="string",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder({"name": name}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -216,25 +222,26 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def delete_project(self, project_id: str) -> None:
+    def delete_project(self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None) -> None:
         """
         Delete a project by ID.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.projects.delete_project(
-            project_id="string",
-        )
+        client.projects.delete_project()
         """
         _response = self._client_wrapper.httpx_client.request(
             "DELETE",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -248,27 +255,65 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_datasets_for_project(self, project_id: str) -> typing.List[EvalDataset]:
+    def get_project_usage(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> IntervalUsageAndPlan:
         """
-        List eval datasets for a project.
+        Get usage for a project
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.projects.list_datasets_for_project(
-            project_id="string",
+        client.projects.get_project_usage()
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/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(IntervalUsageAndPlan, _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_datasets_for_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> typing.List[EvalDataset]:
+        """
+        List eval datasets for a 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.list_datasets_for_project()
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/eval/dataset"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -282,12 +327,16 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def create_eval_dataset_for_project(self, project_id: str, *, name: str) -> EvalDataset:
+    def create_eval_dataset_for_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None, name: str
+    ) -> EvalDataset:
         """
         Create a new eval dataset for a project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
 
             - name: str. The name of the EvalDataset.
         ---
@@ -297,8 +346,7 @@ class ProjectsClient:
             token="YOUR_TOKEN",
         )
         client.projects.create_eval_dataset_for_project(
-            project_id="string",
-            name="string",
+            name="name",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -306,6 +354,7 @@ class ProjectsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/eval/dataset"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder({"name": name}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -321,27 +370,34 @@ class ProjectsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create_local_eval_set_for_project(
-        self, project_id: str, *, app_name: str, results: typing.Dict[str, typing.List[LocalEval]]
+        self,
+        project_id: typing.Optional[str],
+        *,
+        organization_id: typing.Optional[str] = None,
+        app_name: str,
+        results: typing.Dict[str, typing.List[LocalEval]],
     ) -> typing.List[LocalEvalResults]:
         """
         Create a new local eval set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
 
             - app_name: str. The name of the app.
 
             - results: typing.Dict[str, typing.List[LocalEval]]. The eval results.
         ---
+        from llama_cloud import LocalEval
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
         client.projects.create_local_eval_set_for_project(
-            project_id="string",
-            app_name="string",
-            results={"string": []},
+            app_name="app_name",
+            results={"key": [LocalEval()]},
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -349,6 +405,7 @@ class ProjectsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/localevalset"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder({"app_name": app_name, "results": results}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -363,25 +420,28 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_local_evals_for_project(self, project_id: str) -> typing.List[LocalEvalResults]:
+    def list_local_evals_for_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> typing.List[LocalEvalResults]:
         """
         List local eval results for a project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.projects.list_local_evals_for_project(
-            project_id="string",
-        )
+        client.projects.list_local_evals_for_project()
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/localeval"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -395,27 +455,30 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_local_eval_sets_for_project(self, project_id: str) -> typing.List[LocalEvalSets]:
+    def list_local_eval_sets_for_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> typing.List[LocalEvalSets]:
         """
         List local eval sets for a project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.projects.list_local_eval_sets_for_project(
-            project_id="string",
-        )
+        client.projects.list_local_eval_sets_for_project()
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/localevalsets"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -429,14 +492,18 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def delete_local_eval_set(self, project_id: str, local_eval_set_id: str) -> typing.Any:
+    def delete_local_eval_set(
+        self, project_id: typing.Optional[str], local_eval_set_id: str, *, organization_id: typing.Optional[str] = None
+    ) -> typing.Any:
         """
         Delete a local eval set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
 
             - local_eval_set_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -444,8 +511,7 @@ class ProjectsClient:
             token="YOUR_TOKEN",
         )
         client.projects.delete_local_eval_set(
-            project_id="string",
-            local_eval_set_id="string",
+            local_eval_set_id="local_eval_set_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -454,6 +520,7 @@ class ProjectsClient:
                 f"{self._client_wrapper.get_base_url()}/",
                 f"api/v1/projects/{project_id}/localevalset/{local_eval_set_id}",
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -467,25 +534,28 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def list_promptmixin_prompts(self, project_id: str) -> typing.List[PromptMixinPrompts]:
+    def list_promptmixin_prompts(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> typing.List[PromptMixinPrompts]:
         """
         List PromptMixin prompt sets for a project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
-        client.projects.list_promptmixin_prompts(
-            project_id="string",
-        )
+        client.projects.list_promptmixin_prompts()
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/prompts"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -499,33 +569,47 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def create_prompt_mixin_prompts(self, project_id: str, *, request: PromptMixinPrompts) -> PromptMixinPrompts:
+    def create_prompt_mixin_prompts(
+        self,
+        project_id: typing.Optional[str],
+        *,
+        organization_id: typing.Optional[str] = None,
+        request: PromptMixinPrompts,
+    ) -> PromptMixinPrompts:
         """
         Create a new PromptMixin prompt set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
 
             - request: PromptMixinPrompts.
         ---
-        from llama_cloud import PromptMixinPrompts
+        from llama_cloud import PromptMixinPrompts, PromptSpec
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
         client.projects.create_prompt_mixin_prompts(
-            project_id="string",
             request=PromptMixinPrompts(
-                project_id="string",
-                name="string",
-                prompts=[],
+                project_id="project_id",
+                name="name",
+                prompts=[
+                    PromptSpec(
+                        prompt_key="prompt_key",
+                        prompt_class="prompt_class",
+                        prompt_type="prompt_type",
+                    )
+                ],
             ),
         )
         """
         _response = self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/prompts"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -541,31 +625,43 @@ class ProjectsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def update_promptmixin_prompts(
-        self, project_id: str, prompt_set_id: str, *, request: PromptMixinPrompts
+        self,
+        project_id: typing.Optional[str],
+        prompt_set_id: str,
+        *,
+        organization_id: typing.Optional[str] = None,
+        request: PromptMixinPrompts,
     ) -> PromptMixinPrompts:
         """
         Update a PromptMixin prompt set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
 
             - prompt_set_id: str.
 
+            - organization_id: typing.Optional[str].
+
             - request: PromptMixinPrompts.
         ---
-        from llama_cloud import PromptMixinPrompts
+        from llama_cloud import PromptMixinPrompts, PromptSpec
         from llama_cloud.client import LlamaCloud
 
         client = LlamaCloud(
             token="YOUR_TOKEN",
         )
         client.projects.update_promptmixin_prompts(
-            project_id="string",
-            prompt_set_id="string",
+            prompt_set_id="prompt_set_id",
             request=PromptMixinPrompts(
-                project_id="string",
-                name="string",
-                prompts=[],
+                project_id="project_id",
+                name="name",
+                prompts=[
+                    PromptSpec(
+                        prompt_key="prompt_key",
+                        prompt_class="prompt_class",
+                        prompt_type="prompt_type",
+                    )
+                ],
             ),
         )
         """
@@ -574,6 +670,7 @@ class ProjectsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/prompts/{prompt_set_id}"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -588,14 +685,18 @@ class ProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def delete_prompt_mixin_prompts(self, project_id: str, prompt_set_id: str) -> typing.Any:
+    def delete_prompt_mixin_prompts(
+        self, project_id: typing.Optional[str], prompt_set_id: str, *, organization_id: typing.Optional[str] = None
+    ) -> typing.Any:
         """
         Delete a PromptMixin prompt set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
 
             - prompt_set_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import LlamaCloud
 
@@ -603,8 +704,7 @@ class ProjectsClient:
             token="YOUR_TOKEN",
         )
         client.projects.delete_prompt_mixin_prompts(
-            project_id="string",
-            prompt_set_id="string",
+            prompt_set_id="prompt_set_id",
         )
         """
         _response = self._client_wrapper.httpx_client.request(
@@ -612,6 +712,7 @@ class ProjectsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/prompts/{prompt_set_id}"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -682,7 +783,7 @@ class AsyncProjectsClient:
         )
         await client.projects.create_project(
             request=ProjectCreate(
-                name="string",
+                name="name",
             ),
         )
         """
@@ -722,7 +823,7 @@ class AsyncProjectsClient:
         )
         await client.projects.upsert_project(
             request=ProjectCreate(
-                name="string",
+                name="name",
             ),
         )
         """
@@ -744,25 +845,28 @@ 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_project(self, project_id: str) -> Project:
+    async def get_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> Project:
         """
         Get a project by ID.
 
         Parameters:
-            - project_id: str.
+            - 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_project(
-            project_id="string",
-        )
+        await client.projects.get_project()
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -776,12 +880,16 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def update_existing_project(self, project_id: str, *, name: str) -> Project:
+    async def update_existing_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None, name: str
+    ) -> Project:
         """
         Update an existing project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
 
             - name: str.
         ---
@@ -791,13 +899,13 @@ class AsyncProjectsClient:
             token="YOUR_TOKEN",
         )
         await client.projects.update_existing_project(
-            project_id="string",
-            name="string",
+            name="name",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
             "PUT",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder({"name": name}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -812,25 +920,28 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def delete_project(self, project_id: str) -> None:
+    async def delete_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> None:
         """
         Delete a project by ID.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.projects.delete_project(
-            project_id="string",
-        )
+        await client.projects.delete_project()
         """
         _response = await self._client_wrapper.httpx_client.request(
             "DELETE",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -844,27 +955,65 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def list_datasets_for_project(self, project_id: str) -> typing.List[EvalDataset]:
+    async def get_project_usage(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> IntervalUsageAndPlan:
         """
-        List eval datasets for a project.
+        Get usage for a project
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.projects.list_datasets_for_project(
-            project_id="string",
+        await client.projects.get_project_usage()
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/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(IntervalUsageAndPlan, _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_datasets_for_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> typing.List[EvalDataset]:
+        """
+        List eval datasets for a 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.list_datasets_for_project()
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/eval/dataset"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -878,12 +1027,16 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def create_eval_dataset_for_project(self, project_id: str, *, name: str) -> EvalDataset:
+    async def create_eval_dataset_for_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None, name: str
+    ) -> EvalDataset:
         """
         Create a new eval dataset for a project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
 
             - name: str. The name of the EvalDataset.
         ---
@@ -893,8 +1046,7 @@ class AsyncProjectsClient:
             token="YOUR_TOKEN",
         )
         await client.projects.create_eval_dataset_for_project(
-            project_id="string",
-            name="string",
+            name="name",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -902,6 +1054,7 @@ class AsyncProjectsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/eval/dataset"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder({"name": name}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -917,27 +1070,34 @@ class AsyncProjectsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create_local_eval_set_for_project(
-        self, project_id: str, *, app_name: str, results: typing.Dict[str, typing.List[LocalEval]]
+        self,
+        project_id: typing.Optional[str],
+        *,
+        organization_id: typing.Optional[str] = None,
+        app_name: str,
+        results: typing.Dict[str, typing.List[LocalEval]],
     ) -> typing.List[LocalEvalResults]:
         """
         Create a new local eval set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
 
             - app_name: str. The name of the app.
 
             - results: typing.Dict[str, typing.List[LocalEval]]. The eval results.
         ---
+        from llama_cloud import LocalEval
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
         await client.projects.create_local_eval_set_for_project(
-            project_id="string",
-            app_name="string",
-            results={"string": []},
+            app_name="app_name",
+            results={"key": [LocalEval()]},
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -945,6 +1105,7 @@ class AsyncProjectsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/localevalset"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder({"app_name": app_name, "results": results}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -959,25 +1120,28 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def list_local_evals_for_project(self, project_id: str) -> typing.List[LocalEvalResults]:
+    async def list_local_evals_for_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> typing.List[LocalEvalResults]:
         """
         List local eval results for a project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.projects.list_local_evals_for_project(
-            project_id="string",
-        )
+        await client.projects.list_local_evals_for_project()
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/localeval"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -991,27 +1155,30 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def list_local_eval_sets_for_project(self, project_id: str) -> typing.List[LocalEvalSets]:
+    async def list_local_eval_sets_for_project(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> typing.List[LocalEvalSets]:
         """
         List local eval sets for a project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.projects.list_local_eval_sets_for_project(
-            project_id="string",
-        )
+        await client.projects.list_local_eval_sets_for_project()
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/localevalsets"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1025,14 +1192,18 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def delete_local_eval_set(self, project_id: str, local_eval_set_id: str) -> typing.Any:
+    async def delete_local_eval_set(
+        self, project_id: typing.Optional[str], local_eval_set_id: str, *, organization_id: typing.Optional[str] = None
+    ) -> typing.Any:
         """
         Delete a local eval set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
 
             - local_eval_set_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1040,8 +1211,7 @@ class AsyncProjectsClient:
             token="YOUR_TOKEN",
         )
         await client.projects.delete_local_eval_set(
-            project_id="string",
-            local_eval_set_id="string",
+            local_eval_set_id="local_eval_set_id",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1050,6 +1220,7 @@ class AsyncProjectsClient:
                 f"{self._client_wrapper.get_base_url()}/",
                 f"api/v1/projects/{project_id}/localevalset/{local_eval_set_id}",
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1063,25 +1234,28 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def list_promptmixin_prompts(self, project_id: str) -> typing.List[PromptMixinPrompts]:
+    async def list_promptmixin_prompts(
+        self, project_id: typing.Optional[str], *, organization_id: typing.Optional[str] = None
+    ) -> typing.List[PromptMixinPrompts]:
         """
         List PromptMixin prompt sets for a project.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
-        await client.projects.list_promptmixin_prompts(
-            project_id="string",
-        )
+        await client.projects.list_promptmixin_prompts()
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/prompts"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -1095,33 +1269,47 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def create_prompt_mixin_prompts(self, project_id: str, *, request: PromptMixinPrompts) -> PromptMixinPrompts:
+    async def create_prompt_mixin_prompts(
+        self,
+        project_id: typing.Optional[str],
+        *,
+        organization_id: typing.Optional[str] = None,
+        request: PromptMixinPrompts,
+    ) -> PromptMixinPrompts:
         """
         Create a new PromptMixin prompt set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
+
+            - organization_id: typing.Optional[str].
 
             - request: PromptMixinPrompts.
         ---
-        from llama_cloud import PromptMixinPrompts
+        from llama_cloud import PromptMixinPrompts, PromptSpec
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
         await client.projects.create_prompt_mixin_prompts(
-            project_id="string",
             request=PromptMixinPrompts(
-                project_id="string",
-                name="string",
-                prompts=[],
+                project_id="project_id",
+                name="name",
+                prompts=[
+                    PromptSpec(
+                        prompt_key="prompt_key",
+                        prompt_class="prompt_class",
+                        prompt_type="prompt_type",
+                    )
+                ],
             ),
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
             urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/prompts"),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1137,31 +1325,43 @@ class AsyncProjectsClient:
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def update_promptmixin_prompts(
-        self, project_id: str, prompt_set_id: str, *, request: PromptMixinPrompts
+        self,
+        project_id: typing.Optional[str],
+        prompt_set_id: str,
+        *,
+        organization_id: typing.Optional[str] = None,
+        request: PromptMixinPrompts,
     ) -> PromptMixinPrompts:
         """
         Update a PromptMixin prompt set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
 
             - prompt_set_id: str.
 
+            - organization_id: typing.Optional[str].
+
             - request: PromptMixinPrompts.
         ---
-        from llama_cloud import PromptMixinPrompts
+        from llama_cloud import PromptMixinPrompts, PromptSpec
         from llama_cloud.client import AsyncLlamaCloud
 
         client = AsyncLlamaCloud(
             token="YOUR_TOKEN",
         )
         await client.projects.update_promptmixin_prompts(
-            project_id="string",
-            prompt_set_id="string",
+            prompt_set_id="prompt_set_id",
             request=PromptMixinPrompts(
-                project_id="string",
-                name="string",
-                prompts=[],
+                project_id="project_id",
+                name="name",
+                prompts=[
+                    PromptSpec(
+                        prompt_key="prompt_key",
+                        prompt_class="prompt_class",
+                        prompt_type="prompt_type",
+                    )
+                ],
             ),
         )
         """
@@ -1170,6 +1370,7 @@ class AsyncProjectsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/prompts/{prompt_set_id}"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             json=jsonable_encoder(request),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -1184,14 +1385,18 @@ class AsyncProjectsClient:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    async def delete_prompt_mixin_prompts(self, project_id: str, prompt_set_id: str) -> typing.Any:
+    async def delete_prompt_mixin_prompts(
+        self, project_id: typing.Optional[str], prompt_set_id: str, *, organization_id: typing.Optional[str] = None
+    ) -> typing.Any:
         """
         Delete a PromptMixin prompt set.
 
         Parameters:
-            - project_id: str.
+            - project_id: typing.Optional[str].
 
             - prompt_set_id: str.
+
+            - organization_id: typing.Optional[str].
         ---
         from llama_cloud.client import AsyncLlamaCloud
 
@@ -1199,8 +1404,7 @@ class AsyncProjectsClient:
             token="YOUR_TOKEN",
         )
         await client.projects.delete_prompt_mixin_prompts(
-            project_id="string",
-            prompt_set_id="string",
+            prompt_set_id="prompt_set_id",
         )
         """
         _response = await self._client_wrapper.httpx_client.request(
@@ -1208,6 +1412,7 @@ class AsyncProjectsClient:
             urllib.parse.urljoin(
                 f"{self._client_wrapper.get_base_url()}/", f"api/v1/projects/{project_id}/prompts/{prompt_set_id}"
             ),
+            params=remove_none_from_dict({"organization_id": organization_id}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )