amazon-orders 5.2.0__tar.gz → 5.2.2__tar.gz

{amazon_orders-5.2.0 → amazon_orders-5.2.2}/CHANGELOG.md

@@ -4,7 +4,29 @@ 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/5.2.0...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/5.2.2...HEAD)
+
+## [5.2.2](https://github.com/alexdlaird/amazon-orders/compare/5.2.1...5.2.2) - 2026-11-09
+
+### Fixed
+
+- `parse_tracking()` parses the tracking page of a shipment that has not shipped yet, instead of raising.
+- `Order.order_placed_date` is parsed on a Whole Foods Market in-store purchase's details page.
+- `Tracking.carrier` is documented as `None` when the page names no carrier.
+
+### Security
+
+- The `Host` header is no longer pinned, which sent Amazon's session cookies to any host requested, including through an off-site redirect.
+
+## [5.2.1](https://github.com/alexdlaird/amazon-orders/compare/5.2.0...5.2.1) - 2026-10-31
+
+### Added
+
+- `parse_failures` on every entity, the fields that failed to parse and were left `None`, to tell them apart from fields that are `None` by design.
+
+### Changed
+
+- `safe_simple_parse()`'s warning names the selector that failed, instead of `simple_parse`.
 
 ## [5.2.0](https://github.com/alexdlaird/amazon-orders/compare/5.1.0...5.2.0) - 2026-10-25
 

