letta-client 1.0.0a6__py3-none-any.whl → 1.0.0a8__py3-none-any.whl

{letta_sdk/resources → letta_client/resources/identities}/identities.py

@@ -7,38 +7,70 @@ from typing_extensions import Literal
 
 import httpx
 
-from ..types import (
+from .agents import (
+    AgentsResource,
+    AsyncAgentsResource,
+    AgentsResourceWithRawResponse,
+    AsyncAgentsResourceWithRawResponse,
+    AgentsResourceWithStreamingResponse,
+    AsyncAgentsResourceWithStreamingResponse,
+)
+from .blocks import (
+    BlocksResource,
+    AsyncBlocksResource,
+    BlocksResourceWithRawResponse,
+    AsyncBlocksResourceWithRawResponse,
+    BlocksResourceWithStreamingResponse,
+    AsyncBlocksResourceWithStreamingResponse,
+)
+from ...types import (
     IdentityType,
     identity_list_params,
     identity_create_params,
-    identity_modify_params,
+    identity_update_params,
     identity_upsert_params,
-    identity_list_agents_params,
-    identity_list_blocks_params,
 )
-from .._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
-from .._utils import maybe_transform, strip_not_given, async_maybe_transform
-from .._compat import cached_property
-from .._resource import SyncAPIResource, AsyncAPIResource
-from .._response import (
+from ..._types import Body, Omit, Query, Headers, NotGiven, SequenceNotStr, omit, not_given
+from ..._utils import maybe_transform, strip_not_given, async_maybe_transform
+from ..._compat import cached_property
+from .properties import (
+    PropertiesResource,
+    AsyncPropertiesResource,
+    PropertiesResourceWithRawResponse,
+    AsyncPropertiesResourceWithRawResponse,
+    PropertiesResourceWithStreamingResponse,
+    AsyncPropertiesResourceWithStreamingResponse,
+)
+from ..._resource import SyncAPIResource, AsyncAPIResource
+from ..._response import (
     to_raw_response_wrapper,
     to_streamed_response_wrapper,
     async_to_raw_response_wrapper,
     async_to_streamed_response_wrapper,
 )
-from .._base_client import make_request_options
-from ..types.identity import Identity
-from ..types.identity_type import IdentityType
-from ..types.identity_list_response import IdentityListResponse
-from ..types.identity_count_response import IdentityCountResponse
-from ..types.identity_property_param import IdentityPropertyParam
-from ..types.identity_list_agents_response import IdentityListAgentsResponse
-from ..types.identity_list_blocks_response import IdentityListBlocksResponse
+from ...pagination import SyncArrayPage, AsyncArrayPage
+from ..._base_client import AsyncPaginator, make_request_options
+from ...types.identity import Identity
+from ...types.identity_type import IdentityType
+from ...types.identity_count_response import IdentityCountResponse
+from ...types.identity_property_param import IdentityPropertyParam
 
 __all__ = ["IdentitiesResource", "AsyncIdentitiesResource"]
 
 
 class IdentitiesResource(SyncAPIResource):
+    @cached_property
+    def properties(self) -> PropertiesResource:
+        return PropertiesResource(self._client)
+
+    @cached_property
+    def agents(self) -> AgentsResource:
+        return AgentsResource(self._client)
+
+    @cached_property
+    def blocks(self) -> BlocksResource:
+        return BlocksResource(self._client)
+
     @cached_property
     def with_raw_response(self) -> IdentitiesResourceWithRawResponse:
         """
@@ -140,6 +172,8 @@ class IdentitiesResource(SyncAPIResource):
         Retrieve Identity
 
         Args:
+          identity_id: The ID of the identity in the format 'identity-<uuid4>'
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -158,6 +192,70 @@ class IdentitiesResource(SyncAPIResource):
             cast_to=Identity,
         )
 
+    def update(
+        self,
+        identity_id: str,
+        *,
+        agent_ids: Optional[SequenceNotStr[str]] | Omit = omit,
+        block_ids: Optional[SequenceNotStr[str]] | Omit = omit,
+        identifier_key: Optional[str] | Omit = omit,
+        identity_type: Optional[IdentityType] | Omit = omit,
+        name: Optional[str] | Omit = omit,
+        properties: Optional[Iterable[IdentityPropertyParam]] | Omit = omit,
+        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
+        # The extra values given here take precedence over values defined on the client or passed to this method.
+        extra_headers: Headers | None = None,
+        extra_query: Query | None = None,
+        extra_body: Body | None = None,
+        timeout: float | httpx.Timeout | None | NotGiven = not_given,
+    ) -> Identity:
+        """
+        Modify Identity
+
+        Args:
+          identity_id: The ID of the identity in the format 'identity-<uuid4>'
+
+          agent_ids: The agent ids that are associated with the identity.
+
+          block_ids: The IDs of the blocks associated with the identity.
+
+          identifier_key: External, user-generated identifier key of the identity.
+
+          identity_type: Enum to represent the type of the identity.
+
+          name: The name of the identity.
+
+          properties: List of properties associated with the identity.
+
+          extra_headers: Send extra headers
+
+          extra_query: Add additional query parameters to the request
+
+          extra_body: Add additional JSON properties to the request
+
+          timeout: Override the client-level default timeout for this request, in seconds
+        """
+        if not identity_id:
+            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
+        return self._patch(
+            f"/v1/identities/{identity_id}",
+            body=maybe_transform(
+                {
+                    "agent_ids": agent_ids,
+                    "block_ids": block_ids,
+                    "identifier_key": identifier_key,
+                    "identity_type": identity_type,
+                    "name": name,
+                    "properties": properties,
+                },
+                identity_update_params.IdentityUpdateParams,
+            ),
+            options=make_request_options(
+                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+            ),
+            cast_to=Identity,
+        )
+
     def list(
         self,
         *,
@@ -176,7 +274,7 @@ class IdentitiesResource(SyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> IdentityListResponse:
+    ) -> SyncArrayPage[Identity]:
         """
         Get a list of all identities in the database
 
@@ -204,8 +302,9 @@ class IdentitiesResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return self._get(
+        return self._get_api_list(
             "/v1/identities/",
+            page=SyncArrayPage[Identity],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -226,7 +325,7 @@ class IdentitiesResource(SyncAPIResource):
                     identity_list_params.IdentityListParams,
                 ),
             ),
-            cast_to=IdentityListResponse,
+            model=Identity,
         )
 
     def delete(
@@ -244,6 +343,8 @@ class IdentitiesResource(SyncAPIResource):
         Delete an identity by its identifier key
 
         Args:
+          identity_id: The ID of the identity in the format 'identity-<uuid4>'
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -281,144 +382,17 @@ class IdentitiesResource(SyncAPIResource):
             cast_to=int,
         )
 
-    def list_agents(
-        self,
-        identity_id: str,
-        *,
-        after: Optional[str] | Omit = omit,
-        before: Optional[str] | Omit = omit,
-        limit: Optional[int] | Omit = omit,
-        order: Literal["asc", "desc"] | Omit = omit,
-        order_by: Literal["created_at"] | Omit = omit,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> IdentityListAgentsResponse:
-        """
-        Get all agents associated with the specified identity.
-
-        Args:
-          after: Agent ID cursor for pagination. Returns agents that come after this agent ID in
-              the specified sort order
-
-          before: Agent ID cursor for pagination. Returns agents that come before this agent ID in
-              the specified sort order
-
-          limit: Maximum number of agents to return
-
-          order: Sort order for agents by creation time. 'asc' for oldest first, 'desc' for
-              newest first
-
-          order_by: Field to sort by
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identity_id:
-            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
-        return self._get(
-            f"/v1/identities/{identity_id}/agents",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "after": after,
-                        "before": before,
-                        "limit": limit,
-                        "order": order,
-                        "order_by": order_by,
-                    },
-                    identity_list_agents_params.IdentityListAgentsParams,
-                ),
-            ),
-            cast_to=IdentityListAgentsResponse,
-        )
-
-    def list_blocks(
-        self,
-        identity_id: str,
-        *,
-        after: Optional[str] | Omit = omit,
-        before: Optional[str] | Omit = omit,
-        limit: Optional[int] | Omit = omit,
-        order: Literal["asc", "desc"] | Omit = omit,
-        order_by: Literal["created_at"] | Omit = omit,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> IdentityListBlocksResponse:
-        """
-        Get all blocks associated with the specified identity.
-
-        Args:
-          after: Block ID cursor for pagination. Returns blocks that come after this block ID in
-              the specified sort order
-
-          before: Block ID cursor for pagination. Returns blocks that come before this block ID in
-              the specified sort order
-
-          limit: Maximum number of blocks to return
-
-          order: Sort order for blocks by creation time. 'asc' for oldest first, 'desc' for
-              newest first
-
-          order_by: Field to sort by
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identity_id:
-            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
-        return self._get(
-            f"/v1/identities/{identity_id}/blocks",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=maybe_transform(
-                    {
-                        "after": after,
-                        "before": before,
-                        "limit": limit,
-                        "order": order,
-                        "order_by": order_by,
-                    },
-                    identity_list_blocks_params.IdentityListBlocksParams,
-                ),
-            ),
-            cast_to=IdentityListBlocksResponse,
-        )
-
-    def modify(
+    def upsert(
         self,
-        identity_id: str,
         *,
+        identifier_key: str,
+        identity_type: IdentityType,
+        name: str,
         agent_ids: Optional[SequenceNotStr[str]] | Omit = omit,
         block_ids: Optional[SequenceNotStr[str]] | Omit = omit,
-        identifier_key: Optional[str] | Omit = omit,
-        identity_type: Optional[IdentityType] | Omit = omit,
-        name: Optional[str] | Omit = omit,
+        project_id: Optional[str] | Omit = omit,
         properties: Optional[Iterable[IdentityPropertyParam]] | Omit = omit,
+        x_project: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -427,21 +401,25 @@ class IdentitiesResource(SyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Identity:
         """
-        Modify Identity
+        Upsert Identity
 
         Args:
-          agent_ids: The agent ids that are associated with the identity.
-
-          block_ids: The IDs of the blocks associated with the identity.
-
           identifier_key: External, user-generated identifier key of the identity.
 
-          identity_type: Enum to represent the type of the identity.
+          identity_type: The type of the identity.
 
           name: The name of the identity.
 
+          agent_ids: The agent ids that are associated with the identity.
+
+          block_ids: The IDs of the blocks associated with the identity.
+
+          project_id: The project id of the identity, if applicable.
+
           properties: List of properties associated with the identity.
 
+          x_project: The project slug to associate with the identity (cloud only).
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -450,20 +428,20 @@ class IdentitiesResource(SyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        if not identity_id:
-            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
-        return self._patch(
-            f"/v1/identities/{identity_id}",
+        extra_headers = {**strip_not_given({"X-Project": x_project}), **(extra_headers or {})}
+        return self._put(
+            "/v1/identities/",
             body=maybe_transform(
                 {
-                    "agent_ids": agent_ids,
-                    "block_ids": block_ids,
                     "identifier_key": identifier_key,
                     "identity_type": identity_type,
                     "name": name,
+                    "agent_ids": agent_ids,
+                    "block_ids": block_ids,
+                    "project_id": project_id,
                     "properties": properties,
                 },
-                identity_modify_params.IdentityModifyParams,
+                identity_upsert_params.IdentityUpsertParams,
             ),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -471,7 +449,40 @@ class IdentitiesResource(SyncAPIResource):
             cast_to=Identity,
         )
 
-    def upsert(
+
+class AsyncIdentitiesResource(AsyncAPIResource):
+    @cached_property
+    def properties(self) -> AsyncPropertiesResource:
+        return AsyncPropertiesResource(self._client)
+
+    @cached_property
+    def agents(self) -> AsyncAgentsResource:
+        return AsyncAgentsResource(self._client)
+
+    @cached_property
+    def blocks(self) -> AsyncBlocksResource:
+        return AsyncBlocksResource(self._client)
+
+    @cached_property
+    def with_raw_response(self) -> AsyncIdentitiesResourceWithRawResponse:
+        """
+        This property can be used as a prefix for any HTTP method call to return
+        the raw response object instead of the parsed content.
+
+        For more information, see https://www.github.com/letta-ai/letta-python#accessing-raw-response-data-eg-headers
+        """
+        return AsyncIdentitiesResourceWithRawResponse(self)
+
+    @cached_property
+    def with_streaming_response(self) -> AsyncIdentitiesResourceWithStreamingResponse:
+        """
+        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
+
+        For more information, see https://www.github.com/letta-ai/letta-python#with_streaming_response
+        """
+        return AsyncIdentitiesResourceWithStreamingResponse(self)
+
+    async def create(
         self,
         *,
         identifier_key: str,
@@ -490,7 +501,7 @@ class IdentitiesResource(SyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Identity:
         """
-        Upsert Identity
+        Create Identity
 
         Args:
           identifier_key: External, user-generated identifier key of the identity.
@@ -518,9 +529,9 @@ class IdentitiesResource(SyncAPIResource):
           timeout: Override the client-level default timeout for this request, in seconds
         """
         extra_headers = {**strip_not_given({"X-Project": x_project}), **(extra_headers or {})}
-        return self._put(
+        return await self._post(
             "/v1/identities/",
-            body=maybe_transform(
+            body=await async_maybe_transform(
                 {
                     "identifier_key": identifier_key,
                     "identity_type": identity_type,
@@ -530,7 +541,7 @@ class IdentitiesResource(SyncAPIResource):
                     "project_id": project_id,
                     "properties": properties,
                 },
-                identity_upsert_params.IdentityUpsertParams,
+                identity_create_params.IdentityCreateParams,
             ),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
@@ -538,22 +549,23 @@ class IdentitiesResource(SyncAPIResource):
             cast_to=Identity,
         )
 
-    def upsert_properties(
+    async def retrieve(
         self,
         identity_id: str,
         *,
-        body: Iterable[IdentityPropertyParam],
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> object:
+    ) -> Identity:
         """
-        Upsert Identity Properties
+        Retrieve Identity
 
         Args:
+          identity_id: The ID of the identity in the format 'identity-<uuid4>'
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -564,47 +576,24 @@ class IdentitiesResource(SyncAPIResource):
         """
         if not identity_id:
             raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
-        return self._put(
-            f"/v1/identities/{identity_id}/properties",
-            body=maybe_transform(body, Iterable[IdentityPropertyParam]),
+        return await self._get(
+            f"/v1/identities/{identity_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
-            cast_to=object,
+            cast_to=Identity,
         )
 
-
-class AsyncIdentitiesResource(AsyncAPIResource):
-    @cached_property
-    def with_raw_response(self) -> AsyncIdentitiesResourceWithRawResponse:
-        """
-        This property can be used as a prefix for any HTTP method call to return
-        the raw response object instead of the parsed content.
-
-        For more information, see https://www.github.com/letta-ai/letta-python#accessing-raw-response-data-eg-headers
-        """
-        return AsyncIdentitiesResourceWithRawResponse(self)
-
-    @cached_property
-    def with_streaming_response(self) -> AsyncIdentitiesResourceWithStreamingResponse:
-        """
-        An alternative to `.with_raw_response` that doesn't eagerly read the response body.
-
-        For more information, see https://www.github.com/letta-ai/letta-python#with_streaming_response
-        """
-        return AsyncIdentitiesResourceWithStreamingResponse(self)
-
-    async def create(
+    async def update(
         self,
+        identity_id: str,
         *,
-        identifier_key: str,
-        identity_type: IdentityType,
-        name: str,
         agent_ids: Optional[SequenceNotStr[str]] | Omit = omit,
         block_ids: Optional[SequenceNotStr[str]] | Omit = omit,
-        project_id: Optional[str] | Omit = omit,
+        identifier_key: Optional[str] | Omit = omit,
+        identity_type: Optional[IdentityType] | Omit = omit,
+        name: Optional[str] | Omit = omit,
         properties: Optional[Iterable[IdentityPropertyParam]] | Omit = omit,
-        x_project: str | Omit = omit,
         # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
         # The extra values given here take precedence over values defined on the client or passed to this method.
         extra_headers: Headers | None = None,
@@ -613,24 +602,22 @@ class AsyncIdentitiesResource(AsyncAPIResource):
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
     ) -> Identity:
         """
-        Create Identity
+        Modify Identity
 
         Args:
-          identifier_key: External, user-generated identifier key of the identity.
-
-          identity_type: The type of the identity.
-
-          name: The name of the identity.
+          identity_id: The ID of the identity in the format 'identity-<uuid4>'
 
           agent_ids: The agent ids that are associated with the identity.
 
           block_ids: The IDs of the blocks associated with the identity.
 
-          project_id: The project id of the identity, if applicable.
+          identifier_key: External, user-generated identifier key of the identity.
 
-          properties: List of properties associated with the identity.
+          identity_type: Enum to represent the type of the identity.
 
-          x_project: The project slug to associate with the identity (cloud only).
+          name: The name of the identity.
+
+          properties: List of properties associated with the identity.
 
           extra_headers: Send extra headers
 
@@ -640,61 +627,28 @@ class AsyncIdentitiesResource(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        extra_headers = {**strip_not_given({"X-Project": x_project}), **(extra_headers or {})}
-        return await self._post(
-            "/v1/identities/",
+        if not identity_id:
+            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
+        return await self._patch(
+            f"/v1/identities/{identity_id}",
             body=await async_maybe_transform(
                 {
+                    "agent_ids": agent_ids,
+                    "block_ids": block_ids,
                     "identifier_key": identifier_key,
                     "identity_type": identity_type,
                     "name": name,
-                    "agent_ids": agent_ids,
-                    "block_ids": block_ids,
-                    "project_id": project_id,
                     "properties": properties,
                 },
-                identity_create_params.IdentityCreateParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
+                identity_update_params.IdentityUpdateParams,
             ),
-            cast_to=Identity,
-        )
-
-    async def retrieve(
-        self,
-        identity_id: str,
-        *,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> Identity:
-        """
-        Retrieve Identity
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identity_id:
-            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
-        return await self._get(
-            f"/v1/identities/{identity_id}",
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
             cast_to=Identity,
         )
 
-    async def list(
+    def list(
         self,
         *,
         after: Optional[str] | Omit = omit,
@@ -712,7 +666,7 @@ class AsyncIdentitiesResource(AsyncAPIResource):
         extra_query: Query | None = None,
         extra_body: Body | None = None,
         timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> IdentityListResponse:
+    ) -> AsyncPaginator[Identity, AsyncArrayPage[Identity]]:
         """
         Get a list of all identities in the database
 
@@ -740,14 +694,15 @@ class AsyncIdentitiesResource(AsyncAPIResource):
 
           timeout: Override the client-level default timeout for this request, in seconds
         """
-        return await self._get(
+        return self._get_api_list(
             "/v1/identities/",
+            page=AsyncArrayPage[Identity],
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
                 extra_body=extra_body,
                 timeout=timeout,
-                query=await async_maybe_transform(
+                query=maybe_transform(
                     {
                         "after": after,
                         "before": before,
@@ -762,7 +717,7 @@ class AsyncIdentitiesResource(AsyncAPIResource):
                     identity_list_params.IdentityListParams,
                 ),
             ),
-            cast_to=IdentityListResponse,
+            model=Identity,
         )
 
     async def delete(
@@ -780,6 +735,8 @@ class AsyncIdentitiesResource(AsyncAPIResource):
         Delete an identity by its identifier key
 
         Args:
+          identity_id: The ID of the identity in the format 'identity-<uuid4>'
+
           extra_headers: Send extra headers
 
           extra_query: Add additional query parameters to the request
@@ -817,196 +774,6 @@ class AsyncIdentitiesResource(AsyncAPIResource):
             cast_to=int,
         )
 
-    async def list_agents(
-        self,
-        identity_id: str,
-        *,
-        after: Optional[str] | Omit = omit,
-        before: Optional[str] | Omit = omit,
-        limit: Optional[int] | Omit = omit,
-        order: Literal["asc", "desc"] | Omit = omit,
-        order_by: Literal["created_at"] | Omit = omit,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> IdentityListAgentsResponse:
-        """
-        Get all agents associated with the specified identity.
-
-        Args:
-          after: Agent ID cursor for pagination. Returns agents that come after this agent ID in
-              the specified sort order
-
-          before: Agent ID cursor for pagination. Returns agents that come before this agent ID in
-              the specified sort order
-
-          limit: Maximum number of agents to return
-
-          order: Sort order for agents by creation time. 'asc' for oldest first, 'desc' for
-              newest first
-
-          order_by: Field to sort by
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identity_id:
-            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
-        return await self._get(
-            f"/v1/identities/{identity_id}/agents",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "after": after,
-                        "before": before,
-                        "limit": limit,
-                        "order": order,
-                        "order_by": order_by,
-                    },
-                    identity_list_agents_params.IdentityListAgentsParams,
-                ),
-            ),
-            cast_to=IdentityListAgentsResponse,
-        )
-
-    async def list_blocks(
-        self,
-        identity_id: str,
-        *,
-        after: Optional[str] | Omit = omit,
-        before: Optional[str] | Omit = omit,
-        limit: Optional[int] | Omit = omit,
-        order: Literal["asc", "desc"] | Omit = omit,
-        order_by: Literal["created_at"] | Omit = omit,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> IdentityListBlocksResponse:
-        """
-        Get all blocks associated with the specified identity.
-
-        Args:
-          after: Block ID cursor for pagination. Returns blocks that come after this block ID in
-              the specified sort order
-
-          before: Block ID cursor for pagination. Returns blocks that come before this block ID in
-              the specified sort order
-
-          limit: Maximum number of blocks to return
-
-          order: Sort order for blocks by creation time. 'asc' for oldest first, 'desc' for
-              newest first
-
-          order_by: Field to sort by
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identity_id:
-            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
-        return await self._get(
-            f"/v1/identities/{identity_id}/blocks",
-            options=make_request_options(
-                extra_headers=extra_headers,
-                extra_query=extra_query,
-                extra_body=extra_body,
-                timeout=timeout,
-                query=await async_maybe_transform(
-                    {
-                        "after": after,
-                        "before": before,
-                        "limit": limit,
-                        "order": order,
-                        "order_by": order_by,
-                    },
-                    identity_list_blocks_params.IdentityListBlocksParams,
-                ),
-            ),
-            cast_to=IdentityListBlocksResponse,
-        )
-
-    async def modify(
-        self,
-        identity_id: str,
-        *,
-        agent_ids: Optional[SequenceNotStr[str]] | Omit = omit,
-        block_ids: Optional[SequenceNotStr[str]] | Omit = omit,
-        identifier_key: Optional[str] | Omit = omit,
-        identity_type: Optional[IdentityType] | Omit = omit,
-        name: Optional[str] | Omit = omit,
-        properties: Optional[Iterable[IdentityPropertyParam]] | Omit = omit,
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> Identity:
-        """
-        Modify Identity
-
-        Args:
-          agent_ids: The agent ids that are associated with the identity.
-
-          block_ids: The IDs of the blocks associated with the identity.
-
-          identifier_key: External, user-generated identifier key of the identity.
-
-          identity_type: Enum to represent the type of the identity.
-
-          name: The name of the identity.
-
-          properties: List of properties associated with the identity.
-
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identity_id:
-            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
-        return await self._patch(
-            f"/v1/identities/{identity_id}",
-            body=await async_maybe_transform(
-                {
-                    "agent_ids": agent_ids,
-                    "block_ids": block_ids,
-                    "identifier_key": identifier_key,
-                    "identity_type": identity_type,
-                    "name": name,
-                    "properties": properties,
-                },
-                identity_modify_params.IdentityModifyParams,
-            ),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=Identity,
-        )
-
     async def upsert(
         self,
         *,
@@ -1074,41 +841,6 @@ class AsyncIdentitiesResource(AsyncAPIResource):
             cast_to=Identity,
         )
 
-    async def upsert_properties(
-        self,
-        identity_id: str,
-        *,
-        body: Iterable[IdentityPropertyParam],
-        # Use the following arguments if you need to pass additional parameters to the API that aren't available via kwargs.
-        # The extra values given here take precedence over values defined on the client or passed to this method.
-        extra_headers: Headers | None = None,
-        extra_query: Query | None = None,
-        extra_body: Body | None = None,
-        timeout: float | httpx.Timeout | None | NotGiven = not_given,
-    ) -> object:
-        """
-        Upsert Identity Properties
-
-        Args:
-          extra_headers: Send extra headers
-
-          extra_query: Add additional query parameters to the request
-
-          extra_body: Add additional JSON properties to the request
-
-          timeout: Override the client-level default timeout for this request, in seconds
-        """
-        if not identity_id:
-            raise ValueError(f"Expected a non-empty value for `identity_id` but received {identity_id!r}")
-        return await self._put(
-            f"/v1/identities/{identity_id}/properties",
-            body=await async_maybe_transform(body, Iterable[IdentityPropertyParam]),
-            options=make_request_options(
-                extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
-            ),
-            cast_to=object,
-        )
-
 
 class IdentitiesResourceWithRawResponse:
     def __init__(self, identities: IdentitiesResource) -> None:
@@ -1120,6 +852,9 @@ class IdentitiesResourceWithRawResponse:
         self.retrieve = to_raw_response_wrapper(
             identities.retrieve,
         )
+        self.update = to_raw_response_wrapper(
+            identities.update,
+        )
         self.list = to_raw_response_wrapper(
             identities.list,
         )
@@ -1129,21 +864,21 @@ class IdentitiesResourceWithRawResponse:
         self.count = to_raw_response_wrapper(
             identities.count,
         )
-        self.list_agents = to_raw_response_wrapper(
-            identities.list_agents,
-        )
-        self.list_blocks = to_raw_response_wrapper(
-            identities.list_blocks,
-        )
-        self.modify = to_raw_response_wrapper(
-            identities.modify,
-        )
         self.upsert = to_raw_response_wrapper(
             identities.upsert,
         )
-        self.upsert_properties = to_raw_response_wrapper(
-            identities.upsert_properties,
-        )
+
+    @cached_property
+    def properties(self) -> PropertiesResourceWithRawResponse:
+        return PropertiesResourceWithRawResponse(self._identities.properties)
+
+    @cached_property
+    def agents(self) -> AgentsResourceWithRawResponse:
+        return AgentsResourceWithRawResponse(self._identities.agents)
+
+    @cached_property
+    def blocks(self) -> BlocksResourceWithRawResponse:
+        return BlocksResourceWithRawResponse(self._identities.blocks)
 
 
 class AsyncIdentitiesResourceWithRawResponse:
@@ -1156,6 +891,9 @@ class AsyncIdentitiesResourceWithRawResponse:
         self.retrieve = async_to_raw_response_wrapper(
             identities.retrieve,
         )
+        self.update = async_to_raw_response_wrapper(
+            identities.update,
+        )
         self.list = async_to_raw_response_wrapper(
             identities.list,
         )
@@ -1165,21 +903,21 @@ class AsyncIdentitiesResourceWithRawResponse:
         self.count = async_to_raw_response_wrapper(
             identities.count,
         )
-        self.list_agents = async_to_raw_response_wrapper(
-            identities.list_agents,
-        )
-        self.list_blocks = async_to_raw_response_wrapper(
-            identities.list_blocks,
-        )
-        self.modify = async_to_raw_response_wrapper(
-            identities.modify,
-        )
         self.upsert = async_to_raw_response_wrapper(
             identities.upsert,
         )
-        self.upsert_properties = async_to_raw_response_wrapper(
-            identities.upsert_properties,
-        )
+
+    @cached_property
+    def properties(self) -> AsyncPropertiesResourceWithRawResponse:
+        return AsyncPropertiesResourceWithRawResponse(self._identities.properties)
+
+    @cached_property
+    def agents(self) -> AsyncAgentsResourceWithRawResponse:
+        return AsyncAgentsResourceWithRawResponse(self._identities.agents)
+
+    @cached_property
+    def blocks(self) -> AsyncBlocksResourceWithRawResponse:
+        return AsyncBlocksResourceWithRawResponse(self._identities.blocks)
 
 
 class IdentitiesResourceWithStreamingResponse:
@@ -1192,6 +930,9 @@ class IdentitiesResourceWithStreamingResponse:
         self.retrieve = to_streamed_response_wrapper(
             identities.retrieve,
         )
+        self.update = to_streamed_response_wrapper(
+            identities.update,
+        )
         self.list = to_streamed_response_wrapper(
             identities.list,
         )
@@ -1201,21 +942,21 @@ class IdentitiesResourceWithStreamingResponse:
         self.count = to_streamed_response_wrapper(
             identities.count,
         )
-        self.list_agents = to_streamed_response_wrapper(
-            identities.list_agents,
-        )
-        self.list_blocks = to_streamed_response_wrapper(
-            identities.list_blocks,
-        )
-        self.modify = to_streamed_response_wrapper(
-            identities.modify,
-        )
         self.upsert = to_streamed_response_wrapper(
             identities.upsert,
         )
-        self.upsert_properties = to_streamed_response_wrapper(
-            identities.upsert_properties,
-        )
+
+    @cached_property
+    def properties(self) -> PropertiesResourceWithStreamingResponse:
+        return PropertiesResourceWithStreamingResponse(self._identities.properties)
+
+    @cached_property
+    def agents(self) -> AgentsResourceWithStreamingResponse:
+        return AgentsResourceWithStreamingResponse(self._identities.agents)
+
+    @cached_property
+    def blocks(self) -> BlocksResourceWithStreamingResponse:
+        return BlocksResourceWithStreamingResponse(self._identities.blocks)
 
 
 class AsyncIdentitiesResourceWithStreamingResponse:
@@ -1228,6 +969,9 @@ class AsyncIdentitiesResourceWithStreamingResponse:
         self.retrieve = async_to_streamed_response_wrapper(
             identities.retrieve,
         )
+        self.update = async_to_streamed_response_wrapper(
+            identities.update,
+        )
         self.list = async_to_streamed_response_wrapper(
             identities.list,
         )
@@ -1237,18 +981,18 @@ class AsyncIdentitiesResourceWithStreamingResponse:
         self.count = async_to_streamed_response_wrapper(
             identities.count,
         )
-        self.list_agents = async_to_streamed_response_wrapper(
-            identities.list_agents,
-        )
-        self.list_blocks = async_to_streamed_response_wrapper(
-            identities.list_blocks,
-        )
-        self.modify = async_to_streamed_response_wrapper(
-            identities.modify,
-        )
         self.upsert = async_to_streamed_response_wrapper(
             identities.upsert,
         )
-        self.upsert_properties = async_to_streamed_response_wrapper(
-            identities.upsert_properties,
-        )
+
+    @cached_property
+    def properties(self) -> AsyncPropertiesResourceWithStreamingResponse:
+        return AsyncPropertiesResourceWithStreamingResponse(self._identities.properties)
+
+    @cached_property
+    def agents(self) -> AsyncAgentsResourceWithStreamingResponse:
+        return AsyncAgentsResourceWithStreamingResponse(self._identities.agents)
+
+    @cached_property
+    def blocks(self) -> AsyncBlocksResourceWithStreamingResponse:
+        return AsyncBlocksResourceWithStreamingResponse(self._identities.blocks)