python-payway 0.0.5__tar.gz → 0.0.6__tar.gz

{python_payway-0.0.5 → python_payway-0.0.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-payway
-Version: 0.0.5
+Version: 0.0.6
 Summary: Python client for working with Westpac's PayWay REST API
 Author-email: Ben Napper <reppan197@gmail.com>
 License: MIT
@@ -232,7 +232,7 @@ Please follow PayWay's advice about reducing your risk of fraudulent transaction
 
 ```bash
 uv python install 3.8.19
-uv venv
+uv venv --python 3.8.19
 source .venv/bin/activate
 uv sync --extra dev
 ```
@@ -240,5 +240,5 @@ uv sync --extra dev
 ## Testing
 
 ```bash
-python -m unittest discover tests
+uv run pytest tests/ -v
 ```

{python_payway-0.0.5 → python_payway-0.0.6}/README.md

@@ -213,7 +213,7 @@ Please follow PayWay's advice about reducing your risk of fraudulent transaction
 
 ```bash
 uv python install 3.8.19
-uv venv
+uv venv --python 3.8.19
 source .venv/bin/activate
 uv sync --extra dev
 ```
@@ -221,5 +221,5 @@ uv sync --extra dev
 ## Testing
 
 ```bash
-python -m unittest discover tests
+uv run pytest tests/ -v
 ```

{python_payway-0.0.5 → python_payway-0.0.6}/payway/client.py

@@ -6,10 +6,13 @@ from typing import Any
 
 import requests
 
-from payway.conf import CUSTOMER_URL, TOKEN_NO_REDIRECT, TRANSACTION_URL
 from payway.constants import (
     BANK_ACCOUNT_PAYMENT_CHOICE,
     CREDIT_CARD_PAYMENT_CHOICE,
+    CUSTOMER_URL,
+    PAYWAY_ERROR_RESPONSE_CODES,
+    TOKEN_NO_REDIRECT,
+    TRANSACTION_URL,
     VALID_PAYMENT_METHOD_CHOICES,
 )
 from payway.customers import CustomerRequest
@@ -48,10 +51,10 @@ class Client(CustomerRequest, TransactionRequest):
         publishable_api_key: str,
     ) -> None:
         """
-        :param merchant_id        : str                 = PayWay Merchant ID
-        :param bank_account_id   : str                  = PayWay Bank Account ID
-        :param secret_api_key   : str                   = PayWay Secret APi Key
-        :param publishable_api_key   : str              = PayWay Publishable API Key
+        :param merchant_id: PayWay Merchant ID
+        :param bank_account_id: PayWay Bank Account ID
+        :param secret_api_key: PayWay Secret APi Key
+        :param publishable_api_key: PayWay Publishable API Key
         """
         self._validate_credentials(
             merchant_id,
@@ -63,7 +66,6 @@ class Client(CustomerRequest, TransactionRequest):
         self.bank_account_id = bank_account_id
         self.secret_api_key = secret_api_key
         self.publishable_api_key = publishable_api_key
-
         session = requests.Session()
         session.auth = (self.secret_api_key, "")
         session.headers = {"content-type": "application/x-www-form-urlencoded"}
@@ -79,16 +81,14 @@ class Client(CustomerRequest, TransactionRequest):
         secret_api_key: str,
         publishable_api_key: str,
     ) -> None:
-        if not merchant_id or not bank_account_id or not secret_api_key or not publishable_api_key:
-            if not secret_api_key or not publishable_api_key:
-                logger.error("PayWay API keys not found")
-                raise PaywayError(
-                    message="PayWay API keys not found",
-                    code="INVALID_API_KEYS",
-                )
-            logger.error(
-                "Merchant ID, bank account ID, secret API key, publishable API key are " "invalid",
+        if any(not key for key in (secret_api_key, publishable_api_key)):
+            logger.error("PayWay API keys not found")
+            raise PaywayError(
+                message="PayWay API keys not found",
+                code="INVALID_API_KEYS",
             )
+        if any(not val for val in (merchant_id, bank_account_id)):
+            logger.error("Merchant ID or bank account ID invalid")
             raise PaywayError(
                 message="Invalid credentials",
                 code="INVALID_API_CREDENTIALS",
@@ -145,10 +145,9 @@ class Client(CustomerRequest, TransactionRequest):
                 "paymentMethod": payway_payment_method,
             },
         )
