amazon-orders 2.0.2__tar.gz → 3.0.0__tar.gz

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/CHANGELOG.md

@@ -4,7 +4,35 @@ All notable changes to this project will be documented in this file.
 
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/2.0.2...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/3.0.0...HEAD)
+
+## [3.0.0](https://github.com/alexdlaird/amazon-orders/compare/2.0.3...3.0.0) - 2024-11-03
+
+### Added
+
+- Retry support to CLI when stale session fails to authenticate the first time.
+- Improvements to exception messages on auth failures.
+- Documentation improvements.
+
+### Fixed
+
+- Several parsing issues with the implementation of Amazon's new `data-component` tag.
+
+### Removed
+
+- `Order.order_shipped_date`, this cannot be consistently parsed from Amazon.
+- `Order.refund_completed_date`, this cannot be consistently parsed from Amazon.
+
+## [2.0.3](https://github.com/alexdlaird/amazon-orders/compare/2.0.2...2.0.3) - 2024-11-01
+
+### Added
+
+- Further support for Amazon's new `data-component` tag on order price, seller, and return eligibility, and fixing an issue with `Shipment` parsing.
+- [`Parsable.to_date()`](https://amazon-orders.readthedocs.io/api.html#amazonorders.entity.parsable.Parsable.to_date) attempts multiple date formats.
+
+### Fixed
+
+- An issue with `Shipment`s parsing with Amazon's new `data-component`.
 
 ## [2.0.2](https://github.com/alexdlaird/amazon-orders/compare/2.0.1...2.0.2) - 2024-10-30
 

{amazon_orders-2.0.2/amazon_orders.egg-info → amazon_orders-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amazon-orders
-Version: 2.0.2
+Version: 3.0.0
 Summary: A CLI and library for interacting with Amazon order history.
 Maintainer-email: Alex Laird <contact@alexlaird.com>
 License: MIT License

{amazon_orders-2.0.2 → amazon_orders-3.0.0/amazon_orders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: amazon-orders
-Version: 2.0.2
+Version: 3.0.0
 Summary: A CLI and library for interacting with Amazon order history.
 Maintainer-email: Alex Laird <contact@alexlaird.com>
 License: MIT License

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/__init__.py

@@ -1,3 +1,3 @@
 __copyright__ = "Copyright (c) 2024 Alex Laird"
 __license__ = "MIT"
-__version__ = "2.0.2"
+__version__ = "3.0.0"

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/cli.py

@@ -15,7 +15,7 @@ from click.core import Context
 from amazonorders import __version__, util
 from amazonorders.conf import AmazonOrdersConfig
 from amazonorders.entity.order import Order
-from amazonorders.exception import AmazonOrdersError
+from amazonorders.exception import AmazonOrdersError, AmazonOrdersAuthError
 from amazonorders.orders import AmazonOrders
 from amazonorders.session import AmazonSession, IODefault
 
@@ -251,21 +251,34 @@ def _print_banner() -> None:
     click.echo(banner.format(version=__version__))
 
 
-def _authenticate(amazon_session: AmazonSession) -> None:
-    if amazon_session.auth_cookies_stored():
-        if amazon_session.username or amazon_session.password:
-            click.echo(
-                "Info: The --username and --password flags are ignored because a previous session "
-                "still exists. If you would like to reauthenticate, call the `logout` command "
-                "first.\n")
-    else:
-        if not amazon_session.username:
-            amazon_session.username = click.prompt("Username")
-        if not amazon_session.password:
-            amazon_session.password = click.prompt("Password", hide_input=True)
-            click.echo("")
-
-    amazon_session.login()
+def _authenticate(amazon_session: AmazonSession,
+                  retries: int = 0) -> None:
+    try:
+        if amazon_session.auth_cookies_stored():
+            if amazon_session.username or amazon_session.password:
+                click.echo(
+                    "Info: The --username and --password flags are ignored because a previous session "
+                    "still exists. If you would like to reauthenticate, call the `logout` command "
+                    "first.\n")
+        else:
+            if not amazon_session.username:
+                amazon_session.username = click.prompt("Username")
+            if not amazon_session.password:
+                amazon_session.password = click.prompt("Password", hide_input=True)
+                click.echo("")
+
+        amazon_session.login()
+    except AmazonOrdersAuthError as e:
+        if retries < 1:
+            if amazon_session.username:
+                click.echo(
+                    f"Info: Authenticating '{amazon_session.username}' failed, retrying ...\n")
+
+            amazon_session.password = None
+
+            _authenticate(amazon_session, retries=retries + 1)
+        else:
+            raise e
 
 
 def _order_output(order: Order) -> str:
@@ -299,10 +312,6 @@ Order #{}
         order_str += f"\n  Estimated Tax: ${order.estimated_tax:,.2f}"
     if order.refund_total:
         order_str += f"\n  Refund Total: ${order.refund_total:,.2f}"
-    if order.order_shipped_date:
-        order_str += f"\n  Order Shipped Date: {order.order_shipped_date}"
-    if order.refund_completed_date:
-        order_str += f"\n  Refund Completed Date: {order.refund_completed_date}"
 
     order_str += "\n-----------------------------------------------------------------------"
 

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/constants.py

@@ -5,6 +5,16 @@ import os
 
 
 class Constants:
+    """
+    A class containing useful constants. Extend and override with `constants_class` in the config:
+
+    .. code-block:: python
+
+        from amazonorders.conf import AmazonOrdersConfig
+
+        config = AmazonOrdersConfig(data={"constants_class": "my_module.MyConstants"})
+    """
+
     ##########################################################################
     # General URL
     ##########################################################################
@@ -53,3 +63,9 @@ class Constants:
         "User-Agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) "
                       "Chrome/120.0.0.0 Safari/537.36",
     }
+
+    ##########################################################################
+    # Formats
+    ##########################################################################
+
+    VALID_DATE_FORMATS = ["%b %d, %Y", "%B %d, %Y"]

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/entity/item.py

@@ -2,7 +2,7 @@ __copyright__ = "Copyright (c) 2024 Alex Laird"
 __license__ = "MIT"
 
 import logging
-from datetime import date, datetime
+from datetime import date
 from typing import Optional, TypeVar
 
 from bs4 import Tag
@@ -35,11 +35,11 @@ class Item(Parsable):
                                                 link=True, required=True)
         #: The Item price.
         self.price: Optional[float] = self.to_currency(
-            self.safe_simple_parse(selector=self.config.selectors.FIELD_ITEM_TAG_ITERATOR_SELECTOR,
+            self.safe_simple_parse(selector=self.config.selectors.FIELD_ITEM_PRICE_SELECTOR,
                                    prefix_split="$"))
         #: The Item Seller.
         self.seller: Optional[Seller] = self.safe_simple_parse(
-            selector=self.config.selectors.FIELD_ITEM_TAG_ITERATOR_SELECTOR,
+            selector=self.config.selectors.FIELD_ITEM_SELLER_SELECTOR,
             text_contains="Sold by:",
             wrap_tag=Seller)
         #: The Item condition.
@@ -69,7 +69,7 @@ class Item(Parsable):
     def _parse_return_eligible_date(self) -> Optional[date]:
         value = None
 
-        for tag in util.select(self.parsed, self.config.selectors.FIELD_ITEM_TAG_ITERATOR_SELECTOR):
+        for tag in util.select(self.parsed, self.config.selectors.FIELD_ITEM_RETURN_SELECTOR):
             if "Return" in tag.text:
                 tag_str = tag.text.strip()
                 split_str = "through "
@@ -77,6 +77,7 @@ class Item(Parsable):
                     split_str = "closed on "
                 if split_str in tag_str:
                     date_str = tag_str.split(split_str)[1]
-                    value = datetime.strptime(date_str, "%b %d, %Y").date()
+                    value = self.to_date(date_str)
+                    break
 
         return value

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/entity/order.py

@@ -3,7 +3,7 @@ __license__ = "MIT"
 
 import json
 import logging
-from datetime import date, datetime
+from datetime import date
 from typing import Any, List, Optional, TypeVar, Union
 
 from bs4 import BeautifulSoup, Tag
@@ -72,10 +72,6 @@ class Order(Parsable):
         self.estimated_tax: Optional[float] = self._if_full_details(self._parse_estimated_tax())
         #: The Order refund total. Only populated when ``full_details`` is ``True``.
         self.refund_total: Optional[float] = self._if_full_details(self._parse_refund_total())
-        #: The Order shipped date. Only populated when ``full_details`` is ``True``.
-        self.order_shipped_date: Optional[date] = self._if_full_details(self._parse_order_shipping_date())
-        #: The Order refund total. Only populated when ``full_details`` is ``True``.
-        self.refund_completed_date: Optional[date] = self._if_full_details(self._parse_refund_completed_date())
 
     def __repr__(self) -> str:
         return f"<Order #{self.order_number}: \"{self.items}\">"
@@ -137,19 +133,23 @@ class Order(Parsable):
         else:
             split_str = "Order placed"
 
-        value = value.split(split_str)[1].strip()
-        value = datetime.strptime(value, "%B %d, %Y").date()
+        date_str = value.split(split_str)[1].strip()
+        value = self.to_date(date_str)
 
         return value
 
     def _parse_recipient(self) -> Optional[Recipient]:
+        # At least for now, we don't populate Recipient data for digital orders
+        if util.select_one(self.parsed, self.config.selectors.FIELD_ORDER_GIFT_CARD_INSTANCE_SELECTOR):
+            return None
+
         value = util.select_one(self.parsed, self.config.selectors.FIELD_ORDER_ADDRESS_SELECTOR)
 
         if not value:
             value = util.select_one(self.parsed, self.config.selectors.FIELD_ORDER_ADDRESS_FALLBACK_1_SELECTOR)
 
             if value:
-                data_popover = value.get("data-a-popover", {})  # type: ignore[arg-type]
+                data_popover = value.get("data-a-popover", {})  # type: ignore[arg-type, var-annotated]
                 inline_content = data_popover.get("inlineContent")  # type: ignore[union-attr]
                 if inline_content:
                     value = BeautifulSoup(json.loads(inline_content), "html.parser")
@@ -266,26 +266,6 @@ class Order(Parsable):
 
         return value
 
-    def _parse_order_shipping_date(self) -> Optional[date]:
-        value = self.simple_parse(self.config.selectors.FIELD_ORDER_SHIPPED_DATE_SELECTOR,
-                                  prefix_split="Items shipped:")
-
-        if value:
-            date_str = value.split("-")[0].strip()
-            value = datetime.strptime(date_str, "%B %d, %Y").date()
-
-        return value
-
-    def _parse_refund_completed_date(self) -> Optional[date]:
-        value = self.simple_parse(self.config.selectors.FIELD_ORDER_REFUND_COMPLETED_DATE,
-                                  prefix_split="Refund: Completed")
-
-        if value:
-            date_str = value.split("-")[0].strip()
-            value = datetime.strptime(date_str, "%B %d, %Y").date()
-
-        return value
-
     def _if_full_details(self,
                          value: Any) -> Union[Any, None]:
         return value if self.full_details else None

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/entity/parsable.py

@@ -2,6 +2,7 @@ __copyright__ = "Copyright (c) 2024 Alex Laird"
 __license__ = "MIT"
 
 import logging
+from datetime import date, datetime
 from typing import Any, Callable, Optional, Type, Union, Dict
 
 from bs4 import Tag
@@ -169,3 +170,26 @@ class Parsable:
             return None
 
         return currency
+
+    def to_date(self,
+                date_str: str) -> Optional[date]:
+        """
+        Return the given date string as a date object.
+
+        :param date_str: The date string to parse to a date object.
+        :return: The parsed date.
+        """
+        value = None
+
+        for fmt in self.config.constants.VALID_DATE_FORMATS:
+            try:
+                value = datetime.strptime(date_str, fmt).date()
+            except ValueError:
+                pass
+
+        if value is None:
+            logger.warning(
+                f"ValueError: time data '{date_str}' does not match any format in "
+                f"{self.config.constants.VALID_DATE_FORMATS}")
+
+        return value

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/forms.py

@@ -196,7 +196,8 @@ class SignInForm(AuthForm):
         super().fill_form()
         if not self.data:
             raise AmazonOrdersError(
-                "AuthForm did not populate. Check if Amazon changed the expected HTML."
+                "SignInForm data did not populate, but it's required. "
+                "Check if Amazon changed their login flow."
             )  # pragma: no cover
 
         additional_attrs.update({self.solution_attr_key: self.amazon_session.username,
@@ -236,7 +237,8 @@ class MfaDeviceSelectForm(AuthForm):
         super().fill_form()
         if not self.data:
             raise AmazonOrdersError(
-                "AuthForm did not populate. Check if Amazon changed the expected HTML."
+                "MfaDeviceSelectForm data did not populate, but it's required. "
+                "Check if Amazon changed their MFA flow."
             )  # pragma: no cover
 
         contexts = util.select(self.form, self.config.selectors.MFA_DEVICE_SELECT_INPUT_SELECTOR)
@@ -281,8 +283,8 @@ class MfaForm(AuthForm):
         super().fill_form()
         if not self.data:
             raise AmazonOrdersError(
-                "AuthForm did not populate, but it's required. "
-                "Check if Amazon changed the expected HTML."
+                "MfaForm data did not populate, but it's required. "
+                "Check if Amazon changed their MFA flow."
             )  # pragma: no cover
 
         otp = self.amazon_session.io.prompt("Enter the one-time passcode sent to your device")
@@ -320,22 +322,23 @@ class CaptchaForm(AuthForm):
         super().fill_form(additional_attrs)
         if not self.data:
             raise AmazonOrdersError(
-                "AuthForm did not populate. Check if Amazon changed the expected HTML."
+                "CaptchaForm data did not populate, but it's required. "
+                "Check if Amazon changed their Captcha flow."
             )  # pragma: no cover
 
         # TODO: eliminate the use of find_parent() here
         form_parent = self.form.find_parent()
         if not form_parent:
             raise AmazonOrdersError(
-                "AuthForm parent not found, but it's required. "
-                "Check if Amazon changed the expected HTML."
+                "CaptchaForm parent not found, but it's required. "
+                "Check if Amazon changed their Captcha flow."
             )  # pragma: no cover
 
         img_tag = form_parent.select_one("img")
         if not img_tag:
             raise AmazonOrdersError(
-                "AuthForm <img> tag not found, but it's required. "
-                "Check if Amazon changed the expected HTML."
+                "CaptchaForm <img> tag not found, but it's required. "
+                "Check if Amazon changed their Captcha flow."
             )  # pragma: no cover
 
         img_url = str(img_tag["src"])

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/selectors.py

@@ -3,6 +3,16 @@ __license__ = "MIT"
 
 
 class Selectors:
+    """
+    A class containing CSS selectors. Extend and override with `selectors_class` in the config:
+
+    .. code-block:: python
+
+        from amazonorders.conf import AmazonOrdersConfig
+
+        config = AmazonOrdersConfig(data={"selectors_class": "my_module.MyConstants"})
+    """
+
     ##########################################################################
     # CSS selectors for AuthForms
     ##########################################################################
@@ -35,47 +45,52 @@ class Selectors:
     # is passed.
     ##########################################################################
 
-    ORDER_HISTORY_ENTITY_SELECTOR = ["div.order", "div.order-card"]
-    ORDER_DETAILS_ENTITY_SELECTOR = ["div#orderDetails", "div#ordersContainer", "[data-component='orderCard']"]
+    ORDER_HISTORY_ENTITY_SELECTOR = ["div.order-card", "div.order"]
+    ORDER_DETAILS_ENTITY_SELECTOR = ["div#orderDetails", "div#ordersContainer"]
     ITEM_ENTITY_SELECTOR = ["div:has(> div.yohtmlc-item)", ".item-box", "[data-component='purchasedItems']"]
-    SHIPMENT_ENTITY_SELECTOR = ["div.shipment", "div.delivery-box", "[data-component='shipments']"]
+    SHIPMENT_ENTITY_SELECTOR = ["div.shipment", "div.delivery-box",
+                                "[data-component='orderCard'] [data-component='shipments']"]
 
     #####################################
     # CSS selectors for Item fields
     #####################################
 
     FIELD_ITEM_IMG_LINK_SELECTOR = "a img"
-    FIELD_ITEM_QUANTITY_SELECTOR = ["span.item-view-qty", "span.product-image__qty", "[data-component='itemQuantity']"]
-    FIELD_ITEM_TITLE_SELECTOR = [".yohtmlc-item a", ".yohtmlc-product-title", "[data-component='itemTitle']"]
-    FIELD_ITEM_LINK_SELECTOR = [".yohtmlc-item a", "a:has(> .yohtmlc-product-title)", "[data-component='itemTitle'] a"]
-    FIELD_ITEM_TAG_ITERATOR_SELECTOR = [".yohtmlc-item div", "[data-component='purchasedItemsRightGrid']"]
+    FIELD_ITEM_QUANTITY_SELECTOR = [".od-item-view-qty", "span.item-view-qty", "span.product-image__qty"]
+    FIELD_ITEM_TITLE_SELECTOR = ["[data-component='itemTitle']", ".yohtmlc-item a", ".yohtmlc-product-title"]
+    FIELD_ITEM_LINK_SELECTOR = ["[data-component='itemTitle'] a", ".yohtmlc-item a", "a:has(> .yohtmlc-product-title)"]
+    FIELD_ITEM_TAG_ITERATOR_SELECTOR = [".yohtmlc-item div"]
+    FIELD_ITEM_PRICE_SELECTOR = ["[data-component='unitPrice']"] + FIELD_ITEM_TAG_ITERATOR_SELECTOR
+    FIELD_ITEM_SELLER_SELECTOR = ["[data-component='orderedMerchant']"] + FIELD_ITEM_TAG_ITERATOR_SELECTOR
+    FIELD_ITEM_RETURN_SELECTOR = ["[data-component='itemReturnEligibility']"] + FIELD_ITEM_TAG_ITERATOR_SELECTOR
 
     #####################################
     # CSS selectors for Order fields
     #####################################
 
     FIELD_ORDER_DETAILS_LINK_SELECTOR = "a.yohtmlc-order-details-link"
-    FIELD_ORDER_NUMBER_SELECTOR = ["bdi[dir='ltr']", "span[dir='ltr']"]
+    FIELD_ORDER_NUMBER_SELECTOR = [".order-date-invoice-item bdi[dir='ltr']", "bdi[dir='ltr']", "span[dir='ltr']"]
     FIELD_ORDER_GRAND_TOTAL_SELECTOR = ["div.yohtmlc-order-total span.value", "div.order-header div.a-column.a-span2"]
-    FIELD_ORDER_PLACED_DATE_SELECTOR = ["span.order-date-invoice-item",
-                                        "div.a-span3"]
+    FIELD_ORDER_PLACED_DATE_SELECTOR = ["span.order-date-invoice-item", "div.a-span3"]
     FIELD_ORDER_PAYMENT_METHOD_SELECTOR = "img.pmts-payment-credit-card-instrument-logo"
     FIELD_ORDER_PAYMENT_METHOD_LAST_4_SELECTOR = "img.pmts-payment-credit-card-instrument-logo"
-    FIELD_ORDER_SUBTOTALS_TAG_ITERATOR_SELECTOR = ["div#od-subtotals div.a-row", "[data-component='orderSubtotals']"]
+    FIELD_ORDER_SUBTOTALS_TAG_ITERATOR_SELECTOR = ["[data-component='orderSubtotals'] div.a-row",
+                                                   "div#od-subtotals div.a-row"]
     FIELD_ORDER_SUBTOTALS_INNER_TAG_SELECTOR = "div.a-span-last"
     FIELD_ORDER_ADDRESS_SELECTOR = "div.displayAddressDiv"
     FIELD_ORDER_ADDRESS_FALLBACK_1_SELECTOR = "div.recipient span.a-declarative"
     FIELD_ORDER_ADDRESS_FALLBACK_2_SELECTOR = "script[id^='shipToData']"
-    FIELD_ORDER_SHIPPED_DATE_SELECTOR = "#orderDetails div.a-box.a-last div div div.a-row:not(.a-color-success)"
-    FIELD_ORDER_REFUND_COMPLETED_DATE = "#orderDetails div.a-box.a-last div div div.a-row.a-color-success"
+    FIELD_ORDER_GIFT_CARD_INSTANCE_SELECTOR = ".gift-card-instance"
 
     #####################################
     # CSS selectors for Shipment fields
     #####################################
 
-    FIELD_SHIPMENT_TRACKING_LINK_SELECTOR = "span.track-package-button a"
+    FIELD_SHIPMENT_TRACKING_LINK_SELECTOR = ["span.track-package-button a", "a[href*='ship-track?itemId=']"]
     FIELD_SHIPMENT_DELIVERY_STATUS_SELECTOR = ["div.js-shipment-info-container div.a-row",
-                                               "span.delivery-box__primary-text"]
+                                               "span.delivery-box__primary-text",
+                                               ".yohtmlc-shipment-status-primaryText",
+                                               ".od-status-message"]
 
     #####################################
     # CSS selectors for Recipient fields

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/session.py

@@ -98,7 +98,8 @@ class AmazonSession:
         self.io: IODefault = io
         #: The AmazonOrdersConfig to use.
         self.config: AmazonOrdersConfig = config
-        #: The list of known form implementations to use with authentication.
+        #: The list of form implementations to use with authentication. If a value is passed for this when
+        #: instantiating an AmazonSession, ensure that list is populated with the default form implementations.
         self.auth_forms: List[AuthForm] = auth_forms
 
         #: The shared session to be used across all requests.

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/amazonorders/util.py

@@ -2,10 +2,13 @@ __copyright__ = "Copyright (c) 2024 Alex Laird"
 __license__ = "MIT"
 
 import importlib
+import logging
 from typing import List, Union, Optional, Callable
 
 from bs4 import Tag
 
+logger = logging.getLogger(__name__)
+
 
 def select(parsed: Tag, selector: Union[List[str], str]) -> List[Tag]:
     """

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/tests/test_orders.py

@@ -51,6 +51,32 @@ class TestOrders(UnitTestCase):
         self.assertEqual(1, resp1.call_count)
         self.assertEqual(1, resp2.call_count)
 
+    @responses.activate
+    def test_get_order_history_2024_data_component(self):
+        # GIVEN
+        self.amazon_session.is_authenticated = True
+        year = 2024
+        start_index = 0
+        resp1 = self.given_order_history_landing_exists()
+        resp2 = self.given_order_history_exists(year, start_index)
+
+        # WHEN
+        orders = self.amazon_orders.get_order_history(year=year, start_index=start_index)
+
+        # THEN
+        # Giving start_index=0 means we only got the first page, so just 10 results
+        self.assertEqual(10, len(orders))
+        # Regular order with new `data-component` fields
+        self.assert_order_112_5939971_8962610_data_component(orders[0], False)
+        # Gift card order
+        self.assert_order_112_4482432_2955442_gift_card(orders[2], False)
+        # Digital order (legacy)
+        self.assert_order_112_9087159_1657009_digital_order_legacy(orders[3], False)
+        # Subscription order
+        self.assert_order_114_8722141_6545058_data_component_subscription(orders[6], False)
+        self.assertEqual(1, resp1.call_count)
+        self.assertEqual(1, resp2.call_count)
+
     @responses.activate
     def test_get_order_history_paginated(self):
         # GIVEN
@@ -198,6 +224,90 @@ class TestOrders(UnitTestCase):
         self.assert_order_112_9685975_5907428_multiple_items_shipments_sellers(order, True)
         self.assertEqual(1, resp1.call_count)
 
+    @responses.activate
+    def test_get_order_2024_data_component(self):
+        # GIVEN
+        self.amazon_session.is_authenticated = True
+        order_id = "112-5939971-8962610"
+        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+                  encoding="utf-8") as f:
+            resp1 = responses.add(
+                responses.GET,
+                f"{self.test_config.constants.ORDER_DETAILS_URL}?orderID={order_id}",
+                body=f.read(),
+                status=200,
+            )
+
+        # WHEN
+        order = self.amazon_orders.get_order(order_id)
+
+        # THEN
+        self.assert_order_112_5939971_8962610_data_component(order, True)
+        self.assertEqual(1, resp1.call_count)
+
+    @responses.activate
+    def test_get_order_2024_gift_card(self):
+        # GIVEN
+        self.amazon_session.is_authenticated = True
+        order_id = "112-4482432-2955442"
+        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+                  encoding="utf-8") as f:
+            resp1 = responses.add(
+                responses.GET,
+                f"{self.test_config.constants.ORDER_DETAILS_URL}?orderID={order_id}",
+                body=f.read(),
+                status=200,
+            )
+
+        # WHEN
+        order = self.amazon_orders.get_order(order_id)
+
+        # THEN
+        self.assert_order_112_4482432_2955442_gift_card(order, True)
+        self.assertEqual(1, resp1.call_count)
+
+    @responses.activate
+    def test_get_order_2024_digital_order_legacy(self):
+        # GIVEN
+        self.amazon_session.is_authenticated = True
+        order_id = "112-9087159-1657009"
+        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+                  encoding="utf-8") as f:
+            resp1 = responses.add(
+                responses.GET,
+                f"{self.test_config.constants.ORDER_DETAILS_URL}?orderID={order_id}",
+                body=f.read(),
+                status=200,
+            )
+
+        # WHEN
+        order = self.amazon_orders.get_order(order_id)
+
+        # THEN
+        self.assert_order_112_9087159_1657009_digital_order_legacy(order, True)
+        self.assertEqual(1, resp1.call_count)
+
+    @responses.activate
+    def test_get_order_2024_data_component_subscription(self):
+        # GIVEN
+        self.amazon_session.is_authenticated = True
+        order_id = "114-8722141-6545058"
+        with open(os.path.join(self.RESOURCES_DIR, f"order-details-{order_id}.html"), "r",
+                  encoding="utf-8") as f:
+            resp1 = responses.add(
+                responses.GET,
+                f"{self.test_config.constants.ORDER_DETAILS_URL}?orderID={order_id}",
+                body=f.read(),
+                status=200,
+            )
+
+        # WHEN
+        order = self.amazon_orders.get_order(order_id)
+
+        # THEN
+        self.assert_order_114_8722141_6545058_data_component_subscription(order, True)
+        self.assertEqual(1, resp1.call_count)
+
     @unittest.skipIf(not os.path.exists(temp_order_history_file_path),
                      reason="Skipped, to debug an order history page, "
                             "place it at tests/output/temp-order-history.html")

{amazon_orders-2.0.2 → amazon_orders-3.0.0}/tests/testcase.py

@@ -36,9 +36,6 @@ class TestCase(unittest.TestCase):
             self.assertIsNone(order.subscription_discount)
             self.assertEqual(30.99, order.total_before_tax)
             self.assertEqual(3.02, order.estimated_tax)
-            self.assertEqual(date(2018, 12, 28), order.order_shipped_date)
-            # As of April 2024, this is no longer shown in Order History
-            # self.assertEqual("New", order.items[0].condition)
             self.assertEqual(30.99, order.items[0].price)
             self.assertEqual("Amazon.com Services, Inc",
                              order.items[0].seller.name)
@@ -73,9 +70,6 @@ class TestCase(unittest.TestCase):
             self.assertEqual(-5.83, order.subscription_discount)
             self.assertEqual(33.01, order.total_before_tax)
             self.assertEqual(2.89, order.estimated_tax)
-            self.assertEqual(date(2020, 10, 28), order.order_shipped_date)
-            # As of April 2024, this is no longer shown in Order History
-            # self.assertEqual("New", order.items[0].condition)
             self.assertEqual(38.84, order.items[0].price)
             self.assertEqual("Amazon.com Services, Inc",
                              order.items[0].seller.name)
@@ -111,10 +105,6 @@ class TestCase(unittest.TestCase):
             self.assertEqual(69.99, order.total_before_tax)
             self.assertEqual(6.12, order.estimated_tax)
             self.assertEqual(76.11, order.refund_total)
-            self.assertEqual(date(2020, 10, 19), order.order_shipped_date)
-            self.assertTrue(date(2020, 11, 2), order.refund_completed_date)
-            # As of April 2024, this is no longer shown in Order History
-            # self.assertEqual("New", order.items[0].condition)
             self.assertEqual(69.99, order.items[0].price)
             self.assertEqual("Amazon.com Services, Inc",
                              order.items[0].seller.name)
@@ -184,12 +174,7 @@ class TestCase(unittest.TestCase):
             self.assertIsNone(order.subscription_discount)
             self.assertEqual(43.23, order.total_before_tax)
             self.assertEqual(3.38, order.estimated_tax)
-            self.assertEqual(date(2023, 12, 7), order.order_shipped_date)
-            # As of April 2024, this is no longer shown in Order History
-            # self.assertEqual("New", order.items[0].condition)
             self.assertEqual(14.99, order.items[0].price)
-            # As of April 2024, this is no longer shown in Order History
-            # self.assertEqual("New", order.items[1].condition)
             self.assertEqual(28.24, order.items[1].price)
             found_cadeya = False
             found_amazon = False
@@ -266,12 +251,7 @@ class TestCase(unittest.TestCase):
             self.assertIsNone(order.subscription_discount)
             self.assertEqual(42.29, order.total_before_tax)
             self.assertEqual(2.96, order.estimated_tax)
-            self.assertEqual(date(2024, 5, 16), order.order_shipped_date)
-            # As of April 2024, this is no longer shown in Order History
-            # self.assertEqual("New", order.items[0].condition)
             self.assertEqual(12.30, order.items[0].price)
-            # As of April 2024, this is no longer shown in Order History
-            # self.assertEqual("New", order.items[1].condition)
             self.assertEqual(29.99, order.items[1].price)
             found_kimoe = False
             found_amazon = False
@@ -330,22 +310,17 @@ class TestCase(unittest.TestCase):
             self.assertIsNone(order.subscription_discount)
             self.assertEqual(26.48, order.total_before_tax)
             self.assertEqual(2.32, order.estimated_tax)
-            self.assertEqual(date(2020, 10, 27), order.order_shipped_date)
             found_aa = False
             found_aaa = False
             for item in order.items:
                 if "AAA" in item.title:
                     found_aa = True
-                    # As of April 2024, this is no longer shown in Order History
-                    # self.assertEqual("New", item.condition)
                     self.assertEqual(10.99, item.price)
                     self.assertEqual("Amazon.com Services, Inc",
                                      item.seller.name)
                     self.assertIsNone(item.seller.link)
                 else:
                     found_aaa = True
-                    # As of April 2024, this is no longer shown in Order History
-                    # self.assertEqual("New", item.condition)
                     self.assertEqual(15.49, item.price)
                     self.assertEqual("Amazon.com Services, Inc",
                                      item.seller.name)
@@ -353,6 +328,117 @@ class TestCase(unittest.TestCase):
             self.assertTrue(found_aa)
             self.assertTrue(found_aaa)
 
+    def assert_order_112_5939971_8962610_data_component(self, order, full_details=False):
+        self.assertEqual("112-5939971-8962610", order.order_number)
+        self.assertEqual(28.50, order.grand_total)
+        self.assertIsNotNone(order.order_details_link)
+        self.assertEqual(date(2024, 11, 1), order.order_placed_date)
+        self.assertEqual("Alex Laird", order.recipient.name)
+        self.assertIn("555 My Road", order.recipient.address)
+        self.assertEqual(1, len(order.shipments))
+        self.assertEqual(str(order.items),
+                         str(order.shipments[0].items))
+        self.assertIsNotNone(order.shipments[0].tracking_link)
+        self.assertEqual("Delivered November 2", order.shipments[0].delivery_status)
+        self.assertEqual(1, len(order.items))
+        self.assertEqual("2 Set Replacement Parts Roller Brushes Compatible for iRobot Roomba E I and J Series, "
+                         "Brush Replacement for iRobot Roomba i3 i3+ i6 i6+ i7 i7+ i8 i8+Plus E5 E6 E7 j7 j7+ evo "
+                         "Vacuum Cleaner Accessories",
+                         order.items[0].title)
+        self.assertEqual(2, order.items[0].quantity)
+        self.assertIsNotNone(order.items[0].link)
+        self.assertIsNotNone(order.items[0].image_link)
+
+        self.assertEqual(order.full_details, full_details)
+
+        if full_details:
+            self.assertEqual(date(2025, 1, 31), order.items[0].return_eligible_date)
+            self.assertEqual("American Express", order.payment_method)
+            self.assertEqual('1234', order.payment_method_last_4)
+            self.assertEqual(27.98, order.subtotal)
+            self.assertEqual(0.00, order.shipping_total)
+            self.assertEqual(26.58, order.total_before_tax)
+            self.assertEqual(1.92, order.estimated_tax)
+            self.assertEqual(13.99, order.items[0].price)
+            self.assertEqual("xianbaikeshang",
+                             order.items[0].seller.name)
+            self.assertIsNotNone(order.items[0].seller.link)
+
+    def assert_order_112_4482432_2955442_gift_card(self, order, full_details=False):
+        self.assertEqual("112-4482432-2955442", order.order_number)
+        self.assertEqual(10.00, order.grand_total)
+        self.assertIsNotNone(order.order_details_link)
+        self.assertEqual(date(2024, 10, 30), order.order_placed_date)
+        self.assertIsNone(order.recipient)
+        self.assertEqual(0, len(order.shipments))
+        self.assertEqual(1, len(order.items))
+        self.assertEqual("Amazon eGift Card - Amazon Logo (Animated)",
+                         order.items[0].title)
+        self.assertIsNotNone(order.items[0].link)
+        self.assertIsNotNone(order.items[0].image_link)
+
+        self.assertEqual(order.full_details, full_details)
+
+        if full_details:
+            self.assertEqual("American Express", order.payment_method)
+            self.assertEqual('1234', order.payment_method_last_4)
+            self.assertEqual(10.00, order.subtotal)
+            self.assertEqual(10.00, order.total_before_tax)
+            self.assertEqual(0.00, order.estimated_tax)
+
+    def assert_order_112_9087159_1657009_digital_order_legacy(self, order, full_details=False):
+        if full_details:
+            self.assertEqual(order.order_number, "D01-8711688-7680252")
+        else:
+            self.assertEqual(order.order_number, "112-9087159-1657009")
+        self.assertEqual(10.00, order.grand_total)
+        self.assertIsNotNone(order.order_details_link)
+        self.assertEqual(date(2024, 10, 30), order.order_placed_date)
+        self.assertEqual(0, len(order.shipments))
+        self.assertEqual(1, len(order.items))
+        self.assertEqual("$10 -PlayStation Store Gift Card [Digital Code]",
+                         order.items[0].title)
+        self.assertIsNotNone(order.items[0].link)
+        self.assertIsNotNone(order.items[0].image_link)
+
+        self.assertEqual(order.full_details, full_details)
+
+        # We cannot parse full details for digital orders, so nothing to assert
+
+    def assert_order_114_8722141_6545058_data_component_subscription(self, order, full_details=False):
+        self.assertEqual("114-8722141-6545058", order.order_number)
+        self.assertEqual(44.46, order.grand_total)
+        self.assertIsNotNone(order.order_details_link)
+        self.assertEqual(date(2024, 10, 23), order.order_placed_date)
+        self.assertEqual("Alex Laird", order.recipient.name)
+        self.assertIn("555 My Road", order.recipient.address)
+        self.assertEqual(1, len(order.shipments))
+        self.assertEqual(str(order.items),
+                         str(order.shipments[0].items))
+        self.assertIsNotNone(order.shipments[0].tracking_link)
+        self.assertEqual("Delivered October 26", order.shipments[0].delivery_status)
+        self.assertEqual(1, len(order.items))
+        self.assertEqual("Bounty Paper Towels Quick Size, White, 16 Family Rolls = 40 Regular Rolls",
+                         order.items[0].title)
+        self.assertIsNotNone(order.items[0].link)
+        self.assertIsNotNone(order.items[0].image_link)
+
+        self.assertEqual(order.full_details, full_details)
+
+        if full_details:
+            self.assertEqual(date(2024, 11, 25), order.items[0].return_eligible_date)
+            self.assertEqual("American Express", order.payment_method)
+            self.assertEqual('1234', order.payment_method_last_4)
+            self.assertEqual(43.49, order.subtotal)
+            self.assertEqual(0.00, order.shipping_total)
+            self.assertEqual(-2.17, order.subscription_discount)
+            self.assertEqual(41.32, order.total_before_tax)
+            self.assertEqual(3.14, order.estimated_tax)
+            self.assertEqual(43.49, order.items[0].price)
+            self.assertEqual("Amazon.com",
+                             order.items[0].seller.name)
+            self.assertIsNone(order.items[0].seller.link)
+
     def assert_populated_generic(self, order, full_details):
         self.assertIsNotNone(order.order_number)
         self.assertIsNotNone(order.grand_total)
@@ -377,8 +463,6 @@ class TestCase(unittest.TestCase):
                 self.assertIsNotNone(order.shipping_total)
             self.assertIsNotNone(order.total_before_tax)
             self.assertIsNotNone(order.estimated_tax)
-            # As of April 2024, this is no longer shown in Order History
-            # self.assertIsNotNone(order.items[0].condition)
             if order.recipient:
                 self.assertIsNotNone(order.items[0].price)
                 self.assertIsNotNone(order.items[0].seller.name)