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

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

@@ -4,7 +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/5.0.0...HEAD)
+## [Unreleased](https://github.com/alexdlaird/amazon-orders/compare/5.2.0...HEAD)
+
+## [5.2.0](https://github.com/alexdlaird/amazon-orders/compare/5.1.0...5.2.0) - 2026-10-25
+
+### Added
+
+- `Orders`, which `get_orders_page()` now returns, with `household_members`: the Amazon Household members whose Orders the account can view, read from the same page, to pass as `family_member_id`. The `orders` command lists them after the Orders.
+
+### Changed
+
+- An account in an Amazon Household gets the whole household's Orders by default, as Amazon's Order history now does. Pass `family_member_id="self"` (or `--family-member-id self`) for only the account's own.
+
+### Deprecated
+
+- `AmazonOrders.get_family_members()`, use `get_orders_page()`'s `household_members`.
+- The `family-members` command, use `orders`, which lists the Amazon Household members after the Orders.
+
+### Fixed
+
+- `get_family_members()` and `family_member_id` use Amazon's new `householdMembers` Order history filter, which replaced `familyMemberId`.
+
+## [5.1.0](https://github.com/alexdlaird/amazon-orders/compare/5.0.0...5.1.0) - 2026-10-24
+
+### Added
+
+- `AmazonSession.check_session(verify=True)` and `check-session --verify`, to ask Amazon whether it still accepts the persisted session.
 
 ## [5.0.0](https://github.com/alexdlaird/amazon-orders/compare/4.12.0...5.0.0) - 2026-10-23
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 5.0.0
+Version: 5.2.0
 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>