-        endpoint = TOKEN_NO_REDIRECT
         logger.info("Sending Create Token request to PayWay.")
         response = self.post_request(
-            endpoint,
+            TOKEN_NO_REDIRECT,
             data,
             auth=(self.publishable_api_key, ""),
             idempotency_key=idempotency_key,
@@ -156,8 +155,7 @@ class Client(CustomerRequest, TransactionRequest):
         errors = self._validate_response(response)
         if errors:
             return None, errors
-        token_response = TokenResponse().from_dict(response.json())
-        return token_response, errors
+        return TokenResponse().from_dict(response.json()), errors
 
     def create_card_token(
         self, card: PayWayCard, idempotency_key: str | None = None
@@ -187,23 +185,18 @@ class Client(CustomerRequest, TransactionRequest):
     ) -> tuple[PayWayCustomer | None, list[PaymentError] | None]:
         """
         Create a customer in PayWay system
-
         POST /customers to have PayWay generate the customer number
         PUT /customers/{customerNumber} to use your own customer number
-
         :param customer:    PayWayCustomer object represents a customer in PayWay
         :param idempotency_key:   str: unique value to avoid duplicate POSTs
         See model.PayWayCustomer
-        :return:
         """
 
         data = customer.to_dict()
         data.update(
             {"merchantId": self.merchant_id, "bankAccountId": self.bank_account_id},
         )
-
         logger.info("Sending Create Customer request to PayWay.")
-
         if customer.custom_id:
             endpoint = f"{CUSTOMER_URL}/{customer.custom_id}"
             response = self.put_request(endpoint, data)
@@ -214,11 +207,9 @@ class Client(CustomerRequest, TransactionRequest):
                 data,
                 idempotency_key=idempotency_key,
             )
-
         errors = self._validate_response(response)
         if errors:
             return None, errors
-
         customer = PayWayCustomer().from_dict(response.json())
         return customer, errors
 
@@ -246,25 +237,11 @@ class Client(CustomerRequest, TransactionRequest):
         Validates all responses from PayWay to catch documented PayWay errors.
         :param response: requests response object
         """
-        if response.status_code in [
-            400,
-            401,
-            403,
-            405,
-            406,
-            407,
-            409,
-            410,
-            415,
-            429,
-            501,
-            503,
-        ]:
+        if response.status_code in PAYWAY_ERROR_RESPONSE_CODES:
             http_error_msg = f"{response.status_code} Client Error: {response.reason} for url: {response.url}"
             raise PaywayError(code=str(response.status_code), message=http_error_msg)
 
         if response.status_code in [404, 422]:  # Documented PayWay errors in JSON
-            # parse error message
             return PaymentError().from_dict(response.json())
 
         if response.status_code == 500:
@@ -308,8 +285,7 @@ class Client(CustomerRequest, TransactionRequest):
         errors = self._validate_response(response)
         if errors:
             return None, errors
-        transaction = PayWayTransaction.from_dict(response.json())
-        return transaction, errors
+        return PayWayTransaction.from_dict(response.json()), errors
 
     def refund_transaction(
         self,
@@ -340,8 +316,7 @@ class Client(CustomerRequest, TransactionRequest):
         errors = self._validate_response(response)
         if errors:
             return None, errors
-        transaction = PayWayTransaction.from_dict(response.json())
-        return transaction, errors
+        return PayWayTransaction.from_dict(response.json()), errors
 
     def get_customer(self, customer_id: str) -> tuple[PayWayCustomer | None, list[PaymentError] | None]:
         """
@@ -353,8 +328,7 @@ class Client(CustomerRequest, TransactionRequest):
         errors = self._validate_response(response)
         if errors:
             return None, errors
