amazon-orders 3.2.6__tar.gz → 3.2.7__tar.gz

{amazon_orders-3.2.6 → amazon_orders-3.2.7}/CHANGELOG.md

@@ -4,7 +4,13 @@ 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/3.2.6...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/3.2.7...HEAD)
+
+## [3.2.7](https://github.com/alexdlaird/amazon-orders/compare/3.2.6...3.2.7) - 2025-02-17
+
+### Added
+
+- Fixes for parsing Amazon Fresh and Whole Foods Market orders, so they no longer need to be skipped (but their Items and Shipments will still be empty).
 
 ## [3.2.6](https://github.com/alexdlaird/amazon-orders/compare/3.2.5...3.2.6) - 2025-02-17
 

{amazon_orders-3.2.6/amazon_orders.egg-info → amazon_orders-3.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: amazon-orders
-Version: 3.2.6
+Version: 3.2.7
 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.6 → amazon_orders-3.2.7/amazon_orders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: amazon-orders
-Version: 3.2.6
+Version: 3.2.7
 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.6 → amazon_orders-3.2.7}/amazonorders/__init__.py

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

{amazon_orders-3.2.6 → amazon_orders-3.2.7}/amazonorders/entity/order.py

@@ -92,7 +92,7 @@ class Order(Parsable):
         return f"Order #{self.order_number}: {self.items}"
 
     def _parse_shipments(self) -> List[Shipment]:
