Updated the python SDK core models to match that of the other SDKs. Also fixed some of the Tinker related imports.

Author: angelomelonas

bunq/__init__.py

@@ -1,5 +1,6 @@
 from bunq.sdk.http.pagination import Pagination
 from bunq.sdk.json import converter
+from bunq.sdk.model.core.anchored_object_interface import AnchoredObjectInterface
 
 
 def initialize_converter():
@@ -12,15 +13,16 @@ def initialize_converter():
 
     from bunq.sdk.http import api_client
     from bunq.sdk.context import api_context
-    from bunq.sdk.model import core
     from bunq.sdk.json import adapters
     from bunq.sdk.json import converter
     from bunq.sdk.model.generated import object_
     from bunq.sdk.model.generated import endpoint
+    from bunq.sdk.model.core.installation import Installation
+    from bunq.sdk.model.core.session_server import SessionServer
 
-    converter.register_adapter(core.Installation, adapters.InstallationAdapter)
+    converter.register_adapter(Installation, adapters.InstallationAdapter)
     converter.register_adapter(
-        core.SessionServer,
+        SessionServer,
         adapters.SessionServerAdapter
     )
     converter.register_adapter(
@@ -41,10 +43,10 @@ def initialize_converter():
     converter.register_adapter(datetime.datetime, adapters.DateTimeAdapter)
     converter.register_adapter(Pagination, adapters.PaginationAdapter)
 
-    def register_anchor_adapter(class_to_regsiter):
-        if issubclass(class_to_regsiter, core.AnchoredObjectInterface):
+    def register_anchor_adapter(class_to_register):
+        if issubclass(class_to_register, AnchoredObjectInterface):
             converter.register_adapter(
-                class_to_regsiter,
+                class_to_register,
                 adapters.AnchoredObjectModelAdapter
             )
 

bunq/sdk/context/api_context.py

@@ -7,7 +7,6 @@
 from bunq.sdk.context.session_context import SessionContext
 from bunq.sdk.exception.bunq_exception import BunqException
 from bunq.sdk.json import converter
-from bunq.sdk.model import core
 from bunq.sdk.model.generated import endpoint
 from bunq.sdk.security import security
 
@@ -72,7 +71,8 @@ def _initialize_installation(self):
         """
 
         private_key_client = security.generate_rsa_private_key()
-        installation = core.Installation.create(
+        from bunq.sdk.model.core.installation import Installation
+        installation = Installation.create(
             self,
             security.public_key_to_string(private_key_client.publickey())
         ).value
@@ -96,7 +96,7 @@ def _register_device(self, device_description,
         :rtype: None
         """
 
-        from bunq.sdk.model.device_server_internal import DeviceServerInternal
+        from bunq.sdk.model.core.device_server_internal import DeviceServerInternal
 
         DeviceServerInternal.create(
             device_description,
@@ -110,7 +110,8 @@ def _initialize_session(self):
         :rtype: None
         """
 
-        session_server = core.SessionServer.create(self).value
+        from bunq.sdk.model.core.session_server import SessionServer
+        session_server = SessionServer.create(self).value
         token = session_server.token.token
         expiry_time = self._get_expiry_timestamp(session_server)
         user_id = session_server.get_referenced_user().id_
@@ -120,7 +121,7 @@ def _initialize_session(self):
     @classmethod
     def _get_expiry_timestamp(cls, session_server):
         """
-        :type session_server: core.SessionServer
+        :type session_server: SessionServer
 
         :rtype: datetime.datetime
         """
@@ -133,7 +134,7 @@ def _get_expiry_timestamp(cls, session_server):
     @classmethod
     def _get_session_timeout_seconds(cls, session_server):
         """
-        :type session_server: core.SessionServer
+        :type session_server: SessionServer
 
         :rtype: int
         """

bunq/sdk/context/user_context.py

@@ -1,5 +1,4 @@
 from bunq.sdk.exception.bunq_exception import BunqException
-from bunq.sdk.model import core
 from bunq.sdk.model.generated import endpoint
 
 
@@ -25,7 +24,7 @@ def __init__(self, user_id):
     @staticmethod
     def __get_user_object():
         """
-        :rtype: core.BunqModel
+        :rtype: BunqModel
         """
 
         return endpoint.User.list().value[0].get_referenced_object()

bunq/sdk/json/adapters.py

@@ -1,12 +1,14 @@
 import datetime
 import urllib.parse as urlparse
 
-from bunq import Pagination
+from bunq import Pagination, AnchoredObjectInterface
 from bunq.sdk.context import api_context
 from bunq.sdk.exception.bunq_exception import BunqException
+from bunq.sdk.model.core.id import Id
+from bunq.sdk.model.core.public_key_server import PublicKeyServer
+from bunq.sdk.model.core.session_token import SessionToken
 from bunq.sdk.security import security
 from bunq.sdk.json import converter
-from bunq.sdk.model import core
 from bunq.sdk.model.generated import endpoint
 from bunq.sdk.model.generated import object_
 
@@ -24,7 +26,7 @@ class AnchoredObjectModelAdapter(converter.JsonAdapter):
     @classmethod
     def deserialize(cls, cls_target, obj_raw):
         """
-        :type cls_target: core.BunqModel
+        :type cls_target: BunqModel
         :type obj_raw: int|str|bool|float|list|dict|None
 
         :rtype: T
@@ -34,7 +36,7 @@ def deserialize(cls, cls_target, obj_raw):
 
         if isinstance(
                 model_,
-                core.AnchoredObjectInterface
+                AnchoredObjectInterface
         ) and model_.is_all_field_none():
             for field in model_.__dict__:
                 object_class = cls._get_object_class(field)
@@ -55,7 +57,7 @@ def can_serialize(cls):
     def _get_object_class(cls, class_name):
         """
         :type class_name: str
-        :rtype: core.BunqModel
+        :rtype: BunqModel
         """
 
         class_name = class_name.lstrip(cls.__STRING_FORMAT_UNDERSCORE)
@@ -95,25 +97,25 @@ class InstallationAdapter(converter.JsonAdapter):
     @classmethod
     def deserialize(cls, target_class, array):
         """
-        :type target_class: core.Installation|type
+        :type target_class: Installation|type
         :type array: list
 
-        :rtype: core.Installation
+        :rtype: Installation
         """
 
         installation = target_class.__new__(target_class)
         server_public_key_wrapped = array[cls._INDEX_SERVER_PUBLIC_KEY]
         installation.__dict__ = {
             cls._ATTRIBUTE_ID: converter.deserialize(
-                core.Id,
+                Id,
                 array[cls._INDEX_ID][cls._FIELD_ID]
             ),
             cls._ATTRIBUTE_TOKEN: converter.deserialize(
-                core.SessionToken,
+                SessionToken,
                 array[cls._INDEX_TOKEN][cls._FIELD_TOKEN]
             ),
             cls._ATTRIBUTE_SERVER_PUBLIC_KEY: converter.deserialize(
-                core.PublicKeyServer,
+                PublicKeyServer,
                 server_public_key_wrapped[cls._FIELD_SERVER_PUBLIC_KEY]
             ),
         }
@@ -123,7 +125,7 @@ def deserialize(cls, target_class, array):
     @classmethod
     def serialize(cls, installation):
         """
-        :type installation: core.Installation
+        :type installation: Installation
 
         :rtype: list
         """
@@ -171,20 +173,20 @@ class SessionServerAdapter(converter.JsonAdapter):
     @classmethod
     def deserialize(cls, target_class, array):
         """
-        :type target_class: core.SessionServer|type
+        :type target_class: SessionServer|type
         :type array: list
 
-        :rtype: core.SessionServer
+        :rtype: SessionServer
         """
 
         session_server = target_class.__new__(target_class)
         session_server.__dict__ = {
             cls._ATTRIBUTE_ID: converter.deserialize(
-                core.Id,
+                Id,
                 array[cls._INDEX_ID][cls._FIELD_ID]
             ),
             cls._ATTRIBUTE_TOKEN: converter.deserialize(
-                core.SessionToken,
+                SessionToken,
                 array[cls._INDEX_TOKEN][cls._FIELD_TOKEN]
             ),
             cls._ATTRIBUTE_USER_COMPANY: None,
@@ -219,7 +221,7 @@ def deserialize(cls, target_class, array):
     @classmethod
     def serialize(cls, session_server):
         """
-        :type session_server: core.SessionServer
+        :type session_server: SessionServer
 
         :rtype: list
         """