amazon-orders 4.4.1__tar.gz → 4.4.3__tar.gz

{amazon_orders-4.4.1 → amazon_orders-4.4.3}/CHANGELOG.md

@@ -4,23 +4,32 @@ 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.1...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/4.4.3...HEAD)
 
-## [4.4.1](https://github.com/alexdlaird/amazon-orders/compare/4.4.0...4.4.1) - 2026-07-04
+## [4.4.3](https://github.com/alexdlaird/amazon-orders/compare/4.4.2...4.4.3) - 2026-07-06
 
-### Fixed
+### Added
 
-- Fixed parsing of some `Order` fields on older order pages using the `chargeSummary` layout.
+- `AmazonOrders.get_order_history()` `order_filter` parameter to filter by order type via Amazon's `orderFilter` query parameter. `--order-filter` added to the `history` CLI command.
+- `invoice` and `order-transactions` CLI commands, adding parity with `AmazonOrders.get_invoice()` and `AmazonTransactions.get_transactions(order_id=)`.
 
-## [4.4.0](https://github.com/alexdlaird/amazon-orders/compare/4.3.1...4.4.0) - 2026-06-12
+## [4.4.2](https://github.com/alexdlaird/amazon-orders/compare/4.4.1...4.4.2) - 2026-07-05
 
 ### Added
 
-- `PlaywrightAcicForm` now solves visual grid Puzzles (e.g. "Choose all the buckets") automatically when a WAF solver extra is configured. Puzzles are detected and solved in a loop alongside the existing WAF token challenge, handling any combination Amazon presents.
-- `AwsWafForm._solve_visual_captcha()` subclass hook for Puzzle classification. `CapSolverWafForm` implements this via the `AwsWafClassification` task type.
-- `browser_timeout` config key (defaults to 30s) controlling how long the browser waits for challenge elements to appear.
-- `retry_failures` input on the integration test workflow for fail-fast CI runs.
-- Build and stability improvements.
+- `request_timeout` config key (defaults to `None`) controlling the timeout passed to each HTTP request.
+
+### Changed
+
+- `Order.order_number` now uses the caller-supplied value as a fallback when the order number cannot be parsed from the details page; previously documented but unintuitive behavior.
+
+## [4.4.1](https://github.com/alexdlaird/amazon-orders/compare/4.4.0...4.4.1) - 2026-07-04
+
+### Fixed
+
+- Parsing of some `Order` fields on older order pages using the `chargeSummary` layout.
+
+## [4.4.0](https://github.com/alexdlaird/amazon-orders/compare/4.3.1...4.4.0) - 2026-06-12
 
 ### Added
 
@@ -36,20 +45,15 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - `AmazonOrders.get_invoice()` to fetch an Order's print-friendly invoice page, returning the response (including its parsed HTML) for rendering or printing.
 - `AmazonTransactions.get_transactions()` `order_id` parameter to scope results to a single Order server-side via Amazon's `transactionTag` filter, bypassing the `days` window.
 