{amazon_orders-5.2.0/amazon_orders.egg-info → amazon_orders-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 5.2.0
+Version: 5.2.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>

{amazon_orders-5.2.0 → amazon_orders-5.2.2/amazon_orders.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 5.2.0
+Version: 5.2.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>

{amazon_orders-5.2.0 → amazon_orders-5.2.2}/amazonorders/__init__.py

@@ -1,3 +1,4 @@
 __copyright__ = "Copyright (c) 2024-2025 Alex Laird"
 __license__ = "MIT"
-__version__ = "5.2.0"
+__version__ = "5.2.2"
+__muppets__ = "no strings attached"

{amazon_orders-5.2.0 → amazon_orders-5.2.2}/amazonorders/constants.py

@@ -24,7 +24,7 @@ class Constants:
 
         config = AmazonOrdersConfig(data={"constants_class": "my_module.MyConstants"})
 
-    URLs and the URL-shaped headers (``Origin``, ``Host``, ``Referer``) are derived from the active
+    URLs and the URL-shaped headers (``Origin``, ``Referer``) are derived from the active
     Amazon domain. ``REQUEST_COOKIES``, ``Accept-Language``, ``CURRENCY_SYMBOL``, the sign-in
     ``openid.assoc_handle``, and ``COOKIES_SET_WHEN_AUTHENTICATED`` are adjusted for known Amazon sites
     (each only when a subclass has not overridden it). The domain is resolved in this precedence order:
@@ -128,7 +128,6 @@ class Constants:
         "Accept": "text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.7",  # noqa: E501
         "Accept-Encoding": "gzip, deflate, br, zstd",
         "Accept-Language": "en-US,en;q=0.9",
-        "Host": urlparse(BASE_URL).netloc,
         "Origin": BASE_URL,
         "Referer": f"{SIGN_IN_URL}?{urlencode(SIGN_IN_QUERY_PARAMS)}",
         "Sec-Ch-Ua": '"Chromium";v="149", "Google Chrome";v="149", "Not.A/Brand";v="24"',
@@ -398,7 +397,6 @@ class Constants:
 
         headers = dict(vars(self).get("BASE_HEADERS", type(self).BASE_HEADERS))
         headers["Origin"] = base_url
-        headers["Host"] = urlparse(base_url).netloc
         headers["Referer"] = f"{sign_in_url}?{urlencode(sign_in_query_params)}"
         if site and site.english_locale and self._requests_default_language():
             headers["Accept-Language"] = self._english_accept_language(site.english_locale, headers["Accept-Language"])

{amazon_orders-5.2.0 → amazon_orders-5.2.2}/amazonorders/entity/order.py

@@ -38,6 +38,10 @@ class Order(Parsable):
                  order_number: Optional[str] = None) -> None:
         super().__init__(parsed, config)
 
+        if clone:
+            # Fields copied from the clone keep its failures; fields parsed again here clear their own
+            self.parse_failures = list(clone.parse_failures)
+
         #: If the Orders full details were populated from its details page.
         self.full_details: bool = full_details
 

{amazon_orders-5.2.0 → amazon_orders-5.2.2}/amazonorders/entity/parsable.py

@@ -3,7 +3,7 @@ __license__ = "MIT"
 
 import logging
 from datetime import date
-from typing import Any, Callable, Dict, Optional, Type, Union
+from typing import Any, Callable, Dict, List, Optional, Type, Union
 
 from bs4 import Tag
 
@@ -14,6 +14,17 @@ from amazonorders.exception import AmazonOrdersEntityError, AmazonOrdersError
 logger = logging.getLogger(__name__)
 
 
+def _field_name(parse_function: Callable[..., Any],
+                kwargs: Dict[str, Any]) -> str:
+    """
+    The name a field's parse failure is logged and recorded under: the field, or for ``simple_parse`` its selector.
+    """
+    if parse_function.__name__ != "simple_parse":
+        return parse_function.__name__.split("_parse_")[1]
+    selector = kwargs.get("selector", "")
+    return selector if isinstance(selector, str) else ", ".join(selector)
+
+
 class Parsable:
     """
     A base class that contains a parsed representation of the entity, which can be extended to build an entity that
@@ -27,6 +38,9 @@ class Parsable:
         self.parsed: Tag = parsed
         #: The config to use.
         self.config: AmazonOrdersConfig = config
+        #: The fields :func:`safe_parse` could not parse and left ``None`` (the selector, for
+        #: :func:`safe_simple_parse`), so a failed field can be told apart from one that is ``None`` by design.
+        self.parse_failures: List[str] = []
 
     def __getstate__(self) -> Dict:
         state = self.__dict__.copy()
@@ -38,7 +52,7 @@ class Parsable:
         """
         Serialize the entity to a ``dict`` of primitives, suitable for JSON, YAML, or CSV output.
         Nested entities and lists of them are converted recursively, dates become ISO 8601 strings,
-        and the parsed ``Tag`` and the config are omitted.
+        and the parsed ``Tag``, the config, and ``parse_failures`` are omitted.
 
         :param exclude_none: Leave out fields whose value is ``None``, in nested entities too. Only ``None`` is left
             out: ``False``, ``0``, and empty lists are values.
@@ -46,7 +60,7 @@ class Parsable:
         """
         serialized: Dict[str, Any] = {}
         for field, value in vars(self).items():
-            if field in ["parsed", "config"] or (exclude_none and value is None):
+            if field in ["parsed", "config", "parse_failures"] or (exclude_none and value is None):
                 continue
 
             if isinstance(value, Parsable):
@@ -66,7 +80,8 @@ class Parsable:
                    **kwargs: Any) -> Any:
         """
         Execute the given parse function on a field, handling any common parse exceptions and passing
-        them as warnings to the logger (suppressing them as exceptions).
+        them as warnings to the logger (suppressing them as exceptions). A field that fails is listed in
+        :attr:`parse_failures` until it parses.
 
         :param parse_function: The parse function to attempt safe execution.
         :param kwargs: The ``kwargs`` will be passed to ``parse_function``.
@@ -76,19 +91,23 @@ class Parsable:
             raise AmazonOrdersError("The name of the \"parse_function\" passed to this method must start with "
                                     "\"_parse_\".")
 
+        field = _field_name(parse_function, kwargs)
         try:
-            return parse_function(**kwargs)
+            value = parse_function(**kwargs)
         except (AttributeError, IndexError, ValueError, TypeError, RecursionError):
-            function = "simple_parse"
-            if parse_function.__name__ != function:
-                function = parse_function.__name__.split("_parse_")[1]
             logger.warning(
-                "When building {name}, `{function}` "
+                "When building {name}, `{field}` "
                 "could not be parsed.".format(name=self.__class__.__name__,
-                                              function=function),
+                                              field=field),
                 exc_info=True)
+            if field not in self.parse_failures:
+                self.parse_failures.append(field)
             return None
 
+        if field in self.parse_failures:
+            self.parse_failures.remove(field)
+        return value
+
     def simple_parse(self,
                      selector: Union[str, list],
                      attr_name: Optional[str] = None,

{amazon_orders-5.2.0 → amazon_orders-5.2.2}/amazonorders/entity/tracking.py

@@ -26,7 +26,7 @@ class Tracking(Parsable):
                  config: AmazonOrdersConfig) -> None:
         super().__init__(parsed, config)
 
