amazon-orders 3.2.0__tar.gz → 3.2.1__tar.gz

{amazon_orders-3.2.0 → amazon_orders-3.2.1}/CHANGELOG.md

@@ -6,6 +6,13 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/3.2.0...HEAD)
 
+## [3.2.1](https://github.com/alexdlaird/amazon-orders/compare/3.2.0...3.2.1) - 2024-11-08
+
+### Fixed
+
+- Issues with parsing Items and Shipments using the new `data-component`, selectors made more precise.
+- Transactions use `util` selector methods, so consistent use of trying a list of selectors is maintained.
+
 ## [3.2.0](https://github.com/alexdlaird/amazon-orders/compare/3.1.0...3.2.0) - 2024-11-07
 
 ### Added

{amazon_orders-3.2.0/amazon_orders.egg-info → amazon_orders-3.2.1}/PKG-INFO

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

{amazon_orders-3.2.0 → amazon_orders-3.2.1/amazon_orders.egg-info}/PKG-INFO

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

{amazon_orders-3.2.0 → amazon_orders-3.2.1}/amazonorders/__init__.py

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

{amazon_orders-3.2.0 → amazon_orders-3.2.1}/amazonorders/selectors.py

@@ -45,20 +45,30 @@ class Selectors:
     # is passed.
     ##########################################################################
 
-    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='orderCard'] [data-component='shipments']"]
+    ORDER_HISTORY_ENTITY_SELECTOR = ["div.order-card",
+                                     "div.order"]
+    ORDER_DETAILS_ENTITY_SELECTOR = ["div#orderDetails",
+                                     "div#ordersContainer"]
+    ITEM_ENTITY_SELECTOR = ["[data-component='purchasedItems'] .a-fixed-left-grid",
+                            "div:has(> div.yohtmlc-item)",
+                            ".item-box"]
+    SHIPMENT_ENTITY_SELECTOR = ["[data-component='orderCard'] [data-component='shipments'] .a-box",
+                                "div.shipment",
+                                "div.delivery-box"]
 
     #####################################
     # CSS selectors for Item fields
     #####################################
 
     FIELD_ITEM_IMG_LINK_SELECTOR = "a img"
-    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_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'] .a-text-price :not(.a-offscreen)",
                                  ".yohtmlc-item .a-color-price"]
@@ -70,9 +80,13 @@ class Selectors:
     #####################################
 
     FIELD_ORDER_DETAILS_LINK_SELECTOR = "a.yohtmlc-order-details-link"