-        if not self.parsed:
+        if not self.parsed or len(util.select(self.parsed, self.config.selectors.ORDER_SKIP_ITEMS)) > 0:
             return []
 
         shipments: List[Shipment] = [self.config.shipment_cls(x, self.config)
@@ -102,7 +102,7 @@ class Order(Parsable):
         return shipments
 
     def _parse_items(self) -> List[Item]:
-        if not self.parsed:
+        if not self.parsed or len(util.select(self.parsed, self.config.selectors.ORDER_SKIP_ITEMS)) > 0:
             return []
 
         items: List[Item] = [self.config.item_cls(x, self.config)

{amazon_orders-3.2.6 → amazon_orders-3.2.7}/amazonorders/orders.py

@@ -73,11 +73,6 @@ class AmazonOrders:
             response_parsed = self.amazon_session.last_response_parsed
 
             for order_tag in util.select(response_parsed, self.config.selectors.ORDER_HISTORY_ENTITY_SELECTOR):
-                # First check if this Order is known to be of a type that we do not currently have a way to support
-                # parsing, meaning it should be skipped
-                if util.select(order_tag, self.config.selectors.ORDER_HISTORY_BRAND_SELECTOR):
-                    continue
-
                 order: Order = self.config.order_cls(order_tag, self.config)
 
                 if full_details:

{amazon_orders-3.2.6 → amazon_orders-3.2.7}/amazonorders/selectors.py

@@ -55,12 +55,12 @@ class Selectors:
     SHIPMENT_ENTITY_SELECTOR = ["[data-component='orderCard'] [data-component='shipments'] .a-box",
                                 "div.shipment",
                                 "div.delivery-box"]
-    # Selectors defined here, if found in an Order, will cause the Order to be skipped, since it means we currently
-    # do not have a way to support fully parsing its details
-    ORDER_HISTORY_BRAND_SELECTOR = [
-        # Amazon Fresh is not supported
+    # Selectors defined here mean we don't have a reliable way to parse all details in an Order, so Items and
+    # Shipments will be skipped
+    ORDER_SKIP_ITEMS = [
+        # Identifies an Amazon Fresh order
         ".brand-info-box .brand-logo img",
-        # Whole Foods Market is not supported
+        # Identifies a Whole Foods Market order
         "a.yohtmlc-order-details-link[href^='/wholefoodsmarket']"
     ]
 

{amazon_orders-3.2.6 → amazon_orders-3.2.7}/tests/test_cli.py

@@ -92,7 +92,7 @@ class TestCli(UnitTestCase):
         mock_get_today.date.today.return_value = datetime.date(2024, 10, 11)
         days = 1
         self.given_login_responses_success()
-        with open(os.path.join(self.RESOURCES_DIR, "transactions", "get-transactions.html"),
+        with open(os.path.join(self.RESOURCES_DIR, "transactions", "get-transactions-snippet.html"),
                   "r", encoding="utf-8") as f:
             resp = responses.add(
                 responses.GET,

{amazon_orders-3.2.6 → amazon_orders-3.2.7}/tests/test_orders.py

@@ -98,7 +98,7 @@ class TestOrders(UnitTestCase):
         orders = self.amazon_orders.get_order_history(year=year, start_index=start_index)
 
         # THEN
-        self.assertEqual(9, len(orders))
+        self.assertEqual(10, len(orders))
         self.assertEqual(1, resp1.call_count)
         self.assertEqual(1, resp2.call_count)
         order = orders[5]
@@ -139,7 +139,7 @@ class TestOrders(UnitTestCase):
         self.assertEqual(1, resp3.call_count)
 
     @responses.activate
-    def test_get_order_history_skip_fresh(self):
+    def test_get_order_history_fresh(self):
         # GIVEN
         self.amazon_session.is_authenticated = True
         year = 2024
@@ -158,12 +158,18 @@ class TestOrders(UnitTestCase):
         orders = self.amazon_orders.get_order_history(year=year, start_index=start_index)
 
         # THEN
-        self.assertEqual(9, len(orders))
+        self.assertEqual(10, len(orders))
         self.assertEqual(1, resp1.call_count)
         self.assertEqual(1, resp2.call_count)
+        order = orders[4]
+        self.assertEqual("111-2072777-8279433", order.order_number)
+        self.assertEqual(80.27, order.grand_total)
+        self.assertIsNotNone(order.order_details_link)
+        self.assertEqual(date(2025, 1, 3), order.order_placed_date)
+        self.assertEqual(0, len(order.items))
 
     @responses.activate
-    def test_get_order_history_skip_wholefoods(self):
+    def test_get_order_history_wholefoods(self):
         # GIVEN
         self.amazon_session.is_authenticated = True
         year = 2024
@@ -182,9 +188,15 @@ class TestOrders(UnitTestCase):
         orders = self.amazon_orders.get_order_history(year=year, start_index=start_index)
 
         # THEN
-        self.assertEqual(9, len(orders))
+        self.assertEqual(10, len(orders))
         self.assertEqual(1, resp1.call_count)
         self.assertEqual(1, resp2.call_count)
+        order = orders[7]
+        self.assertEqual("113-6307059-7336242", order.order_number)
+        self.assertEqual(62.92, order.grand_total)
+        self.assertIsNotNone(order.order_details_link)
+        self.assertEqual(date(2024, 12, 12), order.order_placed_date)
+        self.assertEqual(0, len(order.items))
 
     @responses.activate
     def test_get_order_history_full_details(self):

{amazon_orders-3.2.6 → amazon_orders-3.2.7}/tests/test_transactions.py

@@ -37,11 +37,9 @@ class TestOrders(UnitTestCase):
         mock_get_today.date.today.return_value = datetime.date(2024, 10, 11)
         days = 1
         self.amazon_session.is_authenticated = True
-        with open(
-                os.path.join(self.RESOURCES_DIR, "transactions", "get-transactions.html"),
-                "r",
-                encoding="utf-8",
-        ) as f:
+        with open(os.path.join(self.RESOURCES_DIR, "transactions", "get-transactions-snippet.html"),
+                  "r",
+                  encoding="utf-8") as f:
             responses.add(
                 responses.GET,
                 f"{self.test_config.constants.TRANSACTION_HISTORY_LANDING_URL}",
@@ -71,11 +69,9 @@ class TestOrders(UnitTestCase):
         mock_get_today.date.today.return_value = datetime.date(2025, 2, 13)
         days = 30
         self.amazon_session.is_authenticated = True
-        with open(
-                os.path.join(self.RESOURCES_DIR, "transactions", "transactions-in-progress.html"),
-                "r",
-                encoding="utf-8",
-        ) as f:
+        with open(os.path.join(self.RESOURCES_DIR, "transactions", "transactions-in-progress.html"),
+                  "r",
+                  encoding="utf-8") as f:
             responses.add(
                 responses.GET,
                 f"{self.test_config.constants.TRANSACTION_HISTORY_LANDING_URL}",
@@ -109,29 +105,27 @@ class TestOrders(UnitTestCase):
 
     def test_parse_transaction_form_tag(self):
         # GIVEN
-        with open(
-                os.path.join(self.RESOURCES_DIR, "transactions", "transaction-form-tag.html"),
-                "r",
-                encoding="utf-8",
-        ) as f:
+        with open(os.path.join(self.RESOURCES_DIR, "transactions", "transaction-form-tag.html"),
+                  "r",
+                  encoding="utf-8") as f:
             parsed = BeautifulSoup(f.read(), self.test_config.bs4_parser)
             form_tag = parsed.select_one("form")
 
-            # WHEN
-            transactions, next_page_url, next_page_data = _parse_transaction_form_tag(
-                form_tag, self.test_config
-            )
+        # WHEN
+        transactions, next_page_url, next_page_data = _parse_transaction_form_tag(
+            form_tag, self.test_config
+        )
 
-            # THEN
-            self.assertEqual(len(transactions), 2)
-            self.assertEqual(
-                next_page_url, "https://www.amazon.com:443/cpe/yourpayments/transactions"
-            )
-            self.assertEqual(
-                next_page_data,
-                {
-                    "ppw-widgetState": "the-ppw-widgetState",
-                    "ie": "UTF-8",
-                    'ppw-widgetEvent:DefaultNextPageNavigationEvent:{"nextPageKey":"key"}': "",
-                },
-            )
+        # THEN
+        self.assertEqual(len(transactions), 2)
+        self.assertEqual(
+            next_page_url, "https://www.amazon.com:443/cpe/yourpayments/transactions"
+        )
+        self.assertEqual(
+            next_page_data,
+            {
+                "ppw-widgetState": "the-ppw-widgetState",
+                "ie": "UTF-8",
+                'ppw-widgetEvent:DefaultNextPageNavigationEvent:{"nextPageKey":"key"}': "",
+            },
+        )