unzer 1.0.0.dev2__tar.gz → 1.0.0.dev4__tar.gz

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unzer
-Version: 1.0.0.dev2
+Version: 1.0.0.dev4
 Summary: An unofficial python SDK for unzer.com
 Home-page: https://github.com/mausbrand/unzer-python-sdk
 Author: Sven Eberth

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/__init__.py

@@ -1,7 +1,7 @@
 __title__ = "unzer-sdk"
 __author__ = "Sven Eberth"
 __email__ = "se@mausbrand.de"
-__version__ = "1.0.0-dev2"
+__version__ = "1.0.0-dev4"
 
 from .client import UnzerClient
 from .model import *

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/client.py

@@ -1,15 +1,12 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 import logging
 import time
 from types import NoneType
 
 import requests
 from urllib3.exceptions import TimeoutError
+
 from . import __version__
 from .model import *
-from .model.abstract_paymenttype import PaymentType
 from .model.basket import Basket
 from .model.payment import PaymentGetResponse, PaymentRequest, PaymentResponse
 from .model.paymentpage import PaymentPage, PaymentPageResponse
@@ -25,10 +22,10 @@ class UnzerClient:
 
     def __init__(
             self,
-            private_key:str,
-            public_key:str,
-            sandbox:bool=False,
-            language:str="en",
+            private_key: str,
+            public_key: str,
+            sandbox: bool = False,
+            language: str = "en",
     ):
         super(UnzerClient, self).__init__()
         self.private_key = private_key

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/__init__.py

@@ -1,25 +1,18 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
-from .abstract_paymenttype import PaymentType
 from .address import Address
-from .bancontact import Bancontact
-from .base import BaseModel
 from .basket import Basket
 from .basketItem import BasketItem
-from .card import Card
 from .customer import Customer
 from .error import Error, ErrorResponse