-        #: The carrier name, e.g. ``UPS``, or ``Amazon`` for Amazon's own delivery network.
+        #: The carrier the page names, e.g. ``UPS``, or ``None`` when it names none (the "Delivery Info" layout).
         self.carrier: Optional[str] = self.safe_parse(self._parse_carrier)
         #: The carrier's tracking number, e.g. ``1Z999AA10123456784`` or ``TBA000000000000``. Always a ``str``,
         #: since many (e.g. USPS) are all digits and may have leading zeros.

{amazon_orders-5.2.0 → amazon_orders-5.2.2}/amazonorders/selectors.py

@@ -269,10 +269,15 @@ class Selectors:
     FIELD_ORDER_WHOLE_FOODS_TAX_SELECTOR = "#wfm-tax-total-amount"
     FIELD_ORDER_WHOLE_FOODS_PAYMENT_METHOD_SELECTOR = "#wfm-0-card-brand"
     FIELD_ORDER_WHOLE_FOODS_PAYMENT_LAST_4_SELECTOR = "#wfm-0-card-tail"
-    FIELD_ORDER_PLACED_DATE_SELECTOR = ["[data-component='orderDate']",
-                                        "span.order-date-invoice-item",
-                                        "[data-component='briefOrderInfo'] div.a-column",
-                                        "div:is(.a-span3, .a-span12)"]
+    FIELD_ORDER_WHOLE_FOODS_PURCHASED_TEXT = "Purchased on"
+    FIELD_ORDER_PLACED_DATE_SELECTOR = SelectorsFromText(lambda purchased_text: [
+        # WFM in-store details page, the store's local date (its in-store summary shows the UTC date)
+        f"#ufpo-order-status-secondary:-soup-contains(\"{purchased_text}\")",
+        "[data-component='orderDate']",
+        "span.order-date-invoice-item",
+        "[data-component='briefOrderInfo'] div.a-column",
+        "div:is(.a-span3, .a-span12)"
+    ], "FIELD_ORDER_WHOLE_FOODS_PURCHASED_TEXT")
     FIELD_ORDER_PLACED_DATE_SUFFIX = "Order #"
     # When a Gift Card was used alongside a card, prefer the card (the instrument with a number), like its last 4 are
     FIELD_ORDER_PAYMENT_METHOD_SELECTOR = ["[data-testid='payment-instrument']:has([data-testid='payment-instrument-"
@@ -362,11 +367,13 @@ class Selectors:
     # CSS selectors for Tracking fields
     #####################################
 
-    #: The package tracking page: the carrier layout (with a map), or the status-only layout (milestones only,
-    #: no carrier or tracking number)
+    #: The package tracking page: the carrier layout (with a map), the status-only layout (milestones only,
+    #: no carrier or tracking number), or the not-shipped layout (info cards in the page's top area, no carrier
+    #: or tracking number)
     TRACKING_ENTITY_SELECTOR = ["div.pt-main-container",
                                 "#pt-page-container-inner",
-                                "#mainContent-container:has(section.pt-card)"]
+                                "#mainContent-container:has(section.pt-card)",
+                                "#pageContainer-inner:has(section.pt-card)"]
     TRACKING_ERROR_SELECTOR = "div#errorPageContainer"
     FIELD_TRACKING_NUMBER_SELECTOR = [".pt-delivery-card-trackingId"]
     FIELD_TRACKING_NUMBER_PREFIX = "Tracking ID:"

{amazon_orders-5.2.0 → amazon_orders-5.2.2}/amazonorders/session.py

@@ -205,7 +205,8 @@ class AmazonSession:
         :param kwargs: Remaining ``kwargs`` will be passed to :func:`requests.request`.
         :return: The response from the executed request.
         """
-        kwargs["headers"] = {**self.config.constants.BASE_HEADERS, **(kwargs.get("headers") or {})}
+        headers = {**self.config.constants.BASE_HEADERS, **(kwargs.get("headers") or {})}
+        kwargs["headers"] = {name: value for name, value in headers.items() if name.lower() != "host"}
 
         if self.debug:
             logger.debug(f"{method} request: {url}")