-    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_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_PAYMENT_METHOD_SELECTOR = "img.pmts-payment-credit-card-instrument-logo"
     FIELD_ORDER_PAYMENT_METHOD_LAST_4_SELECTOR = "span:has(img.pmts-payment-credit-card-instrument-logo):last-child"
     FIELD_ORDER_SUBTOTALS_TAG_ITERATOR_SELECTOR = ["[data-component='orderSubtotals'] div.a-row",
@@ -88,7 +102,8 @@ class Selectors:
     # CSS selectors for Shipment fields
     #####################################
 
-    FIELD_SHIPMENT_TRACKING_LINK_SELECTOR = ["span.track-package-button a", "a[href*='ship-track?itemId=']"]
+    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",
                                                ".yohtmlc-shipment-status-primaryText",
@@ -122,25 +137,19 @@ class Selectors:
     TRANSACTIONS_CONTAINER_SELECTOR = "div"
     TRANSACTIONS_SELECTOR = "div.apx-transactions-line-item-component-container"
 
-    TRANSACTIONS_NEXT_PAGE_INPUT_SELECTOR = (
-        "input[type='submit'][name^='ppw-widgetEvent:DefaultNextPageNavigationEvent']"
-    )
+    TRANSACTIONS_NEXT_PAGE_INPUT_SELECTOR = [
+        "input[type='submit'][name^='ppw-widgetEvent:DefaultNextPageNavigationEvent']"]
     TRANSACTIONS_NEXT_PAGE_INPUT_STATE_SELECTOR = "input[name='ppw-widgetState']"
     TRANSACTIONS_NEXT_PAGE_INPUT_IE_SELECTOR = "input[name='ie']"
 
     FIELD_TRANSACTION_COMPLETED_DATE_SELECTOR = "span"
-    FIELD_TRANSACTION_PAYMENT_METHOD_SELECTOR = (
-        "div.apx-transactions-line-item-component-container > div:nth-child(1) span.a-size-base"
-    )
-    FIELD_TRANSACTION_GRAND_TOTAL_SELECTOR = (
-        "div.apx-transactions-line-item-component-container > div:nth-child(1) span.a-size-base-plus"
-    )
-    FIELD_TRANSACTION_ORDER_NUMBER_SELECTOR = (
-        "div.apx-transactions-line-item-component-container > div:nth-child(2) a.a-link-normal"
-    )
-    FIELD_TRANSACTION_ORDER_LINK_SELECTOR = (
-        "div.apx-transactions-line-item-component-container > div:nth-child(2) a.a-link-normal"
-    )
-    FIELD_TRANSACTION_SELLER_NAME_SELECTOR = (
-        "div.apx-transactions-line-item-component-container > div:nth-child(3) span.a-size-base"
-    )
+    FIELD_TRANSACTION_PAYMENT_METHOD_SELECTOR = [
+        "div.apx-transactions-line-item-component-container > div:nth-child(1) span.a-size-base"]
+    FIELD_TRANSACTION_GRAND_TOTAL_SELECTOR = [
+        "div.apx-transactions-line-item-component-container > div:nth-child(1) span.a-size-base-plus"]
+    FIELD_TRANSACTION_ORDER_NUMBER_SELECTOR = [
+        "div.apx-transactions-line-item-component-container > div:nth-child(2) a.a-link-normal"]
+    FIELD_TRANSACTION_ORDER_LINK_SELECTOR = [
+        "div.apx-transactions-line-item-component-container > div:nth-child(2) a.a-link-normal"]
+    FIELD_TRANSACTION_SELLER_NAME_SELECTOR = [
+        "div.apx-transactions-line-item-component-container > div:nth-child(3) span.a-size-base"]

{amazon_orders-3.2.0 → amazon_orders-3.2.1}/amazonorders/transactions.py

@@ -8,6 +8,7 @@ from typing import Dict, List, Optional, Tuple
 from bs4 import Tag
 from dateutil import parser
 
+from amazonorders import util
 from amazonorders.conf import AmazonOrdersConfig
 from amazonorders.entity.transaction import Transaction
 from amazonorders.exception import AmazonOrdersError
@@ -24,13 +25,9 @@ def _parse_transaction_form_tag(
         form_tag: Tag, config: AmazonOrdersConfig
 ) -> Tuple[List[Transaction], Optional[str], Optional[Dict[str, str]]]:
     transactions = []
-    date_container_tags = form_tag.select(
-        config.selectors.TRANSACTION_DATE_CONTAINERS_SELECTOR
-    )
+    date_container_tags = util.select(form_tag, config.selectors.TRANSACTION_DATE_CONTAINERS_SELECTOR)
     for date_container_tag in date_container_tags:
-        date_tag = date_container_tag.select_one(
-            config.selectors.FIELD_TRANSACTION_COMPLETED_DATE_SELECTOR
-        )
+        date_tag = util.select_one(date_container_tag, config.selectors.FIELD_TRANSACTION_COMPLETED_DATE_SELECTOR)
         if not date_tag:
             logger.warning("Could not find date tag in transaction form.")
             continue
@@ -39,30 +36,21 @@ def _parse_transaction_form_tag(
         date = parser.parse(date_str).date()
 
         transactions_container_tag = date_container_tag.find_next_sibling(
-            config.selectors.TRANSACTIONS_CONTAINER_SELECTOR
-        )
+            config.selectors.TRANSACTIONS_CONTAINER_SELECTOR)
         if not isinstance(transactions_container_tag, Tag):
             logger.warning(
                 "Could not find transactions container tag in transaction form."
             )
             continue
 
-        transaction_tags = transactions_container_tag.select(
-            config.selectors.TRANSACTIONS_SELECTOR
-        )
+        transaction_tags = util.select(transactions_container_tag, config.selectors.TRANSACTIONS_SELECTOR)
         for transaction_tag in transaction_tags:
             transaction = Transaction(transaction_tag, config, date)
             transactions.append(transaction)
 
-    form_state_input = form_tag.select_one(
-        config.selectors.TRANSACTIONS_NEXT_PAGE_INPUT_STATE_SELECTOR
-    )
-    form_ie_input = form_tag.select_one(
-        config.selectors.TRANSACTIONS_NEXT_PAGE_INPUT_IE_SELECTOR
-    )
-    next_page_input = form_tag.select_one(
-        config.selectors.TRANSACTIONS_NEXT_PAGE_INPUT_SELECTOR
-    )
+    form_state_input = util.select_one(form_tag, config.selectors.TRANSACTIONS_NEXT_PAGE_INPUT_STATE_SELECTOR)
+    form_ie_input = util.select_one(form_tag, config.selectors.TRANSACTIONS_NEXT_PAGE_INPUT_IE_SELECTOR)
+    next_page_input = util.select_one(form_tag, config.selectors.TRANSACTIONS_NEXT_PAGE_INPUT_SELECTOR)
     if not next_page_input or not form_state_input or not form_ie_input:
         return (transactions, None, None)
 
@@ -118,9 +106,8 @@ class AmazonTransactions:
         if not self.amazon_session.last_response_parsed:
             raise AmazonOrdersError("Could not get transaction history landing page.")
 
-        form_tag = self.amazon_session.last_response_parsed.select_one(
-            self.config.selectors.TRANSACTION_HISTORY_FORM_SELECTOR
-        )
+        form_tag = util.select_one(self.amazon_session.last_response_parsed,
+                                   self.config.selectors.TRANSACTION_HISTORY_FORM_SELECTOR)
 
         transactions: List[Transaction] = []
         while form_tag:
@@ -140,8 +127,7 @@ class AmazonTransactions:
             if not self.amazon_session.last_response_parsed:
                 raise AmazonOrdersError("Could not get next transaction history page.")
 
-            form_tag = self.amazon_session.last_response_parsed.select_one(
-                self.config.selectors.TRANSACTION_HISTORY_FORM_SELECTOR
-            )
+            form_tag = util.select_one(self.amazon_session.last_response_parsed,
+                                       self.config.selectors.TRANSACTION_HISTORY_FORM_SELECTOR)
 
         return transactions

{amazon_orders-3.2.0 → amazon_orders-3.2.1}/tests/test_orders.py

@@ -308,6 +308,27 @@ class TestOrders(UnitTestCase):
         self.assert_order_114_8722141_6545058_data_component_subscription(order, True)
         self.assertEqual(1, resp1.call_count)
 
+    @responses.activate
+    def test_get_order_2024_data_component_multiple_shipments(self):
+        # GIVEN
+        self.amazon_session.is_authenticated = True
+        order_id = "111-6778632-7354601"
+        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_111_6778632_7354601_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-3.2.0 → amazon_orders-3.2.1}/tests/testcase.py

