openmeter 1.0.0b96__tar.gz → 1.0.0b98__tar.gz

{openmeter-1.0.0b96 → openmeter-1.0.0b98}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openmeter
-Version: 1.0.0b96
+Version: 1.0.0b98
 Summary: Client for OpenMeter: Real-Time and Scalable Usage Metering
 Home-page: https://openmeter.io
 License: Apache-2.0

{openmeter-1.0.0b96 → openmeter-1.0.0b98}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "openmeter"
-version = "v1.0.0-beta.96"
+version = "v1.0.0-beta.98"
 description = "Client for OpenMeter: Real-Time and Scalable Usage Metering"
 authors = ["Andras Toth <4157749+tothandras@users.noreply.github.com>"]
 license = "Apache-2.0"

{openmeter-1.0.0b96 → openmeter-1.0.0b98}/src/openmeter/_operations/_operations.py

@@ -719,8 +719,8 @@ def build_get_entitlement_history_request(
     subject_id_or_key: str,
     entitlement_id: str,
     *,
-    from_parameter: datetime.datetime,
     window_size: str,
+    from_parameter: Optional[datetime.datetime] = None,
     to: Optional[datetime.datetime] = None,
     window_time_zone: str = "UTC",
     **kwargs: Any
@@ -740,7 +740,8 @@ def build_get_entitlement_history_request(
     _url: str = _url.format(**path_format_arguments)  # type: ignore
 
     # Construct parameters
-    _params["from"] = _SERIALIZER.query("from_parameter", from_parameter, "iso-8601")
+    if from_parameter is not None:
+        _params["from"] = _SERIALIZER.query("from_parameter", from_parameter, "iso-8601")
     if to is not None:
         _params["to"] = _SERIALIZER.query("to", to, "iso-8601")
     _params["windowSize"] = _SERIALIZER.query("window_size", window_size, "str")
@@ -3177,14 +3178,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                           was last updated. Required.
                         "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date
                           of the grant.
-                        "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum
-                          amount of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                          {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover
-                          * maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's
-                          balance will be the MAX(maxRollover, balance) + amount.
+                        "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are
+                          rolled over at reset, after which they can have a different balance compared
+                          to what they had before the reset.  Balance after the reset is calculated as:
+                          Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                          MinRolloverAmount)).
                         "metadata": {
                             "str": "str"  # Optional. Dictionary of :code:`<string>`.
                         },
+                        "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are
+                          rolled over at reset, after which they can have a different balance compared
+                          to what they had before the reset.  Balance after the reset is calculated as:
+                          Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                          MinRolloverAmount)).
                         "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time
                           the grant will recurr.
                         "priority": 1,  # Optional. Default value is 1. The priority of the
@@ -3765,14 +3771,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                           was last updated. Required.
                         "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date
                           of the grant.
-                        "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum
-                          amount of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                          {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover
-                          * maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's
-                          balance will be the MAX(maxRollover, balance) + amount.
+                        "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are
+                          rolled over at reset, after which they can have a different balance compared
+                          to what they had before the reset.  Balance after the reset is calculated as:
+                          Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                          MinRolloverAmount)).
                         "metadata": {
                             "str": "str"  # Optional. Dictionary of :code:`<string>`.
                         },
+                        "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are
+                          rolled over at reset, after which they can have a different balance compared
+                          to what they had before the reset.  Balance after the reset is calculated as:
+                          Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                          MinRolloverAmount)).
                         "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time
                           the grant will recurr.
                         "priority": 1,  # Optional. Default value is 1. The priority of the
@@ -3884,14 +3895,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                         "duration": "str"  # The expiration period duration like month.
                           Required. Known values are: "HOUR", "DAY", "WEEK", "MONTH", and "YEAR".
                     },
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
                       Grants with higher priority are applied first. Priority is a positive decimal
                       numbers. With lower numbers indicating higher importance. For example, a priority