-        customer = PayWayCustomer.from_dict(response.json())
-        return customer, errors
+        return PayWayCustomer.from_dict(response.json()), errors
 
     def update_payment_setup(self, token: str, customer_id: str) -> tuple[PaymentSetup | None, list[PaymentError] | None]:
         """
@@ -372,5 +346,4 @@ class Client(CustomerRequest, TransactionRequest):
         errors = self._validate_response(response)
         if errors:
             return None, errors
-        ps = PaymentSetup.from_dict(response.json())
-        return ps, errors
+        return PaymentSetup.from_dict(response.json()), errors

{python_payway-0.0.5 → python_payway-0.0.6}/payway/constants.py

@@ -1,5 +1,11 @@
 from __future__ import annotations
 
+PAYWAY_API_URL = "https://api.payway.com.au/rest/v1"
+TOKEN_URL = PAYWAY_API_URL + "/single-use-tokens-redirect"
+TRANSACTION_URL = PAYWAY_API_URL + "/transactions"
+CUSTOMER_URL = PAYWAY_API_URL + "/customers"
+OWN_BANK_ACCOUNTS_URL = PAYWAY_API_URL + "/your-bank-accounts"
+TOKEN_NO_REDIRECT = PAYWAY_API_URL + "/single-use-tokens"
 TRANSACTION_APPROVED = "0"
 
 SUMMARY_CODES = {
@@ -69,7 +75,8 @@ EFT_RESPONSE_CODES = {
 CVN_RESPONSE_CODES = {
     "M": "Matched",  # i.e. the CVN is correct
     "N": "Not Matched",  # i.e. the CVN is incorrect
-    "P": "Not Processed",  # i.e. the CVN was not processed for some reason; do not assume that the CVN is necessarily correct
+    "P": "Not Processed",
+    # i.e. the CVN was not processed for some reason; do not assume that the CVN is necessarily correct
     "S": "Suspicious",
     "U": "Unknown",  # i.e. the CVN was not processed for some reason; do not assume that the CVN is necessarily correct
 }
@@ -132,3 +139,17 @@ DIRECT_DEBIT_CHOICES = (
 )
 PAYMENT_METHOD_CHOICES = OTHER_PAYMENT_CHOICES + DIRECT_DEBIT_CHOICES
 VALID_PAYMENT_METHOD_CHOICES = ["card", "direct_debit"]
+PAYWAY_ERROR_RESPONSE_CODES = [
+    400,
+    401,
+    403,
+    405,
+    406,
+    407,
+    409,
+    410,
+    415,
+    429,
+    501,
+    503,
+]

{python_payway-0.0.5 → python_payway-0.0.6}/payway/customers.py

@@ -4,7 +4,7 @@ from typing import Any
 
 import requests
 
-from payway.conf import CUSTOMER_URL
+from payway.constants import CUSTOMER_URL
 from payway.model import PayWayCustomer
 from payway.utils import json_list
 

{python_payway-0.0.5 → python_payway-0.0.6}/payway/model.py

@@ -1,8 +1,10 @@
 from __future__ import annotations
 
+from dataclasses import dataclass
 from typing import Any
 
 
+@dataclass
 class BankAccount:
     """
     account_name: str: 	Name used to open bank account.
