amazon-orders 4.4.4__tar.gz → 4.4.6__tar.gz

{amazon_orders-4.4.4 → amazon_orders-4.4.6}/CHANGELOG.md

@@ -4,7 +4,20 @@ 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.4...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/4.4.6...HEAD)
+
+## [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
+
+### Fixed
+
+- CLI `history` crash when using `--last-30-days` or `--last-3-months`.
+- CLI `history --start-index` now validates non-numeric input.
 
 ## [4.4.4](https://github.com/alexdlaird/amazon-orders/compare/4.4.3...4.4.4) - 2026-07-07
 

{amazon_orders-4.4.4/amazon_orders.egg-info → amazon_orders-4.4.6}/PKG-INFO

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.4.4
+Version: 4.4.6
 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.4 → amazon_orders-4.4.6}/amazonorders/__init__.py

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

{amazon_orders-4.4.4 → amazon_orders-4.4.6}/amazonorders/cli.py

@@ -119,7 +119,7 @@ def amazon_orders_cli(ctx: Context,
               help="Get Order history for the last 30 days.")
 @click.option("--last-3-months", "last_3_months", is_flag=True, default=False,
               help="Get Order history for the past 3 months.")
-@click.option("--start-index",
+@click.option("--start-index", type=int,
               help="The index of the Order from which to start fetching in the history.")
 @click.option("--single-page", is_flag=True, default=False,
               help="Only one page should be fetched.")
@@ -147,7 +147,7 @@ def history(ctx: Context,
         order_filter = kwargs["order_filter"]
 
         exclusive_flags = [year, last_3_months, last_30_days]
-        if not all(not item for item in exclusive_flags) and sum(exclusive_flags) == 1:
+        if sum(1 for item in exclusive_flags if item) > 1:
             ctx.fail("Only one of --last-30-days, --last-3-months, or --year may be used at a time.")
 
         # Determine time filter

{amazon_orders-4.4.4 → amazon_orders-4.4.6}/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.4 → amazon_orders-4.4.6}/pyproject.toml

@@ -137,7 +137,7 @@ directory = "build/coverage"
 [tool.flake8]
 max-line-length = 119
 statistics = true
-exclude = "scripts/*,docs/*,venv/*,build/*,dist/*,.egg-info/*,.mypy_cache/*"
+exclude = "scripts/*,docs/*,venv/*,build/*,dist/*,.egg-info/*,.mypy_cache/*,.claude/*"
 
 [[tool.mypy.overrides]]
 module = "amazoncaptcha.*"