feat: adds client dependency injection to model (#8)

* feat: adds dependency client injection

* style: Improves code readability with black

Author: becelot

hostingde/hostingde.py

@@ -55,7 +55,7 @@ def _request(self, url: str, model: Optional[Model] = None, **kwargs: dict) -> R
             if error_check.get('status', 'error') == 'error':
                 raise ApiException(error_check)
         except json.decoder.JSONDecodeError:
-            raise ClientException('Error while reading response from server. ' 'Is your endpoint configured correctly?')
+            raise ClientException('Error while reading response from server. Is your endpoint configured correctly?')
 
         return response
 

hostingde/model/__init__.py

@@ -1,7 +1,7 @@
 from typing import Any, Optional, Type, TypeVar
 
 import marshmallow_dataclass
-from marshmallow import post_dump, Schema
+from marshmallow import post_dump, post_load, Schema
 from marshmallow.fields import Field
 
 import hostingde
@@ -26,6 +26,11 @@ def on_bind_field(self, field_name: str, field_obj: Field) -> None:
         """Use lower-camel-casing as external representation"""
         field_obj.data_key = camelcase(field_obj.data_key or field_name)
 
+    @post_load
+    def post_load(self, data: Any, **kwargs: Any) -> Any:
+        data["context"] = self.context.get('client', None)
+        return data
+
     @post_dump
     def remove_skip_values(self, data: dict, **kwargs: dict) -> dict:
         """
@@ -69,18 +74,6 @@ def __init__(self, **kwargs: Any):
         if "context" in kwargs and isinstance(kwargs["context"], hostingde.HostingDeClient):
             self.client = kwargs["context"]
 
-    def get_client(self) -> 'hostingde.HostingDeClient':
-        """
-        Get the client used to create this object.
-
-        Throws an attribute error if no client is set.
-        :return: an initialized client
-        """
-        if not self.client:
-            raise AttributeError("Context not set")
-
-        return self.client
-
     @classmethod
     def from_json(cls: Type[T], data: dict, client: 'hostingde.HostingDeClient' = None) -> T:
         """
@@ -89,7 +82,6 @@ def from_json(cls: Type[T], data: dict, client: 'hostingde.HostingDeClient' = No
         :param client: The client to use for this object
         :return: New instance of the class
         """
-        inst = marshmallow_dataclass.class_schema(cls, base_schema=CamelCaseSchema)().load(data)
-        inst.client = client
-
-        return inst
+        return marshmallow_dataclass.class_schema(cls, base_schema=CamelCaseSchema)(context={'client': client}).load(
+            data
+        )

hostingde/model/account.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Optional
+from typing import Any, Optional
 
 from hostingde.model import Model
 
@@ -17,12 +17,13 @@ class Account(Model):
     name: Optional[str]
     id: Optional[str]
 
-    def __init__(self, name: Optional[str], id: Optional[str]):
+    def __init__(self, name: Optional[str], id: Optional[str], **kwargs: Any):
         """
         The Account object a object.
         :param name: Namw of this Account
 
         :param id: ID of this Account.
         """
+        super().__init__(**kwargs)
         self.id: Optional[str] = id
         self.name: Optional[str] = name

hostingde/model/job.py

@@ -58,7 +58,7 @@ def __init__(
         :param status: The current status of the job, e.g. 'inProgress', 'successfull'
         :param kwargs:
         """
-        super().__init__()
+        super().__init__(**kwargs)
         self.account_id = account_id
         self.action = action
         self.add_date = add_date

hostingde/model/record.py

@@ -61,6 +61,7 @@ def __init__(
         ttl: Optional[int] = None,
         priority: Optional[int] = None,
         last_change_date: Optional[str] = None,
+        **kwargs: Any,
     ):
         """
         The DNS Record object is part of a zone. It is used to manage DNS resource records.
@@ -94,7 +95,7 @@ def __init__(
 
         :param last_change_date:   Date and time of last record modification
         """
-        super().__init__()
+        super().__init__(**kwargs)
         self.id = id
         self.zone_id = zone_id
         self.record_template_id = record_template_id

hostingde/model/soa_values.py

@@ -1,4 +1,5 @@
 from dataclasses import dataclass, field
+from typing import Any
 
 from hostingde.model import Model
 
@@ -19,6 +20,7 @@ def __init__(
         expire: int = 3600000,
         ttl: int = 172800,
         negative_ttl: int = 3600,
+        **kwargs: Any
     ):
         """
         The SOA values object contains the time (seconds) used in a zone's SOA record. The maximum number of seconds is
@@ -31,7 +33,7 @@ def __init__(
         :param ttl: TTL for the SOA record. Default: 172800, minimum: 60.
         :param negative_ttl: Negative TTL for the SOA record. Default: 3600, minimum: 60.
         """
-        super().__init__()
+        super().__init__(**kwargs)
         self.refresh: int = refresh
         self.retry: int = retry
         self.expire: int = expire

hostingde/model/sort.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
 from enum import Enum
+from typing import Any
 
 from marshmallow_enum import EnumField
 
@@ -20,13 +21,13 @@ class SortConfiguration(Model):
     field: str
     order: SortOrder = EnumField(SortOrder)
 
-    def __init__(self, field: str, order: SortOrder):
+    def __init__(self, field: str, order: SortOrder, **kwargs: Any):
         """
         The field you want to order on.
 
         :param field: The field name
         :param order: The ordering of the results. Either 'ASC' or 'DESC'
         """
-        super().__init__()
+        super().__init__(**kwargs)
         self.field: str = field
         self.order: SortOrder = order

hostingde/model/zone.py

@@ -1,6 +1,8 @@
-from dataclasses import dataclass, field
+from dataclasses import field
 from typing import List
 
+from marshmallow_dataclass import dataclass
+
 from hostingde.model import Model
 from hostingde.model.record import Record
 from hostingde.model.zone_config import ZoneConfig
@@ -15,5 +17,8 @@ class Zone(Model):
     zone_config: ZoneConfig
     records: List[Record] = field(default_factory=list)
 
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
     def __str__(self):
         return f"Name: {self.zone_config.name}; Type: {self.zone_config.type.value}; Status: {self.zone_config.status}"

hostingde/model/zone_config.py

@@ -124,7 +124,7 @@ def __init__(
         :param soa_values: Values for the SOA record of the zone. If it is left empty an SOA record with default values
                            will be created.
         """
-        super().__init__()
+        super().__init__(**kwargs)
         self.id: Optional[str] = id
         self.account_id: Optional[str] = account_id
         self.status: Optional[str] = status