@@ -10,10 +12,9 @@ class BankAccount:
     account_number: str: bank account number
     """
 
-    def __init__(self, account_name: str, bsb: str, account_number: str) -> None:
-        self.account_name = account_name
-        self.bsb = bsb
-        self.account_number = account_number
+    account_name: str
+    bsb: str
+    account_number: str
 
     def to_dict(self) -> dict[str, Any]:
         return {
@@ -23,20 +24,13 @@ class BankAccount:
         }
 
 
+@dataclass
 class PayWayCard:
-    def __init__(
-        self,
-        card_number: str | None = None,
-        cvn: str | None = None,
-        card_holder_name: str | None = None,
-        expiry_date_month: str | None = None,
-        expiry_date_year: str | None = None,
-    ) -> None:
-        self.card_number = card_number
-        self.cvn = cvn
-        self.card_holder_name = card_holder_name
-        self.expiry_date_month = expiry_date_month
-        self.expiry_date_year = expiry_date_year
+    card_number: str | None = None
+    cvn: str | None = None
+    card_holder_name: str | None = None
+    expiry_date_month: str | None = None
+    expiry_date_year: str | None = None
 
     def to_dict(self) -> dict[str, Any]:
         return {
@@ -49,58 +43,36 @@ class PayWayCard:
 
     @staticmethod
     def from_dict(payway_card: dict[str, Any]) -> PayWayCard:
-        card = PayWayCard()
-        if payway_card.get("maskedCardNumber"):
-            card.card_number = payway_card.get("maskedCardNumber")
-        else:
-            card.card_number = payway_card.get("cardNumber")
-        card.cvn = payway_card.get("cvn")
-        card.card_holder_name = payway_card.get("cardholderName")
-        card.expiry_date_month = payway_card.get("expiryDateMonth")
-        card.expiry_date_year = payway_card.get("expiryDateYear")
-        return card
+        card_number = payway_card.get("maskedCardNumber") or payway_card.get("cardNumber")
+        return PayWayCard(
+            card_number=card_number,
+            cvn=payway_card.get("cvn"),
+            card_holder_name=payway_card.get("cardholderName"),
+            expiry_date_month=payway_card.get("expiryDateMonth"),
+            expiry_date_year=payway_card.get("expiryDateYear"),
+        )
 
 
+@dataclass
 class PayWayCustomer:
-    def __init__(
-        self,
-        custom_id: str | None = None,
-        customer_name: str | None = None,
-        email_address: str | None = None,
-        send_email_receipts: bool | None = None,
-        phone_number: str | None = None,
-        street: str | None = None,
-        street2: str | None = None,
-        city_name: str | None = None,
-        state: str | None = None,
-        postal_code: str | None = None,
-        token: str | None = None,
-        customer_number: str | None = None,
-        payment_setup: PaymentSetup | None = None,
-        notes: str | None = None,
-        custom_field_1: str | None = None,
-        custom_field_2: str | None = None,
-        custom_field_3: str | None = None,
-        custom_field_4: str | None = None,
-    ) -> None:
-        self.custom_id = custom_id
-        self.customer_name = customer_name
-        self.email_address = email_address
-        self.send_email_receipts = send_email_receipts
-        self.phone_number = phone_number
-        self.street = street
-        self.street2 = street2
-        self.city_name = city_name
-        self.state = state
-        self.postal_code = postal_code
-        self.token = token
-        self.customer_number = customer_number
-        self.payment_setup = payment_setup
-        self.notes = notes
-        self.customField1 = custom_field_1
-        self.customField2 = custom_field_2
-        self.customField3 = custom_field_3
-        self.customField4 = custom_field_4
+    custom_id: str | None = None
+    customer_name: str | None = None
+    email_address: str | None = None
+    send_email_receipts: bool | None = None
+    phone_number: str | None = None
+    street: str | None = None
+    street2: str | None = None
+    city_name: str | None = None
+    state: str | None = None
+    postal_code: str | None = None
+    token: str | None = None
+    customer_number: str | None = None
+    payment_setup: PaymentSetup | None = None
+    notes: str | None = None
+    custom_field_1: str | None = None
+    custom_field_2: str | None = None
+    custom_field_3: str | None = None
+    custom_field_4: str | None = None
 
     def to_dict(self) -> dict[str, Any]:
         customer = {
@@ -114,10 +86,10 @@ class PayWayCustomer:
             "state": self.state,
             "postalCode": self.postal_code,
             "notes": self.notes,
-            "customField1": self.customField1,
-            "customField2": self.customField2,
-            "customField3": self.customField3,
-            "customField4": self.customField4,
+            "customField1": self.custom_field_1,
+            "customField2": self.custom_field_2,
+            "customField3": self.custom_field_3,
+            "customField4": self.custom_field_4,
         }
         if self.token:
             customer.update({"singleUseTokenId": self.token})
@@ -130,36 +102,33 @@ class PayWayCustomer:
         :param response: dict    PayWay response dictionary
         :return:
         """
-        customer = PayWayCustomer()
         contact = response.get("contact", {})
-        customer.customer_name = contact.get("customerName")
-        customer.email_address = contact.get("emailAddress")
-        customer.send_email_receipts = contact.get("sendEmailReceipts")
-        customer.phone_number = contact.get("phoneNumber")
-        address = contact.get("address")
-        customer.street = address.get("street1")
-        customer.street2 = address.get("street2")
-        customer.city_name = address.get("cityName")
-        customer.state = address.get("state")
-        customer.postal_code = address.get("postalCode")
-        customer.customer_number = response.get("customerNumber")
-
+        address = contact.get("address", {})
+        payment_setup = None
         if response.get("paymentSetup") is not None:
-            customer.payment_setup = PaymentSetup().from_dict(
-                response.get("paymentSetup", {}),
-            )
-
-        if response.get("customFields") is not None:
-            custom_fields = response.get("customFields", {})
-            for k, v in custom_fields.items():
-                setattr(customer, k, v)
-
-        if response.get("notes") is not None:
-            customer.notes = response["notes"]
-
-        return customer
-
-
+            payment_setup = PaymentSetup.from_dict(response.get("paymentSetup", {}))
+        custom_fields = response.get("customFields", {})
+        return PayWayCustomer(
+            customer_name=contact.get("customerName"),
+            email_address=contact.get("emailAddress"),
+            send_email_receipts=contact.get("sendEmailReceipts"),
+            phone_number=contact.get("phoneNumber"),
+            street=address.get("street1"),
+            street2=address.get("street2"),
+            city_name=address.get("cityName"),
+            state=address.get("state"),
+            postal_code=address.get("postalCode"),
+            customer_number=response.get("customerNumber"),
+            payment_setup=payment_setup,
+            notes=response.get("notes"),
+            custom_field_1=custom_fields.get("customField1"),
+            custom_field_2=custom_fields.get("customField2"),
+            custom_field_3=custom_fields.get("customField3"),
+            custom_field_4=custom_fields.get("customField4"),
+        )
+
+
+@dataclass
 class PaymentError:
     field_name: str | None = None
     message: str | None = None
@@ -172,14 +141,14 @@ class PaymentError:
         :param: payway_response: dict PayWay response dictionary
         """
         errors = payway_response.get("data", [])
-        payment_errors = []
-        for error in errors:
-            payway_error = PaymentError()
-            payway_error.field_name = error.get("fieldName")
-            payway_error.message = error.get("message")
-            payway_error.field_value = error.get("fieldValue")
-            payment_errors.append(payway_error)
-        return payment_errors
+        return [
+            PaymentError(
+                field_name=error.get("fieldName"),
+                message=error.get("message"),
+                field_value=error.get("fieldValue"),
+            )
+            for error in errors
+        ]
 
     def to_message(self) -> str:
         return f"Field: {self.field_name} Message: {self.message} Field Value: {self.field_value}"
@@ -199,6 +168,7 @@ class PaymentError:
         return message
 
 
+@dataclass
 class ServerError:
     error_number: int | None = None
     trace_code: str | None = None
@@ -208,15 +178,16 @@ class ServerError:
         """
         :param: response: dict PayWay response dictionary
         """
-        payway_error = ServerError()
-        payway_error.error_number = response.get("errorNumber", {})
-        payway_error.trace_code = response.get("traceCode", {})
-        return payway_error
+        return ServerError(
+            error_number=response.get("errorNumber"),
+            trace_code=response.get("traceCode"),
+        )
 
     def to_message(self) -> str:
         return f"Error number: {self.error_number} Trace code: {self.trace_code}"
 
 
+@dataclass
 class PayWayPayment:
     """
     customer_number: 	Customer to which this payment belongs.
