Monzo-API 1.2.6__tar.gz → 1.2.7__tar.gz

{monzo_api-1.2.6 → monzo_api-1.2.7/Monzo_API.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Monzo-API
-Version: 1.2.6
+Version: 1.2.7
 Summary: Package to interact with the API provided by Monzo bank
 Author-email: Peter McDonald <git@petermcdonald.co.uk>
 License: MIT License

{monzo_api-1.2.6/Monzo_API.egg-info → monzo_api-1.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: Monzo-API
-Version: 1.2.6
+Version: 1.2.7
 Summary: Package to interact with the API provided by Monzo bank
 Author-email: Peter McDonald <git@petermcdonald.co.uk>
 License: MIT License

{monzo_api-1.2.6 → monzo_api-1.2.7}/monzo/authentication.py

@@ -14,6 +14,8 @@ from monzo.httpio import DEFAULT_TIMEOUT, REQUEST_RESPONSE_TYPE, HttpIO
 MONZO_AUTH_URL = "https://auth.monzo.com"
 MONZO_API_URL = "https://api.monzo.com"
 
+logger: logging.Logger = logging.getLogger(name=__name__)
+
 
 class Authentication:
     """
@@ -72,12 +74,12 @@ class Authentication:
         Raises:
             MonzoAuthenticationError On missing authorization token or mismatching state tokens
         """
-        logging.debug("Attempting authentication")
+        logger.debug(msg="Attempting authentication")
         if not authorization_token:
-            logging.debug("Authentication - Missing token")
+            logger.debug(msg="Authentication - Missing token")
             raise MonzoAuthenticationError("Code missing from response")
         if state_token != self.state_token:
-            logging.debug("Authentication - state token mismatch")
+            logger.debug(msg="Authentication - state token mismatch")
             raise MonzoAuthenticationError("State tokens do not match")
         tmp_file_name = "monzo"
         tmp_file_path = PurePath(gettempdir(), tmp_file_name)
@@ -86,7 +88,7 @@ class Authentication:
 
     def logout(self) -> None:
         """Invalidate the access token."""
-        logging.debug("Invalidating token")
+        logger.debug(msg="Invalidating token")
         self.make_request(path="/oauth2/logout", method="post")
 
     def make_request(
@@ -140,9 +142,9 @@ class Authentication:
         Raises:
             MonzoAuthenticationError: On lack of refresh token or failure to refresh a token
         """
-        logging.debug("Fetching new token")
+        logger.debug(msg="Fetching new token")
         if not self.refresh_token:
-            logging.debug("Unable to fetch new token without a refresh token")
+            logger.debug(msg="Unable to fetch new token without a refresh token")
             raise MonzoAuthenticationError("Unable to refresh without a refresh token")
         data = {
             "grant_type": "refresh_token",
@@ -153,9 +155,9 @@ class Authentication:
         conn = HttpIO(MONZO_API_URL)
         try:
             res = conn.post(path="/oauth2/token", data=data)
-            self._populate_tokens(res)
+            self._populate_tokens(response=res)
         except MonzoError as exc:
-            logging.debug("Failed to fetch new token")
+            logger.debug(msg="Failed to fetch new token")
             raise MonzoAuthenticationError("Could not refresh the access token") from exc
 
     @property
@@ -240,7 +242,7 @@ class Authentication:
         Raises:
             MonzoAuthenticationError On failure to create a token
         """
-        logging.debug("Authentication - swapping authorization token for an access token")
+        logger.debug(msg="Authentication - swapping authorization token for an access token")
         data = {
             "grant_type": "authorization_code",
             "client_id": self._client_id,
@@ -249,10 +251,10 @@ class Authentication:
             "code": authorization_token,
         }
         try:
-            res = self.make_request("/oauth2/token", authenticated=False, method="post", data=data)
-            self._populate_tokens(res)
+            res = self.make_request(path="/oauth2/token", authenticated=False, method="post", data=data)
+            self._populate_tokens(response=res)
         except MonzoError as exc:
-            logging.debug(f"Could not fetch access token {exc}")
+            logger.debug(msg=f"Could not fetch access token {exc}")
             raise MonzoAuthenticationError("Could not fetch a valid access token") from exc
 
     def _populate_tokens(self, response: REQUEST_RESPONSE_TYPE) -> None:
@@ -262,7 +264,7 @@ class Authentication:
         Args:
             response: Response from an auth request.
         """
-        logging.debug("Populating tokens")
+        logger.debug(msg="Populating tokens")
         self._access_token = response["data"]["access_token"]
         self.access_token_expiry = response["data"]["expires_in"]
         self._refresh_token = ""
@@ -285,5 +287,5 @@ class Authentication:
         Args:
             handler: Credential handler implementing Storage
         """
-        logging.debug("Registered a new callback handler")
+        logger.debug(msg="Registered a new callback handler")
         self._handlers.append(handler)

{monzo_api-1.2.6 → monzo_api-1.2.7}/monzo/endpoints/account.py

@@ -35,10 +35,10 @@ class Account(Monzo):
         "_account_id",
         "_auth",
         "_balance",
+        "_closed",
         "_created",
         "_description",
         "_has_balance",
-        "_closed",
     ]
 
     def __init__(
@@ -88,7 +88,7 @@ class Account(Monzo):
         return next(
             (
                 MONZO_ACCOUNT_TYPES[account_type]
-                for account_type in MONZO_ACCOUNT_TYPES.keys()
+                for account_type in MONZO_ACCOUNT_TYPES
                 if self.description.lower().startswith(account_type)
             ),
             "UNKNOWN",

{monzo_api-1.2.6 → monzo_api-1.2.7}/monzo/endpoints/balance.py

@@ -14,7 +14,7 @@ class Balance(Monzo):
     along with the balance property. Otherwise, you can fetch an account balance using the fetch class method.
     """
 
-    __slots__ = ["_balance", "_total_balance", "_currency", "_spend_today"]
+    __slots__ = ("_balance", "_currency", "_spend_today", "_total_balance")
 
     def __init__(
         self,

{monzo_api-1.2.6 → monzo_api-1.2.7}/monzo/endpoints/feed_item.py

@@ -98,7 +98,7 @@ class FeedItem(Monzo):
         }
         if self._url:
             data["url"] = self._url
-        for parameter in parameters.keys():
+        for parameter in parameters:
             data[f"params[{parameter}]"] = parameters[parameter]
         self._monzo_auth.make_request(path="/feed", method="POST", data=data)
 

{monzo_api-1.2.6 → monzo_api-1.2.7}/monzo/endpoints/pot.py

@@ -19,22 +19,22 @@ class Pot(Monzo):
     Class provides methods to fetch pots as well as depositing and withdrawing from pots.
     """
 
-    __slots__ = [
-        "_pot_id",
-        "_name",
-        "_style",
+    __slots__ = (
         "_balance",
-        "_currency",
         "_created",
-        "_updated",
+        "_currency",
         "_deleted",
         "_goal_amount",
         "_has_round_up",
-        "_round_up_multiplier",
-        "_pot_type",
         "_locked",
         "_locked_until",
-    ]
+        "_name",
+        "_pot_id",
+        "_pot_type",
+        "_round_up_multiplier",
+        "_style",
+        "_updated",
+    )
 
     def __init__(
         self,

{monzo_api-1.2.6 → monzo_api-1.2.7}/monzo/endpoints/receipt.py

@@ -103,14 +103,14 @@ class Receipt(Monzo):
     """
 
     __slots__ = (
-        "_external_id",
-        "_transaction_id",
-        "_total",
         "_currency",
+        "_external_id",
         "_items",
-        "_taxes",
-        "_payments",
         "_merchant",
+        "_payments",
+        "_taxes",
+        "_total",
+        "_transaction_id",
     )
 
     def __init__(
@@ -363,9 +363,9 @@ class Receipt(Monzo):
         receipt_data = res["data"]["receipt"]
         receipt_items: list[ReceiptItem] = []
         for item in receipt_data["items"]:
-            quantity = float(item["quantity"]) if "quantity" in item else 0.0
-            tax = item["tax"] if "tax" in item else 0
-            unit = item["unit"] if "unit" in item else ""
+            quantity = float(item.get("quantity", 0.0)) if "quantity" in item else 0.0
+            tax = item.get("tax", 0) if "tax" in item else 0
+            unit = item.get("unit", "") if "unit" in item else ""
             receipt_item: ReceiptItem = ReceiptItem(
                 description=item["description"],
                 amount=item["amount"],
@@ -376,9 +376,9 @@ class Receipt(Monzo):
             )
 
             for sub_item in item["sub_items"]:
-                sub_item_quantity = sub_item["quantity"] if "quantity" in sub_item else 0.0
-                sub_item_tax = sub_item["tax"] if "tax" in sub_item else 0
-                sub_item_unit = sub_item["unit"] if "unit" in sub_item else ""
+                sub_item_quantity = sub_item.get("quantity", 0.0) if "quantity" in sub_item else 0.0
+                sub_item_tax = sub_item.get("tax", 0) if "tax" in sub_item else 0
+                sub_item_unit = sub_item.get("unit", "") if "unit" in sub_item else ""
                 receipt_sub_item = ReceiptItem(
                     description=sub_item["description"],
                     amount=sub_item["amount"],

{monzo_api-1.2.6 → monzo_api-1.2.7}/monzo/helpers.py

@@ -1,6 +1,6 @@
 """Helper functions."""
 
-from datetime import datetime
+from datetime import UTC, datetime
 
 
 def create_date(date_str: str) -> datetime:
@@ -13,7 +13,7 @@ def create_date(date_str: str) -> datetime:
     Returns:
         Converted date and time
     """
-    return datetime.strptime(date_str[:19], "%Y-%m-%dT%H:%M:%S")
+    return datetime.strptime(date_str[:19], "%Y-%m-%dT%H:%M:%S").replace(tzinfo=UTC)
 
 
 def format_date(date: datetime) -> str:

{monzo_api-1.2.6 → monzo_api-1.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "Monzo-API"
-version = "1.2.6"
+version = "1.2.7"
 authors = [{ name = "Peter McDonald", email = "git@petermcdonald.co.uk"}]
 description = "Package to interact with the API provided by Monzo bank"
 keywords = ["monzo", "bank", "api"]
@@ -29,19 +29,11 @@ documentation = "https://monzo-api.readthedocs.io"
 
 [dependency-groups]
 dev = [
-    "cosmic-ray>=8.4.6",
-    "idna>=3.16", # To resolve security vulnerabilities in dependencies pip-audit
-    "pip-audit>=2.9.0",
-    "pygments>=2.20.0", # To resolve security vulnerabilities in dependencies pytest sphinx
     "pytest>=9.0.3",
     "pytest-cov>=7.1.0",
     "pytest-mock>=3.15.1",
-    "ruff>=0.15.10",
     "sphinx>=9.1.0",
     "sphinx-rtd-theme>=3.1.0",
-    "troml>=0.4.1",
-    "ty>=0.0.29",
-    "urllib3>=2.7.0", # To resolve security vulnerabilities in dependencies pip-audit
 ]
 
 [tool.pytest.ini_options]

{monzo_api-1.2.6 → monzo_api-1.2.7}/tests/test_endpoints.py

@@ -1,6 +1,6 @@
 """Tests for endpoints."""
 
-from datetime import datetime
+from datetime import UTC, datetime
 from typing import Any
 
 import pytest
@@ -225,7 +225,7 @@ class TestEndPoints:
                 {"bills": -2775},
                 "bills",
                 {},
-                datetime(2022, 8, 9, 14, 15, 1),
+                datetime(year=2022, month=8, day=9, hour=14, minute=15, second=1, tzinfo=UTC),
                 "GBP",
                 "123ABC",
                 "",
@@ -250,9 +250,9 @@ class TestEndPoints:
                 "",
                 False,
                 "mastercard",
-                datetime(2022, 8, 10, 0, 30, 40),
+                datetime(year=2022, month=8, day=10, hour=0, minute=30, second=40, tzinfo=UTC),
                 "tx_123ABC1",
-                datetime(2022, 8, 10, 0, 30, 40),
+                datetime(year=2022, month=8, day=10, hour=0, minute=30, second=40, tzinfo=UTC),
                 "user_ABC123",
             ),
         ],
@@ -358,7 +358,11 @@ class TestEndPoints:
 
         auth.register_callback_handler(handler)
 
-        transactions = Transaction.fetch(auth=auth, account_id=expected_account_id, since=datetime.now())
+        transactions = Transaction.fetch(
+            auth=auth,
+            account_id=expected_account_id,
+            since=datetime.now(tz=UTC),
+        )
         assert len(transactions) == 1
         transaction = transactions[0]
 

{monzo_api-1.2.6 → monzo_api-1.2.7}/tests/test_httpio_errors.py

@@ -1,3 +1,4 @@
+from email.message import Message
 from unittest.mock import patch
 from urllib.error import HTTPError
 
@@ -5,12 +6,10 @@ import pytest
 
 from monzo.exceptions import MonzoGeneralError
 from monzo.httpio import HttpIO
-from email.message import Message
 
 
 def test_unknown_status_code_raises_monzogeneralerror():
     http = HttpIO("https://example.com")
     error = HTTPError(url="https://example.com/test", code=418, msg="teapot", hdrs=Message(), fp=None)
-    with patch("monzo.httpio.urlopen", side_effect=error):
-        with pytest.raises(MonzoGeneralError):
-            http.get("/test")
+    with patch("monzo.httpio.urlopen", side_effect=error), pytest.raises(MonzoGeneralError):
+        http.get("/test")

{monzo_api-1.2.6 → monzo_api-1.2.7}/monzo/endpoints/attachment.py

@@ -27,11 +27,11 @@ class Attachment(Monzo):
 
     __slots__ = [
         "_attachment_id",
-        "_user_id",
+        "_created",
+        "_file_type",
         "_transaction_id",
         "_url",
-        "_file_type",
-        "_created",
+        "_user_id",
     ]
 
     def __init__(