Updated mixins for create and update in account, added an update mixin in product

Author: Robert Segal

mpt_api_client/http/mixins.py

@@ -1,4 +1,3 @@
-import json
 from collections.abc import AsyncIterator, Iterator
 from typing import Self
 from urllib.parse import urljoin
@@ -113,77 +112,6 @@ def create(
         return self._model_class.from_response(response)  # type: ignore[attr-defined, no-any-return]
 
 
-class CreateWithIconMixin[Model]:
-    """Create resource with icon mixin."""
-
-    def create(
-        self,
-        resource_data: ResourceData,
-        icon: FileTypes,
-        data_key: str,
-        icon_key: str,
-    ) -> Model:
-        """Create resource with icon.
-
-        Args:
-            resource_data: Resource data.
-            data_key: Key for the resource data.
-            icon: Icon image in jpg, png, GIF, etc.
-            icon_key: Key for the icon.
-
-        Returns:
-            Created resource.
-        """
-        files: dict[str, FileTypes] = {}
-        files[data_key] = (
-            None,
-            json.dumps(resource_data),
-            APPLICATION_JSON,
-        )
-        files[icon_key] = icon
-        response = self.http_client.request("post", self.path, files=files)  # type: ignore[attr-defined]
-
-        return self._model_class.from_response(response)  # type: ignore[attr-defined, no-any-return]
-
-
-class UpdateWithIconMixin[Model]:
-    """Update resource with icon mixin."""
-
-    def update(
-        self,
-        resource_id: str,
-        resource_data: ResourceData,
-        icon: FileTypes,
-        data_key: str,
-        icon_key: str,
-    ) -> Model:
-        """Update resource with icon.
-
-        Args:
-            resource_id: Resource ID.
-            resource_data: Resource data.
-            data_key: Key for the resource data.
-            icon: Icon image in jpg, png, GIF, etc.
-            icon_key: Key for the icon.
-
-        Returns:
-            Updated resource.
-        """
-        files: dict[str, FileTypes] = {}
-        files[data_key] = (
-            None,
-            json.dumps(resource_data),
-            APPLICATION_JSON,
-        )
-        files[icon_key] = icon
-
-        url = urljoin(f"{self.path}/", resource_id)  # type: ignore[attr-defined]
-
-        response = self.http_client.request("put", url, files=files)  # type: ignore[attr-defined]
-
-        return self._model_class.from_response(response)  # type: ignore[attr-defined, no-any-return]
-
-
 class AsyncCreateMixin[Model]:
     """Create resource mixin."""
 
@@ -286,77 +214,6 @@ async def create(
         return self._model_class.from_response(response)  # type: ignore[attr-defined, no-any-return]
 
 
-class AsyncCreateWithIconMixin[Model]:
-    """Create resource with icon mixin."""
-
-    async def create(
-        self,
-        resource_data: ResourceData,
-        icon: FileTypes,
-        data_key: str,
-        icon_key: str,
-    ) -> Model:
-        """Create resource with icon.
-
-        Args:
-            resource_data: Resource data.
-            data_key: Key for the resource data.
-            icon: Icon image in jpg, png, GIF, etc.
-            icon_key: Key for the icon.
-
-        Returns:
-            Created resource.
-        """
-        files: dict[str, FileTypes] = {}
-        files[data_key] = (
-            None,
-            json.dumps(resource_data),
-            APPLICATION_JSON,
-        )
-        files[icon_key] = icon
-        response = await self.http_client.request("post", self.path, files=files)  # type: ignore[attr-defined]
-
-        return self._model_class.from_response(response)  # type: ignore[attr-defined, no-any-return]
-
-
-class AsyncUpdateWithIconMixin[Model]:
-    """Update resource with icon mixin."""
-
-    async def update(
-        self,
-        resource_id: str,
-        resource_data: ResourceData,
-        icon: FileTypes,
-        data_key: str,
-        icon_key: str,
-    ) -> Model:
-        """Update resource with icon.
-
-        Args:
-            resource_id: Resource ID.
-            resource_data: Resource data.
-            data_key: Key for the resource data.
-            icon: Icon image in jpg, png, GIF, etc.
-            icon_key: Key for the icon.
-
-        Returns:
-            Updated resource.
-        """
-        files: dict[str, FileTypes] = {}
-        files[data_key] = (
-            None,
-            json.dumps(resource_data),
-            APPLICATION_JSON,
-        )
-        files[icon_key] = icon
-
-        url = urljoin(f"{self.path}/", resource_id)  # type: ignore[attr-defined]
-
-        response = await self.http_client.request("put", url, files=files)  # type: ignore[attr-defined]
-
-        return self._model_class.from_response(response)  # type: ignore[attr-defined, no-any-return]
-
-
 class GetMixin[Model]:
     """Get resource mixin."""
 

mpt_api_client/resources/accounts/account.py

@@ -1,30 +1,18 @@
-from typing import override
-
 from mpt_api_client.http import AsyncService, Service
 from mpt_api_client.http.mixins import (
     AsyncCollectionMixin,
-    AsyncCreateWithIconMixin,
     AsyncGetMixin,
-    AsyncUpdateWithIconMixin,
     CollectionMixin,
-    CreateWithIconMixin,
     GetMixin,
-    UpdateWithIconMixin,
 )
-from mpt_api_client.http.types import FileTypes
 from mpt_api_client.models import Model
-from mpt_api_client.models.model import ResourceData
 from mpt_api_client.resources.accounts.accounts_users import (
     AccountsUsersService,
     AsyncAccountsUsersService,
 )
 from mpt_api_client.resources.accounts.mixins import (
-    ActivatableMixin,
-    AsyncActivatableMixin,
-    AsyncEnablableMixin,
-    AsyncValidateMixin,
-    EnablableMixin,
-    ValidateMixin,
+    AccountMixin,
+    AsyncAccountMixin,
 )
 
 
@@ -38,78 +26,19 @@ class AccountsServiceConfig:
     _endpoint = "/public/v1/accounts/accounts"
     _model_class = Account
     _collection_key = "data"
+    _upload_file_key = "logo"
+    _upload_data_key = "account"
 
 
 class AccountsService(
-    CreateWithIconMixin[Account],
-    UpdateWithIconMixin[Account],
-    ActivatableMixin[Account],
-    EnablableMixin[Account],
-    ValidateMixin[Account],
+    AccountMixin[Account],
     GetMixin[Account],
     CollectionMixin[Account],
     Service[Account],
     AccountsServiceConfig,
 ):
     """Accounts service."""
 
-    @override
-    def create(
-        self,
-        resource_data: ResourceData,
-        logo: FileTypes,
-        data_key: str = "account",
-        icon_key: str = "logo",
-    ) -> Account:
-        """
-        Create a new account with logo.
-
-        Args:
-            resource_data (ResourceData): Account data.
-            logo: Logo image in jpg, png, GIF, etc.
-            data_key: Key for the account data.
-            icon_key: Key for the logo.
-
-        Returns:
-            Account: The created account.
-        """
-        return super().create(
-            resource_data=resource_data,
-            icon=logo,
-            data_key=data_key,
-            icon_key=icon_key,
-        )
-
-    @override
-    def update(
-        self,
-        resource_id: str,
-        resource_data: ResourceData,
-        logo: FileTypes,
-        data_key: str = "account",
-        icon_key: str = "logo",
-    ) -> Account:
-        """
-        Update an existing account with logo.
-
-        Args:
-            resource_id (str): The ID of the account to update.
-            resource_data (ResourceData): Account data.
-            logo: Logo image in jpg, png, GIF, etc.
-            data_key: Key for the account data.
-            icon_key: Key for the logo.
-
-        Returns:
-            Account: The updated account.
-        """
-        return super().update(
-            resource_id=resource_id,
-            resource_data=resource_data,
-            icon=logo,
-            data_key=data_key,
-            icon_key=icon_key,
-        )
-
     def users(self, account_id: str) -> AccountsUsersService:
         """Return account users service."""
         return AccountsUsersService(
@@ -118,75 +47,14 @@ def users(self, account_id: str) -> AccountsUsersService:
 
 
 class AsyncAccountsService(
-    AsyncCreateWithIconMixin[Account],
-    AsyncUpdateWithIconMixin[Account],
-    AsyncActivatableMixin[Account],
-    AsyncEnablableMixin[Account],
-    AsyncValidateMixin[Account],
+    AsyncAccountMixin[Account],
     AsyncGetMixin[Account],
     AsyncCollectionMixin[Account],
     AsyncService[Account],
     AccountsServiceConfig,
 ):
     """Async Accounts service."""
 
-    @override
-    async def create(
-        self,
-        resource_data: ResourceData,
-        logo: FileTypes,
-        data_key: str = "account",
-        icon_key: str = "logo",
-    ) -> Account:
-        """
-        Create a new account with logo.
-
-        Args:
-            resource_data (ResourceData): Account data.
-            logo: Logo image in jpg, png, GIF, etc.
-            data_key: Key for the account data.
-            icon_key: Key for the logo.
-
-        Returns:
-            Account: The created account.
-        """
-        return await super().create(
-            resource_data=resource_data,
-            icon=logo,
-            data_key=data_key,
-            icon_key=icon_key,
-        )
-
-    @override
-    async def update(
-        self,
-        resource_id: str,
-        resource_data: ResourceData,
-        logo: FileTypes,
-        data_key: str = "account",
-        icon_key: str = "logo",
-    ) -> Account:
-        """
-        Update an existing account with logo.
-
-        Args:
-            resource_id (str): The ID of the account to update.
-            resource_data (ResourceData): Account data.
-            logo: Logo image in jpg, png, GIF, etc.
-            data_key: Key for the account data.
-            icon_key: Key for the logo.
-
-        Returns:
-            Account: The updated account.
-        """
-        return await super().update(
-            resource_id=resource_id,
-            resource_data=resource_data,
-            icon=logo,
-            data_key=data_key,
-            icon_key=icon_key,
-        )
-
     def users(self, account_id: str) -> AsyncAccountsUsersService:
         """Return account users service."""
         return AsyncAccountsUsersService(