MPT-14452 Move get from service into a mixin

Author: albertsola

mpt_api_client/http/__init__.py

@@ -1,16 +1,11 @@
 from mpt_api_client.http.async_client import AsyncHTTPClient
 from mpt_api_client.http.async_service import AsyncService
 from mpt_api_client.http.client import HTTPClient
-from mpt_api_client.http.mixins import AsyncCreateMixin, AsyncDeleteMixin, CreateMixin, DeleteMixin
 from mpt_api_client.http.service import Service
 
 __all__ = [  # noqa: WPS410
-    "AsyncCreateMixin",
-    "AsyncDeleteMixin",
     "AsyncHTTPClient",
     "AsyncService",
-    "CreateMixin",
-    "DeleteMixin",
     "HTTPClient",
     "Service",
 ]

mpt_api_client/http/async_service.py

@@ -77,20 +77,6 @@ async def iterate(self, batch_size: int = 100) -> AsyncIterator[Model]:
                 break
             offset = items_collection.meta.pagination.next_offset()
 
-    async def get(self, resource_id: str, select: list[str] | str | None = None) -> Model:
-        """Fetch a specific resource using `GET /endpoint/{resource_id}`.
-
-        Args:
-            resource_id: Resource ID.
-            select: List of fields to select.
-
-        Returns:
-            Resource object.
-        """
-        if isinstance(select, list):
-            select = ",".join(select) if select else None
-        return await self._resource_action(resource_id=resource_id, query_params={"select": select})
-
     async def _fetch_page_as_response(self, limit: int = 100, offset: int = 0) -> httpx.Response:
         """Fetch one page of resources.
 

mpt_api_client/http/mixins.py

@@ -192,3 +192,40 @@ async def download(self, resource_id: str) -> FileModel:
             resource_id, method="GET", headers={"Accept": "*"}
         )
         return FileModel(response)
+
+
+class GetMixin[Model]:
+    """Get resource mixin."""
+
+    def get(self, resource_id: str, select: list[str] | str | None = None) -> Model:
+        """Fetch a specific resource using `GET /endpoint/{resource_id}`.
+
+        Args:
+            resource_id: Resource ID.
+            select: List of fields to select.
+
+        Returns:
+            Resource object.
+        """
+        if isinstance(select, list):
+            select = ",".join(select) if select else None
+
+        return self._resource_action(resource_id=resource_id, query_params={"select": select})  # type: ignore[attr-defined, no-any-return]
+
+
+class AsyncGetMixin[Model]:
+    """Async get resource mixin."""
+
+    async def get(self, resource_id: str, select: list[str] | str | None = None) -> Model:
+        """Fetch a specific resource using `GET /endpoint/{resource_id}`.
+
+        Args:
+            resource_id: Resource ID.
+            select: List of fields to select.
+
+        Returns:
+            Resource object.
+        """
+        if isinstance(select, list):
+            select = ",".join(select) if select else None
+        return await self._resource_action(resource_id=resource_id, query_params={"select": select})  # type: ignore[attr-defined, no-any-return]

mpt_api_client/http/service.py

@@ -76,21 +76,6 @@ def iterate(self, batch_size: int = 100) -> Iterator[Model]:
                 break
             offset = items_collection.meta.pagination.next_offset()
 
-    def get(self, resource_id: str, select: list[str] | str | None = None) -> Model:
-        """Fetch a specific resource using `GET /endpoint/{resource_id}`.
-
-        Args:
-            resource_id: Resource ID.
-            select: List of fields to select.
-
-        Returns:
-            Resource object.
-        """
-        if isinstance(select, list):
-            select = ",".join(select) if select else None
-
-        return self._resource_action(resource_id=resource_id, query_params={"select": select})
-
     def _fetch_page_as_response(self, limit: int = 100, offset: int = 0) -> httpx.Response:
         """Fetch one page of resources.
 

mpt_api_client/resources/accounts/account.py

@@ -1,8 +1,10 @@
 from mpt_api_client.http import AsyncService, Service
 from mpt_api_client.http.mixins import (
     AsyncCreateMixin,
+    AsyncGetMixin,
     AsyncUpdateMixin,
     CreateMixin,
+    GetMixin,
     UpdateMixin,
 )
 from mpt_api_client.models import Model
@@ -38,6 +40,7 @@ class AccountsService(
     ActivatableMixin[Account],
     EnablableMixin[Account],
     ValidateMixin[Account],
+    GetMixin[Account],
     Service[Account],
     AccountsServiceConfig,
 ):
@@ -56,6 +59,7 @@ class AsyncAccountsService(
     AsyncActivatableMixin[Account],
     AsyncEnablableMixin[Account],
     AsyncValidateMixin[Account],
+    AsyncGetMixin[Account],
     AsyncService[Account],
     AccountsServiceConfig,
 ):

mpt_api_client/resources/accounts/account_user_groups.py

@@ -2,9 +2,11 @@
 from mpt_api_client.http.mixins import (
     AsyncCreateMixin,
     AsyncDeleteMixin,
+    AsyncGetMixin,
     AsyncUpdateMixin,
     CreateMixin,
     DeleteMixin,
+    GetMixin,
     UpdateMixin,
 )
 from mpt_api_client.models import Model
