Fixed the project to ensure that it works with the ConnectRPC changes

Author: mridang

spec/auth/using_access_token_spec.py

@@ -47,7 +47,7 @@ def test_retrieves_general_settings_with_valid_token(
             base_url,
             auth_token,
         )
-        client.settings.settings_service_get_general_settings()
+        client.settings.get_general_settings(body={})
 
     def test_raises_api_exception_with_invalid_token(
         self,
@@ -59,4 +59,4 @@ def test_raises_api_exception_with_invalid_token(
             "invalid",
         )
         with pytest.raises(ZitadelError):
-            client.settings.settings_service_get_general_settings()
+            client.settings.get_general_settings(body={})

spec/auth/using_client_credentials_spec.py

@@ -58,7 +58,7 @@ def test_retrieves_general_settings_with_valid_client_credentials(
             client_id,
             client_secret,
         )
-        client.settings.settings_service_get_general_settings()
+        client.settings.get_general_settings(body={})
 
     def test_raises_api_exception_with_invalid_client_credentials(
         self,
@@ -71,4 +71,4 @@ def test_raises_api_exception_with_invalid_client_credentials(
             "invalid",
         )
         with pytest.raises(ZitadelError):
-            client.settings.settings_service_get_general_settings()
+            client.settings.get_general_settings(body={})

spec/auth/using_private_key_spec.py

@@ -47,7 +47,7 @@ def test_retrieves_general_settings_with_valid_private_key(
             base_url,
             key_file,
         )
-        client.settings.settings_service_get_general_settings()
+        client.settings.get_general_settings(body={})
 
     def test_raises_api_exception_with_invalid_private_key(
         self,
@@ -59,4 +59,4 @@ def test_raises_api_exception_with_invalid_private_key(
             key_file,
         )
         with pytest.raises(ZitadelError):
-            client.settings.settings_service_get_general_settings()
+            client.settings.get_general_settings(body={})

spec/check_session_service_spec.py

@@ -12,11 +12,10 @@
     SessionServiceCreateSessionRequest,
     SessionServiceCreateSessionResponse,
     SessionServiceDeleteSessionRequest,
+    SessionServiceGetSessionRequest,
     SessionServiceGetSessionResponse,
     SessionServiceListSessionsRequest,
-    SessionServiceListSessionsResponse,
     SessionServiceSetSessionRequest,
-    SessionServiceSetSessionResponse,
 )
 
 
@@ -52,15 +51,12 @@ def session(client: zitadel.Zitadel) -> Generator[SessionServiceCreateSessionRes
         checks=SessionServiceChecks(user=SessionServiceCheckUser(loginName="johndoe")),
         lifetime="18000s",
     )
-    response = client.sessions.session_service_create_session(request)
+    response = client.sessions.create_session(request)
     yield response
     # Teardown
-    delete_body = SessionServiceDeleteSessionRequest()
     try:
-        client.sessions.session_service_delete_session(
-            response.session_id if response.session_id is not None else "",
-            delete_body,
-        )
+        request2 = SessionServiceDeleteSessionRequest(sessionId=response.session_id if response.session_id is not None else "")
+        client.sessions.delete_session(request2)
     except ApiError:
         pass
 
@@ -88,9 +84,8 @@ def test_retrieves_session_details_by_id(
         session: SessionServiceCreateSessionResponse,
     ) -> None:
         """Retrieves the session details by ID."""
-        response: SessionServiceGetSessionResponse = client.sessions.session_service_get_session(
-            session.session_id if session.session_id is not None else ""
-        )
+        request = SessionServiceGetSessionRequest(sessionId=session.session_id if session.session_id is not None else "")
+        response: SessionServiceGetSessionResponse = client.sessions.get_session(request)
         assert response.session is not None
         assert response.session.id == session.session_id
 
@@ -101,7 +96,7 @@ def test_includes_created_session_when_listing(
     ) -> None:
         """Includes the created session when listing all sessions."""
         request = SessionServiceListSessionsRequest(queries=[])
-        response: SessionServiceListSessionsResponse = client.sessions.session_service_list_sessions(request)
+        response = client.sessions.list_sessions(request)
         assert response.sessions is not None
         assert session.session_id in [session.id for session in response.sessions]
 
@@ -111,11 +106,10 @@ def test_updates_session_lifetime_and_returns_new_token(
         session: SessionServiceCreateSessionResponse,
     ) -> None:
         """Updates the session lifetime and returns a new token."""
-        request = SessionServiceSetSessionRequest(lifetime="36000s")
-        response: SessionServiceSetSessionResponse = client.sessions.session_service_set_session(
-            session.session_id if session.session_id is not None else "",
-            request,
+        request = SessionServiceSetSessionRequest(
+            sessionId=session.session_id if session.session_id is not None else "", lifetime="36000s"
         )
+        response = client.sessions.set_session(request)
         assert isinstance(response.session_token, str)
 
     def test_raises_api_exception_for_nonexistent_session(
@@ -125,7 +119,8 @@ def test_raises_api_exception_for_nonexistent_session(
     ) -> None:
         """Raises an ApiException when retrieving a non-existent session."""
         with pytest.raises(ApiError):
-            client.sessions.session_service_get_session(
-                str(uuid.uuid4()),
-                session_token=session.session_token,
+            request = SessionServiceGetSessionRequest(
+                sessionId=str(uuid.uuid4()),
+                sessionToken=session.session_token,
             )
+            client.sessions.get_session(request)

spec/check_user_service_spec.py

@@ -5,6 +5,7 @@
 import pytest
 
 import zitadel_client as zitadel
+from zitadel_client import UserServiceGetUserByIDRequest
 from zitadel_client.exceptions import ApiError
 from zitadel_client.models import (
     UserServiceAddHumanUserRequest,
@@ -50,10 +51,10 @@ def user(client: zitadel.Zitadel) -> Generator[UserServiceAddHumanUserResponse,
         profile=UserServiceSetHumanProfile(given_name="John", family_name="Doe"),  # type: ignore[call-arg]
         email=UserServiceSetHumanEmail(email=f"johndoe{uuid.uuid4().hex}@example.com"),
     )
-    response = client.users.user_service_add_human_user(request)
+    response = client.users.add_human_user(request)
     yield response
     try:
-        client.users.user_service_delete_user(response.user_id)  # type: ignore[arg-type]
+        client.users.delete_user(response.user_id)  # type: ignore[arg-type]
     except ApiError:
         pass
 
@@ -81,7 +82,10 @@ def test_retrieves_user_details_by_id(
         user: UserServiceAddHumanUserResponse,
     ) -> None:
         """Retrieves the user details by ID."""
-        response: UserServiceGetUserByIDResponse = client.users.user_service_get_user_by_id(user.user_id)  # type: ignore[arg-type]
+        request = UserServiceGetUserByIDRequest(
+            userId=user.user_id,  # type: ignore[arg-type]
+        )
+        response: UserServiceGetUserByIDResponse = client.users.get_user_by_id(request)
         assert response.user.user_id == user.user_id  # type: ignore[union-attr]
 
     def test_includes_created_user_when_listing(
@@ -91,7 +95,7 @@ def test_includes_created_user_when_listing(
     ) -> None:
         """Includes the created user when listing all users."""
         request = UserServiceListUsersRequest(queries=[])
-        response = client.users.user_service_list_users(request)
+        response = client.users.list_users(request)
         ids = [u.user_id for u in response.result]  # type: ignore
         assert user.user_id in ids
 
@@ -101,11 +105,11 @@ def test_updates_user_email_and_reflects_in_get(
         user: UserServiceAddHumanUserResponse,
     ) -> None:
         """Updates the user's email and verifies the change."""
-        client.users.user_service_update_human_user(
-            user.user_id,  # type: ignore[arg-type]
-            UserServiceUpdateHumanUserRequest(email=UserServiceSetHumanEmail(email=f"updated{uuid.uuid4().hex}@example.com")),
+        request = UserServiceUpdateHumanUserRequest(
+            userId=user.user_id, email=UserServiceSetHumanEmail(email=f"updated{uuid.uuid4().hex}@example.com")
         )
-        response = client.users.user_service_get_user_by_id(user.user_id)  # type: ignore[arg-type]
+        client.users.update_human_user(request)
+        response = client.users.get_user_by_id(user.user_id)  # type: ignore[arg-type]
         assert "updated" in response.user.human.email.email  # type: ignore
 
     def test_raises_api_exception_for_nonexistent_user(
@@ -114,4 +118,7 @@ def test_raises_api_exception_for_nonexistent_user(
     ) -> None:
         """Raises an ApiException when retrieving a non-existent user."""
         with pytest.raises(ApiError):
-            client.users.user_service_get_user_by_id(str(uuid.uuid4()))
+            request = UserServiceGetUserByIDRequest(
+                userId=str(uuid.uuid4()),
+            )
+            client.users.get_user_by_id(request)

zitadel_client/zitadel.py

@@ -1,7 +1,7 @@
 from types import TracebackType
 from typing import Callable, Optional, Type, TypeVar
 
-from zitadel_client.api import ActionServiceApi, SAMLServiceApi, WebKeyServiceApi
+from zitadel_client.api import BetaActionServiceApi, SAMLServiceApi, BetaWebKeyServiceApi
 from zitadel_client.api.feature_service_api import FeatureServiceApi
 from zitadel_client.api.identity_provider_service_api import IdentityProviderServiceApi
 from zitadel_client.api.oidc_service_api import OIDCServiceApi
@@ -63,7 +63,7 @@ def __init__(
             mutate_config(self.configuration)
 
         client = ApiClient(configuration=self.configuration)
-        self.actions = ActionServiceApi(client)
+        self.actions = BetaActionServiceApi(client)
         self.features = FeatureServiceApi(client)
         self.idps = IdentityProviderServiceApi(client)
         self.oidc = OIDCServiceApi(client)
@@ -73,7 +73,7 @@ def __init__(
         self.settings = SettingsServiceApi(client)
         self.users = UserServiceApi(client)
         self.users = UserServiceApi(client)
-        self.webkeys = WebKeyServiceApi(client)
+        self.webkeys = BetaWebKeyServiceApi(client)
 
     T = TypeVar("T", bound="Zitadel")