meshagent-api 0.53.0__tar.gz → 0.53.2__tar.gz

{meshagent_api-0.53.0/meshagent_api.egg-info → meshagent_api-0.53.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-api
-Version: 0.53.0
+Version: 0.53.2
 Summary: Python Server API for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com

{meshagent_api-0.53.0 → meshagent_api-0.53.2}/meshagent/api/client.py

@@ -722,6 +722,27 @@ class UpdateUserProfileRequest(BaseModel):
     annotations: dict[str, str] = Field(default_factory=dict)
 
 
+UserProfileView = Literal["project", "user", "merged"]
+UserProfileField = Literal["first_name", "last_name", "metadata", "annotations"]
+
+
+class UpdateProjectUserProfileRequest(UpdateUserProfileRequest):
+    inherit: list[UserProfileField] = Field(default_factory=list)
+
+    @model_validator(mode="after")
+    def validate_inherited_fields(self) -> "UpdateProjectUserProfileRequest":
+        if set(self.inherit) & self.model_fields_set:
+            raise ValueError(
+                "A field cannot be supplied and inherited in the same update"
+            )
+        return self
+
+
+class UserProfilesPage(BaseModel):
+    users: list[User]
+    continuation_token: str | None = None
+
+
 class UserRoomGrant(BaseModel):
     room: Room
     user: User
@@ -1558,13 +1579,14 @@ class Meshagent:
         page_size: int = 100,
         continuation_token: str | None = None,
         filter: str | None = None,
+        view: UserProfileView = "merged",
     ) -> ProjectMembersPage:
         """
         Corresponds to: GET /accounts/projects/:id/users
         Returns a JSON dict with { "users": [...] }.
         """
         url = f"{self.base_url}/accounts/projects/{project_id}/users"
-        params: Dict[str, str] = {"page_size": str(page_size)}
+        params: Dict[str, str] = {"page_size": str(page_size), "view": view}
         if continuation_token is not None:
             params["continuation_token"] = continuation_token
         if filter is not None and filter.strip() != "":
@@ -1580,18 +1602,37 @@ class Meshagent:
             except ValidationError as exc:
                 raise RoomException(f"Invalid project users payload: {exc}") from exc
 
-    async def get_users_in_project(self, project_id: str) -> Dict[str, Any]:
-        page = await self.get_users_in_project_page(project_id)
-        return page.model_dump(mode="json")
+    async def get_users_in_project(
+        self, project_id: str, *, view: UserProfileView = "merged"
+    ) -> Dict[str, Any]:
+        page = await self.get_users_in_project_page(project_id, view=view)
+        return page.model_dump(mode="json", exclude_unset=view == "project")
 
-    async def get_user_profile(self, user_id: str) -> Dict[str, Any]:
+    async def get_user_profile(
+        self,
+        user_id: str,
+        *,
+        project_id: str | None = None,
+        view: UserProfileView = "merged",
+    ) -> Dict[str, Any]:
         """
         Corresponds to: GET /accounts/profiles/:id
         Returns the user profile JSON, e.g. { "id", "first_name", "last_name", "email" } or raises 404 if not found.
         """
-        url = f"{self.base_url}/accounts/profiles/{user_id}"
+        user_path = quote(user_id, safe="")
+        if project_id is None:
+            if view == "project":
+                raise ValueError("project_id is required for the project view")
+            url = f"{self.base_url}/accounts/profiles/{user_path}"
+            params = None
+        else:
+            project_path = quote(project_id, safe="")
+            url = f"{self.base_url}/accounts/projects/{project_path}/users/{user_path}/profile"
+            params = {"view": view}
 
-        async with self._session.get(url, headers=self._get_headers()) as resp:
+        async with self._session.get(
+            url, headers=self._get_headers(), params=params
+        ) as resp:
             await self._raise_for_status(resp)
             return await resp.json()
 
@@ -1604,15 +1645,17 @@ class Meshagent:
         metadata: dict[str, JsonValue] | None = None,
         annotations: dict[str, str] | None = None,
         project_id: str | None = None,
+        inherit: list[UserProfileField] | None = None,
     ) -> Dict[str, Any]:
         """
         Corresponds to: PUT /accounts/profiles/:id
         Omitted fields are preserved; metadata and annotations replace their maps.
-        Editing another user or annotations requires the user_profile_editor role
-        in project_id, and the target must belong to that project.
+        With project_id, edits project overrides and requires user_profile_editor,
+        including for your own profile. Without a project, edits your global profile.
         Returns a JSON dict with { "ok": True } on success.
         """
-        url = f"{self.base_url}/accounts/profiles/{user_id}"
+        user_path = quote(user_id, safe="")
+        url = f"{self.base_url}/accounts/profiles/{user_path}"
         body: dict[str, Any] = {}
         if first_name is not None:
             body["first_name"] = first_name
@@ -1623,7 +1666,12 @@ class Meshagent:
         if annotations is not None:
             body["annotations"] = annotations
         if project_id is not None:
-            url += f"?project_id={quote(project_id, safe='')}"
+            project_path = quote(project_id, safe="")
+            url = f"{self.base_url}/accounts/projects/{project_path}/users/{user_path}/profile"
+        if inherit is not None:
+            if project_id is None:
+                raise ValueError("project_id is required to inherit profile fields")
+            body["inherit"] = inherit
 
         async with self._session.put(
             url, headers=self._get_headers(), json=body
@@ -1631,6 +1679,45 @@ class Meshagent:
             await self._raise_for_status(resp)
             return await resp.json()
 
+    async def search_sysadmin_users(
+        self,
+        *,
+        filter: str | None = None,
+        page_size: int = 100,
+        continuation_token: str | None = None,
+    ) -> UserProfilesPage:
+        params = {"page_size": str(page_size)}
+        if filter is not None:
+            params["filter"] = filter
+        if continuation_token is not None:
+            params["continuation_token"] = continuation_token
+        async with self._session.get(
+            f"{self.base_url}/accounts/sysadmin/users",
+            headers=self._get_headers(),
+            params=params,
+        ) as resp:
+            await self._raise_for_status(resp)
+            return UserProfilesPage.model_validate(await resp.json())
+
+    async def get_sysadmin_user_profile(self, user_id: str) -> User:
+        async with self._session.get(
+            f"{self.base_url}/accounts/sysadmin/users/{quote(user_id, safe='')}",
+            headers=self._get_headers(),
+        ) as resp:
+            await self._raise_for_status(resp)
+            return User.model_validate(await resp.json())
+
+    async def update_sysadmin_user_profile(
+        self, user_id: str, *, update: UpdateUserProfileRequest
+    ) -> dict[str, Any]:
+        async with self._session.put(
+            f"{self.base_url}/accounts/sysadmin/users/{quote(user_id, safe='')}",
+            headers=self._get_headers(),
+            json=update.model_dump(mode="json", exclude_unset=True),
+        ) as resp:
+            await self._raise_for_status(resp)
+            return await resp.json()
+
     async def list_projects(self) -> ProjectsPage:
         """
         Corresponds to: GET /accounts/projects

{meshagent_api-0.53.0 → meshagent_api-0.53.2}/meshagent/api/client_test.py

@@ -2764,7 +2764,7 @@ async def test_update_user_profile_supports_partial_metadata_and_editor_context(
         ("put", "http://example.test/accounts/profiles/me", {"metadata": {}}),
         (
             "put",
-            "http://example.test/accounts/profiles/user-2?project_id=project-1",
+            "http://example.test/accounts/projects/project-1/users/user-2/profile",
             {
                 "first_name": "Grace",
                 "last_name": "Hopper",
@@ -2792,3 +2792,81 @@ def test_user_profile_models_preserve_json_metadata_and_string_annotations():
     assert User(id="old-user", email="old@example.test").metadata == {}
     update = UpdateUserProfileRequest.model_validate({"metadata": {}})
     assert update.model_dump(exclude_unset=True) == {"metadata": {}}
+
+
+@pytest.mark.asyncio
+@pytest.mark.parametrize("view", ["project", "user", "merged"])
+async def test_project_profile_reads_use_project_endpoint_and_preserve_raw_fields(view):
+    payload = {
+        "id": "user-1",
+        "email": "a@example.test",
+        "first_name": None,
+        "metadata": {"local": True},
+    }
+    session = _FakeSession([_FakeResponse(status=200, payload=payload)])
+    client = Meshagent(base_url="http://example.test", token="token", session=session)
+    assert (
+        await client.get_user_profile("user-1", project_id="project-1", view=view)
+        == payload
+    )
+    assert session.calls == [
+        (
+            "get",
+            "http://example.test/accounts/projects/project-1/users/user-1/profile",
+            {"view": view},
+        )
+    ]
+
+
+@pytest.mark.asyncio
+async def test_project_profile_inheritance_and_global_sysadmin_routes():
+    from meshagent.api.client import UpdateUserProfileRequest
+
+    session = _FakeSession(
+        [
+            _FakeResponse(status=200, payload={"ok": True}),
+            _FakeResponse(
+                status=200, payload={"users": [], "continuation_token": None}
+            ),
+            _FakeResponse(status=200, payload={"ok": True}),
+        ]
+    )
+    client = Meshagent(base_url="http://example.test", token="token", session=session)
+    await client.update_user_profile(
+        "me", project_id="project-1", inherit=["first_name", "metadata"]
+    )
+    await client.search_sysadmin_users(filter="Ada", page_size=10)
+    await client.update_sysadmin_user_profile(
+        "user-1", update=UpdateUserProfileRequest(annotations={})
+    )
+    assert session.calls == [
+        (
+            "put",
+            "http://example.test/accounts/projects/project-1/users/me/profile",
+            {"inherit": ["first_name", "metadata"]},
+        ),
+        (
+            "get",
+            "http://example.test/accounts/sysadmin/users",
+            {"page_size": "10", "filter": "Ada"},
+        ),
+        (
+            "put",
+            "http://example.test/accounts/sysadmin/users/user-1",
+            {"annotations": {}},
+        ),
+    ]
+    with pytest.raises(ValueError):
+        await client.get_user_profile("me", view="project")
+    with pytest.raises(ValueError):
+        await client.update_user_profile("me", inherit=["metadata"])
+
+
+@pytest.mark.asyncio
+async def test_sysadmin_profile_access_denials_are_raised():
+    from meshagent.api.client import PermissionDeniedError
+
+    session = _FakeSession([_FakeResponse(status=403, payload={"error": "forbidden"})])
+    client = Meshagent(base_url="http://example.test", token="token", session=session)
+    with pytest.raises(PermissionDeniedError):
+        await client.get_sysadmin_user_profile("user-1")

meshagent_api-0.53.2/meshagent/api/version.py

@@ -0,0 +1 @@
+__version__ = "0.53.2"

{meshagent_api-0.53.0 → meshagent_api-0.53.2/meshagent_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshagent-api
-Version: 0.53.0
+Version: 0.53.2
 Summary: Python Server API for Meshagent
 License-Expression: Apache-2.0
 Project-URL: Documentation, https://docs.meshagent.com

meshagent_api-0.53.0/meshagent/api/version.py

@@ -1 +0,0 @@
-__version__ = "0.53.0"