@@ -26,6 +28,7 @@ class AccountUserGroupsService(
     CreateMixin[AccountUserGroup],
     DeleteMixin,
     UpdateMixin[AccountUserGroup],
+    GetMixin[AccountUserGroup],
     Service[AccountUserGroup],
     AccountUserGroupsServiceConfig,
 ):
@@ -36,6 +39,7 @@ class AsyncAccountUserGroupsService(
     AsyncCreateMixin[AccountUserGroup],
     AsyncDeleteMixin,
     AsyncUpdateMixin[AccountUserGroup],
+    AsyncGetMixin[AccountUserGroup],
     AsyncService[AccountUserGroup],
     AccountUserGroupsServiceConfig,
 ):

mpt_api_client/resources/accounts/account_users.py

@@ -1,7 +1,9 @@
 from mpt_api_client.http import AsyncService, Service
 from mpt_api_client.http.mixins import (
     AsyncCreateMixin,
+    AsyncGetMixin,
     CreateMixin,
+    GetMixin,
 )
 from mpt_api_client.models import Model
 from mpt_api_client.resources.accounts.account_user_groups import (
@@ -29,6 +31,7 @@ class AccountUsersServiceConfig:
 class AccountUsersService(
     CreateMixin[AccountUser],
     InvitableMixin[AccountUser],
+    GetMixin[AccountUser],
     Service[AccountUser],
     AccountUsersServiceConfig,
 ):
@@ -44,8 +47,9 @@ def groups(self, account_user_id: str) -> AccountUserGroupsService:
 
 class AsyncAccountUsersService(
     AsyncCreateMixin[AccountUser],
-    AsyncService[AccountUser],
     AsyncInvitableMixin[AccountUser],
+    AsyncGetMixin[AccountUser],
+    AsyncService[AccountUser],
     AccountUsersServiceConfig,
 ):
     """Asynchronous Account Users Service."""

mpt_api_client/resources/accounts/accounts_user_groups.py

@@ -2,9 +2,11 @@
 from mpt_api_client.http.mixins import (
     AsyncCreateMixin,
     AsyncDeleteMixin,
+    AsyncGetMixin,
     AsyncUpdateMixin,
     CreateMixin,
     DeleteMixin,
+    GetMixin,
     UpdateMixin,
 )
 from mpt_api_client.models import Model
@@ -25,6 +27,7 @@ class AccountsUserGroupsServiceConfig:
 class AccountsUserGroupsService(
     UpdateMixin[AccountsUserGroup],
     DeleteMixin,
+    GetMixin[AccountsUserGroup],
     CreateMixin[AccountsUserGroup],
     Service[AccountsUserGroup],
     AccountsUserGroupsServiceConfig,
@@ -35,6 +38,7 @@ class AccountsUserGroupsService(
 class AsyncAccountsUserGroupsService(
     AsyncUpdateMixin[AccountsUserGroup],
     AsyncDeleteMixin,
+    AsyncGetMixin[AccountsUserGroup],
     AsyncCreateMixin[AccountsUserGroup],
     AsyncService[AccountsUserGroup],
     AccountsUserGroupsServiceConfig,

mpt_api_client/resources/accounts/accounts_users.py

@@ -2,9 +2,11 @@
 from mpt_api_client.http.mixins import (
     AsyncCreateMixin,
     AsyncDeleteMixin,
+    AsyncGetMixin,
     AsyncUpdateMixin,
     CreateMixin,
     DeleteMixin,
+    GetMixin,
     UpdateMixin,
 )
 from mpt_api_client.models import Model
@@ -35,6 +37,7 @@ class AccountsUsersService(
     DeleteMixin,
     CreateMixin[AccountsUser],
     InvitableMixin[AccountsUser],
+    GetMixin[AccountsUser],
     Service[AccountsUser],
     AccountsUsersServiceConfig,
 ):
@@ -55,8 +58,9 @@ class AsyncAccountsUsersService(
     AsyncUpdateMixin[AccountsUser],
     AsyncDeleteMixin,
     AsyncCreateMixin[AccountsUser],
-    AsyncService[AccountsUser],
     AsyncInvitableMixin[AccountsUser],
+    AsyncGetMixin[AccountsUser],
+    AsyncService[AccountsUser],
     AccountsUsersServiceConfig,
 ):
     """Asynchronous Account Users Service."""

mpt_api_client/resources/accounts/api_tokens.py

@@ -2,9 +2,11 @@
 from mpt_api_client.http.mixins import (
     AsyncCreateMixin,
     AsyncDeleteMixin,
+    AsyncGetMixin,
     AsyncUpdateMixin,
     CreateMixin,
     DeleteMixin,
+    GetMixin,
     UpdateMixin,
 )
 from mpt_api_client.models import Model
@@ -28,6 +30,7 @@ class ApiTokensService(
     DeleteMixin,
     UpdateMixin[ApiToken],
     EnablableMixin[ApiToken],
+    GetMixin[ApiToken],
     Service[ApiToken],
     ApiTokensServiceConfig,
 ):
@@ -39,6 +42,7 @@ class AsyncApiTokensService(
     AsyncDeleteMixin,
     AsyncUpdateMixin[ApiToken],
     AsyncEnablableMixin[ApiToken],
+    AsyncGetMixin[ApiToken],
     AsyncService[ApiToken],
     ApiTokensServiceConfig,
 ):