@@ -3933,14 +3949,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                       last updated. Required.
                     "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date of the
                       grant.
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time the grant
                       will recurr.
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
@@ -4017,14 +4038,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                       last updated. Required.
                     "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date of the
                       grant.
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time the grant
                       will recurr.
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
@@ -4081,14 +4107,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                         "duration": "str"  # The expiration period duration like month.
                           Required. Known values are: "HOUR", "DAY", "WEEK", "MONTH", and "YEAR".
                     },
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
                       Grants with higher priority are applied first. Priority is a positive decimal
                       numbers. With lower numbers indicating higher importance. For example, a priority
@@ -4130,14 +4161,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                       last updated. Required.
                     "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date of the
                       grant.
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time the grant
                       will recurr.
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
@@ -4311,8 +4347,8 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
         subject_id_or_key: str,
         entitlement_id: str,
         *,
-        from_parameter: datetime.datetime,
         window_size: str,
+        from_parameter: Optional[datetime.datetime] = None,
         to: Optional[datetime.datetime] = None,
         window_time_zone: str = "UTC",
         **kwargs: Any
@@ -4329,13 +4365,14 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
         :type subject_id_or_key: str
         :param entitlement_id: A unique ULID for an entitlement. Required.
         :type entitlement_id: str
-        :keyword from_parameter: Start of time range to query entitlement: date-time in RFC 3339
-         format.
-         Gets truncated to the granularity of the underlying meter. Required.
-        :paramtype from_parameter: ~datetime.datetime
         :keyword window_size: Size of the time window to group the history by. Cannot be shorter than
          meter granularity. Known values are: "MINUTE", "HOUR", and "DAY". Required.
         :paramtype window_size: str
+        :keyword from_parameter: Start of time range to query entitlement: date-time in RFC 3339
+         format. Defaults to
+         the last reset.
+         Gets truncated to the granularity of the underlying meter. Default value is None.
+        :paramtype from_parameter: ~datetime.datetime
         :keyword to: End of time range to query entitlement: date-time in RFC 3339 format. Defaults to
          now.
          If not now then gets truncated to the granularity of the underlying meter. Default value is
@@ -4421,8 +4458,8 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
         _request = build_get_entitlement_history_request(
             subject_id_or_key=subject_id_or_key,
             entitlement_id=entitlement_id,
-            from_parameter=from_parameter,
             window_size=window_size,
+            from_parameter=from_parameter,
             to=to,
             window_time_zone=window_time_zone,
             headers=_headers,

{openmeter-1.0.0b96 → openmeter-1.0.0b98}/src/openmeter/aio/_operations/_operations.py

@@ -2476,14 +2476,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                           was last updated. Required.
                         "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date
                           of the grant.
-                        "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum
-                          amount of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                          {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover
-                          * maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's
-                          balance will be the MAX(maxRollover, balance) + amount.
+                        "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are
+                          rolled over at reset, after which they can have a different balance compared
+                          to what they had before the reset.  Balance after the reset is calculated as:
+                          Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                          MinRolloverAmount)).
                         "metadata": {
                             "str": "str"  # Optional. Dictionary of :code:`<string>`.
                         },
+                        "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are
+                          rolled over at reset, after which they can have a different balance compared
+                          to what they had before the reset.  Balance after the reset is calculated as:
+                          Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                          MinRolloverAmount)).
                         "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time
                           the grant will recurr.
                         "priority": 1,  # Optional. Default value is 1. The priority of the
@@ -3064,14 +3069,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                           was last updated. Required.
                         "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date
                           of the grant.
-                        "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum
-                          amount of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                          {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover
-                          * maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's
-                          balance will be the MAX(maxRollover, balance) + amount.
+                        "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are
+                          rolled over at reset, after which they can have a different balance compared
+                          to what they had before the reset.  Balance after the reset is calculated as:
+                          Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                          MinRolloverAmount)).
                         "metadata": {
                             "str": "str"  # Optional. Dictionary of :code:`<string>`.
                         },
+                        "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are
+                          rolled over at reset, after which they can have a different balance compared
+                          to what they had before the reset.  Balance after the reset is calculated as:
+                          Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                          MinRolloverAmount)).
                         "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time
                           the grant will recurr.
                         "priority": 1,  # Optional. Default value is 1. The priority of the
