update classname to ApiObject or Object

Author: Pascal Wink

bunq/__init__.py

@@ -5,7 +5,7 @@
 from bunq.sdk.http.pagination import Pagination
 from bunq.sdk.json import converter
 from bunq.sdk.model.core.anchor_object_interface import AnchorObjectInterface
-from bunq.sdk.model.generated.object_ import Geolocation, ShareDetail, MonetaryAccountReference
+from bunq.sdk.model.generated.object_ import GeolocationObject, ShareDetailObject, MonetaryAccountReference
 from bunq.sdk.util.type_alias import T
 
 
@@ -37,9 +37,9 @@ def initialize_converter() -> None:
     converter.register_adapter(InstallationContext, InstallationContextAdapter)
     converter.register_adapter(ApiEnvironmentType, ApiEnvironmentTypeAdapter)
     converter.register_adapter(float, FloatAdapter)
-    converter.register_adapter(Geolocation, GeolocationAdapter)
+    converter.register_adapter(GeolocationObject, GeolocationAdapter)
     converter.register_adapter(MonetaryAccountReference, MonetaryAccountReferenceAdapter)
-    converter.register_adapter(ShareDetail, ShareDetailAdapter)
+    converter.register_adapter(ShareDetailObject, ShareDetailAdapter)
     converter.register_adapter(datetime.datetime, DateTimeAdapter)
     converter.register_adapter(Pagination, PaginationAdapter)
 

bunq/sdk/context/api_context.py

@@ -12,7 +12,7 @@
 from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.json import converter
 from bunq.sdk.model.core.payment_service_provider_credential_internal import PaymentServiceProviderCredentialInternal
-from bunq.sdk.model.generated.endpoint import UserCredentialPasswordIp, Session
+from bunq.sdk.model.generated.endpoint import UserCredentialPasswordIpApiObject, SessionApiObject
 from bunq.sdk.security import security
 
 if typing.TYPE_CHECKING:
@@ -115,7 +115,7 @@ def __initialize_installation(self) -> None:
     def __initialize_psd2_credential(self,
                                      certificate: str,
                                      private_key: str,
-                                     all_chain_certificate: List[str]) -> UserCredentialPasswordIp:
+                                     all_chain_certificate: List[str]) -> UserCredentialPasswordIpApiObject:
         session_token = self.installation_context.token
         client_key_pair = self.installation_context.private_key_client
 

bunq/sdk/context/session_context.py

@@ -6,18 +6,18 @@
 from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.model.core.bunq_model import BunqModel
 from bunq.sdk.model.core.session_token import SessionToken
-from bunq.sdk.model.generated.endpoint import UserPerson, UserCompany, UserApiKey, UserPaymentServiceProvider
+from bunq.sdk.model.generated.endpoint import UserPersonApiObject, UserCompanyApiObject, UserApiKeyApiObject, UserPaymentServiceProviderApiObject
 
 
 class SessionContext:
     """
     :type _token: str
     :type _expiry_time: datetime.datetime
     :type _user_id: int
-    :type _user_person: UserPerson|None
-    :type _user_company: UserCompany|None
-    :type _user_api_key: UserApiKey|None
-    :type _user_payment_service_provider: UserPaymentServiceProvider|None
+    :type _user_person: UserPersonApiObject|None
+    :type _user_company: UserCompanyApiObject|None
+    :type _user_api_key: UserApiKeyApiObject|None
+    :type _user_payment_service_provider: UserPaymentServiceProviderApiObject|None
     """
 
     # Error constants
@@ -37,19 +37,19 @@ def user_id(self) -> int:
         return self._user_id
 
     @property
-    def user_person(self) -> Optional[UserPerson]:
+    def user_person(self) -> Optional[UserPersonApiObject]:
         return self._user_person
 
     @property
-    def user_company(self) -> Optional[UserCompany]:
+    def user_company(self) -> Optional[UserCompanyApiObject]:
         return self._user_company
 
     @property
