⬆️ Upgrade wallet-group-id plugin and cloudcontroller (#1520)

* 🚧 Test group-id plugin changes
didx-xyz/acapy-wallet-groups-plugin#80

* 🚧 Test latest cloudcontroller
didx-xyz/aries-cloudcontroller-python#246

* 🎨 Update models

* 🚧 Test latest changes

* 🚧

* 🎨 Update model

* 🚧 Test latest cloudcontroller

* ⬆️ Use official release

* ⬆️ Use official release

* 📝 Update openapi spec

Author: ff137

app/models/tenants.py

@@ -1,7 +1,6 @@
 import re
 from typing import Dict, List, Literal, Optional
 
-from aries_cloudcontroller import CreateWalletRequest, UpdateWalletRequest
 from pydantic import BaseModel, Field, field_validator
 
 from shared.exceptions import CloudApiValueError
@@ -49,10 +48,6 @@
 )
 
 
-class CreateWalletRequestWithGroups(CreateWalletRequest):
-    group_id: Optional[str] = group_id_field
-
-
 class CreateTenantRequest(BaseModel):
     wallet_label: str = Field(
         ..., description=label_description, examples=label_examples
@@ -140,12 +135,6 @@ def validate_wallet_label(cls, v):
         return v
 
 
-class UpdateWalletRequestWithGroupId(UpdateWalletRequest):
-    """Adds group_id to the default UpdateWalletRequest body"""
-
-    group_id: Optional[str] = Field(default=None, examples=["some_group_id"])
-
-
 class Tenant(BaseModel):
     wallet_id: str = Field(..., examples=["545135a4-ecbc-4400-8594-bdb74c51c88d"])
     wallet_label: str = Field(..., examples=["Alice"])

app/routes/admin/tenants.py

@@ -2,7 +2,10 @@
 from typing import List, Optional
 
 import base58
-from aries_cloudcontroller import CreateWalletTokenRequest
+from aries_cloudcontroller import (
+    CreateWalletRequestWithGroupId,
+    CreateWalletTokenRequest,
+)
 from fastapi import APIRouter, Depends, HTTPException, Query
 from uuid_utils import uuid4
 
@@ -21,7 +24,6 @@
 from app.models.tenants import (
     CreateTenantRequest,
     CreateTenantResponse,
-    CreateWalletRequestWithGroups,
     Tenant,
     TenantAuth,
     UpdateTenantRequest,
@@ -155,7 +157,7 @@ async def create_tenant(
     wallet_response = None
     body_request = handle_model_with_validation(
         logger=bound_logger,
-        model_class=CreateWalletRequestWithGroups,
+        model_class=CreateWalletRequestWithGroupId,
         image_url=body.image_url,
         key_management_mode="managed",
         label=wallet_label,

app/services/onboarding/tenants.py

@@ -1,6 +1,10 @@
 from typing import List
 
-from aries_cloudcontroller import AcaPyClient, UpdateWalletRequest, WalletRecord
+from aries_cloudcontroller import (
+    AcaPyClient,
+    UpdateWalletRequestWithGroupId,
+    WalletRecordWithGroupId,
+)
 from fastapi.exceptions import HTTPException
 
 from app.dependencies.acapy_clients import (
@@ -26,7 +30,7 @@ async def handle_tenant_update(
     admin_controller: AcaPyClient,
     wallet_id: str,
     update_request: UpdateTenantRequest,
-) -> WalletRecord:
+) -> WalletRecordWithGroupId:
     bound_logger = logger.bind(body={"wallet_id": wallet_id})
     bound_logger.bind(body=update_request).debug("Handling tenant update")
 
@@ -88,7 +92,7 @@ async def handle_tenant_update(
     bound_logger.debug("Updating wallet")
     request_body = handle_model_with_validation(
         logger=bound_logger,
-        model_class=UpdateWalletRequest,
+        model_class=UpdateWalletRequestWithGroupId,
         label=new_label,
         image_url=update_request.image_url,
         extra_settings=update_request.extra_settings,

app/tests/routes/admin_tenants/test_create_tenant.py

@@ -3,14 +3,13 @@
 
 import base58
 import pytest
-from aries_cloudcontroller import CreateWalletResponse
+from aries_cloudcontroller import CreateWalletRequestWithGroupId, CreateWalletResponse
 from fastapi import HTTPException
 
 from app.dependencies.acapy_clients import TENANT_ADMIN_AUTHED
 from app.exceptions import CloudApiException, TrustRegistryException
 from app.models.tenants import (
     CreateTenantRequest,
-    CreateWalletRequestWithGroups,
     OnboardResult,
 )
 from app.routes.admin.tenants import create_tenant
@@ -60,7 +59,7 @@ async def test_create_tenant_success(roles):
 
     mock_register_actor = AsyncMock()
 
-    expected_wallet_body = CreateWalletRequestWithGroups(
+    expected_wallet_body = CreateWalletRequestWithGroupId(
         image_url=body.image_url,
         key_management_mode="managed",
         label=wallet_label,

app/util/tenants.py

@@ -3,7 +3,7 @@
 from logging import Logger
 from typing import Optional
 
-from aries_cloudcontroller import AcaPyClient, WalletRecordWithGroups
+from aries_cloudcontroller import AcaPyClient, WalletRecordWithGroupId
 from fastapi import HTTPException
 
 from app.dependencies.acapy_clients import get_tenant_admin_controller
@@ -20,7 +20,7 @@ def __init__(self, wallet_id: str) -> None:
         )
 
 
-def tenant_from_wallet_record(wallet_record: WalletRecordWithGroups) -> Tenant:
+def tenant_from_wallet_record(wallet_record: WalletRecordWithGroupId) -> Tenant:
     label: str = wallet_record.settings.get("default_label") or ""
     wallet_name: str = wallet_record.settings.get("wallet.name") or ""
     image_url: Optional[str] = wallet_record.settings.get("image_url")
@@ -64,7 +64,7 @@ async def get_wallet_and_assert_valid_group(
     wallet_id: str,
     group_id: Optional[str],
     logger: Logger,
-) -> WalletRecordWithGroups:
+) -> WalletRecordWithGroupId:
     """Fetch the wallet record for wallet_id, and assert it exists and belongs to group.
 
     Args:
@@ -77,7 +77,7 @@ async def get_wallet_and_assert_valid_group(
         HTTPException: If the wallet does not exist or does not belong to group
 
     Returns:
-        WalletRecordWithGroups: When assertions pass, returns the wallet record.
+        WalletRecordWithGroupId: When assertions pass, returns the wallet record.
     """
     logger.debug("Retrieving the wallet record for {}", wallet_id)
     wallet = await handle_acapy_call(
@@ -98,15 +98,15 @@ async def get_wallet_and_assert_valid_group(
 
 
 def assert_valid_group(
-    wallet: WalletRecordWithGroups,
+    wallet: WalletRecordWithGroupId,
     wallet_id: str,
     group_id: Optional[str],
     logger: Logger,
 ) -> None:
     """Assert that wallet record belongs to group, and raise exception if not.
 
     Args:
-        wallet (WalletRecordWithGroups): The wallet record to check.
+        wallet (WalletRecordWithGroupId): The wallet record to check.
         wallet_id (str): The wallet id for the wallet record.
         group_id (Optional[str]): The group to validate against.
         logger (Logger): A logger object.

dockerfiles/agents/Dockerfile

@@ -5,7 +5,7 @@ USER root
 # Install Google Protobuf and Plugins
 ARG PROTOBUF_VERSION=5.29.3
 RUN pip install --no-cache-dir protobuf==${PROTOBUF_VERSION} \
-  acapy-wallet-groups-plugin==1.3.0.post20250505 \
+  acapy-wallet-groups-plugin==1.3.0.post20250506 \
   git+https://github.com/didx-xyz/aries-acapy-plugins@1.3.0-20250505#subdirectory=nats_events
 
 COPY scripts/startup.sh startup.sh

docs/openapi/tenant-openapi.json

@@ -6200,7 +6200,8 @@
               "key",
               "web",
               "did:peer:2",
-              "did:peer:4"
+              "did:peer:4",
+              "cheqd"
             ],
             "title": "Method",
             "description": "Did method associated with the DID"

docs/openapi/tenant-openapi.yaml

@@ -3627,6 +3627,7 @@ components:
             - web
             - did:peer:2
             - did:peer:4
+            - cheqd
           title: Method
           description: Did method associated with the DID
         posture:

poetry.lock

@@ -27,13 +27,13 @@ uvloop = "^0.21.0"
 [tool.poetry.group.app.dependencies]
 aiohttp = "~3.11.7"
 aiocache = "~0.12.0"
-aries-cloudcontroller = "==1.3.0rc1.post20250417"
+aries-cloudcontroller = "==1.3.0.post20250506"
 base58 = "~2.1.1"
 pyjwt = "~2.10.0"
 uuid_utils = "^0.10.0"
 
 [tool.poetry.group.endorser.dependencies]
-aries-cloudcontroller = "==1.3.0rc1.post20250417"
+aries-cloudcontroller = "==1.3.0.post20250506"
 dependency-injector = "^4.46.0"
 nats-py = { extras = ["nkeys"], version = "^2.10.0" }
 tenacity = "^9.1.0"