amazon-orders 4.2.0__tar.gz → 4.2.2__tar.gz

{amazon_orders-4.2.0 → amazon_orders-4.2.2}/CHANGELOG.md

@@ -4,7 +4,23 @@ 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.2.0...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/4.2.2...HEAD)
+
+## [4.2.2](https://github.com/alexdlaird/amazon-orders/compare/4.2.1...4.2.2) - 2026-06-06
+
+### Fixed
+
+- Improved error messaging for known JavaScript-based authentication challenges.
+
+## [4.2.1](https://github.com/alexdlaird/amazon-orders/compare/4.2.0...4.2.1) - 2026-05-08
+
+### Changed
+
+- WAF solver API keys can now also be set via `AmazonOrdersConfig` (under the lowercased env var name, e.g. `capsolver_api_key`), matching the precedence pattern used for other credentials.
+
+### Changed
+
+- WAF solver API keys can now also be set via `AmazonOrdersConfig` (under the lowercased env var name, e.g. `capsolver_api_key`), matching the precedence pattern used for other credentials.
 
 ## [4.2.0](https://github.com/alexdlaird/amazon-orders/compare/4.1.0...4.2.0) - 2026-05-08
 
@@ -16,6 +32,14 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - Configurable Amazon domain for non-`.com` sites via the `domain` parameter on `AmazonSession`, the `domain` config field, and the `--domain` CLI flag.
 - Improved currency parsing for English non-`.com` Amazon sites.
 