@@ -230,27 +201,15 @@ class PayWayPayment:
     merchant_id: 	This merchant will be used for processing.
     """
 
-    def __init__(
-        self,
-        transaction_type: str,
-        customer_number: str | None = None,
-        amount: float | None = None,
-        currency: str | None = None,
-        order_number: str | None = None,
-        ip_address: str | None = None,
-        parent_transaction_id: str | None = None,
-        token: str | None = None,
-        merchant_id: str | None = None,
-    ) -> None:
-        self.transaction_type = transaction_type
-        self.customer_number = customer_number
-        self.amount = amount
-        self.currency = currency
-        self.order_number = order_number
-        self.ip_address = ip_address
-        self.parent_transaction_id = parent_transaction_id
-        self.token = token
-        self.merchant_id = merchant_id
+    transaction_type: str
+    customer_number: str | None = None
+    amount: float | None = None
+    currency: str | None = None
+    order_number: str | None = None
+    ip_address: str | None = None
+    parent_transaction_id: str | None = None
+    token: str | None = None
+    merchant_id: str | None = None
 
     def to_dict(self) -> dict[str, Any]:
         payment = {
@@ -271,6 +230,7 @@ class PayWayPayment:
         return payment
 
 
+@dataclass
 class PayWayTransaction:
     transaction_id: int | None = None
     receipt_number: str | None = None
@@ -328,7 +288,7 @@ class PayWayTransaction:
             "creditCard": self.card.to_dict() if self.card is not None else {},
             "merchant": self.merchant.to_dict() if self.merchant is not None else {},
             "virtualAccount": self.virtual_account,
-            "bpaustraliaPostay": self.australia_post,
+            "australiaPost": self.australia_post,
             "bpay": self.bpay,
             "yourBankAccount": self.your_bank_account,
             "customerPayPalAccount": self.customer_paypal_account,
@@ -352,49 +312,53 @@ class PayWayTransaction:
         """
         :param: response: dict PayWay response dictionary
         """
-        transaction = PayWayTransaction()
-        transaction.transaction_id = response.get("transactionId")
-        transaction.receipt_number = response.get("receiptNumber")
-        transaction.status = response.get("status")
-        transaction.response_code = response.get("responseCode")
-        transaction.response_text = response.get("responseText")
-        transaction.transaction_type = response.get("transactionType")
-        transaction.customer_number = response.get("customerNumber")
-        transaction.customer_name = response.get("customerName")
-        transaction.customer_email = response.get("customerEmail")
-        transaction.currency = response.get("currency")
-        transaction.principal_amount = response.get("principalAmount")
-        transaction.surcharge_amount = response.get("surchargeAmount")
-        transaction.payment_amount = response.get("paymentAmount")
-        transaction.payment_method = response.get("paymentMethod")
-
+        card = None
         if response.get("creditCard") is not None:
-            transaction.card = PayWayCard.from_dict(response.get("creditCard", {}))
+            card = PayWayCard.from_dict(response.get("creditCard", {}))
 
+        merchant = None
         if response.get("merchant") is not None:
-            transaction.merchant = Merchant.from_dict(response.get("merchant", {}))
-
-        transaction.virtual_account = response.get("virtualAccount")
-        transaction.australia_post = response.get("bpaustraliaPostay")
-        transaction.bpay = response.get("bpay")
-        transaction.your_bank_account = response.get("yourBankAccount")
-        transaction.customer_paypal_account = response.get("customerPayPalAccount")
-        transaction.your_paypal_account = response.get("yourPayPalAccount")
-        transaction.transaction_date_time = response.get("transactionDateTime")
-        transaction.user = response.get("user")
-        transaction.settlement_date = response.get("settlementDate")
-        transaction.declined_date = response.get("declinedDate")
-        transaction.parent_transaction = response.get("parentTransaction")
-        transaction.ip_address = response.get("customerIpAddress")
-        transaction.fraud_result = response.get("fraudResult")
-        transaction.ip_country = response.get("customerIpCountry")
-        transaction.card_country = response.get("cardCountry")
-        transaction.custom_fields = response.get("customFields")
-        transaction.is_voidable = response.get("isVoidable")
-        transaction.is_refundable = response.get("isRefundable")
-        return transaction
-
-
+            merchant = Merchant.from_dict(response.get("merchant", {}))
+
+        return PayWayTransaction(
+            transaction_id=response.get("transactionId"),
+            receipt_number=response.get("receiptNumber"),
+            status=response.get("status"),
+            response_code=response.get("responseCode"),
+            response_text=response.get("responseText"),
+            transaction_type=response.get("transactionType"),
+            customer_number=response.get("customerNumber"),
+            customer_name=response.get("customerName"),
+            customer_email=response.get("customerEmail"),
+            currency=response.get("currency"),
+            principal_amount=response.get("principalAmount"),
+            surcharge_amount=response.get("surchargeAmount"),
+            payment_amount=response.get("paymentAmount"),
+            payment_method=response.get("paymentMethod"),
+            card=card,
+            merchant=merchant,
+            virtual_account=response.get("virtualAccount"),
+            australia_post=response.get("australiaPost"),
+            bpay=response.get("bpay"),
+            your_bank_account=response.get("yourBankAccount"),
+            customer_paypal_account=response.get("customerPayPalAccount"),
+            your_paypal_account=response.get("yourPayPalAccount"),
+            transaction_date_time=response.get("transactionDateTime"),
+            user=response.get("user"),
+            settlement_date=response.get("settlementDate"),
+            declined_date=response.get("declinedDate"),
+            parent_transaction=response.get("parentTransaction"),
+            ip_address=response.get("customerIpAddress"),
+            fraud_result=response.get("fraudResult"),
+            ip_country=response.get("customerIpCountry"),
+            card_country=response.get("cardCountry"),
+            custom_fields=response.get("customFields"),
+            is_voidable=response.get("isVoidable"),
+            is_refundable=response.get("isRefundable"),
+        )
+
+
+@dataclass
 class Merchant:
     """
     merchantId 	Issued by us to uniquely identify a merchant facility
