amazon-orders 4.9.0__tar.gz → 4.9.2__tar.gz

{amazon_orders-4.9.0 → amazon_orders-4.9.2}/CHANGELOG.md

@@ -4,16 +4,44 @@ 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.9.0...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/4.9.2...HEAD)
+
+## [4.9.2](https://github.com/alexdlaird/amazon-orders/compare/4.9.1...4.9.2) - 2026-10-15
+
+### Added
+
+- `Constants.BROWSER_HEADERS`, `REGION_CURRENCY_OVERRIDES`, `ZERO_DECIMAL_CURRENCY_SYMBOLS`, `region_auth_cookie()`, and `region_currency_symbol()`, so a `constants_class` can override a browser's headers, or a site's auth cookie or currency symbol.
+
+### Deprecated
+
+- `AwsWafForm`'s `_solve_token()` and `_solve_visual_captcha()`, renamed to `solve_token()` and `solve_visual_captcha()`.
+
+### Fixed
+
+- Sign-in on Amazon sites other than `.com`, `.ca`, `.co.jp`, `.co.uk`, `.com.au`, `.de`, `.in`, and `.it` now checks for that site's own auth cookie.
+- Bug fixes and stability improvements.
+
+## [4.9.1](https://github.com/alexdlaird/amazon-orders/compare/4.9.0...4.9.1) - 2026-10-14
+
+### Added
+
+- `--progress` and `--no-progress` CLI flags, to force the progress status on or off.
+- Browser sign-in first tries Chrome, then Edge, and then falls back to downloading a browser.
+
+### Fixed
+
+- The CLI's progress spammed a newline for every update in `4.9.0` instead of animating, and now shows the overall total when known.
+- Bug fixes and stability improvements.
 
 ## [4.9.0](https://github.com/alexdlaird/amazon-orders/compare/4.8.1...4.9.0) - 2026-10-14
 
 ### Added
 
-- English pages on any Amazon site that offers them, with `domain` and no language package (e.g. `amazon.de`, `amazon.fr`, `amazon.co.jp`).
+- English pages on any Amazon site that offers them, whatever language the account is set to, including `amazon.com`, and with `domain` and no language package (e.g. `amazon.de`, `amazon.fr`, `amazon.co.jp`).
 - Sign-in and currency symbols for more non-`.com` Amazon sites (e.g. `amazon.fr`, `amazon.co.za`).
 - Browser sign-in with any browser Playwright supports, using the installed Chrome by default, with `browser` and `browser_executable_path`.
-- `AMAZON_<KEY>` environment variables for every config value (e.g. `AMAZON_MAX_AUTH_ATTEMPTS`).
+- `AMAZON_<KEY>` environment variables for every config value (e.g. `AMAZON_MAX_AUTH_ATTEMPTS`), which take precedence over `config.yml`.
+- Progress status while the CLI fetches history, and a `progress` callback to do the same with the API.
 
 ### Changed
 
@@ -25,7 +53,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Removed
 
-- `AMAZON_CURRENCY_SYMBOL`.
+- `AMAZON_CURRENCY_SYMBOL`, superseded by full regional support.
 
 ### Fixed
 