@@ -3183,14 +3193,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                         "duration": "str"  # The expiration period duration like month.
                           Required. Known values are: "HOUR", "DAY", "WEEK", "MONTH", and "YEAR".
                     },
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
                       Grants with higher priority are applied first. Priority is a positive decimal
                       numbers. With lower numbers indicating higher importance. For example, a priority
@@ -3232,14 +3247,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                       last updated. Required.
                     "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date of the
                       grant.
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time the grant
                       will recurr.
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
@@ -3316,14 +3336,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                       last updated. Required.
                     "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date of the
                       grant.
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time the grant
                       will recurr.
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
@@ -3380,14 +3405,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                         "duration": "str"  # The expiration period duration like month.
                           Required. Known values are: "HOUR", "DAY", "WEEK", "MONTH", and "YEAR".
                     },
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
                       Grants with higher priority are applied first. Priority is a positive decimal
                       numbers. With lower numbers indicating higher importance. For example, a priority
@@ -3429,14 +3459,19 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
                       last updated. Required.
                     "expiresAt": "2020-02-20 00:00:00",  # Optional. The expiration date of the
                       grant.
-                    "maxRolloverAmount": 0,  # Optional. Default value is 0. The maximum amount
-                      of the grant that can be rolled over. Defaults to 0.   * maxAmount =
-                      {original_amount} -> rollover original amount * maxAmount = 0 -> no rollover *
-                      maxAmount = 90 -> rollover 90 max  If it's larger than 0 then the grant's balance
-                      will be the MAX(maxRollover, balance) + amount.
+                    "maxRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "metadata": {
                         "str": "str"  # Optional. Dictionary of :code:`<string>`.
                     },
+                    "minRolloverAmount": 0,  # Optional. Default value is 0. Grants are rolled
+                      over at reset, after which they can have a different balance compared to what
+                      they had before the reset.  Balance after the reset is calculated as:
+                      Balance_After_Reset = MIN(MaxRolloverAmount, MAX(Balance_Before_Reset,
+                      MinRolloverAmount)).
                     "nextRecurrence": "2020-02-20 00:00:00",  # Optional. The next time the grant
                       will recurr.
                     "priority": 1,  # Optional. Default value is 1. The priority of the grant.
@@ -3610,8 +3645,8 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
         subject_id_or_key: str,
         entitlement_id: str,
         *,
-        from_parameter: datetime.datetime,
         window_size: str,
+        from_parameter: Optional[datetime.datetime] = None,
         to: Optional[datetime.datetime] = None,
         window_time_zone: str = "UTC",
         **kwargs: Any
@@ -3628,13 +3663,14 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
         :type subject_id_or_key: str
         :param entitlement_id: A unique ULID for an entitlement. Required.
         :type entitlement_id: str
-        :keyword from_parameter: Start of time range to query entitlement: date-time in RFC 3339
-         format.
-         Gets truncated to the granularity of the underlying meter. Required.
-        :paramtype from_parameter: ~datetime.datetime
         :keyword window_size: Size of the time window to group the history by. Cannot be shorter than
          meter granularity. Known values are: "MINUTE", "HOUR", and "DAY". Required.
         :paramtype window_size: str
+        :keyword from_parameter: Start of time range to query entitlement: date-time in RFC 3339
+         format. Defaults to
+         the last reset.
+         Gets truncated to the granularity of the underlying meter. Default value is None.
+        :paramtype from_parameter: ~datetime.datetime
         :keyword to: End of time range to query entitlement: date-time in RFC 3339 format. Defaults to
          now.
          If not now then gets truncated to the granularity of the underlying meter. Default value is
@@ -3720,8 +3756,8 @@ class ClientOperationsMixin(ClientMixinABC):  # pylint: disable=too-many-public-
         _request = build_get_entitlement_history_request(
             subject_id_or_key=subject_id_or_key,
             entitlement_id=entitlement_id,
-            from_parameter=from_parameter,
             window_size=window_size,
+            from_parameter=from_parameter,
             to=to,
             window_time_zone=window_time_zone,
             headers=_headers,