-### Added
-
-- `AmazonOrders.get_invoice()` to fetch an Order's print-friendly invoice page, returning the response (including its parsed HTML) for rendering or printing.
-- `AmazonTransactions.get_transactions()` `order_id` parameter to scope results to a single Order server-side via Amazon's `transactionTag` filter, bypassing the `days` window.
-
 ## [4.3.0](https://github.com/alexdlaird/amazon-orders/compare/4.2.2...4.3.0) - 2026-06-07
 
 ### Added
 
 - `[browser]` optional extra (`pip install amazon-orders[browser]`) for handling JavaScript-based authentication challenges via a headless browser. See [the docs](https://amazon-orders.readthedocs.io/browser.html) for setup.
-  - `PlaywrightAcicForm` handles the ACIC challenge page. If an embedded AWS WAF CAPTCHA is present, it delegates automatically to any configured WAF solver extra.
-  - `PlaywrightJSAuthForm` is a best-effort handler for the JS robot-detection page.
-  - `PlaywrightManualWafForm` opens a **visible** browser window for manual WAF CAPTCHA solving — a free alternative to the paid `[waf]` extras for local/interactive use.
-- `browser` config key and `AMAZON_BROWSER` environment variable to select between `chromium` (default) and `firefox` browser fingerprints.
+  - `PlaywrightAcicForm` handles the ACIC challenge page. If an embedded WAF is present, it delegates automatically to any configured WAF solver extra.
+  - `PlaywrightJSAuthForm` is a best-effort handler for the JS bot-detection page.
+  - `PlaywrightManualWafForm` opens a **visible** browser window for you to solve the challenge yourself, suitable when a display is available.
+- `browser` config key and `AMAZON_BROWSER` environment variable to select between `chromium` (default) and `firefox` browser user agents.
 - `Transaction.payment_method_last_4`, the masked card digits parsed from `payment_method`, mirroring the existing field on `Order`.
 
 ### Changed
@@ -57,15 +61,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 - JavaScript-based authentication challenge errors now direct users to the `[browser]` extra rather than reporting the challenge as unsolvable.
 - All user-facing error messages that include install commands now wrap those commands in backticks.
 
-### Added
-
-- `[browser]` optional extra (`pip install amazon-orders[browser]`) for handling JavaScript-based authentication challenges via a headless browser. See [the docs](https://amazon-orders.readthedocs.io/browser.html) for setup.
-  - `PlaywrightAcicForm` handles the ACIC challenge page. If an embedded WAF is present, it delegates automatically to any configured WAF solver extra.
-  - `PlaywrightJSAuthForm` is a best-effort handler for the JS bot-detection page.
-  - `PlaywrightManualWafForm` opens a **visible** browser window for you to solve the challenge yourself, suitable when a display is available.
-- `browser` config key and `AMAZON_BROWSER` environment variable to select between `chromium` (default) and `firefox` browser user agents.
-- `Transaction.payment_method_last_4`, the masked card digits parsed from `payment_method`, mirroring the existing field on `Order`.
-
 ## [4.2.2](https://github.com/alexdlaird/amazon-orders/compare/4.2.1...4.2.2) - 2026-06-06
 
 ### Fixed
@@ -78,10 +73,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - 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
 
 ### Added
@@ -92,14 +83,6 @@ 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
@@ -114,28 +97,12 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 - Captcha auto-solve via `amazoncaptcha` is likely to be removed in the future, since Amazon has continued to phase out OCR-style Captchas in favor of WAF.
 
-### Added
-
-- Python 3.13 support.
-
-### Changed
-
-- `amazoncaptcha` is now an optional dependency. Install with `pip install amazon-orders[captcha]` to enable Captcha auto-solve (only compatible with Python <=3.12. When not installed, Captcha challenges fall back to manual entry.
-
-### Deprecated
-
-- Captcha auto-solve via `amazoncaptcha` is likely to be removed in the future, since Amazon has continued to phase out OCR-style Captchas in favor of WAF.
-
 ## [4.0.19](https://github.com/alexdlaird/amazon-orders/compare/4.0.18...4.0.19) - 2026-04-29
 
 ### Added
 
 - Build and stability improvements.
 
-### Added
-
-- Build and stability improvements.
-
 ## [4.0.18](https://github.com/alexdlaird/amazon-orders/compare/4.0.17...4.0.18) - 2025-12-06
 
 ### Added
@@ -260,13 +227,6 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm
 
 ### Added
 
-- Improvements around auth retry logic.
-- Detect JavaScript-based auth challenges (which can be solved) and give more clear error for them.
-- Stability improvements.
-- Documentation improvements.
-
-### Added
-
 - Stability improvements for auth flow.
 - Documentation improvements.
 

{amazon_orders-4.4.1/amazon_orders.egg-info → amazon_orders-4.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.4.1
+Version: 4.4.3
 Summary: A Python library (and CLI) for Amazon order history
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>

{amazon_orders-4.4.1 → amazon_orders-4.4.3/amazon_orders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 4.4.1
+Version: 4.4.3
 Summary: A Python library (and CLI) for Amazon order history
 Author-email: Alex Laird <contact@alexlaird.com>
 Maintainer-email: Alex Laird <contact@alexlaird.com>

{amazon_orders-4.4.1 → amazon_orders-4.4.3}/amazonorders/__init__.py

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

{amazon_orders-4.4.1 → amazon_orders-4.4.3}/amazonorders/cli.py

@@ -126,6 +126,8 @@ def amazon_orders_cli(ctx: Context,
 @click.option("--full-details", is_flag=True, default=False,
               help="Get the full details for each Order in the history. "
                    "This will execute an additional request per Order.")
+@click.option("--order-filter", "order_filter", default=None,
+              help="The order type filter to use.")
 def history(ctx: Context,
             **kwargs: Any) -> None:
     """
@@ -142,6 +144,7 @@ def history(ctx: Context,
         start_index = kwargs["start_index"]
         single_page = kwargs["single_page"]
         full_details = kwargs["full_details"]
+        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:
@@ -180,7 +183,8 @@ Order History for {filter_description}{optional_start_index}{optional_full_detai
                                                  start_index=start_index,
                                                  full_details=full_details,
                                                  keep_paging=not single_page,
-                                                 time_filter=time_filter):
+                                                 time_filter=time_filter,
+                                                 order_filter=order_filter):
             click.echo(f"{_order_output(o, config)}\n")
             total += 1
         end_time = time.time()
@@ -222,6 +226,67 @@ def order(ctx: Context,
         ctx.fail(str(e))
 
 
+@amazon_orders_cli.command()
+@click.pass_context
+@click.argument("order_id")
+def invoice(ctx: Context,
+            order_id: str) -> None:
+    """
+    Get the invoice for a given Amazon Order ID.
+    """
+    amazon_session = ctx.obj["amazon_session"]
+
+    try:
+        _authenticate(amazon_session)
+
+        config = ctx.obj["conf"]
+        amazon_orders = AmazonOrders(amazon_session,
+                                     config=config)
+
+        invoice_response = amazon_orders.get_invoice(order_id)
+
+        click.echo(invoice_response.response.text)
+    except AmazonOrdersAuthRedirectError:
+        _prompt_to_reauth_flow()
+    except AmazonOrdersError as e:
+        logger.debug("An error occurred.", exc_info=True)
+        ctx.fail(str(e))
+
+
+@amazon_orders_cli.command("order-transactions")
+@click.pass_context
+@click.argument("order_id")
+def order_transactions(ctx: Context,
+                       order_id: str) -> None:
+    """
+    Get the Transactions for a given Amazon Order ID.
+    """
+    amazon_session = ctx.obj["amazon_session"]
+
+    try:
+        _authenticate(amazon_session)
+
+        config = ctx.obj["conf"]
+        amazon_transactions = AmazonTransactions(amazon_session,
+                                                 config=config)
+
+        start_time = time.time()
+        total = 0
+        for t in amazon_transactions.get_transactions(order_id=order_id):
+            click.echo(f"{_transaction_output(t, config)}\n")
+            total += 1
+        end_time = time.time()
+
+        click.echo(
+            "... {total} Transactions parsed in {time} seconds.\n".format(total=total,
+                                                                          time=int(end_time - start_time)))
+    except AmazonOrdersAuthRedirectError:
+        _prompt_to_reauth_flow()
+    except AmazonOrdersError as e:
+        logger.debug("An error occurred.", exc_info=True)
+        ctx.fail(str(e))
+
+
 @amazon_orders_cli.command()
 @click.pass_context
 @click.option("--days", default=365,

{amazon_orders-4.4.1 → amazon_orders-4.4.3}/amazonorders/conf.py

@@ -60,6 +60,8 @@ class AmazonOrdersConfig:
             "auth_forms_classes": [],
             # Timeout in seconds for browser-based challenge detection and resolution
             "browser_timeout": 30,
+            # Timeout in seconds for HTTP requests; ``None`` leaves requests with no timeout
+            "request_timeout": None,
             "thread_pool_size": (os.cpu_count() or 1) * 4,
             "connection_pool_size": thread_pool_size * 2,
             # The maximum number of failed attempts to allow before failing CLI authentication

{amazon_orders-4.4.1 → amazon_orders-4.4.3}/amazonorders/constants.py

@@ -112,6 +112,7 @@ class Constants:
     ORDER_DETAILS_URL = f"{BASE_URL}/gp/your-account/order-details"
     ORDER_INVOICE_URL = f"{BASE_URL}/gp/css/summary/print.html"
     HISTORY_FILTER_QUERY_PARAM = "timeFilter"
+    ORDER_FILTER_QUERY_PARAM = "orderFilter"
 
     ##########################################################################
     # URLs for Transactions

{amazon_orders-4.4.1 → amazon_orders-4.4.3}/amazonorders/entity/order.py

@@ -58,11 +58,17 @@ class Order(Parsable):
         self.items: List[Item] = clone.items if clone and not full_details else self._parse_items()
         #: The Order number. May be ``None`` only when the Order is :attr:`cancelled` and Amazon stripped the order
         #: number from the details page (the ``order_number`` parameter is used as a fallback in that case).
-        self.order_number: Optional[str] = clone.order_number if clone else self.safe_simple_parse(
+        # `required` is relaxed only when `order_number` is explicitly supplied (the `get_order()` path), so the
+        # fallback is never silently applied when parsing the history list, where the parsed value must be present.
+        _parsed_order_number = None if clone else self.safe_simple_parse(
             selector=self.config.selectors.FIELD_ORDER_NUMBER_SELECTOR,
-            required=not self.cancelled,
+            required=not self.cancelled and order_number is None,
             prefix_split="#",
-            prefix_split_fuzzy=True) or order_number
+            prefix_split_fuzzy=True)
+        if _parsed_order_number is None and order_number is not None:
+            logger.debug(f"Order number could not be parsed from the page; "
+                         f"using supplied order_number={order_number}.")
+        self.order_number: Optional[str] = clone.order_number if clone else _parsed_order_number or order_number
         #: The Order details link.
         self.order_details_link: Optional[str] = clone.order_details_link if clone else self.safe_parse(
             self._parse_order_details_link)

{amazon_orders-4.4.1 → amazon_orders-4.4.3}/amazonorders/orders.py

@@ -6,6 +6,7 @@ import concurrent.futures
 import datetime
 import logging
 from typing import Any, Callable, List, Optional
+from urllib.parse import quote
 
 from bs4 import Tag
 
@@ -103,7 +104,8 @@ class AmazonOrders:
                           start_index: Optional[int] = None,
                           full_details: bool = False,
                           keep_paging: bool = True,
-                          time_filter: Optional[str] = None) -> List[Order]:
+                          time_filter: Optional[str] = None,
+                          order_filter: Optional[str] = None) -> List[Order]:
         """
         Get the Amazon Order history for a given time period.
 
@@ -119,6 +121,7 @@ class AmazonOrders:
         :param time_filter: The time filter to use. Supported values are ``"last30"`` (last 30 days),
             ``"months-3"`` (past 3 months), or ``"year-YYYY"`` (specific year). If provided, this takes
             precedence over the ``year`` parameter.
+        :param order_filter: The order type filter to use. If provided, appended alongside the time filter.
         :return: A list of the requested Orders.
         """
         if not self.amazon_session.is_authenticated:
@@ -144,12 +147,17 @@ class AmazonOrders:
             filter_value = f"year-{year}"
 
         optional_start_index = f"&startIndex={start_index}" if start_index else ""
+        optional_order_filter = (
+            f"&{self.config.constants.ORDER_FILTER_QUERY_PARAM}={quote(order_filter, safe='')}"
+            if order_filter else ""
+        )
         next_page: Optional[str] = (
-            "{url}?{query_param}={filter_value}{optional_start_index}"
+            "{url}?{query_param}={filter_value}{optional_order_filter}{optional_start_index}"
         ).format(
             url=self.config.constants.ORDER_HISTORY_URL,
             query_param=self.config.constants.HISTORY_FILTER_QUERY_PARAM,
             filter_value=filter_value,
+            optional_order_filter=optional_order_filter,
             optional_start_index=optional_start_index
         )
 

{amazon_orders-4.4.1 → amazon_orders-4.4.3}/amazonorders/session.py

@@ -200,6 +200,9 @@ class AmazonSession:
                     url_to_log += "?" + encoded_params
             logger.debug(f"{method} request: {url_to_log}")
 
+        if self.config.request_timeout is not None:
+            kwargs.setdefault("timeout", self.config.request_timeout)
+
         response = self.session.request(method, url, **kwargs)
         amazon_session_response = AmazonSessionResponse(response,
                                                         self.config.bs4_parser)