-    def user_api_key(self) -> Optional[UserApiKey]:
+    def user_api_key(self) -> Optional[UserApiKeyApiObject]:
         return self._user_api_key
 
     @property
-    def user_payment_service_provider(self) -> Optional[UserPaymentServiceProvider]:
+    def user_payment_service_provider(self) -> Optional[UserPaymentServiceProviderApiObject]:
         return self._user_payment_service_provider
 
     def __init__(self, token: SessionToken, expiry_time: datetime.datetime, user: BunqModel) -> None:
@@ -63,28 +63,28 @@ def __init__(self, token: SessionToken, expiry_time: datetime.datetime, user: Bu
         self.__set_user(user)
 
     def __get_user_id(self, user: BunqModel) -> int:
-        if isinstance(user, UserPerson):
+        if isinstance(user, UserPersonApiObject):
             return user.id_
 
-        if isinstance(user, UserCompany):
+        if isinstance(user, UserCompanyApiObject):
             return user.id_
 
-        if isinstance(user, UserApiKey):
+        if isinstance(user, UserApiKeyApiObject):
             return user.id_
 
-        if isinstance(user, UserPaymentServiceProvider):
+        if isinstance(user, UserPaymentServiceProviderApiObject):
             return user.id_
 
         raise BunqException(self._ERROR_UNEXPECTED_USER_INSTANCE)
 
     def __set_user(self, user: BunqModel):
-        if isinstance(user, UserPerson):
+        if isinstance(user, UserPersonApiObject):
             self._user_person = user
-        elif isinstance(user, UserCompany):
+        elif isinstance(user, UserCompanyApiObject):
             self._user_company = user
-        elif isinstance(user, UserApiKey):
+        elif isinstance(user, UserApiKeyApiObject):
             self._user_api_key = user
-        elif isinstance(user, UserPaymentServiceProvider):
+        elif isinstance(user, UserPaymentServiceProviderApiObject):
             self._user_payment_service_provider = user
         else:
             raise BunqException(self._ERROR_UNEXPECTED_USER_INSTANCE)

bunq/sdk/context/user_context.py

@@ -1,7 +1,7 @@
 from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.model.core.bunq_model import BunqModel
-from bunq.sdk.model.generated.endpoint import UserPerson, UserCompany, UserApiKey, MonetaryAccountBank, User, \
-    UserPaymentServiceProvider
+from bunq.sdk.model.generated.endpoint import UserPersonApiObject, UserCompanyApiObject, UserApiKeyApiObject, MonetaryAccountBankApiObject, UserApiObject, \
+    UserPaymentServiceProviderApiObject
 
 
 class UserContext:
@@ -21,19 +21,19 @@ def __init__(self, user_id: int, user: BunqModel) -> None:
 
     @staticmethod
     def __get_user_object() -> BunqModel:
-        return User.list().value[0].get_referenced_object()
+        return UserApiObject.list().value[0].get_referenced_object()
 
     def _set_user(self, user: BunqModel) -> None:
-        if isinstance(user, UserPerson):
+        if isinstance(user, UserPersonApiObject):
             self._user_person = user
 
-        elif isinstance(user, UserCompany):
+        elif isinstance(user, UserCompanyApiObject):
             self._user_company = user
 
-        elif isinstance(user, UserApiKey):
+        elif isinstance(user, UserApiKeyApiObject):
             self._user_api_key = user
 
-        elif isinstance(user, UserPaymentServiceProvider):
+        elif isinstance(user, UserPaymentServiceProviderApiObject):
             self._user_payment_service_provider = user
 
         else:
@@ -44,7 +44,7 @@ def init_main_monetary_account(self) -> None:
         if self._user_payment_service_provider is not None:
             return
 
-        all_monetary_account = MonetaryAccountBank.list().value
+        all_monetary_account = MonetaryAccountBankApiObject.list().value
 
         for account in all_monetary_account:
             if account.status == self._STATUS_ACTIVE:
@@ -87,17 +87,17 @@ def refresh_user_context(self) -> None:
         self.init_main_monetary_account()
 
     @property
-    def user_company(self) -> UserCompany:
+    def user_company(self) -> UserCompanyApiObject:
         return self._user_company
 
     @property
-    def user_person(self) -> UserPerson:
+    def user_person(self) -> UserPersonApiObject:
         return self._user_person
 
     @property
-    def user_api_key(self) -> UserApiKey:
+    def user_api_key(self) -> UserApiKeyApiObject:
         return self._user_api_key
 
     @property
-    def primary_monetary_account(self) -> MonetaryAccountBank:
+    def primary_monetary_account(self) -> MonetaryAccountBankApiObject:
         return self._primary_monetary_account

bunq/sdk/json/anchor_object_adapter.py

@@ -51,11 +51,21 @@ def _get_object_class(cls, class_name: str) -> BunqModel:
         if class_name in cls._override_field_map:
             class_name = cls._override_field_map[class_name]
 
+        try:
+            return getattr(endpoint, class_name + "ApiObject")
+        except AttributeError:
+            pass
+
         try:
             return getattr(endpoint, class_name)
         except AttributeError:
             pass
 
+        try:
+            return getattr(object_, class_name + "Object")
+        except AttributeError:
+            pass
+
         try:
             return getattr(object_, class_name)
         except AttributeError:

bunq/sdk/json/converter.py

@@ -248,19 +248,58 @@ def _str_to_type_from_member_module(cls,
                                         module_: ModuleType,
                                         string: str) -> Type[T]:
         """
-
         :raise: BunqException when could not find the class for the string.
         """
-
+        # Handle the case where string doesn't contain a dot
+        if cls._DELIMITER_MODULE not in string:
+            # Try direct lookup in current module
+            if hasattr(module_, string):
+                return getattr(module_, string)
+
+            # Check module type and try appropriate suffix
+            if "object_" in module_.__name__:
+                # For object_ modules, try with Object suffix
+                obj_name = string + "Object"
+                if hasattr(module_, obj_name):
+                    return getattr(module_, obj_name)
+            elif "endpoint" in module_.__name__:
+                # For endpoint modules, try with ApiObject suffix
+                api_name = string + "ApiObject"
+                if hasattr(module_, api_name):
+                    return getattr(module_, api_name)
+            else:
+                # For other modules, try ApiObject suffix as default
+                api_name = string + "ApiObject"
+                if hasattr(module_, api_name):
+                    return getattr(module_, api_name)
+
+            # If not found, fallback to legacy behavior with appropriate error
+            error_message = cls._ERROR_COULD_NOT_FIND_CLASS.format(string)
+            raise BunqException(error_message)
+
+        # Original behavior for strings with dots
         module_name_short, class_name = string.split(cls._DELIMITER_MODULE)
         members = inspect.getmembers(module_, inspect.ismodule)
 
         for name, module_member in members:
             if module_name_short == name:
-                return getattr(module_member, class_name)
+                # Try original class name first
+                if hasattr(module_member, class_name):
+                    return getattr(module_member, class_name)
+
+                # If "object_" module, try with Object suffix
+                if "object_" in module_member.__name__:
+                    obj_name = class_name + "Object"
+                    if hasattr(module_member, obj_name):
+                        return getattr(module_member, obj_name)
+
+                # If "endpoint" module, try with ApiObject suffix
+                if "endpoint" in module_member.__name__:
+                    api_name = class_name + "ApiObject"
+                    if hasattr(module_member, api_name):
+                        return getattr(module_member, api_name)
 
         error_message = cls._ERROR_COULD_NOT_FIND_CLASS.format(string)
-
         raise BunqException(error_message)
 
     @classmethod

bunq/sdk/json/geolocation_adapter.py

@@ -1,7 +1,7 @@
 from typing import Type, Dict
 
 from bunq.sdk.json import converter
-from bunq.sdk.model.generated.object_ import Geolocation
+from bunq.sdk.model.generated.object_ import GeolocationObject
 
 
 class GeolocationAdapter(converter.JsonAdapter):
@@ -27,7 +27,7 @@ def deserialize(cls,
         raise NotImplementedError()
 
     @classmethod
-    def serialize(cls, geolocation: Geolocation) -> Dict:
+    def serialize(cls, geolocation: GeolocationObject) -> Dict:
         obj = {}
 
         cls.add_if_not_none(obj, cls._FIELD_LATITUDE, geolocation.latitude)

bunq/sdk/json/installation_adapter.py

@@ -53,3 +53,7 @@ def serialize(cls, installation: Installation) -> List:
             {cls._FIELD_TOKEN: converter.serialize(installation.token)},
             {cls._FIELD_SERVER_PUBLIC_KEY: converter.serialize(installation.server_public_key)},
         ]
+
+    @classmethod
+    def can_serialize(cls) -> bool:
+        return True

bunq/sdk/json/monetary_account_reference_adapter.py

@@ -1,15 +1,15 @@
 from typing import Type, Dict
 
 from bunq.sdk.json import converter
-from bunq.sdk.model.generated.object_ import MonetaryAccountReference, LabelMonetaryAccount
+from bunq.sdk.model.generated.object_ import MonetaryAccountReference, LabelMonetaryAccountObject
 
 
 class MonetaryAccountReferenceAdapter(converter.JsonAdapter):
     @classmethod
     def deserialize(cls,
                     target_class: Type[MonetaryAccountReference],
                     obj: Dict) -> MonetaryAccountReference:
-        label_monetary_account = converter.deserialize(LabelMonetaryAccount, obj)
+        label_monetary_account = converter.deserialize(LabelMonetaryAccountObject, obj)
 
         return target_class.create_from_label_monetary_account(label_monetary_account)
 

bunq/sdk/json/session_server_adapter.py

@@ -5,7 +5,7 @@
 from bunq.sdk.model.core.id import Id
 from bunq.sdk.model.core.session_server import SessionServer
 from bunq.sdk.model.core.session_token import SessionToken
-from bunq.sdk.model.generated.endpoint import UserCompany, UserPerson, UserApiKey, UserPaymentServiceProvider
+from bunq.sdk.model.generated.endpoint import UserCompanyApiObject, UserPersonApiObject, UserApiKeyApiObject, UserPaymentServiceProviderApiObject
 
 
 class SessionServerAdapter(converter.JsonAdapter):
@@ -65,25 +65,25 @@ def deserialize(cls,
         if cls._FIELD_USER_COMPANY in user_dict_wrapped:
             session_server.__dict__[cls._ATTRIBUTE_USER_COMPANY] = \
                 converter.deserialize(
-                    UserCompany,
+                    UserCompanyApiObject,
                     user_dict_wrapped[cls._FIELD_USER_COMPANY]
                 )
         elif cls._FIELD_USER_PERSON in user_dict_wrapped:
             session_server.__dict__[cls._ATTRIBUTE_USER_PERSON] = \
                 converter.deserialize(
-                    UserPerson,
+                    UserPersonApiObject,
                     user_dict_wrapped[cls._FIELD_USER_PERSON]
                 )
         elif cls._FIELD_USER_API_KEY in user_dict_wrapped:
             session_server.__dict__[cls._ATTRIBUTE_USER_API_KEY] = \
                 converter.deserialize(
-                    UserApiKey,
+                    UserApiKeyApiObject,
                     user_dict_wrapped[cls._FIELD_USER_API_KEY]
                 )
         elif cls._FIELD_USER_PAYMENT_SERVER_PROVIDER in user_dict_wrapped:
             session_server.__dict__[cls._ATTRIBUTE_USER_PAYMENT_SERVER_PROVIDER] = \
                 converter.deserialize(
-                    UserPaymentServiceProvider,
+                    UserPaymentServiceProviderApiObject,
                     user_dict_wrapped[cls._FIELD_USER_PAYMENT_SERVER_PROVIDER]
                 )
         else: