Revert "Fixed mypy using facade pattern on adapters level"

This reverts commit 2563ffc.

Author: IgorChvyrov-sm

src/conductor/asyncio_client/adapters/api/group_resource_api.py

@@ -4,24 +4,15 @@
 
 from pydantic import Field, StrictFloat, StrictInt, StrictStr
 
-from conductor.asyncio_client.adapters.models.granted_access_response_adapter import (
-    GrantedAccessResponseAdapter,
-)
 from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter
 from conductor.asyncio_client.adapters.models.upsert_group_request_adapter import (
     UpsertGroupRequestAdapter,
 )
 from conductor.asyncio_client.http.api import GroupResourceApi
-from conductor.asyncio_client.adapters.utils import convert_list_to_adapter, convert_to_adapter
-
 
-class GroupResourceApiAdapter:
-    """Adapter for GroupResourceApi that converts between generated models and adapters."""
 
-    def __init__(self, api_client):
-        self._api = GroupResourceApi(api_client)
-
-    async def list_groups(
+class GroupResourceApiAdapter(GroupResourceApi):
+    async def list_groups(  # type: ignore[override]
         self,
         _request_timeout: Union[
             None,
@@ -33,15 +24,14 @@ async def list_groups(
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> List[GroupAdapter]:
-        """List all groups, returning GroupAdapter instances."""
-        result = await self._api.list_groups(
+        result = await super().list_groups(
             _request_timeout=_request_timeout,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
             _host_index=_host_index,
         )
-        return convert_list_to_adapter(result, GroupAdapter)
+        return result  # type: ignore[return-value]
 
     async def get_group(
         self,
@@ -56,21 +46,20 @@ async def get_group(
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> GroupAdapter:
-        """Get a group by ID, returning a GroupAdapter instance."""
-        result = await self._api.get_group(
+        result = await super().get_group(
             id,
             _request_timeout=_request_timeout,
             _request_auth=_request_auth,
             _content_type=_content_type,
             _headers=_headers,
             _host_index=_host_index,
         )
-        return convert_to_adapter(result, GroupAdapter)
+        return result  # type: ignore[return-value]
 
     async def upsert_group(
         self,
         id: StrictStr,
-        upsert_group_request: UpsertGroupRequestAdapter,
+        upsert_group_request: UpsertGroupRequestAdapter,  # type: ignore[override]
         _request_timeout: Union[
             None,
             Annotated[StrictFloat, Field(gt=0)],
@@ -81,8 +70,7 @@ async def upsert_group(
         _headers: Optional[Dict[StrictStr, Any]] = None,
         _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
     ) -> GroupAdapter:
-        """Create or update a group, returning a GroupAdapter instance."""
-        result = await self._api.upsert_group(
+        result = await super().upsert_group(
             id,
             upsert_group_request,
             _request_timeout=_request_timeout,
@@ -91,174 +79,5 @@ async def upsert_group(
             _headers=_headers,
             _host_index=_host_index,
         )
-        return convert_to_adapter(result, GroupAdapter)
-
-    async def delete_group(
-        self,
-        id: StrictStr,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]],
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> None:
-        """Delete a group by ID."""
-        await self._api.delete_group(
-            id,
-            _request_timeout=_request_timeout,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index,
-        )
 
-    async def add_user_to_group(
-        self,
-        group_id: StrictStr,
-        user_id: StrictStr,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]],
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> object:
-        """Add a user to a group."""
-        return await self._api.add_user_to_group(
-            group_id,
-            user_id,
-            _request_timeout=_request_timeout,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index,
-        )
-
-    async def remove_user_from_group(
-        self,
-        group_id: StrictStr,
-        user_id: StrictStr,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]],
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> object:
-        """Remove a user from a group."""
-        return await self._api.remove_user_from_group(
-            group_id,
-            user_id,
-            _request_timeout=_request_timeout,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index,
-        )
-
-    async def add_users_to_group(
-        self,
-        group_id: StrictStr,
-        request_body: List[StrictStr],
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]],
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> None:
-        """Add multiple users to a group."""
-        await self._api.add_users_to_group(
-            group_id,
-            request_body,
-            _request_timeout=_request_timeout,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index,
-        )
-
-    async def remove_users_from_group(
-        self,
-        group_id: StrictStr,
-        request_body: List[StrictStr],
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]],
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> None:
-        """Remove multiple users from a group."""
-        await self._api.remove_users_from_group(
-            group_id,
-            request_body,
-            _request_timeout=_request_timeout,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index,
-        )
-
-    async def get_users_in_group(
-        self,
-        id: StrictStr,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]],
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> object:
-        """Get users in a group."""
-        return await self._api.get_users_in_group(
-            id,
-            _request_timeout=_request_timeout,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index,
-        )
-
-    async def get_granted_permissions1(
-        self,
-        group_id: StrictStr,
-        _request_timeout: Union[
-            None,
-            Annotated[StrictFloat, Field(gt=0)],
-            Tuple[Annotated[StrictFloat, Field(gt=0)], Annotated[StrictFloat, Field(gt=0)]],
-        ] = None,
-        _request_auth: Optional[Dict[StrictStr, Any]] = None,
-        _content_type: Optional[StrictStr] = None,
-        _headers: Optional[Dict[StrictStr, Any]] = None,
-        _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0,
-    ) -> GrantedAccessResponseAdapter:
-        """Get granted permissions for a group."""
-        result = await self._api.get_granted_permissions1(
-            group_id,
-            _request_timeout=_request_timeout,
-            _request_auth=_request_auth,
-            _content_type=_content_type,
-            _headers=_headers,
-            _host_index=_host_index,
-        )
-        return convert_to_adapter(result, GrantedAccessResponseAdapter)
+        return result  # type: ignore[return-value]

src/conductor/asyncio_client/adapters/utils.py

@@ -18,9 +18,6 @@
 from conductor.asyncio_client.adapters.models.granted_access_adapter import (
     GrantedAccessAdapter as GrantedAccess,
 )
-from conductor.asyncio_client.adapters.models.granted_access_response_adapter import (
-    GrantedAccessResponseAdapter,
-)
 from conductor.asyncio_client.adapters.models.group_adapter import GroupAdapter
 from conductor.asyncio_client.adapters.models.tag_adapter import TagAdapter
 from conductor.asyncio_client.adapters.models.target_ref_adapter import (
@@ -172,7 +169,7 @@ async def get_permissions(self, entity_type: str, entity_id: str) -> object:
         """Get permissions for a specific entity (user, group, or application)"""
         return await self.authorization_api.get_permissions(type=entity_type, id=entity_id)
 
-    async def get_group_permissions(self, group_id: str) -> GrantedAccessResponseAdapter:
+    async def get_group_permissions(self, group_id: str) -> object:
         """Get permissions granted to a group"""
         return await self.group_api.get_granted_permissions1(group_id=group_id)