{amazon_orders-4.9.0/amazon_orders.egg-info → amazon_orders-4.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.9.0
+Version: 4.9.2
 Summary: A Python library (and CLI) for Amazon order history, line items, and transactions
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>
@@ -112,6 +112,7 @@ to interact with account data. [`get_order_history`](https://amazon-orders.readt
 and [`get_order`](https://amazon-orders.readthedocs.io/api.html#amazonorders.orders.AmazonOrders.get_order) are good places to start.
 
 ```python
+from amazonorders.constants import Constants
 from amazonorders.session import AmazonSession
 from amazonorders.orders import AmazonOrders
 
@@ -125,8 +126,8 @@ amazon_orders = AmazonOrders(amazon_session)
 orders = amazon_orders.get_order_history(year=2023)
 
 # Or use time filters for recent orders
-orders = amazon_orders.get_order_history(time_filter="last30")  # Last 30 days
-orders = amazon_orders.get_order_history(time_filter="months-3")  # Past 3 months
+orders = amazon_orders.get_order_history(time_filter=Constants.LAST_30_DAYS_TIME_FILTER)
+orders = amazon_orders.get_order_history(time_filter=Constants.LAST_3_MONTHS_TIME_FILTER)
 
 for order in orders:
     print(f"{order.order_number} - {order.grand_total}")
@@ -210,6 +211,9 @@ environment variables `amazon-orders` looks for are:
 
 Any other config value can be set the same way, as `AMAZON_<KEY>` (see [`AmazonOrdersConfig`](https://amazon-orders.readthedocs.io/api.html#amazonorders.conf.AmazonOrdersConfig)).
 
+A configured username also applies to `amazon-orders login --browser`: it's filled in and submitted for you, so the
+browser opens on Amazon's password or passkey step. The browser never fills in your password.
+
 ### Languages and Regions
 
 `amazon-orders` reads Amazon's pages in English. The `.com` site is validated nightly.
@@ -221,6 +225,13 @@ Any other config value can be set the same way, as `AMAZON_<KEY>` (see [`AmazonO
   lets `amazon-orders` read the site's pages; its own CLI and messages stay in English. See
   [Language Packages](https://amazon-orders.readthedocs.io/language-packages.html).
 
+### AI Assistants
+
+An AI assistant has two ways to use `amazon-orders`. One that runs commands uses the CLI or the library directly, just
+as shown above. Any MCP client gets the same as tools through
+[`amazon-orders-mcp`](https://github.com/alexdlaird/amazon-orders-mcp#readme), a server built on `amazon-orders` — see
+its README for setup.
+
 ## Documentation
 
 For more advanced usage, `amazon-orders`'s official documentation is available

{amazon_orders-4.9.0 → amazon_orders-4.9.2}/README.md

@@ -36,6 +36,7 @@ to interact with account data. [`get_order_history`](https://amazon-orders.readt
 and [`get_order`](https://amazon-orders.readthedocs.io/api.html#amazonorders.orders.AmazonOrders.get_order) are good places to start.
 
 ```python
+from amazonorders.constants import Constants
 from amazonorders.session import AmazonSession
 from amazonorders.orders import AmazonOrders
 
@@ -49,8 +50,8 @@ amazon_orders = AmazonOrders(amazon_session)
 orders = amazon_orders.get_order_history(year=2023)
 
 # Or use time filters for recent orders
-orders = amazon_orders.get_order_history(time_filter="last30")  # Last 30 days
-orders = amazon_orders.get_order_history(time_filter="months-3")  # Past 3 months
+orders = amazon_orders.get_order_history(time_filter=Constants.LAST_30_DAYS_TIME_FILTER)
+orders = amazon_orders.get_order_history(time_filter=Constants.LAST_3_MONTHS_TIME_FILTER)
 
 for order in orders:
     print(f"{order.order_number} - {order.grand_total}")
@@ -134,6 +135,9 @@ environment variables `amazon-orders` looks for are:
 
 Any other config value can be set the same way, as `AMAZON_<KEY>` (see [`AmazonOrdersConfig`](https://amazon-orders.readthedocs.io/api.html#amazonorders.conf.AmazonOrdersConfig)).
 
+A configured username also applies to `amazon-orders login --browser`: it's filled in and submitted for you, so the
+browser opens on Amazon's password or passkey step. The browser never fills in your password.
+
 ### Languages and Regions
 
 `amazon-orders` reads Amazon's pages in English. The `.com` site is validated nightly.
@@ -145,6 +149,13 @@ Any other config value can be set the same way, as `AMAZON_<KEY>` (see [`AmazonO
   lets `amazon-orders` read the site's pages; its own CLI and messages stay in English. See
   [Language Packages](https://amazon-orders.readthedocs.io/language-packages.html).
 
+### AI Assistants
+
+An AI assistant has two ways to use `amazon-orders`. One that runs commands uses the CLI or the library directly, just
+as shown above. Any MCP client gets the same as tools through
+[`amazon-orders-mcp`](https://github.com/alexdlaird/amazon-orders-mcp#readme), a server built on `amazon-orders` — see
+its README for setup.
+
 ## Documentation
 
 For more advanced usage, `amazon-orders`'s official documentation is available

{amazon_orders-4.9.0 → amazon_orders-4.9.2/amazon_orders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.9.0
+Version: 4.9.2
 Summary: A Python library (and CLI) for Amazon order history, line items, and transactions
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>
@@ -112,6 +112,7 @@ to interact with account data. [`get_order_history`](https://amazon-orders.readt
 and [`get_order`](https://amazon-orders.readthedocs.io/api.html#amazonorders.orders.AmazonOrders.get_order) are good places to start.
 
 ```python
+from amazonorders.constants import Constants
 from amazonorders.session import AmazonSession
 from amazonorders.orders import AmazonOrders
 
@@ -125,8 +126,8 @@ amazon_orders = AmazonOrders(amazon_session)
 orders = amazon_orders.get_order_history(year=2023)
 
 # Or use time filters for recent orders
-orders = amazon_orders.get_order_history(time_filter="last30")  # Last 30 days
-orders = amazon_orders.get_order_history(time_filter="months-3")  # Past 3 months
+orders = amazon_orders.get_order_history(time_filter=Constants.LAST_30_DAYS_TIME_FILTER)
+orders = amazon_orders.get_order_history(time_filter=Constants.LAST_3_MONTHS_TIME_FILTER)
 
 for order in orders:
     print(f"{order.order_number} - {order.grand_total}")
@@ -210,6 +211,9 @@ environment variables `amazon-orders` looks for are:
 
 Any other config value can be set the same way, as `AMAZON_<KEY>` (see [`AmazonOrdersConfig`](https://amazon-orders.readthedocs.io/api.html#amazonorders.conf.AmazonOrdersConfig)).
 
+A configured username also applies to `amazon-orders login --browser`: it's filled in and submitted for you, so the
+browser opens on Amazon's password or passkey step. The browser never fills in your password.
+
 ### Languages and Regions
 
 `amazon-orders` reads Amazon's pages in English. The `.com` site is validated nightly.
@@ -221,6 +225,13 @@ Any other config value can be set the same way, as `AMAZON_<KEY>` (see [`AmazonO
   lets `amazon-orders` read the site's pages; its own CLI and messages stay in English. See
   [Language Packages](https://amazon-orders.readthedocs.io/language-packages.html).
 
+### AI Assistants
+
+An AI assistant has two ways to use `amazon-orders`. One that runs commands uses the CLI or the library directly, just
+as shown above. Any MCP client gets the same as tools through
+[`amazon-orders-mcp`](https://github.com/alexdlaird/amazon-orders-mcp#readme), a server built on `amazon-orders` — see
+its README for setup.
+
 ## Documentation
 
 For more advanced usage, `amazon-orders`'s official documentation is available

{amazon_orders-4.9.0 → amazon_orders-4.9.2}/amazonorders/__init__.py

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

{amazon_orders-4.9.0 → amazon_orders-4.9.2}/amazonorders/cli.py

@@ -8,8 +8,9 @@ import logging
 import os
 import platform
 import sys
+import threading
 import time
-from typing import Any, Callable, List, Optional
+from typing import Any, List, Optional
 
 import click
 from click.core import Context
@@ -77,19 +78,69 @@ class IOClick(IODefault):
         click.echo(banner.format(version=__version__), err=True)
 
     @staticmethod
-    def echo_progress(noun: str) -> Callable[[int], None]:
-        """
-        Build a ``progress`` callback that tells the user, on ``stderr``, how many ``noun`` have been found so far.
-        """
-        def echo(count: int) -> None:
-            click.echo(f"Info: {count} {noun} found so far ...", err=True)
+    def echo_session_expired() -> None:
+        click.echo("... Amazon redirected to login, so it wants the persisted session's sign-in confirmed. Call the "
+                   "`login` command to sign in again, or `login --browser` to log in on Amazon's own page.\n")
 
-        return echo
 
-    @staticmethod
-    def echo_session_expired() -> None:
-        click.echo("... Amazon redirected to login, which likely means the persisted session is stale. It was logged "
-                   "out, so call the `login` command again, or `login --browser` to log in on Amazon's own page.\n")
+class ProgressSpinner:
+    """
+    While a fetch runs, show a spinner and how many ``noun`` have been found so far on a single ``stderr`` line,
+    redrawn in place, and how many are expected if a total is known. The line is cleared when the fetch ends, whether
+    or not it succeeded. Pass it as a ``progress`` or ``progress_with_total`` callback. When not ``enabled``, nothing
+    is shown.
+    """
+
+    FRAMES = "|/-\\"
+    INTERVAL_SECONDS = 0.1
+
+    def __init__(self,
+                 noun: str,
+                 enabled: bool) -> None:
+        self.noun: str = noun
+        self.enabled: bool = enabled
+        self._count: int = 0
+        self._total: Optional[int] = None
+        self._line_length: int = 0
+        self._lock: threading.Lock = threading.Lock()
+        self._stopped: threading.Event = threading.Event()
+        self._thread: Optional[threading.Thread] = None
+
+    def __call__(self,
+                 count: int,
+                 total: Optional[int] = None) -> None:
+        with self._lock:
+            self._count = count
+            self._total = total
+
+    def __enter__(self) -> "ProgressSpinner":
+        if self.enabled:
+            self._thread = threading.Thread(target=self._spin, daemon=True)
+            self._thread.start()
+
+        return self
+
+    def __exit__(self,
+                 *exc_info: Any) -> None:
+        if self._thread:
+            self._stopped.set()
+            self._thread.join()
+            click.echo(f"\r{' ' * self._line_length}\r", nl=False, err=True)
+
+    def _spin(self) -> None:
+        frame = 0
+        while not self._stopped.is_set():
+            with self._lock:
+                count = self._count
+                optional_total = f" of {self._total}" if self._total is not None else ""
+            self._redraw(f"{self.FRAMES[frame % len(self.FRAMES)]} {self.noun} found so far: {count}{optional_total}")
+            frame += 1
+            self._stopped.wait(self.INTERVAL_SECONDS)
+
+    def _redraw(self,
+                line: str) -> None:
+        click.echo(f"\r{line.ljust(self._line_length)}", nl=False, err=True)
+        self._line_length = max(self._line_length, len(line))
 
 
 class CliAuth:
@@ -105,7 +156,7 @@ class CliAuth:
                 if amazon_session.username or amazon_session.password:
                     click.echo(
                         "Info: The given username and password are being ignored because a previous session still "
-                        "exists. To reauthenticate, call the `logout` command first.\n")
+                        "exists. To reauthenticate, call the `login` command.\n")
             else:
                 if not amazon_session.username:
                     amazon_session.username = click.prompt("Username")
@@ -143,7 +194,7 @@ class CliAuth:
                     raise
                 browser_type = browser_types[0]
             else:
-                click.echo("Info: Chrome isn't installed, so a browser to sign in with needs to be downloaded.\n")
+                click.echo("Info: No default browser was found, so one to sign in with needs to be downloaded.\n")
                 browser_type = IOClick.prompt_for_choice("Choose a browser to download", browser_types)
 
             browser_selected = PlaywrightBrowserLauncher(self.amazon_session.config).install(browser_type)
@@ -168,6 +219,9 @@ class CliAuth:
 @click.option("--domain",
               help="The Amazon domain to target (e.g. amazon.com, amazon.co.uk, amazon.com.au). "
                    "Defaults to amazon.com.")
+@click.option("--progress/--no-progress", default=None,
+              help="Show a running count while fetching. Defaults to showing it only in an interactive terminal, "
+                   "and not with --debug.")
 @click.pass_context
 def amazon_orders_cli(ctx: Context,
                       **kwargs: Any) -> None:
@@ -195,6 +249,9 @@ def amazon_orders_cli(ctx: Context,
         logger.setLevel(logging.DEBUG)
         logger.addHandler(logging.StreamHandler())
 
+    ctx.obj["show_progress"] = (kwargs["progress"] if kwargs["progress"] is not None
+                                else _is_interactive_terminal() and not kwargs["debug"])
+
     data = {}
     if kwargs.get("output_dir"):
         data["output_dir"] = kwargs["output_dir"]
@@ -274,10 +331,10 @@ def history(ctx: Context,
         # Determine time filter
         time_filter = None
         if last_30_days:
-            time_filter = "last30"
+            time_filter = amazon_session.config.constants.LAST_30_DAYS_TIME_FILTER
             filter_description = "last 30 days"
         elif last_3_months:
-            time_filter = "months-3"
+            time_filter = amazon_session.config.constants.LAST_3_MONTHS_TIME_FILTER
             filter_description = "past 3 months"
         else:
             if year is None:
@@ -293,20 +350,22 @@ Order History for {filter_description}{optional_start_index}{optional_full_detai
                    .format(filter_description=filter_description,
                            optional_start_index=optional_start_index,
                            optional_full_details=optional_full_details), err=True)
-        click.echo("Info: Fetching Order history, this might take a minute ...", err=True)
+        if not ctx.obj["show_progress"]:
+            click.echo("Info: Fetching Order history, this might take a minute ...", err=True)
 
         config = ctx.obj["conf"]
         amazon_orders = AmazonOrders(amazon_session,
                                      config=config)
 
         start_time = time.time()
-        orders = amazon_orders.get_order_history(year=year,
-                                                 start_index=start_index,
-                                                 full_details=full_details,
-                                                 keep_paging=not single_page,
-                                                 time_filter=time_filter,
-                                                 order_filter=order_filter,
-                                                 progress=IOClick.echo_progress("Orders"))
+        with ProgressSpinner("Orders", ctx.obj["show_progress"]) as progress:
+            orders = amazon_orders.get_order_history(year=year,
+                                                     start_index=start_index,
+                                                     full_details=full_details,
+                                                     keep_paging=not single_page,
+                                                     time_filter=time_filter,
+                                                     order_filter=order_filter,
+                                                     progress_with_total=progress)
         end_time = time.time()
 
         click.echo(config.output_cls(config).format(orders, output))
@@ -403,7 +462,8 @@ def order_transactions(ctx: Context,
         output = kwargs["output"]
 
         start_time = time.time()
-        order_transaction_list = amazon_transactions.get_transactions(order_id=order_id)
+        with ProgressSpinner("Transactions", ctx.obj["show_progress"]) as progress:
+            order_transaction_list = amazon_transactions.get_transactions(order_id=order_id, progress=progress)
         end_time = time.time()
 
         click.echo(config.output_cls(config).format(order_transaction_list, output))
@@ -441,15 +501,16 @@ def transactions(ctx: Context, **kwargs: Any) -> None:
 Transaction History for {days} days
 -----------------------------------------------------------------------\n""".format(days=days), err=True
         )
-        click.echo("Info: Fetching Transaction history, this might take a minute ...", err=True)
+        if not ctx.obj["show_progress"]:
+            click.echo("Info: Fetching Transaction history, this might take a minute ...", err=True)
 
         config = ctx.obj["conf"]
         amazon_transactions = AmazonTransactions(amazon_session,
                                                  config=config)
 
         start_time = time.time()
-        transaction_list = amazon_transactions.get_transactions(days=days,
-                                                                progress=IOClick.echo_progress("Transactions"))
+        with ProgressSpinner("Transactions", ctx.obj["show_progress"]) as progress:
+            transaction_list = amazon_transactions.get_transactions(days=days, progress=progress)
         end_time = time.time()
 
         click.echo(config.output_cls(config).format(transaction_list, output))
@@ -512,15 +573,16 @@ def gift_card_activity(ctx: Context, **kwargs: Any) -> None:
 Gift Card Activity for {days} days
 -----------------------------------------------------------------------\n""".format(days=days), err=True
         )
-        click.echo("Info: Fetching Gift Card activity, this might take a minute ...", err=True)
+        if not ctx.obj["show_progress"]:
+            click.echo("Info: Fetching Gift Card activity, this might take a minute ...", err=True)
 
         config = ctx.obj["conf"]
         amazon_gift_cards = AmazonGiftCards(amazon_session,
                                             config=config)
 
         start_time = time.time()
-        activity = amazon_gift_cards.get_gift_card_activity(
-            days=days, progress=IOClick.echo_progress("Gift Card activity entries"))
+        with ProgressSpinner("Gift Card activity entries", ctx.obj["show_progress"]) as progress:
+            activity = amazon_gift_cards.get_gift_card_activity(days=days, progress=progress)
         end_time = time.time()
 
         click.echo(config.output_cls(config).format(activity, output))
@@ -559,20 +621,20 @@ def login(ctx: Context, **kwargs: Any) -> None:
     """
     amazon_session = ctx.obj["amazon_session"]
 
-    if amazon_session.auth_cookies_stored():
-        click.echo(
-            "Info: A persisted session exists. Call the `logout` command first to change users.\n")
-    else:
-        try:
-            if kwargs["browser"]:
-                CliAuth(amazon_session).authenticate_with_browser()
-            else:
-                CliAuth(amazon_session).authenticate()
-        except AmazonOrdersError as e:
-            logger.debug("An error occurred.", exc_info=True)
-            ctx.fail(str(e))
+    try:
+        if amazon_session.auth_cookies_stored():
+            click.echo("Info: Logging out of the persisted session first, so this login starts fresh.\n")
+            amazon_session.logout()
 
-        click.echo("Info: Successfully logged in to Amazon, session persisted.\n")
+        if kwargs["browser"]:
+            CliAuth(amazon_session).authenticate_with_browser()
+        else:
+            CliAuth(amazon_session).authenticate()
+    except AmazonOrdersError as e:
+        logger.debug("An error occurred.", exc_info=True)
+        ctx.fail(str(e))
+
+    click.echo("Info: Successfully logged in to Amazon, session persisted.\n")
 
 
 @amazon_orders_cli.command()
@@ -620,5 +682,9 @@ def version(ctx: Context) -> None:
     ctx.exit(0)
 
 
+def _is_interactive_terminal() -> bool:
+    return sys.stderr.isatty() and os.environ.get("TERM") != "dumb"
+
+
 if __name__ == "__main__":
     amazon_orders_cli(obj={})

{amazon_orders-4.9.0 → amazon_orders-4.9.2}/amazonorders/conf.py

@@ -1,3 +1,6 @@
+__copyright__ = "Copyright (c) 2024-2025 Alex Laird"
+__license__ = "MIT"
+
 import importlib
 import inspect
 import logging