@@ -217,8 +217,8 @@ class TestCase(unittest.TestCase):
                 self.assertIn("Delivered May 13", shipment.delivery_status)
         self.assertTrue(found_kimoe)
         self.assertTrue(found_amazon)
-        self.assertEqual(str(order.items),
-                         str(order.shipments[0].items + order.shipments[1].items))
+        self.assertEqual(str(order.items.sort()),
+                         str((order.shipments[0].items + order.shipments[1].items).sort()))
         self.assertEqual(2, len(order.items))
         found_kimoe = False
         found_amazon = False
@@ -439,6 +439,51 @@ class TestCase(unittest.TestCase):
                              order.items[0].seller.name)
             self.assertIsNone(order.items[0].seller.link)
 
+    def assert_order_111_6778632_7354601_data_component_subscription(self, order, full_details=False):
+        self.assertEqual("111-6778632-7354601", order.order_number)
+        self.assertEqual(60.88, order.grand_total)
+        self.assertIsNotNone(order.order_details_link)
+        self.assertEqual(date(2024, 9, 8), order.order_placed_date)
+        self.assertEqual("Name1 & Name2", order.recipient.name)
+        self.assertIn("Address2", order.recipient.address)
+        self.assertEqual(2, len(order.shipments))
+        self.assertEqual(str(order.items.sort()),
+                         str((order.shipments[0].items + order.shipments[1].items).sort()))
+        self.assertEqual(3, len(order.shipments[0].items))
+        self.assertEqual(1, len(order.shipments[1].items))
+        self.assertEqual("Delivered September 9", order.shipments[0].delivery_status)
+        self.assertEqual("Delivered September 9", order.shipments[1].delivery_status)
+        self.assertEqual(4, len(order.items))
+        self.assertEqual(
+            "Dxhycc Satin Pirate Sash Pirate Medieval Renaissance Large Sash Halloween Costume Waist "
+            "Sash Belt, Red",
+            order.items[0].title)
+        self.assertEqual("Ziploc Paper Sandwich and Snack Bags, Recyclable & Sealable with Fun Designs, "
+                         "150 Total Bags",
+                         order.items[3].title)
+        self.assertIsNotNone(order.items[0].link)
+        self.assertIsNotNone(order.items[0].image_link)
+        self.assertIsNotNone(order.items[3].link)
+        self.assertIsNotNone(order.items[3].image_link)
+
+        self.assertEqual(order.full_details, full_details)
+
+        if full_details:
+            self.assertEqual("Prime Visa", order.payment_method)
+            self.assertEqual(1111, order.payment_method_last_4)
+            self.assertEqual(57.69, order.subtotal)
+            self.assertEqual(2.99, order.shipping_total)
+            self.assertEqual(57.69, order.total_before_tax)
+            self.assertEqual(3.19, order.estimated_tax)
+            self.assertEqual(date(2024, 10, 9), order.items[0].return_eligible_date)
+            self.assertEqual(date(2024, 10, 9), order.items[1].return_eligible_date)
+            self.assertEqual(date(2024, 10, 9), order.items[2].return_eligible_date)
+            self.assertEqual(date(2024, 10, 9), order.items[3].return_eligible_date)
+            self.assertEqual(7.49, order.items[0].price)
+            self.assertEqual(18.95, order.items[1].price)
+            self.assertEqual(9.98, order.items[2].price)
+            self.assertEqual(21.27, order.items[3].price)
+
     def assert_populated_generic(self, order, full_details):
         self.assertIsNotNone(order.order_number)
         self.assertIsNotNone(order.grand_total)