-from .payment import PaymentGetResponse, PaymentRequest, PaymentResponse, PaymentTransaction
+from .payment import PaymentGetResponse, PaymentRequest, PaymentResponse, \
+    PaymentTransaction, PaymentTypes
+from .payment_type import *
 from .paymentpage import PaymentPage, PaymentPageResponse
 from .webhook import Webhook
 
 __all__ = [
     "Address",
-    "Bancontact",
     "Basket",
     "BasketItem",
-    "Card",
     "Customer",
     "Error",
     "ErrorResponse",
@@ -29,5 +22,13 @@ __all__ = [
     "PaymentRequest",
     "PaymentResponse",
     "PaymentTransaction",
+    "PaymentTypes",
     "Webhook",
+    # payment_types
+    "PaymentType",
+    "Bancontact",
+    "Card",
+    "Ideal",
+    "PayPal",
+    "Sofort",
 ]

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/address.py

@@ -1,6 +1,3 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 from .base import BaseModel
 
 

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/base.py

@@ -1,6 +1,3 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 import abc
 
 

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/basket.py

@@ -1,6 +1,3 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 from .base import BaseModel
 from .basketItem import BasketItem
 

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/basketItem.py

@@ -1,6 +1,3 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 from .base import BaseModel
 
 

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/customer.py

@@ -1,6 +1,3 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 import datetime
 
 from .address import Address

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/error.py

@@ -1,6 +1,3 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 import datetime
 import logging
 
@@ -8,6 +5,7 @@ import requests
 
 logger = logging.getLogger("unzer-sdk")
 
+
 class Error:
     def __init__(self, code, merchantMessage, customerMessage, **kwargs):
         self.code = code

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/payment.py

@@ -1,35 +1,29 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 import datetime
+import enum
 import logging
 import re
+import typing as t
 from types import NoneType
 
-import unzer.client
-from .abstract_paymenttype import PaymentType
 from .base import BaseModel
 from ..utils import parseBool, parseDateTime
 
+if t.TYPE_CHECKING:
+    from ..client import UnzerClient
+
 
-class TransactionStatus:
+class TransactionStatus(enum.Enum):
     SUCCESS = "success"
     PENDING = "pending"
     ERROR = "error"
 
 
-TransactionStatusInverted = {v: k for k, v in vars(TransactionStatus).items()}
-
-
-class Action:
+class Action(enum.Enum):
     CHARGE = "charge"
     AUTHORIZE = "authorize"
 
 
-ActionInverted = {v: k for k, v in vars(Action).items()}
-
-
-class PaymentState:
+class PaymentState(enum.Enum):
     PENDING = 0
     COMPLETED = 1
     CANCELED = 2
@@ -39,10 +33,7 @@ class PaymentState:
     CREATE = 6
 
 
-PaymentStateInverted = {v: k for k, v in vars(PaymentState).items()}
-
-
-class PaymentTypes:
+class PaymentTypes(enum.Enum):
     CARD = "crd"
     EPS = "eps"
     GIROPAY = "gro"
@@ -72,8 +63,6 @@ class PaymentTypes:
     UNKNOWN = "unknown"
 
 
-PaymentTypesInverted = {v: k for k, v in vars(PaymentTypes).items()}
-
 paymentUrlRe = re.compile(
     r"^https://api.unzer.com/v1/"
     r"(?P<operation>[a-z]+)/(?P<paymentId>[\w-]+)"  # payments/{codeOrOrderId}
@@ -105,7 +94,7 @@ class PaymentGetResponse(BaseModel):
             linkPayId=None,
             typeId=None,
 
-            client=None,
+            client: "UnzerClient" = None,
 
             **kwargs
     ):
@@ -159,8 +148,9 @@ class PaymentGetResponse(BaseModel):
         """
         if transactions is None:
             transactions = []
-        if state not in vars(PaymentState).values():
-            raise TypeError("Invalid state %r" % state)
+        state = PaymentState(state)
+        # if state not in vars(PaymentState).values():
+        #     raise TypeError("Invalid state %r" % state)
         if not isinstance(card3ds, (bool, NoneType)):
             raise TypeError("Invalid value %r for card3ds. Must be a boolean or None." % card3ds)
         self.paymentId = paymentId  # type:str
@@ -185,7 +175,7 @@ class PaymentGetResponse(BaseModel):
         self.linkPayId = linkPayId  # type: str
         self.typeId = typeId  # type: str
 
-        self._client = client  # type: unzer.client.UnzerClient
+        self._client: "UnzerClient" = client
 
     def serialize(self):
         raise NotImplementedError("No serialisation for response models.")
@@ -227,15 +217,17 @@ class PaymentGetResponse(BaseModel):
         return transactions
 
     @staticmethod
-    def getPaymentTypeFromTypeId(typeId):
+    def getPaymentTypeFromTypeId(typeId) -> PaymentTypes:
         if not typeId:
             raise ValueError("Invalid typeId %r" % typeId)  # TODO: or return PaymentTypes.UNKNOWN?
         paymentType = typeId.split("-")[1].lower()
-        if paymentType not in vars(PaymentTypes).values():
+        try:
+            paymentType = PaymentTypes(paymentType)
+        except ValueError:
             raise ValueError("Invalid type %r" % typeId)  # TODO: or return PaymentTypes.UNKNOWN?
         return paymentType
 
-    def charge(self, amount):  # type: (float) -> PaymentResponse
+    def charge(self, amount: float) -> "PaymentResponse":
         req_kwargs = self.__dict__.copy()
         req_kwargs["paymentType"] = PaymentType.construct(self.paymentType)(self.typeId)
         req_kwargs["amount"] = amount
@@ -652,3 +644,6 @@ class PaymentResponseMetadata(BaseModel):
         # Nobody, really nobody starts identifier with a digit. Unzer: here you have the 3dsEci flag
         data["threeDsEci"] = data["3dsEci"] if "3dsEci" in data else None
         return cls(**data)
+
+
+from unzer.model.payment_type.abstract_paymenttype import PaymentType  # noqa: Avoid circular imports

unzer-1.0.0.dev4/src/unzer/model/payment_type/__init__.py

@@ -0,0 +1,15 @@
+from .abstract_paymenttype import PaymentType
+from .bancontact import Bancontact
+from .card import Card
+from .ideal import Ideal
+from .paypal import PayPal
+from .sofort import Sofort
+
+__all__ = [
+    "PaymentType",
+    "Bancontact",
+    "Card",
+    "Ideal",
+    "PayPal",
+    "Sofort",
+]

unzer-1.0.0.dev4/src/unzer/model/payment_type/abstract_paymenttype.py

@@ -0,0 +1,53 @@
+import abc
+import logging
+import typing as t
+
+from ..base import BaseModel
+
+if t.TYPE_CHECKING:
+    from .. import PaymentTypes
+
+logger = logging.getLogger("unzer-sdk").getChild(__name__)
+
+
+class PaymentType(BaseModel):
+    @property
+    @abc.abstractmethod
+    def method(self) -> "PaymentTypes":
+        """Hold the type."""
+        pass
+
+    def __init__(
+            self,
+            key: str = None,
+            **kwargs
+    ):
+        """Create a new paymentType ressource.
+
+        :param key: (optional) (original: id) ID for this payment type
+        """
+        self.key: str = key
+
+    def serialize(self) -> dict:
+        return {}
+
+    @classmethod
+    def fromDict(cls, data: dict) -> t.Self:
+        data = data.copy()
+        data["key"] = data["id"]
+        return cls(**data)
+
+    @classmethod
+    def get_subclasses(cls) -> t.Type[t.Self]:
+        for subclass in cls.__subclasses__():
+            yield from subclass.get_subclasses()
+            yield subclass
+
+    @classmethod
+    def construct(cls, method: "PaymentTypes") -> t.Type["PaymentType"]:
+        for subclass in PaymentType.get_subclasses():
+            if subclass.method == method:
+                return subclass
+        logger.warning(f"Creating not existing PaymentType for method {method} on the fly")
+        sub_cls = type(str(method).title(), (cls,), {"method": method})
+        return sub_cls  # noqa

{unzer-1.0.0.dev2/src/unzer/model → unzer-1.0.0.dev4/src/unzer/model/payment_type}/bancontact.py

@@ -1,34 +1,33 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
+import typing as t
 
+from unzer.model.payment import PaymentTypes
 from .abstract_paymenttype import PaymentType
 
 
 class Bancontact(PaymentType):
-    method = "bancontact"
+    method = PaymentTypes.BANCONTACT
 
     REQUIRED_ATTRIBUTES = ["holder"]
 
     def __init__(
             self,
-            holder,
+            holder: str,
             **kwargs
     ):
         """Create a new Bancontact paymentType ressource.
 
         :param holder: The holder name.
-        :type holder: str
         """
-        super(Bancontact, self).__init__(**kwargs)
-        self.holder = holder  # type: str
+        super().__init__(**kwargs)
+        self.holder: str = holder
 
-    def serialize(self):
+    def serialize(self) -> dict:
         return {
             "holder": self.holder,
         }
 
     @classmethod
-    def fromDict(cls, data):
+    def fromDict(cls, data: dict) -> t.Self:
         data = data.copy()
         data["key"] = data["id"]
         return cls(**data)

unzer-1.0.0.dev4/src/unzer/model/payment_type/card.py

@@ -0,0 +1,6 @@
+from unzer.model.payment import PaymentTypes
+from .abstract_paymenttype import PaymentType
+
+
+class Card(PaymentType):
+    method = PaymentTypes.CARD

unzer-1.0.0.dev4/src/unzer/model/payment_type/ideal.py

@@ -0,0 +1,6 @@
+from unzer.model.payment import PaymentTypes
+from .abstract_paymenttype import PaymentType
+
+
+class Ideal(PaymentType):
+    method = PaymentTypes.IDEAL

unzer-1.0.0.dev4/src/unzer/model/payment_type/paypal.py

@@ -0,0 +1,6 @@
+from unzer.model.payment import PaymentTypes
+from .abstract_paymenttype import PaymentType
+
+
+class PayPal(PaymentType):
+    method = PaymentTypes.PAYPAL

unzer-1.0.0.dev4/src/unzer/model/payment_type/sofort.py

@@ -0,0 +1,6 @@
+from unzer.model.payment import PaymentTypes
+from .abstract_paymenttype import PaymentType
+
+
+class Sofort(PaymentType):
+    method = PaymentTypes.SOFORT

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/paymentpage.py

@@ -1,6 +1,3 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 from .base import BaseModel
 from .payment import Action
 from ..utils import parseBool

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/model/webhook.py

@@ -1,6 +1,3 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 from .base import BaseModel
 
 # https://docs.unzer.com/reference/basic-integration-req/#allowlist-of-ip-addresses

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer/utils.py

@@ -1,6 +1,3 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
 import datetime
 
 

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unzer
-Version: 1.0.0.dev2
+Version: 1.0.0.dev4
 Summary: An unofficial python SDK for unzer.com
 Home-page: https://github.com/mausbrand/unzer-python-sdk
 Author: Sven Eberth

{unzer-1.0.0.dev2 → unzer-1.0.0.dev4}/src/unzer.egg-info/SOURCES.txt

@@ -11,15 +11,19 @@ src/unzer.egg-info/dependency_links.txt
 src/unzer.egg-info/requires.txt
 src/unzer.egg-info/top_level.txt
 src/unzer/model/__init__.py
-src/unzer/model/abstract_paymenttype.py
 src/unzer/model/address.py
-src/unzer/model/bancontact.py
 src/unzer/model/base.py
 src/unzer/model/basket.py
 src/unzer/model/basketItem.py
-src/unzer/model/card.py
 src/unzer/model/customer.py
 src/unzer/model/error.py
 src/unzer/model/payment.py
 src/unzer/model/paymentpage.py
-src/unzer/model/webhook.py
+src/unzer/model/webhook.py
+src/unzer/model/payment_type/__init__.py
+src/unzer/model/payment_type/abstract_paymenttype.py
+src/unzer/model/payment_type/bancontact.py
+src/unzer/model/payment_type/card.py
+src/unzer/model/payment_type/ideal.py
+src/unzer/model/payment_type/paypal.py
+src/unzer/model/payment_type/sofort.py

unzer-1.0.0.dev2/src/unzer/model/abstract_paymenttype.py

@@ -1,40 +0,0 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
-import abc
-
-from .base import BaseModel
-
-
-class PaymentType(BaseModel):
-    @property
-    @abc.abstractmethod
-    def method(self):
-        """Hold the type as str."""
-        pass
-
-    def __init__(
-            self,
-            key=None,
-            **kwargs
-    ):
-        """Create a new paymentType ressource.
-
-        :param key: (optional) (original: id) ID for this payment type
-        :type key: str
-        """
-        self.key = key  # type: str
-
-    def serialize(self):
-        return {}
-
-    @classmethod
-    def fromDict(cls, data):
-        data = data.copy()
-        data["key"] = data["id"]
-        return cls(**data)
-
-    @classmethod
-    def construct(cls, method):
-        sub_cls = type(str(method).title(), (cls,), {"method": method})
-        return sub_cls

unzer-1.0.0.dev2/src/unzer/model/card.py

@@ -1,8 +0,0 @@
-__author__ = "Sven Eberth"
-__email__ = "se@mausbrand.de"
-
-from .abstract_paymenttype import PaymentType
-
-
-class Card(PaymentType):
-    method = "card"