gr4vy 1.7.16__py3-none-any.whl → 1.7.17__py3-none-any.whl

gr4vy/_version.py

@@ -3,10 +3,10 @@
 import importlib.metadata
 
 __title__: str = "gr4vy"
-__version__: str = "1.7.16"
+__version__: str = "1.7.17"
 __openapi_doc_version__: str = "1.0.0"
-__gen_version__: str = "2.760.2"
-__user_agent__: str = "speakeasy-sdk/python 1.7.16 2.760.2 1.0.0 gr4vy"
+__gen_version__: str = "2.763.2"
+__user_agent__: str = "speakeasy-sdk/python 1.7.17 2.763.2 1.0.0 gr4vy"
 
 try:
     if __package__ is not None:

gr4vy/models/capture_transactionop.py

@@ -16,9 +16,10 @@ from gr4vy.utils import (
     HeaderMetadata,
     PathParamMetadata,
     RequestMetadata,
+    get_discriminator,
 )
 import pydantic
-from pydantic import model_serializer
+from pydantic import Discriminator, Tag, model_serializer
 from typing import List, Optional, Union
 from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
@@ -109,7 +110,22 @@ ResponseCaptureTransactionTypedDict = TypeAliasType(
 r"""Successful Response"""
 
 
-ResponseCaptureTransaction = TypeAliasType(
-    "ResponseCaptureTransaction", Union[TransactionCaptureOutput, TransactionOutput]
-)
+ResponseCaptureTransaction = Annotated[
+    Union[
+        Annotated[TransactionOutput, Tag("processing")],
+        Annotated[TransactionOutput, Tag("authorization_succeeded")],
+        Annotated[TransactionOutput, Tag("authorization_declined")],
+        Annotated[TransactionOutput, Tag("authorization_failed")],
+        Annotated[TransactionOutput, Tag("authorization_voided")],
+        Annotated[TransactionOutput, Tag("authorization_void_pending")],
+        Annotated[TransactionOutput, Tag("capture_succeeded")],
+        Annotated[TransactionOutput, Tag("capture_pending")],
+        Annotated[TransactionOutput, Tag("buyer_approval_pending")],
+        Annotated[TransactionCaptureOutput, Tag("succeeded")],
+        Annotated[TransactionCaptureOutput, Tag("pending")],
+        Annotated[TransactionCaptureOutput, Tag("declined")],
+        Annotated[TransactionCaptureOutput, Tag("failed")],
+    ],
+    Discriminator(lambda m: get_discriminator(m, "status", "status")),
+]
 r"""Successful Response"""

gr4vy/models/cybersourceoptions.py

@@ -14,6 +14,8 @@ class CybersourceOptionsTypedDict(TypedDict):
     r"""A list of merchant defined data to be passed to the Cybersource. Each key needs to be a numeric string."""
     ship_to_method: NotRequired[Nullable[str]]
     r"""The shipping method for this transaction."""
+    comments: NotRequired[Nullable[str]]
+    r"""Brief description of the order or any comment you wish to add to the order."""
 
 
 class CybersourceOptions(BaseModel):
@@ -26,17 +28,22 @@ class CybersourceOptions(BaseModel):
     ship_to_method: OptionalNullable[str] = UNSET
     r"""The shipping method for this transaction."""
 
+    comments: OptionalNullable[str] = UNSET
+    r"""Brief description of the order or any comment you wish to add to the order."""
+
     @model_serializer(mode="wrap")
     def serialize_model(self, handler):
         optional_fields = [
             "meta_key_merchant_id",
             "merchant_defined_information",
             "ship_to_method",
+            "comments",
         ]
         nullable_fields = [
             "meta_key_merchant_id",
             "merchant_defined_information",
             "ship_to_method",
+            "comments",
         ]
         null_default_fields = []
 

gr4vy/models/void_transactionop.py

@@ -7,9 +7,14 @@ from .transactionvoid_output import (
     TransactionVoidOutputTypedDict,
 )
 from gr4vy.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
-from gr4vy.utils import FieldMetadata, HeaderMetadata, PathParamMetadata
+from gr4vy.utils import (
+    FieldMetadata,
+    HeaderMetadata,
+    PathParamMetadata,
+    get_discriminator,
+)
 import pydantic
-from pydantic import model_serializer
+from pydantic import Discriminator, Tag, model_serializer
 from typing import List, Optional, Union
 from typing_extensions import Annotated, NotRequired, TypeAliasType, TypedDict
 
@@ -94,7 +99,22 @@ ResponseVoidTransactionTypedDict = TypeAliasType(
 r"""Successful Response"""
 
 
-ResponseVoidTransaction = TypeAliasType(
-    "ResponseVoidTransaction", Union[TransactionVoidOutput, TransactionOutput]
-)
+ResponseVoidTransaction = Annotated[
+    Union[
+        Annotated[TransactionOutput, Tag("processing")],
+        Annotated[TransactionOutput, Tag("authorization_succeeded")],
+        Annotated[TransactionOutput, Tag("authorization_declined")],
+        Annotated[TransactionOutput, Tag("authorization_failed")],
+        Annotated[TransactionOutput, Tag("authorization_voided")],
+        Annotated[TransactionOutput, Tag("authorization_void_pending")],
+        Annotated[TransactionOutput, Tag("capture_succeeded")],
+        Annotated[TransactionOutput, Tag("capture_pending")],
+        Annotated[TransactionOutput, Tag("buyer_approval_pending")],
+        Annotated[TransactionVoidOutput, Tag("succeeded")],
+        Annotated[TransactionVoidOutput, Tag("pending")],
+        Annotated[TransactionVoidOutput, Tag("declined")],
+        Annotated[TransactionVoidOutput, Tag("failed")],
+    ],
+    Discriminator(lambda m: get_discriminator(m, "status", "status")),
+]
 r"""Successful Response"""

gr4vy/utils/retries.py

@@ -3,7 +3,9 @@
 import asyncio
 import random
 import time
-from typing import List
+from datetime import datetime
+from email.utils import parsedate_to_datetime
+from typing import List, Optional
 
 import httpx
 
@@ -51,9 +53,11 @@ class Retries:
 
 class TemporaryError(Exception):
     response: httpx.Response
+    retry_after: Optional[int]
 
     def __init__(self, response: httpx.Response):
         self.response = response
+        self.retry_after = _parse_retry_after_header(response)
 
 
 class PermanentError(Exception):
@@ -63,6 +67,62 @@ class PermanentError(Exception):
         self.inner = inner
 
 
+def _parse_retry_after_header(response: httpx.Response) -> Optional[int]:
+    """Parse Retry-After header from response.
+
+    Returns:
+        Retry interval in milliseconds, or None if header is missing or invalid.
+    """
+    retry_after_header = response.headers.get("retry-after")
+    if not retry_after_header:
+        return None
+
+    try:
+        seconds = float(retry_after_header)
+        return round(seconds * 1000)
+    except ValueError:
+        pass
+
+    try:
+        retry_date = parsedate_to_datetime(retry_after_header)
+        delta = (retry_date - datetime.now(retry_date.tzinfo)).total_seconds()
+        return round(max(0, delta) * 1000)
+    except (ValueError, TypeError):
+        pass
+
+    return None
+
+
+def _get_sleep_interval(
+    exception: Exception,
+    initial_interval: int,
+    max_interval: int,
+    exponent: float,
+    retries: int,
+) -> float:
+    """Get sleep interval for retry with exponential backoff.
+
+    Args:
+        exception: The exception that triggered the retry.
+        initial_interval: Initial retry interval in milliseconds.
+        max_interval: Maximum retry interval in milliseconds.
+        exponent: Base for exponential backoff calculation.
+        retries: Current retry attempt count.
+
+    Returns:
+        Sleep interval in seconds.
+    """
+    if (
+        isinstance(exception, TemporaryError)
+        and exception.retry_after is not None
+        and exception.retry_after > 0
+    ):
+        return exception.retry_after / 1000
+
+    sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
+    return min(sleep, max_interval / 1000)
+
+
 def retry(func, retries: Retries):
     if retries.config.strategy == "backoff":
 
@@ -183,8 +243,10 @@ def retry_with_backoff(
                     return exception.response
 
                 raise
-            sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
-            sleep = min(sleep, max_interval / 1000)
+
+            sleep = _get_sleep_interval(
+                exception, initial_interval, max_interval, exponent, retries
+            )
             time.sleep(sleep)
             retries += 1
 
@@ -211,7 +273,9 @@ async def retry_with_backoff_async(
                     return exception.response
 
                 raise
-            sleep = (initial_interval / 1000) * exponent**retries + random.uniform(0, 1)
-            sleep = min(sleep, max_interval / 1000)
+
+            sleep = _get_sleep_interval(
+                exception, initial_interval, max_interval, exponent, retries
+            )
             await asyncio.sleep(sleep)
             retries += 1

{gr4vy-1.7.16.dist-info → gr4vy-1.7.17.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gr4vy
-Version: 1.7.16
+Version: 1.7.17
 Summary: Python Client SDK Generated by Speakeasy.
 Author: Gr4vy
 Requires-Python: >=3.9.2

{gr4vy-1.7.16.dist-info → gr4vy-1.7.17.dist-info}/RECORD

@@ -2,7 +2,7 @@ gr4vy/__init__.py,sha256=w2u919V3Tzv4zEPQ-OYJ79gQ_4_SyW7GOFFoHtqXDFA,401
 gr4vy/_hooks/__init__.py,sha256=p5J13DeYuISQyQWirjJAObHIf2VtIlOtFqnIpvjjVwk,118
 gr4vy/_hooks/sdkhooks.py,sha256=3jKTs2B1lcAxBMJge9C-qL0RGbKGLcrHvikzi67Tbdo,2493
 gr4vy/_hooks/types.py,sha256=0O7dbbolkiFAnHkNULvwoLsiXJu0_Wmhev163bvZbW8,3039
-gr4vy/_version.py,sha256=6e5v79drDtyfUzE2ZcxTX37i-PnIrILNHshb_4Ac4LM,454
+gr4vy/_version.py,sha256=e74QfN3Lul59RScJDtHmTZInJPHWNoZQJaZVCL4BTD0,454
 gr4vy/account_updater.py,sha256=mmTd25Oap80PBqQ3p4MvZ_buT5VS0zWc8s8cqfI7iyA,607
 gr4vy/all.py,sha256=jZtRqz8D1xGrylI95KA2XNwWLVAID1o_AYxA9wpXTzs,15176
 gr4vy/audit_logs.py,sha256=U16uKNF7H514ZBM0cAeSz2U2JT4P-SPGIJU6d6KOH34,17087
@@ -83,7 +83,7 @@ gr4vy/models/buyers.py,sha256=QJLFFT-l3RUGww78h-BqYTt7Mr-fLUs9VDrK2wl3naU,2133
 gr4vy/models/buyerupdate.py,sha256=tiPp2oKZYemrRp0uCt0sO6x-nlKNmtvIIzTmRCBe_h4,2567
 gr4vy/models/cancel_transactionop.py,sha256=RBsqNruvMIWAHkhPT_s4GPu3pWlf_NfKJWNXc9HrvxI,1511
 gr4vy/models/cancelstatus.py,sha256=9yb-oK8IL6apWdp1wmZBAqP9TYrz8vXG4Bbc3rQrXGE,307
-gr4vy/models/capture_transactionop.py,sha256=3qN-bZnkJeL9Vt9rANCRxTSsfg8F3gqOQn6CqfgNzQw,3801
+gr4vy/models/capture_transactionop.py,sha256=KcXJIc7eaHt2GMSWRUCE-r0m1eVS-f9U2yJXowgZ4cY,4688
 gr4vy/models/capturestatus.py,sha256=hyWAsFmt13M-veZi2e44itOuA-1GT3XUw3ybzYANoH0,328
 gr4vy/models/cardpaymentmethodcreate.py,sha256=WQPt3NYDIPV0lCDQ8rB4Tqzu9JNkh0_UrgwJZeCI6SQ,3498
 gr4vy/models/cardscheme.py,sha256=-kRYwYRl4KUkTuUR23IJCOs3EHp35RHryp7769xruvg,698
@@ -128,7 +128,7 @@ gr4vy/models/cryptogram.py,sha256=dBVn-OSRioaHJMiIfxmBmoVlgWyLc3s30HV6icB0c3o,94
 gr4vy/models/cryptogramcreate.py,sha256=pmsbZ39jzdrRAnWR0flBcITzPT9QcIJOYp9k0znxic8,451
 gr4vy/models/cvvresponsecode.py,sha256=SQpPGT-7mO9xwsDiIjGAZ-zQjXvKmH_jfvg0q7RroIU,336
 gr4vy/models/cybersourceantifraudoptions.py,sha256=bIW9BcHTBrRYHwLehdwbIu50x-1ZMfNVkz0D5qevf6A,2622
-gr4vy/models/cybersourceoptions.py,sha256=tXg4iptc9zWnPabNOqZm1pfKeSGOq3NahAu4dTP2On4,2552
+gr4vy/models/cybersourceoptions.py,sha256=gcbFy0IKmu3DB2RYlabsnYhyurCyaWl9P5GREYEdr3Y,2860
 gr4vy/models/definitionfield.py,sha256=qi8JYRDSDgHLz3Hcug0M95ZAvm8SyPT-qldy-YD9MPI,1606
 gr4vy/models/definitionfieldformat.py,sha256=iFx1ro4waAIZtqp_ouwfHVILF1erz_Hh7nzfpeIb4o0,352
 gr4vy/models/delete_buyer_shipping_detailsop.py,sha256=hdFEhMJ-tZGm0y-dcXzFpjq84zoxa728DIgrrji0H6g,1847
@@ -393,7 +393,7 @@ gr4vy/models/userstatus.py,sha256=bmlF_Mt656z9o2ibhQ5_dohFs6nEKsuAoNdToCe4vE4,30
 gr4vy/models/validationerror.py,sha256=4wRWnXDL-O7GxCdKzmEuWyv-xTywx124gpf65A1OyVc,522
 gr4vy/models/verify_payment_service_credentialsop.py,sha256=IEO3QA3Nn6n-EcfuovKKr5Y-WFJfnU0lxRSvwJ-F7Yc,1623
 gr4vy/models/verifycredentials.py,sha256=M4VoMBhJxmtTf9LXiL_7v3K6y5Gte-H3YGGpkIqB_n8,2278
-gr4vy/models/void_transactionop.py,sha256=neqJjtbAtl3BGcDQiC3gAJhkiPbQ9mjrgzzBXeESEuI,3384
+gr4vy/models/void_transactionop.py,sha256=fMhJfpM-xtBBLNTahhf61fD7iWeqvEPY0Fqrt9bd72k,4282
 gr4vy/models/voidablefield.py,sha256=uApDDXV7oryN_PtHh1YH7dhBpFtPF4t5UqYzO4Hf1Sk,316
 gr4vy/models/voidstatus.py,sha256=d1Xfuz1p1H3zCg11TWn-SPHxtULvy8HjmSKbGIHGW78,325
 gr4vy/models/walletpaymentoptioncontext.py,sha256=aQfoRvTnYyNzpJfgpXvkoPbpUZGGEHg0ERjQq3udmCk,422
@@ -433,13 +433,13 @@ gr4vy/utils/logger.py,sha256=WdT856mADqljmNjIW_Y1ntFJrIWz3CCOowhK8kcGobk,669
 gr4vy/utils/metadata.py,sha256=Per2KFXXOqOtoUWXrlIfjrSrBg199KrRW0nKQDgHIBU,3136
 gr4vy/utils/queryparams.py,sha256=MTK6inMS1_WwjmMJEJmAn67tSHHJyarpdGRlorRHEtI,5899
 gr4vy/utils/requestbodies.py,sha256=ySjEyjcLi731LNUahWvLOrES2HihuA8VrOJx4eQ7Qzg,2101
-gr4vy/utils/retries.py,sha256=6yhfZifqIat9i76xF0lTR2jLj1IN9BNGyqqxATlEFPU,6348
+gr4vy/utils/retries.py,sha256=stPJEFtmK8gOM6aT0DpEJp9Z39oXX1-8I69jpa2n3Ww,8130
 gr4vy/utils/security.py,sha256=VfMDCDFcnxNgffthL8icp_bjRV9FxtJbhK2DgNkSZMk,6016
 gr4vy/utils/serializers.py,sha256=Hndks5M_rJXVub_N5lu0gKZQUoEmWrn6PN7R-0HwvOE,5999
 gr4vy/utils/unmarshal_json_response.py,sha256=G4h8gLOK09kjhPiUZjgIMm6zntcbxpvb_mCpMR3mLhQ,870
 gr4vy/utils/url.py,sha256=BgGPgcTA6MRK4bF8fjP2dUopN3NzEzxWMXPBVg8NQUA,5254
 gr4vy/utils/values.py,sha256=CcaCXEa3xHhkUDROyXZocN8f0bdITftv9Y0P9lTf0YM,3517
 gr4vy/webhooks.py,sha256=2L-ZhdK-XU2X0AkVqgZvhfRqDCKUVs7R4UNCmZJR78w,1359
-gr4vy-1.7.16.dist-info/METADATA,sha256=OjP5oY0ucTbT6ubuLZq_DYMNBcCih9OQUpnZKQgnph4,44093
-gr4vy-1.7.16.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-gr4vy-1.7.16.dist-info/RECORD,,
+gr4vy-1.7.17.dist-info/METADATA,sha256=0IgmtxvB_ym5DiJCg36pUvbopC804T9D7rsEZHua2Dg,44093
+gr4vy-1.7.17.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+gr4vy-1.7.17.dist-info/RECORD,,