@@ -448,10 +493,16 @@ class TestCase(unittest.TestCase):
             self.assertIsNotNone(order.recipient.name)
             self.assertIsNotNone(order.recipient.address)
             self.assertGreaterEqual(len(order.shipments), 1)
-            self.assertEqual(str(order.items), str(order.shipments[0].items))
+            shipment_items = []
+            for shipment in order.shipments:
+                shipment_items += shipment.items
+                self.assertGreaterEqual(len(shipment.items), 1)
+                self.assertIsNotNone(shipment.delivery_status)
+            self.assertEqual(str(order.items.sort()), str(shipment_items.sort()))
         self.assertGreaterEqual(len(order.items), 1)
-        self.assertIsNotNone(order.items[0].title)
-        self.assertIsNotNone(order.items[0].link)
+        for item in order.items:
+            self.assertIsNotNone(item.title)
+            self.assertIsNotNone(item.link)
 
         self.assertEqual(order.full_details, full_details)
 
@@ -464,5 +515,6 @@ class TestCase(unittest.TestCase):
             self.assertIsNotNone(order.total_before_tax)
             self.assertIsNotNone(order.estimated_tax)
             if order.recipient:
-                self.assertIsNotNone(order.items[0].price)
-                self.assertIsNotNone(order.items[0].seller.name)
+                for item in order.items:
+                    self.assertIsNotNone(item.price)
+                    self.assertIsNotNone(item.seller.name)