+### Added
+
+- Support for AWS WAF solving via third-party providers like CapSolver (`pip install amazon-orders[capsolver]`), Anti-Captcha (`pip install amazon-orders[anticaptcha]`), and 2Captcha (`pip install amazon-orders[2captcha]`). See [the docs](https://amazon-orders.readthedocs.io/waf.html) for setup.
+- `auth_forms_classes` config option for plugging custom `AuthForm` subclasses into the auth chain without code changes.
+- `AmazonSession.default_auth_forms()` static helper that returns the default form chain so callers can more easily extend it.
+- Configurable Amazon domain for non-`.com` sites via the `domain` parameter on `AmazonSession`, the `domain` config field, and the `--domain` CLI flag.
+- Improved currency parsing for English non-`.com` Amazon sites.
+
 ## [4.1.0](https://github.com/alexdlaird/amazon-orders/compare/4.0.19...4.1.0) - 2026-05-03
 
 ### Added

{amazon_orders-4.2.0/amazon_orders.egg-info → amazon_orders-4.2.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.2.0
-Summary: A Python libray (and CLI) for Amazon order history
+Version: 4.2.2
+Summary: A Python library (and CLI) for Amazon order history
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>
 License-Expression: MIT
@@ -9,6 +9,7 @@ Project-URL: Changelog, https://github.com/alexdlaird/amazon-orders/blob/main/CH
 Project-URL: Documentation, https://amazon-orders.readthedocs.io
 Project-URL: Sponsor, https://github.com/sponsors/alexdlaird
 Project-URL: Source Code, https://github.com/alexdlaird/amazon-orders
+Keywords: amazon,orders,order-history,scraper,web-scraping,receipts,cli
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: Web Environment
@@ -20,7 +21,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Internet :: WWW/HTTP :: Browsers
+Classifier: Topic :: Office/Business :: Financial
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Text Processing :: Markup :: HTML
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -28,8 +32,8 @@ Requires-Dist: click>=7.1
 Requires-Dist: requests>=2.23
 Requires-Dist: Pillow>=9.0.1
 Requires-Dist: beautifulsoup4>=4.12
-Requires-Dist: PyYAML>=5.1
-Requires-Dist: python-dateutil>=2.8
+Requires-Dist: PyYAML>=6.0.3
+Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: pyotp>=2.9
 Provides-Extra: captcha
 Requires-Dist: amazoncaptcha>=0.4; extra == "captcha"
@@ -63,9 +67,11 @@ Requires-Dist: types-beautifulsoup4; extra == "docs"
 Requires-Dist: types-Pillow; extra == "docs"
 Requires-Dist: types-PyYAML; extra == "docs"
 Requires-Dist: types-python-dateutil; extra == "docs"
+Requires-Dist: sphinx-sitemap; extra == "docs"
+Requires-Dist: sphinxext-opengraph; extra == "docs"
 Dynamic: license-file
 
-<p align="center"><img alt="amazon-orders - A Python libray (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/_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)
@@ -74,17 +80,17 @@ Dynamic: license-file
 [![Docs](https://img.shields.io/readthedocs/amazon-orders)](https://amazon-orders.readthedocs.io)
 [![GitHub License](https://img.shields.io/github/license/alexdlaird/amazon-orders)](https://github.com/alexdlaird/amazon-orders/blob/main/LICENSE)
 
-`amazon-orders` is an unofficial library that provides a Python API (and CLI) for Amazon order history.
-
-This package works by parsing data from Amazon's consumer-facing website. A periodic build validates functionality
-to ensure its stability, but as Amazon provides no official API to use, this package may break at any time (so check
-often to ensure you're on the latest version).
+`amazon-orders` is an unofficial library that provides a Python API (and CLI) for Amazon order history, line items, and transactions.
 
 Only the English, `.com` version of Amazon is officially supported. Other Amazon domains can be
 targeted by passing `domain` to [`AmazonSession`](https://amazon-orders.readthedocs.io/api.html#amazonorders.session.AmazonSession)
 (or `--domain` on the CLI), and other English-based sites may work by chance — see
 [Known Limitations](https://amazon-orders.readthedocs.io/index.html#known-limitations) for details.
 
+> **Note:** This package works by parsing data from Amazon's consumer-facing website. A periodic build validates
+> functionality to ensure its stability, but as Amazon provides no official API to use, older versions of this
+> package may break at any time, so it's recommended that you use the latest version.
+
 ## Installation
 
 `amazon-orders` is available on [PyPI](https://pypi.org/project/amazon-orders/) and can be installed and/or upgraded using `pip`:
@@ -95,29 +101,9 @@ pip install amazon-orders --upgrade
 
 That's it! `amazon-orders` is now available as a package to your Python projects and from the command line.
 
-If pinning, be sure to use a wildcard for the [minor version](https://semver.org/) (ex. `==4.0.*`, not `==4.2.0`) to
+If pinning, be sure to use a wildcard for the [minor version](https://semver.org/) (ex. `==4.2.*`, not `==4.2.2`) to
 ensure you always get the latest stable release.
 
-To enable **WAF auto-solve** via a third-party integration, install with the relevant extra:
-
-```sh
-pip install amazon-orders[capsolver]
-pip install amazon-orders[anticaptcha]
-pip install amazon-orders[2captcha]
-```
-
-See [Solving WAF Challenges](https://amazon-orders.readthedocs.io/waf.html) for details.
-
-To enable **Captcha auto-solve** on Python <=3.12 (via the optional [`amazoncaptcha`](https://pypi.org/project/amazoncaptcha/)
-dependency), install with the `captcha` extra:
-
-```sh
-pip install amazon-orders[captcha]
-```
-
-Without this extra, Captcha challenges fall back to manual entry. `amazoncaptcha` is not available on Python 3.13+; see
-[Captcha Blocking Login](https://amazon-orders.readthedocs.io/troubleshooting.html#captcha-blocking-login) for details.
-
 ## Basic Usage
 
 You'll use [`AmazonSession`](https://amazon-orders.readthedocs.io/api.html#amazonorders.session.AmazonSession) to
@@ -174,6 +160,26 @@ environment variables `amazon-orders` looks for are:
 - `AMAZON_PASSWORD`
 - `AMAZON_OTP_SECRET_KEY` (see [docs for usage](https://amazon-orders.readthedocs.io/api.html#amazonorders.session.AmazonSession.otp_secret_key))
 
+To enable **WAF auto-solve** via a third-party integration, install with the relevant extra:
+
+```sh
+pip install amazon-orders[capsolver]
+pip install amazon-orders[anticaptcha]
+pip install amazon-orders[2captcha]
+```
+
+See [Solving WAF Challenges](https://amazon-orders.readthedocs.io/waf.html) for details.
+
+To enable **Captcha auto-solve** on Python <=3.12 (via the optional [`amazoncaptcha`](https://pypi.org/project/amazoncaptcha/)
+dependency), install with the `captcha` extra:
+
+```sh
+pip install amazon-orders[captcha]
+```
+
+Without this extra, Captcha challenges fall back to manual entry. `amazoncaptcha` is not available on Python 3.13+; see
+[Captcha Blocking Login](https://amazon-orders.readthedocs.io/troubleshooting.html#captcha-blocking-login) for details.
+
 ## Documentation
 
 For more advanced usage, `amazon-orders`'s official documentation is available

{amazon_orders-4.2.0 → amazon_orders-4.2.2}/README.md

@@ -1,4 +1,4 @@
-<p align="center"><img alt="amazon-orders - A Python libray (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/_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)
@@ -7,17 +7,17 @@
 [![Docs](https://img.shields.io/readthedocs/amazon-orders)](https://amazon-orders.readthedocs.io)
 [![GitHub License](https://img.shields.io/github/license/alexdlaird/amazon-orders)](https://github.com/alexdlaird/amazon-orders/blob/main/LICENSE)
 
-`amazon-orders` is an unofficial library that provides a Python API (and CLI) for Amazon order history.
-
-This package works by parsing data from Amazon's consumer-facing website. A periodic build validates functionality
-to ensure its stability, but as Amazon provides no official API to use, this package may break at any time (so check
-often to ensure you're on the latest version).
+`amazon-orders` is an unofficial library that provides a Python API (and CLI) for Amazon order history, line items, and transactions.
 
 Only the English, `.com` version of Amazon is officially supported. Other Amazon domains can be
 targeted by passing `domain` to [`AmazonSession`](https://amazon-orders.readthedocs.io/api.html#amazonorders.session.AmazonSession)
 (or `--domain` on the CLI), and other English-based sites may work by chance — see
 [Known Limitations](https://amazon-orders.readthedocs.io/index.html#known-limitations) for details.
 
+> **Note:** This package works by parsing data from Amazon's consumer-facing website. A periodic build validates
+> functionality to ensure its stability, but as Amazon provides no official API to use, older versions of this
+> package may break at any time, so it's recommended that you use the latest version.
+
 ## Installation
 
 `amazon-orders` is available on [PyPI](https://pypi.org/project/amazon-orders/) and can be installed and/or upgraded using `pip`:
@@ -28,29 +28,9 @@ pip install amazon-orders --upgrade
 
 That's it! `amazon-orders` is now available as a package to your Python projects and from the command line.
 
-If pinning, be sure to use a wildcard for the [minor version](https://semver.org/) (ex. `==4.0.*`, not `==4.2.0`) to
+If pinning, be sure to use a wildcard for the [minor version](https://semver.org/) (ex. `==4.2.*`, not `==4.2.2`) to
 ensure you always get the latest stable release.
 
-To enable **WAF auto-solve** via a third-party integration, install with the relevant extra:
-
-```sh
-pip install amazon-orders[capsolver]
-pip install amazon-orders[anticaptcha]
-pip install amazon-orders[2captcha]
-```
-
-See [Solving WAF Challenges](https://amazon-orders.readthedocs.io/waf.html) for details.
-
-To enable **Captcha auto-solve** on Python <=3.12 (via the optional [`amazoncaptcha`](https://pypi.org/project/amazoncaptcha/)
-dependency), install with the `captcha` extra:
-
-```sh
-pip install amazon-orders[captcha]
-```
-
-Without this extra, Captcha challenges fall back to manual entry. `amazoncaptcha` is not available on Python 3.13+; see
-[Captcha Blocking Login](https://amazon-orders.readthedocs.io/troubleshooting.html#captcha-blocking-login) for details.
-
 ## Basic Usage
 
 You'll use [`AmazonSession`](https://amazon-orders.readthedocs.io/api.html#amazonorders.session.AmazonSession) to
@@ -107,6 +87,26 @@ environment variables `amazon-orders` looks for are:
 - `AMAZON_PASSWORD`
 - `AMAZON_OTP_SECRET_KEY` (see [docs for usage](https://amazon-orders.readthedocs.io/api.html#amazonorders.session.AmazonSession.otp_secret_key))
 
+To enable **WAF auto-solve** via a third-party integration, install with the relevant extra:
+
+```sh
+pip install amazon-orders[capsolver]
+pip install amazon-orders[anticaptcha]
+pip install amazon-orders[2captcha]
+```
+
+See [Solving WAF Challenges](https://amazon-orders.readthedocs.io/waf.html) for details.
+
+To enable **Captcha auto-solve** on Python <=3.12 (via the optional [`amazoncaptcha`](https://pypi.org/project/amazoncaptcha/)
+dependency), install with the `captcha` extra:
+
+```sh
+pip install amazon-orders[captcha]
+```
+
+Without this extra, Captcha challenges fall back to manual entry. `amazoncaptcha` is not available on Python 3.13+; see
+[Captcha Blocking Login](https://amazon-orders.readthedocs.io/troubleshooting.html#captcha-blocking-login) for details.
+
 ## Documentation
 
 For more advanced usage, `amazon-orders`'s official documentation is available

{amazon_orders-4.2.0 → amazon_orders-4.2.2/amazon_orders.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.2.0
-Summary: A Python libray (and CLI) for Amazon order history
+Version: 4.2.2
+Summary: A Python library (and CLI) for Amazon order history
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>
 License-Expression: MIT
@@ -9,6 +9,7 @@ Project-URL: Changelog, https://github.com/alexdlaird/amazon-orders/blob/main/CH
 Project-URL: Documentation, https://amazon-orders.readthedocs.io
 Project-URL: Sponsor, https://github.com/sponsors/alexdlaird
 Project-URL: Source Code, https://github.com/alexdlaird/amazon-orders
+Keywords: amazon,orders,order-history,scraper,web-scraping,receipts,cli
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: Web Environment
@@ -20,7 +21,10 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
+Classifier: Topic :: Internet :: WWW/HTTP :: Browsers
+Classifier: Topic :: Office/Business :: Financial
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Text Processing :: Markup :: HTML
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
@@ -28,8 +32,8 @@ Requires-Dist: click>=7.1
 Requires-Dist: requests>=2.23
 Requires-Dist: Pillow>=9.0.1
 Requires-Dist: beautifulsoup4>=4.12
-Requires-Dist: PyYAML>=5.1
-Requires-Dist: python-dateutil>=2.8
+Requires-Dist: PyYAML>=6.0.3
+Requires-Dist: python-dateutil>=2.9.0.post0
 Requires-Dist: pyotp>=2.9
 Provides-Extra: captcha
 Requires-Dist: amazoncaptcha>=0.4; extra == "captcha"
@@ -63,9 +67,11 @@ Requires-Dist: types-beautifulsoup4; extra == "docs"
 Requires-Dist: types-Pillow; extra == "docs"
 Requires-Dist: types-PyYAML; extra == "docs"
 Requires-Dist: types-python-dateutil; extra == "docs"
+Requires-Dist: sphinx-sitemap; extra == "docs"
+Requires-Dist: sphinxext-opengraph; extra == "docs"
 Dynamic: license-file
 
-<p align="center"><img alt="amazon-orders - A Python libray (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/_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)
@@ -74,17 +80,17 @@ Dynamic: license-file
 [![Docs](https://img.shields.io/readthedocs/amazon-orders)](https://amazon-orders.readthedocs.io)
 [![GitHub License](https://img.shields.io/github/license/alexdlaird/amazon-orders)](https://github.com/alexdlaird/amazon-orders/blob/main/LICENSE)
 
-`amazon-orders` is an unofficial library that provides a Python API (and CLI) for Amazon order history.
-
-This package works by parsing data from Amazon's consumer-facing website. A periodic build validates functionality
-to ensure its stability, but as Amazon provides no official API to use, this package may break at any time (so check
-often to ensure you're on the latest version).
+`amazon-orders` is an unofficial library that provides a Python API (and CLI) for Amazon order history, line items, and transactions.
 
 Only the English, `.com` version of Amazon is officially supported. Other Amazon domains can be
 targeted by passing `domain` to [`AmazonSession`](https://amazon-orders.readthedocs.io/api.html#amazonorders.session.AmazonSession)
 (or `--domain` on the CLI), and other English-based sites may work by chance — see
 [Known Limitations](https://amazon-orders.readthedocs.io/index.html#known-limitations) for details.
 
+> **Note:** This package works by parsing data from Amazon's consumer-facing website. A periodic build validates
+> functionality to ensure its stability, but as Amazon provides no official API to use, older versions of this
+> package may break at any time, so it's recommended that you use the latest version.
+
 ## Installation
 
 `amazon-orders` is available on [PyPI](https://pypi.org/project/amazon-orders/) and can be installed and/or upgraded using `pip`:
@@ -95,29 +101,9 @@ pip install amazon-orders --upgrade
 
 That's it! `amazon-orders` is now available as a package to your Python projects and from the command line.
 
-If pinning, be sure to use a wildcard for the [minor version](https://semver.org/) (ex. `==4.0.*`, not `==4.2.0`) to
+If pinning, be sure to use a wildcard for the [minor version](https://semver.org/) (ex. `==4.2.*`, not `==4.2.2`) to
 ensure you always get the latest stable release.
 
-To enable **WAF auto-solve** via a third-party integration, install with the relevant extra:
-
-```sh
-pip install amazon-orders[capsolver]
-pip install amazon-orders[anticaptcha]
-pip install amazon-orders[2captcha]
-```
-
-See [Solving WAF Challenges](https://amazon-orders.readthedocs.io/waf.html) for details.
-
-To enable **Captcha auto-solve** on Python <=3.12 (via the optional [`amazoncaptcha`](https://pypi.org/project/amazoncaptcha/)
-dependency), install with the `captcha` extra:
-
-```sh
-pip install amazon-orders[captcha]
-```
-
-Without this extra, Captcha challenges fall back to manual entry. `amazoncaptcha` is not available on Python 3.13+; see
-[Captcha Blocking Login](https://amazon-orders.readthedocs.io/troubleshooting.html#captcha-blocking-login) for details.
-
 ## Basic Usage
 
 You'll use [`AmazonSession`](https://amazon-orders.readthedocs.io/api.html#amazonorders.session.AmazonSession) to
@@ -174,6 +160,26 @@ environment variables `amazon-orders` looks for are:
 - `AMAZON_PASSWORD`
 - `AMAZON_OTP_SECRET_KEY` (see [docs for usage](https://amazon-orders.readthedocs.io/api.html#amazonorders.session.AmazonSession.otp_secret_key))
 
+To enable **WAF auto-solve** via a third-party integration, install with the relevant extra:
+
+```sh
+pip install amazon-orders[capsolver]
+pip install amazon-orders[anticaptcha]
+pip install amazon-orders[2captcha]
+```
+
+See [Solving WAF Challenges](https://amazon-orders.readthedocs.io/waf.html) for details.
+
+To enable **Captcha auto-solve** on Python <=3.12 (via the optional [`amazoncaptcha`](https://pypi.org/project/amazoncaptcha/)
+dependency), install with the `captcha` extra:
+
+```sh
+pip install amazon-orders[captcha]
+```
+
+Without this extra, Captcha challenges fall back to manual entry. `amazoncaptcha` is not available on Python 3.13+; see
+[Captcha Blocking Login](https://amazon-orders.readthedocs.io/troubleshooting.html#captcha-blocking-login) for details.
+
 ## Documentation
 
 For more advanced usage, `amazon-orders`'s official documentation is available

{amazon_orders-4.2.0 → amazon_orders-4.2.2}/amazon_orders.egg-info/requires.txt

@@ -2,8 +2,8 @@ click>=7.1
 requests>=2.23
 Pillow>=9.0.1
 beautifulsoup4>=4.12
-PyYAML>=5.1
-python-dateutil>=2.8
+PyYAML>=6.0.3
+python-dateutil>=2.9.0.post0
 pyotp>=2.9
 
 [2captcha]
@@ -40,6 +40,8 @@ types-beautifulsoup4
 types-Pillow
 types-PyYAML
 types-python-dateutil
+sphinx-sitemap
+sphinxext-opengraph
 
 [integration]
 pytest-rerunfailures

{amazon_orders-4.2.0 → amazon_orders-4.2.2}/amazonorders/__init__.py

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

{amazon_orders-4.2.0 → amazon_orders-4.2.2}/amazonorders/contrib/waf/base.py

@@ -46,13 +46,18 @@ class AwsWafForm(AuthForm):
     def __init__(self,
                  config: AmazonOrdersConfig) -> None:
         super().__init__(config, selector=None)
-        api_key = os.environ.get(self.API_KEY_ENV_VAR, "")
+        config_key = self.API_KEY_ENV_VAR.lower()
+        api_key = (os.environ.get(self.API_KEY_ENV_VAR)
+                   or getattr(config, config_key, None)
+                   or "")
         if not api_key:
             raise AmazonOrdersError(
                 f"{type(self).__name__} requires the {self.API_KEY_ENV_VAR} "
-                f"environment variable to be set."
+                f"environment variable, or the {config_key} config key, to be set."
             )
-        #: The third-party solver API key, sourced from :attr:`API_KEY_ENV_VAR`.
+        #: The third-party solver API key. Resolved (in order of precedence) from the
+        #: :attr:`API_KEY_ENV_VAR` environment variable, then from the lowercase config key
+        #: of the same name on :class:`~amazonorders.conf.AmazonOrdersConfig`.
         self.api_key: str = api_key
         self._goku: Optional[Dict[str, Any]] = None
         self._challenge_script: Optional[str] = None

{amazon_orders-4.2.0 → amazon_orders-4.2.2}/amazonorders/forms.py

@@ -451,6 +451,22 @@ class CaptchaForm(AuthForm):
         self.data.update(additional_attrs)
 
 
+class AcicAuthBlocker(AuthForm):
+    def __init__(self,
+                 config: AmazonOrdersConfig) -> None:
+        super().__init__(config, None)
+
+    def select_form(self,
+                    amazon_session: "AmazonSession",
+                    parsed: Tag) -> bool:
+        if parsed.find(id="aa-challenge-page-captcha-container"):
+            raise AmazonOrdersAuthError(
+                "Amazon returned a JavaScript-based authentication challenge that this library cannot solve. See "
+                "https://amazon-orders.readthedocs.io/troubleshooting.html#captcha-blocking-login for help.")
+
+        return False
+
+
 class JSAuthBlocker(AuthForm):
     def __init__(self,
                  config: AmazonOrdersConfig,
@@ -467,8 +483,7 @@ class JSAuthBlocker(AuthForm):
 
         if re.search(self.regex, parsed.text):
             raise AmazonOrdersAuthError(
-                "A JavaScript-based authentication challenge page has been found. This library cannot solve these "
-                "challenges. See "
-                "https://amazon-orders.readthedocs.io/troubleshooting.html#captcha-blocking-login for more details.")
+                "Amazon returned a JavaScript-based authentication challenge that this library cannot solve. See "
+                "https://amazon-orders.readthedocs.io/troubleshooting.html#captcha-blocking-login for help.")
 
         return False

{amazon_orders-4.2.0 → amazon_orders-4.2.2}/amazonorders/session.py

@@ -15,7 +15,7 @@ from requests.utils import dict_from_cookiejar
 
 from amazonorders.conf import AmazonOrdersConfig, config_file_lock, cookies_file_lock, debug_output_file_lock
 from amazonorders.exception import AmazonOrdersAuthError, AmazonOrdersError, AmazonOrdersAuthRedirectError
-from amazonorders.forms import (AuthForm, CaptchaForm, JSAuthBlocker, MfaDeviceSelectForm, MfaForm,
+from amazonorders.forms import (AuthForm, AcicAuthBlocker, CaptchaForm, JSAuthBlocker, MfaDeviceSelectForm, MfaForm,
                                 SignInForm, ClaimForm, IntentForm)
 from amazonorders.util import AmazonSessionResponse, load_class
 
@@ -164,6 +164,7 @@ class AmazonSession:
                             "field-keywords"),
                 MfaForm(config,
                         config.selectors.CAPTCHA_OTP_FORM_SELECTOR),
+                AcicAuthBlocker(config),
                 JSAuthBlocker(config,
                               config.constants.JS_ROBOT_TEXT_REGEX)]
 

{amazon_orders-4.2.0 → amazon_orders-4.2.2}/pyproject.toml

@@ -1,9 +1,10 @@
 [project]
 name = "amazon-orders"
 dynamic = ["version"]
-description = "A Python libray (and CLI) for Amazon order history"
+description = "A Python library (and CLI) for Amazon order history"
 readme = "README.md"
 license = "MIT"
+keywords = ["amazon", "orders", "order-history", "scraper", "web-scraping", "receipts", "cli"]
 authors = [{ name = "Alex Laird", email = "contact@alexlaird.com" }]
 maintainers = [{ name = "Alex Laird", email = "contact@alexlaird.com" }]
 requires-python = ">=3.9"
@@ -12,8 +13,8 @@ dependencies = [
     "requests>=2.23",
     "Pillow>=9.0.1",
     "beautifulsoup4>=4.12",
-    "PyYAML>=5.1",
-    "python-dateutil>=2.8",
+    "PyYAML>=6.0.3",
+    "python-dateutil>=2.9.0.post0",
     "pyotp>=2.9",
 ]
 classifiers = [
@@ -28,7 +29,10 @@ classifiers = [
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.13",
+    "Topic :: Internet :: WWW/HTTP :: Browsers",
+    "Topic :: Office/Business :: Financial",
     "Topic :: Software Development :: Libraries :: Python Modules",
+    "Topic :: Text Processing :: Markup :: HTML",
 ]
 
 [project.optional-dependencies]
@@ -71,6 +75,8 @@ docs = [
     "types-Pillow",
     "types-PyYAML",
     "types-python-dateutil",
+    "sphinx-sitemap",
+    "sphinxext-opengraph",
 ]
 
 [project.scripts]