@@ -428,16 +392,17 @@ class Merchant:
         """
         :param: payway_obj: dict PayWay response dictionary
         """
-        merchant = Merchant()
-        merchant.merchant_id = payway_obj.get("merchantId")
-        merchant.merchant_name = payway_obj.get("merchantName")
-        merchant.settlement_bsb = payway_obj.get("settlementBsb")
-        merchant.settlement_account_number = payway_obj.get("settlementAccountNumber")
-        merchant.surcharge_bsb = payway_obj.get("surchargeBsb")
-        merchant.surcharge_account_number = payway_obj.get("surchargeAccountNumber")
-        return merchant
+        return Merchant(
+            merchant_id=payway_obj.get("merchantId"),
+            merchant_name=payway_obj.get("merchantName"),
+            settlement_bsb=payway_obj.get("settlementBsb"),
+            settlement_account_number=payway_obj.get("settlementAccountNumber"),
+            surcharge_bsb=payway_obj.get("surchargeBsb"),
+            surcharge_account_number=payway_obj.get("surchargeAccountNumber"),
+        )
 
 
+@dataclass
 class PaymentSetup:
     payment_method: str | None = None
     stopped: bool | None = None
@@ -449,16 +414,23 @@ class PaymentSetup:
         """
         :param: response: dict PayWay response dictionary
         """
-        ps = PaymentSetup()
-        ps.payment_method = response.get("paymentMethod")
-        ps.stopped = response.get("stopped")
+        credit_card = None
         if response.get("creditCard") is not None:
-            ps.credit_card = PayWayCard().from_dict(response.get("creditCard", {}))
+            credit_card = PayWayCard.from_dict(response.get("creditCard", {}))
+
+        merchant = None
         if response.get("merchant") is not None:
-            ps.merchant = Merchant().from_dict(response.get("merchant", {}))
-        return ps
+            merchant = Merchant.from_dict(response.get("merchant", {}))
+
+        return PaymentSetup(
+            payment_method=response.get("paymentMethod"),
+            stopped=response.get("stopped"),
+            credit_card=credit_card,
+            merchant=merchant,
+        )
 
 
+@dataclass
 class TokenResponse:
     token: str | None = None
     payment_method: str | None = None
@@ -470,10 +442,12 @@ class TokenResponse:
         """
         :param: response: dict PayWay response dictionary
         """
-        tr = TokenResponse()
-        tr.token = response.get("singleUseTokenId")
-        tr.payment_method = response.get("paymentMethod")
+        card = None
         if response.get("creditCard") is not None:
-            card = PayWayCard().from_dict(response["creditCard"])
-            tr.card = card
-        return tr
+            card = PayWayCard.from_dict(response["creditCard"])
+
+        return TokenResponse(
+            token=response.get("singleUseTokenId"),
+            payment_method=response.get("paymentMethod"),
+            card=card,
+        )

{python_payway-0.0.5 → python_payway-0.0.6}/payway/transactions.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import requests
 
-from payway.conf import TRANSACTION_URL
+from payway.constants import TRANSACTION_URL
 from payway.utils import json_list
 
 