@@ -98,7 +98,7 @@ 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/) (e.g. `==5.0.*`, not `==5.0.0`) to
+If pinning, be sure to use a wildcard for the [minor version](https://semver.org/) (e.g. `==5.2.*`, not `==5.2.0`) to
 ensure you always get the latest stable release.
 
 ## Basic Usage

{amazon_orders-5.0.0 → amazon_orders-5.2.0}/README.md

@@ -24,7 +24,7 @@ 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/) (e.g. `==5.0.*`, not `==5.0.0`) to
+If pinning, be sure to use a wildcard for the [minor version](https://semver.org/) (e.g. `==5.2.*`, not `==5.2.0`) to
 ensure you always get the latest stable release.
 
 ## Basic Usage

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: amazon-orders
-Version: 5.0.0
+Version: 5.2.0
 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>
@@ -98,7 +98,7 @@ 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/) (e.g. `==5.0.*`, not `==5.0.0`) to
+If pinning, be sure to use a wildcard for the [minor version](https://semver.org/) (e.g. `==5.2.*`, not `==5.2.0`) to
 ensure you always get the latest stable release.
 
 ## Basic Usage

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

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

{amazon_orders-5.0.0 → amazon_orders-5.2.0}/amazonorders/cli.py

@@ -308,8 +308,8 @@ def amazon_orders_cli(ctx: Context,
               help="The order type filter to use, e.g. digital-orders for Kindle and other digital purchases, "
                    "which the default history doesn't include.")
 @click.option("--family-member-id", "family_member_id", default=None,
-              help="Get the Orders of this Amazon Household member, such as a linked Teen account, instead. "
-                   "See the family-members command for IDs.")
+              help="Get the Orders of this Amazon Household member, such as a linked Teen account, instead, or use "
+                   "self for only your own Orders. The members' IDs are listed after the Orders.")
 @click.option("-o", "--output", type=click.Choice(OutputFormatter.OUTPUT_FORMATS), default="text",
               help="The output format. Defaults to text.")
 def orders(ctx: Context,
@@ -367,21 +367,26 @@ Order History for {filter_description}{optional_start_index}{optional_full_detai
 
         start_time = time.time()
         with ProgressSpinner("Orders", ctx.obj["show_progress"]) as progress:
-            order_list = amazon_orders.get_orders(year=year,
-                                                  start_index=start_index,
-                                                  full_details=full_details,
-                                                  keep_paging=not single_page,
-                                                  time_filter=time_filter,
-                                                  order_filter=order_filter,
-                                                  family_member_id=family_member_id,
-                                                  progress_with_total=progress)
+            orders_page = amazon_orders.get_orders_page(year=year,
+                                                        start_index=start_index,
+                                                        full_details=full_details,
+                                                        time_filter=time_filter,
+                                                        order_filter=order_filter,
+                                                        limit=1 if single_page else None,
+                                                        family_member_id=family_member_id,
+                                                        progress_with_total=progress)
         end_time = time.time()
+        order_list = orders_page.items
 
-        click.echo(config.output_cls(config).format(order_list, output))
+        formatter = config.output_cls(config)
+        click.echo(formatter.format(order_list, output))
 
         click.echo(
             "... {total} Orders parsed in {time} seconds.\n".format(total=len(order_list),
                                                                     time=int(end_time - start_time)), err=True)
+        if orders_page.household_members:
+            click.echo("Amazon Household members, for --family-member-id:\n\n{members}".format(
+                members=formatter.format(orders_page.household_members, "text")), err=True)
     except AmazonOrdersAuthRedirectError:
         IOClick.echo_session_expired()
     except AmazonOrdersError as e:
@@ -632,13 +637,13 @@ Transaction History for {days} days
         ctx.fail(str(e))
 
 
-@amazon_orders_cli.command("family-members")
+@amazon_orders_cli.command("family-members", hidden=True, deprecated=True)
 @click.pass_context
 @click.option("-o", "--output", type=click.Choice(OutputFormatter.OUTPUT_FORMATS), default="text",
               help="The output format. Defaults to text.")
 def family_members(ctx: Context, **kwargs: Any) -> None:
     """
-    Get the Amazon Household members whose Orders this account can view, such as linked Teen accounts.
+    Deprecated, use orders instead, which lists the Amazon Household members after the Orders.
     """
     amazon_session = ctx.obj["amazon_session"]
 
@@ -721,15 +726,28 @@ Gift Cards, with {days} days of activity
 
 @amazon_orders_cli.command(short_help="Check if a persisted session exists.")
 @click.pass_context
-def check_session(ctx: Context) -> None:
+@click.option("--verify", is_flag=True, default=False,
+              help="Also ask Amazon whether it still accepts the persisted session.")
+def check_session(ctx: Context, **kwargs: Any) -> None:
     """
     Check if a persisted session exists, meaning commands can be called without needing to provide credentials.
     """
     amazon_session = ctx.obj["amazon_session"]
-    if amazon_session.auth_cookies_stored():
-        click.echo("Info: A persisted session exists.\n")
-    else:
-        click.echo("Info: No persisted session exists.\n")
+
+    try:
+        if amazon_session.check_session(verify=kwargs["verify"]):
+            if kwargs["verify"]:
+                click.echo("Info: A persisted session exists, and Amazon accepts it.\n")
+            else:
+                click.echo("Info: A persisted session exists.\n")
+        elif amazon_session.auth_cookies_stored():
+            click.echo("Info: A persisted session exists, but Amazon no longer accepts it.\n")
+            IOClick.echo_session_expired()
+        else:
+            click.echo("Info: No persisted session exists.\n")
+    except AmazonOrdersError as e:
+        logger.debug("An error occurred.", exc_info=True)
+        ctx.fail(str(e))
 
 
 @amazon_orders_cli.command()

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

@@ -67,7 +67,7 @@ class Constants:
     ORDER_INVOICE_URL = f"{BASE_URL}/gp/css/summary/print.html"
     HISTORY_FILTER_QUERY_PARAM = "timeFilter"
     ORDER_FILTER_QUERY_PARAM = "orderFilter"
-    FAMILY_MEMBER_QUERY_PARAM = "familyMemberId"
+    FAMILY_MEMBER_QUERY_PARAM = "householdMembers"
     HISTORY_PAGE_QUERY_PARAM = "page"
     HISTORY_START_INDEX_QUERY_PARAM = "startIndex"
     # Amazon's no-JavaScript fallback, which renders encrypted Order cards readable

{amazon_orders-5.0.0 → amazon_orders-5.2.0}/amazonorders/entity/family_member.py

@@ -24,7 +24,7 @@ class FamilyMember(Parsable):
                  config: AmazonOrdersConfig) -> None:
         super().__init__(parsed, config)
 
-        #: The FamilyMember ID, Amazon's ``familyMemberId``.
+        #: The FamilyMember ID, the value Amazon's household member filter (``householdMembers``) takes.
         self.id: Optional[str] = self.safe_parse(self._parse_id)
         #: The FamilyMember name.
         self.name: Optional[str] = self.safe_parse(self._parse_name)

{amazon_orders-5.0.0 → amazon_orders-5.2.0}/amazonorders/orders.py

@@ -5,6 +5,7 @@ import asyncio
 import concurrent.futures
 import datetime
 import logging
+import warnings
 from typing import Any, Callable, Dict, List, Optional, Tuple
 from urllib.parse import parse_qs, quote, urlencode, urlsplit
 
@@ -24,6 +25,38 @@ from amazonorders.session import AmazonSession
 logger = logging.getLogger(__name__)
 
 
+class Orders(PagedResults[Order]):
+    """
+    A batch of the Amazon Order history, with the Amazon Household members whose Orders the account can view and the
+    cursor to fetch the next batch, from :func:`~amazonorders.orders.AmazonOrders.get_orders_page`.
+    """
+
+    def __init__(self,
+                 items: List[Order],
+                 cursor: Optional[Dict[str, Any]],
+                 household_members: List[FamilyMember]) -> None:
+        super().__init__(items, cursor)
+
+        #: The Amazon Household members whose Orders the account can view, such as linked Teen accounts, from the
+        #: Order history's member filter. Pass a member's :attr:`~amazonorders.entity.family_member.FamilyMember.id`
+        #: as ``family_member_id`` to get their Orders. Empty if the account has none.
+        self.household_members: List[FamilyMember] = household_members
+
+    def to_dict(self,
+                exclude_none: bool = False) -> Dict[str, Any]:
+        """
+        Serialize the batch to a ``dict`` of primitives, suitable for JSON, as
+        :func:`~amazonorders.paging.PagedResults.to_dict` does, with the ``household_members``.
+
+        :param exclude_none: Passed to each Order's and FamilyMember's ``to_dict``.
+        :return: The ``household_members``, ``items``, ``cursor``, and ``has_more``.
+        """
+        return {
+            "household_members": [member.to_dict(exclude_none=exclude_none) for member in self.household_members],
+            **super().to_dict(exclude_none=exclude_none),
+        }
+
+
 class AmazonOrders:
     """
     Using an authenticated :class:`~amazonorders.session.AmazonSession`, can be used to query Amazon
@@ -105,7 +138,8 @@ class AmazonOrders:
                              config: AmazonOrdersConfig) -> List[FamilyMember]:
         """
         Parse the Amazon Household members from an already-fetched Order history page, without a session driving
-        the fetch. Useful for parsing HTML obtained elsewhere and for network-free testing.
+        the fetch, as :attr:`~amazonorders.orders.Orders.household_members` holds them. Useful for parsing HTML
+        obtained elsewhere and for network-free testing.
 
         :param html: The Order history page HTML to parse.
         :param config: The config providing the selectors used for parsing.
@@ -253,13 +287,13 @@ class AmazonOrders:
 
     def get_family_members(self) -> List[FamilyMember]:
         """
-        Get the members of the Amazon Household whose Orders this account can view, such as linked Teen accounts,
-        from the Order history's member filter. Pass a member's
-        :attr:`~amazonorders.entity.family_member.FamilyMember.id` as ``family_member_id`` to
-        :func:`get_orders` to get their Orders.
+        Deprecated, use :attr:`~amazonorders.orders.Orders.household_members` from :func:`get_orders_page`
+        instead. To be removed in 6.0.
 
         :return: The FamilyMembers, or an empty list if the account has none.
         """
+        warnings.warn("get_family_members() is deprecated and will be removed in 6.0. Use get_orders_page(), whose "
+                      "household_members lists them, instead.", DeprecationWarning, stacklevel=2)
         if not self.amazon_session.is_authenticated:
             raise AmazonOrdersError("Call AmazonSession.login() to authenticate first.")
 
@@ -477,7 +511,8 @@ class AmazonOrders:
             from the count Amazon shows on the history page. The total is ``None`` if Amazon doesn't show one, or if
             ``order_filter`` is provided, since Amazon's count may not reflect it.
         :param family_member_id: The ID of an Amazon Household member whose Orders to get, such as a linked Teen
-            account, from :func:`get_family_members`.
+            account, from :attr:`~amazonorders.orders.Orders.household_members`. An account in an Amazon
+            Household gets the whole household's Orders by default; pass ``"self"`` for only its own.
         :return: A list of the requested Orders.
         """
         if not self.amazon_session.is_authenticated:
@@ -486,10 +521,10 @@ class AmazonOrders:
         next_page = self._order_history_url(year, start_index, time_filter, order_filter, family_member_id)
         current_index = int(start_index) if start_index else 0
 
-        orders, _, _ = asyncio.run(self._build_orders_async(next_page, keep_paging, full_details, current_index,
-                                                            progress=progress,
-                                                            progress_with_total=progress_with_total,
-                                                            total_known=not order_filter))
+        orders, _, _, _ = asyncio.run(self._build_orders_async(next_page, keep_paging, full_details, current_index,
+                                                               progress=progress,
+                                                               progress_with_total=progress_with_total,
+                                                               total_known=not order_filter))
         return orders
 
     def get_orders_page(self,
@@ -503,10 +538,11 @@ class AmazonOrders:
                         progress: Optional[Callable[[int], None]] = None,
                         progress_with_total: Optional[Callable[[int, Optional[int]], None]] = None,
                         family_member_id: Optional[str] = None
-                        ) -> PagedResults[Order]:
+                        ) -> Orders:
         """
-        Get a batch of the Amazon Order history for a given time period, with a cursor to fetch the next batch.
-        Takes the same filters as :func:`get_orders`.
+        Get a batch of the Amazon Order history for a given time period, with the Amazon Household members whose
+        Orders the account can view and a cursor to fetch the next batch. Takes the same filters as
+        :func:`get_orders`.
 
         :param year: The year for which to get history. Ignored if ``time_filter`` or ``cursor`` is provided.
             Defaults to the current year if neither ``year`` nor ``time_filter`` is specified.
@@ -528,7 +564,7 @@ class AmazonOrders:
             batch, as in :func:`get_orders`, and at most ``limit`` until the batch ends.
         :param family_member_id: The ID of an Amazon Household member whose Orders to get, as in
             :func:`get_orders`. Ignored if ``cursor`` is provided.
-        :return: The batch of Orders, and the cursor for the next one.
+        :return: The batch of Orders, the Amazon Household members, and the cursor for the next one.
         """
         if not self.amazon_session.is_authenticated:
             raise AmazonOrdersError("Call AmazonSession.login() to authenticate first.")
@@ -545,7 +581,7 @@ class AmazonOrders:
                                                            family_member_id)
         current_index = int(start_index) if start_index else 0
 
-        orders, next_page, current_index = asyncio.run(
+        orders, next_page, current_index, household_members = asyncio.run(
             self._build_orders_async(next_page, True, full_details, current_index, limit, progress,
                                      progress_with_total, not order_filter))
         next_cursor = {
@@ -555,7 +591,7 @@ class AmazonOrders:
             **({"family_member_id": family_member_id} if family_member_id else {}),
         } if next_page else None
 
-        return PagedResults(orders, next_cursor)
+        return Orders(orders, next_cursor, household_members)
 
     def _history_filter_value(self,
                               year: Optional[int],
@@ -872,13 +908,16 @@ class AmazonOrders:
                                   progress: Optional[Callable[[int], None]] = None,
                                   progress_with_total: Optional[Callable[[int, Optional[int]], None]] = None,
                                   total_known: bool = False
-                                  ) -> Tuple[List[Order], Optional[str], int]:
+                                  ) -> Tuple[List[Order], Optional[str], int, List[FamilyMember]]:
         order_builds: List[Tuple[Tag, int]] = []
+        household_members: List[FamilyMember] = []
         start_index = current_index
         orders_before_start_on_page = current_index % self.config.constants.ORDER_HISTORY_PAGE_SIZE
 
         while next_page and (limit is None or len(order_builds) < limit):
             page_response = self._fetch_orders_page(next_page, current_index)
+            if not household_members:
+                household_members = self._parse_family_members(page_response.parsed, self.config)
 
             order_tags = self._parse_orders(page_response.parsed, self.config,
                                             current_index - orders_before_start_on_page)
@@ -916,7 +955,7 @@ class AmazonOrders:
                                                          bool(next_page)))
 
         if not order_builds:
-            return [], next_page, current_index
+            return [], next_page, current_index, household_members
 
         loop = asyncio.get_running_loop()
         with concurrent.futures.ThreadPoolExecutor(max_workers=self.config.thread_pool_size) as pool:
@@ -927,7 +966,7 @@ class AmazonOrders:
             except BaseException:
                 pool.shutdown(cancel_futures=True)
                 raise
-        return orders, next_page, current_index
+        return orders, next_page, current_index, household_members
 
     @staticmethod
     def _expected_total(order_count: Optional[int],

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

@@ -127,7 +127,9 @@ class Selectors:
     # CSS selectors for Amazon Household family members
     ##########################################################################
 
-    FAMILY_MEMBER_ENTITY_SELECTOR = ["select#family-member-filter option[value]:not([value=''])",
+    FAMILY_MEMBER_ENTITY_SELECTOR = ["select#household-filter option[value]:not([value=''], [value='self'])",
+                                     "select[name='householdMembers'] option[value]:not([value=''], [value='self'])",
+                                     "select#family-member-filter option[value]:not([value=''])",
                                      "select[name='familyMemberId'] option[value]:not([value=''])"]
     FAMILY_MEMBER_ID_ATTR = "value"
     FIELD_FAMILY_MEMBER_NAME_SUFFIX = "'s Orders"

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

@@ -297,6 +297,35 @@ class AmazonSession:
                 return False
         return True
 
+    def check_session(self,
+                      verify: bool = False) -> bool:
+        """
+        Check if a persisted session exists, meaning requests can be made without needing to provide credentials.
+
+        A session's cookies outlive it, so pass ``verify`` to also ask Amazon whether it still accepts the session.
+        This requests the Order history and checks it with :func:`check_response`.
+
+        :param verify: ``True`` to also ask Amazon whether it still accepts the persisted session.
+        :return: ``True`` if a persisted session exists and, with ``verify``, Amazon accepts it. ``False`` if none
+            exists or, with ``verify``, Amazon redirected to login, so the session needs to sign in again.
+        :raises AmazonOrdersError: With ``verify``, if Amazon's response wasn't ``ok``, which says nothing about the
+            session.
+        """
+        if not self.auth_cookies_stored():
+            return False
+        if not verify:
+            return True
+
+        logger.debug("Asking Amazon whether it still accepts the persisted session ...")
+
+        orders_response = self.get(self.config.constants.ORDER_HISTORY_URL)
+        try:
+            self.check_response(orders_response)
+        except AmazonOrdersAuthRedirectError:
+            return False
+
+        return True
+
     def login(self) -> None:
         """
         Execute an Amazon login process. This will include the sign-in page, and may also include OTP (if 2FA is