amazon-orders 4.4.5__tar.gz → 4.4.7__tar.gz

{amazon_orders-4.4.5 → amazon_orders-4.4.7}/CHANGELOG.md

@@ -4,7 +4,19 @@ 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/4.4.5...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/4.4.7...HEAD)
+
+## [4.4.7](https://github.com/alexdlaird/amazon-orders/compare/4.4.6...4.4.7) - 2026-08-02
+
+### Fixed
+
+- `get_order()` now fetches Whole Foods Market orders via their dedicated details page instead of raising `AmazonOrdersNotFoundError` on redirect.
+
+## [4.4.6](https://github.com/alexdlaird/amazon-orders/compare/4.4.5...4.4.6) - 2026-07-20
+
+### Fixed
+
+- `PlaywrightManualWafForm` alongside `PlaywrightAcicForm` now opens a visible browser to solve ACIC-embedded challenges manually.
 
 ## [4.4.5](https://github.com/alexdlaird/amazon-orders/compare/4.4.4...4.4.5) - 2026-07-15
 

{amazon_orders-4.4.5/amazon_orders.egg-info → amazon_orders-4.4.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.4.5
+Version: 4.4.7
 Summary: A Python library (and CLI) for Amazon order history
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>
@@ -72,7 +72,7 @@ Requires-Dist: sphinx-sitemap; extra == "docs"
 Requires-Dist: sphinxext-opengraph; extra == "docs"
 Dynamic: license-file
 
-<p align="center"><img alt="amazon-orders - A Python library (and CLI) for Amazon order history" src="https://amazon-orders.readthedocs.io/_images/logo.png" /></p>
+<p align="center"><img alt="amazon-orders - A Python library (and CLI) for Amazon order history" src="https://amazon-orders.readthedocs.io/en/latest/_images/logo.png" /></p>
 
 [![Version](https://img.shields.io/pypi/v/amazon-orders)](https://pypi.org/project/amazon-orders)
 [![Python Versions](https://img.shields.io/pypi/pyversions/amazon-orders.svg)](https://pypi.org/project/amazon-orders)

{amazon_orders-4.4.5 → amazon_orders-4.4.7}/README.md

@@ -1,4 +1,4 @@
-<p align="center"><img alt="amazon-orders - A Python library (and CLI) for Amazon order history" src="https://amazon-orders.readthedocs.io/_images/logo.png" /></p>
+<p align="center"><img alt="amazon-orders - A Python library (and CLI) for Amazon order history" src="https://amazon-orders.readthedocs.io/en/latest/_images/logo.png" /></p>
 
 [![Version](https://img.shields.io/pypi/v/amazon-orders)](https://pypi.org/project/amazon-orders)
 [![Python Versions](https://img.shields.io/pypi/pyversions/amazon-orders.svg)](https://pypi.org/project/amazon-orders)

{amazon_orders-4.4.5 → amazon_orders-4.4.7/amazon_orders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.4.5
+Version: 4.4.7
 Summary: A Python library (and CLI) for Amazon order history
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>
@@ -72,7 +72,7 @@ Requires-Dist: sphinx-sitemap; extra == "docs"
 Requires-Dist: sphinxext-opengraph; extra == "docs"
 Dynamic: license-file
 
-<p align="center"><img alt="amazon-orders - A Python library (and CLI) for Amazon order history" src="https://amazon-orders.readthedocs.io/_images/logo.png" /></p>
+<p align="center"><img alt="amazon-orders - A Python library (and CLI) for Amazon order history" src="https://amazon-orders.readthedocs.io/en/latest/_images/logo.png" /></p>
 
 [![Version](https://img.shields.io/pypi/v/amazon-orders)](https://pypi.org/project/amazon-orders)
 [![Python Versions](https://img.shields.io/pypi/pyversions/amazon-orders.svg)](https://pypi.org/project/amazon-orders)

{amazon_orders-4.4.5 → amazon_orders-4.4.7}/amazonorders/__init__.py

@@ -1,3 +1,3 @@
 __copyright__ = "Copyright (c) 2024-2025 Alex Laird"
 __license__ = "MIT"
-__version__ = "4.4.5"
+__version__ = "4.4.7"

{amazon_orders-4.4.5 → amazon_orders-4.4.7}/amazonorders/constants.py

@@ -113,6 +113,7 @@ class Constants:
     ORDER_INVOICE_URL = f"{BASE_URL}/gp/css/summary/print.html"
     HISTORY_FILTER_QUERY_PARAM = "timeFilter"
     ORDER_FILTER_QUERY_PARAM = "orderFilter"
+    WHOLE_FOODS_DETAILS_ROUTES = ["/fopo/order-details", "/wholefoodsmarket/receipts/order/"]
 
     ##########################################################################
     # URLs for Transactions

{amazon_orders-4.4.5 → amazon_orders-4.4.7}/amazonorders/contrib/browser/playwright.py

@@ -19,6 +19,7 @@ from amazonorders.forms import AuthForm
 from amazonorders.util import AmazonSessionResponse
 
 if TYPE_CHECKING:
+    from amazonorders.contrib.waf.base import AwsWafForm
     from amazonorders.session import AmazonSession
 
 logger = logging.getLogger(__name__)
@@ -44,6 +45,10 @@ class PlaywrightAuthForm(AuthForm):
         #: Whether to launch the browser in headless mode. Defaults to ``True``.
         #: Set to ``False`` in subclasses that require user interaction.
         self.headless: bool = True
+        #: Whether this form solves challenges by handing off to a human in a visible
+        #: browser window (as opposed to an automated third-party solver). Forms with
+        #: this set act as the free, manual solver for an embedded ACIC challenge.
+        self.manual: bool = False
 
     def fill_form(self,
                   additional_attrs: Optional[Dict[str, Any]] = None) -> None:
@@ -197,10 +202,16 @@ class PlaywrightAuthForm(AuthForm):
 class PlaywrightAcicForm(PlaywrightAuthForm):
     """
     Handles Amazon's ACIC (Amazon Challenge and Identity Component) JavaScript challenge
-    by running it in a headless browser. If an embedded AWS WAF challenge is present on
-    the ACIC page, it will be solved automatically using the first
+    by running it in a headless browser. If an embedded AWS WAF challenge or visual grid
+    Puzzle is present on the ACIC page, it will be solved automatically using the first
     :class:`~amazonorders.contrib.waf.base.AwsWafForm` found in ``auth_forms_classes``.
 
+    If no automated solver is registered but a manual solver
+    (:class:`~amazonorders.contrib.browser.playwright.PlaywrightManualWafForm`) is, a
+    **visible** browser window is opened instead so the user can solve the embedded
+    challenge themselves, for free. An automated solver takes precedence when both are
+    registered.
+
     Detects the challenge via the ``#aa-challenge-page-captcha-container`` element and
     waits for navigation away from ``/ax/aaut/verify/ap/challenge``.
 
@@ -224,9 +235,50 @@ class PlaywrightAcicForm(PlaywrightAuthForm):
         :return: ``True`` if an ACIC challenge was detected, ``False`` otherwise.
         """
         self.amazon_session = amazon_session
-        return bool(parsed.select_one(self.config.selectors.ACIC_CHALLENGE_SELECTOR))
+        detected = bool(parsed.select_one(self.config.selectors.ACIC_CHALLENGE_SELECTOR))
+        if detected:
+            self.headless = not self._manual_mode()
+        return detected
+
+    def _manual_mode(self) -> bool:
+        """
+        Return ``True`` if the embedded challenge should be handed off to a human in a
+        visible browser window rather than an automated solver. This is the case when a
+        manual solver form is registered and no automated :class:`AwsWafForm` is; an
+        automated solver takes precedence when both are present, since it is
+        non-interactive.
+        """
+        return self._find_manual_solver() is not None and self._find_waf_solver() is None
+
+    def _find_waf_solver(self) -> Optional["AwsWafForm"]:
+        if not self.amazon_session:
+            return None  # pragma: no cover
+        from amazonorders.contrib.waf.base import AwsWafForm
+        return next(
+            (f for f in self.amazon_session.auth_forms if isinstance(f, AwsWafForm)),
+            None,
+        )
+
+    def _find_manual_solver(self) -> Optional["PlaywrightAuthForm"]:
+        if not self.amazon_session:
+            return None  # pragma: no cover
+        return next(
+            (f for f in self.amazon_session.auth_forms
+             if isinstance(f, PlaywrightAuthForm) and f.manual),
+            None,
+        )
 
     def _on_challenge_page(self, page: Any, context: Any, output_dir: Optional[str]) -> None:
+        if self._manual_mode():
+            message = (
+                "Info: A browser window has opened — solve the challenge, then return "
+                "here when done."
+            )
+            logger.info(message)
+            if self.amazon_session:
+                self.amazon_session.io.echo(message)
+            return
+
         max_solves = self.config.max_auth_attempts
         solves = 0
         while solves < max_solves:
@@ -281,11 +333,7 @@ class PlaywrightAcicForm(PlaywrightAuthForm):
         if not self.amazon_session:
             return False  # pragma: no cover
 
-        from amazonorders.contrib.waf.base import AwsWafForm
-        waf_form = next(
-            (f for f in self.amazon_session.auth_forms if isinstance(f, AwsWafForm)),
-            None,
-        )
+        waf_form = self._find_waf_solver()
         if not waf_form:
             logger.debug("No AwsWafForm configured, skipping WAF challenge.")
             return False
@@ -339,11 +387,7 @@ class PlaywrightAcicForm(PlaywrightAuthForm):
         if not self.amazon_session:
             return False  # pragma: no cover
 
-        from amazonorders.contrib.waf.base import AwsWafForm
-        waf_form = next(
-            (f for f in self.amazon_session.auth_forms if isinstance(f, AwsWafForm)),
-            None,
-        )
+        waf_form = self._find_waf_solver()
         if not waf_form:
             logger.debug("No AwsWafForm configured, skipping Puzzle.")
             return False
@@ -502,6 +546,7 @@ class PlaywrightManualWafForm(PlaywrightAuthForm):
                  config: AmazonOrdersConfig) -> None:
         super().__init__(config)
         self.headless = False
+        self.manual = True
 
     def select_form(self,
                     amazon_session: "AmazonSession",

{amazon_orders-4.4.5 → amazon_orders-4.4.7}/amazonorders/orders.py

@@ -63,7 +63,12 @@ class AmazonOrders:
             f"{self.config.constants.ORDER_DETAILS_URL}?orderID={order_id}")
         self.amazon_session.check_response(order_details_response, meta=meta)
 
-        if not order_details_response.response.url.startswith(self.config.constants.ORDER_DETAILS_URL):
+        response_url = order_details_response.response.url
+        if not response_url.startswith(self.config.constants.ORDER_DETAILS_URL):
+            if self._is_whole_foods_details_url(response_url):
+                # GET already followed the redirect, so order_details_response is the FOPO/receipt page.
+                return self._get_whole_foods_order(order_details_response, order_number=order_id, clone=clone)
+
             raise AmazonOrdersNotFoundError(f"Amazon redirected, which likely means Order {order_id} was not found.",
                                             meta=meta)
 
@@ -217,12 +222,12 @@ class AmazonOrders:
 
         if full_details:
             if order.is_whole_foods:
-                # Whole Foods orders are served by a dedicated details page (the in-store/FOPO page or the
-                # receipt page), never the standard order-details endpoint, so only fetch full details when
-                # the history page linked us to one of those routes.
                 link = order.order_details_link or ""
-                if "/fopo/order-details" in link or "/wholefoodsmarket/receipts/order/" in link:
-                    order = self._get_whole_foods_order(order, link)
+                if self._is_whole_foods_details_url(link):
+                    details_response = self.amazon_session.get(link)
+                    self.amazon_session.check_response(details_response, meta={"index": order.index})
+                    order = self._get_whole_foods_order(details_response, order_number=order.order_number,
+                                                        clone=order)
                 else:
                     logger.warning(f"Order {order.order_number} is a Whole Foods Market order whose details "
                                    f"page could not be located, so it was left partially populated.")
@@ -237,23 +242,29 @@ class AmazonOrders:
 
         return order
 
-    def _get_whole_foods_order(self,
-                               order: Order,
-                               url: str) -> Order:
-        """Fetches the WFM dedicated details page and returns the order enriched with per-item details."""
-        details_response = self.amazon_session.get(url)
-        self.amazon_session.check_response(details_response, meta={"index": order.index})
+    def _is_whole_foods_details_url(self,
+                                    url: str) -> bool:
+        return any(route in url for route in self.config.constants.WHOLE_FOODS_DETAILS_ROUTES)
 
+    def _get_whole_foods_order(self,
+                               details_response: util.AmazonSessionResponse,
+                               order_number: Optional[str] = None,
+                               clone: Optional[Order] = None) -> Order:
+        """Builds an Order from an already-fetched Whole Foods Market details page response."""
         details_tag = util.select_one(details_response.parsed,
                                       self.config.selectors.ORDER_DETAILS_ENTITY_SELECTOR)
 
         if not details_tag:
-            logger.warning(f"Could not parse Whole Foods Market details for Order {order.order_number}, "
-                           f"so it was left partially populated.")
-            return order
+            if clone:
+                logger.warning(f"Could not parse Whole Foods Market details for Order {clone.order_number}, "
+                               f"so it was left partially populated.")
+                return clone
+
+            raise AmazonOrdersError(f"Could not parse Whole Foods Market details for Order {order_number}. "
+                                    f"Check if Amazon changed the HTML.")
 
-        return self.config.order_cls(details_tag, self.config, full_details=True, clone=order,
-                                     order_number=order.order_number)
+        return self.config.order_cls(details_tag, self.config, full_details=True, clone=clone,
+                                     order_number=order_number)
 
     async def _async_wrapper(self,
                              func: Callable,