{python_payway-0.0.5 → python_payway-0.0.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-payway"
-version = "0.0.5"
+version = "0.0.6"
 description = "Python client for working with Westpac's PayWay REST API"
 authors = [
     { name = "Ben Napper", email = "reppan197@gmail.com" }
@@ -24,9 +24,9 @@ dependencies = [
 
 [project.optional-dependencies]
 dev = [
-  "pre-commit>=3.5.0",
-  "ruff==0.6.6",
-  "mypy>=0.971",
+    "pre-commit>=3.5.0",
+    "ruff==0.6.6",
+    "mypy>=0.971",
 ]
 
 [tool.mypy]
@@ -48,53 +48,53 @@ target-version = "py38"
 
 [tool.ruff.lint]
 select = [
-  "F",
-  "E",
-  "W",
-  "C90",
-  "I",
-  "N",
-  "UP",
-  "YTT",
-  "ANN",
-  "ASYNC",
-  "S",
-  "BLE",
-  "FBT",
-  "B",
-  "A",
-  "COM",
-  "C4",
-  "DTZ",
-  "T10",
-  "DJ",
-  "EM",
-  "EXE",
-  "FA",
-  'ISC',
-  "ICN",
-  "G",
-  'INP',
-  'PIE',
-  "T20",
-  'PYI',
-  'PT',
-  "Q",
-  "RSE",
-  "RET",
-  "SLF",
-  "SLOT",
-  "SIM",
-  "TID",
-  "INT",
-  "ERA",
-  "PD",
-  "PGH",
-  "PL",
-  "TRY",
-  "FLY",
-  "PERF",
-  "RUF",
+    "F",
+    "E",
+    "W",
+    "C90",
+    "I",
+    "N",
+    "UP",
+    "YTT",
+    "ANN",
+    "ASYNC",
+    "S",
+    "BLE",
+    "FBT",
+    "B",
+    "A",
+    "COM",
+    "C4",
+    "DTZ",
+    "T10",
+    "DJ",
+    "EM",
+    "EXE",
+    "FA",
+    'ISC',
+    "ICN",
+    "G",
+    'INP',
+    'PIE',
+    "T20",
+    'PYI',
+    'PT',
+    "Q",
+    "RSE",
+    "RET",
+    "SLF",
+    "SLOT",
+    "SIM",
+    "TID",
+    "INT",
+    "ERA",
+    "PD",
+    "PGH",
+    "PL",
+    "TRY",
+    "FLY",
+    "PERF",
+    "RUF",
 ]
 ignore = ["ANN101", "COM812", "ISC001"]
 
@@ -116,6 +116,10 @@ required-imports = ["from __future__ import annotations"]
 [tool.pyright]
 typeCheckingMode = "strict"
 
+[tool.ty.environment]
+extra-paths = []
+python-version = "3.8"
+
 [tool.pytest.ini_options]
 log_cli = true
 log_cli_level = "INFO"
@@ -123,11 +127,19 @@ log_format = "%(asctime)s %(levelname)s %(message)s"
 log_date_format = "%Y-%m-%d %H:%M:%S"
 addopts = "-v -ra -q"
 filterwarnings = [
-  "ignore:.*defines default_app_config.*",
-  "ignore:The providing_args argument is deprecated..*",
-  "ignore::DeprecationWarning",
+    "ignore:.*defines default_app_config.*",
+    "ignore:The providing_args argument is deprecated..*",
+    "ignore::DeprecationWarning",
 ]
 
 [tool.bandit]
 exclude_dirs = ["tests", "migrations"]
 tests = ["B201", "B301"]
+
+[dependency-groups]
+dev = [
+    "mypy>=0.971",
+    "pytest>=8.3.5",
+    "ruff>=0.6.6",
+    "ty>=0.0.1a33",
+]

{python_payway-0.0.5 → python_payway-0.0.6}/python_payway.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-payway
-Version: 0.0.5
+Version: 0.0.6
 Summary: Python client for working with Westpac's PayWay REST API
 Author-email: Ben Napper <reppan197@gmail.com>
 License: MIT
@@ -232,7 +232,7 @@ Please follow PayWay's advice about reducing your risk of fraudulent transaction
 
 ```bash
 uv python install 3.8.19
-uv venv
+uv venv --python 3.8.19
 source .venv/bin/activate
 uv sync --extra dev
 ```
@@ -240,5 +240,5 @@ uv sync --extra dev
 ## Testing
 
 ```bash
-python -m unittest discover tests
+uv run pytest tests/ -v
 ```

{python_payway-0.0.5 → python_payway-0.0.6}/python_payway.egg-info/SOURCES.txt

@@ -3,7 +3,6 @@ README.md
 pyproject.toml
 payway/__init__.py
 payway/client.py
-payway/conf.py
 payway/constants.py
 payway/customers.py
 payway/exceptions.py

python_payway-0.0.5/payway/conf.py

@@ -1,8 +0,0 @@
-from __future__ import annotations
-
-PAYWAY_API_URL = "https://api.payway.com.au/rest/v1"
-TOKEN_URL = PAYWAY_API_URL + "/single-use-tokens-redirect"
-TRANSACTION_URL = PAYWAY_API_URL + "/transactions"
-CUSTOMER_URL = PAYWAY_API_URL + "/customers"
-OWN_BANK_ACCOUNTS_URL = PAYWAY_API_URL + "/your-bank-accounts"
-TOKEN_NO_REDIRECT = PAYWAY_API_URL + "/single-use-tokens"