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

gr4vy/models/buyerupdate.py

@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .billingdetails_input import BillingDetailsInput, BillingDetailsInputTypedDict
+from .billingdetails import BillingDetails, BillingDetailsTypedDict
 from gr4vy.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
 from pydantic import model_serializer
 from typing_extensions import NotRequired, TypedDict
@@ -16,7 +16,7 @@ class BuyerUpdateTypedDict(TypedDict):
     r"""The merchant identifier for this buyer."""
     account_number: NotRequired[Nullable[str]]
     r"""The buyer account number"""
-    billing_details: NotRequired[Nullable[BillingDetailsInputTypedDict]]
+    billing_details: NotRequired[Nullable[BillingDetailsTypedDict]]
     r"""The billing name, address, email, and other fields for this buyer."""
 
 
@@ -32,7 +32,7 @@ class BuyerUpdate(BaseModel):
     account_number: OptionalNullable[str] = UNSET
     r"""The buyer account number"""
 
-    billing_details: OptionalNullable[BillingDetailsInput] = UNSET
+    billing_details: OptionalNullable[BillingDetails] = UNSET
     r"""The billing name, address, email, and other fields for this buyer."""
 
     @model_serializer(mode="wrap")

gr4vy/models/capture_transactionop.py

@@ -1,11 +1,8 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .transaction_output import TransactionOutput, TransactionOutputTypedDict
-from .transactioncapture_output import (
-    TransactionCaptureOutput,
-    TransactionCaptureOutputTypedDict,
-)
+from .transaction import Transaction, TransactionTypedDict
+from .transactioncapture import TransactionCapture, TransactionCaptureTypedDict
 from .transactioncapturecreate import (
     TransactionCaptureCreate,
     TransactionCaptureCreateTypedDict,
@@ -16,9 +13,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
 
@@ -104,12 +102,27 @@ class CaptureTransactionRequest(BaseModel):
 
 ResponseCaptureTransactionTypedDict = TypeAliasType(
     "ResponseCaptureTransactionTypedDict",
-    Union[TransactionCaptureOutputTypedDict, TransactionOutputTypedDict],
+    Union[TransactionCaptureTypedDict, TransactionTypedDict],
 )
 r"""Successful Response"""
 
 
-ResponseCaptureTransaction = TypeAliasType(
-    "ResponseCaptureTransaction", Union[TransactionCaptureOutput, TransactionOutput]
-)
+ResponseCaptureTransaction = Annotated[
+    Union[
+        Annotated[Transaction, Tag("processing")],
+        Annotated[Transaction, Tag("authorization_succeeded")],
+        Annotated[Transaction, Tag("authorization_declined")],
+        Annotated[Transaction, Tag("authorization_failed")],
+        Annotated[Transaction, Tag("authorization_voided")],
+        Annotated[Transaction, Tag("authorization_void_pending")],
+        Annotated[Transaction, Tag("capture_succeeded")],
+        Annotated[Transaction, Tag("capture_pending")],
+        Annotated[Transaction, Tag("buyer_approval_pending")],
+        Annotated[TransactionCapture, Tag("succeeded")],
+        Annotated[TransactionCapture, Tag("pending")],
+        Annotated[TransactionCapture, Tag("declined")],
+        Annotated[TransactionCapture, Tag("failed")],
+    ],
+    Discriminator(lambda m: get_discriminator(m, "status", "status")),
+]
 r"""Successful Response"""

gr4vy/models/checkoutsession.py

@@ -3,11 +3,11 @@
 from __future__ import annotations
 from .airline import Airline, AirlineTypedDict
 from .cartitem import CartItem, CartItemTypedDict
-from .checkoutsessionpaymentmethod_output import (
-    CheckoutSessionPaymentMethodOutput,
-    CheckoutSessionPaymentMethodOutputTypedDict,
+from .checkoutsessionpaymentmethod import (
+    CheckoutSessionPaymentMethod,
+    CheckoutSessionPaymentMethodTypedDict,
 )
-from .guestbuyer_output import GuestBuyerOutput, GuestBuyerOutputTypedDict
+from .guestbuyer import GuestBuyer, GuestBuyerTypedDict
 from datetime import datetime
 from gr4vy.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
 from gr4vy.utils import validate_const
@@ -27,7 +27,7 @@ class CheckoutSessionTypedDict(TypedDict):
     r"""An array of cart items that represents the line items of a transaction."""
     metadata: NotRequired[Nullable[Dict[str, str]]]
     r"""Any additional information about the transaction that you would like to store as key-value pairs. This data is passed to payment service providers that support it."""
-    buyer: NotRequired[Nullable[GuestBuyerOutputTypedDict]]
+    buyer: NotRequired[Nullable[GuestBuyerTypedDict]]
     r"""Provide buyer details for the transaction. No buyer resource will be created on Gr4vy when used."""
     airline: NotRequired[Nullable[AirlineTypedDict]]
     r"""The airline addendum data which describes the airline booking associated with this transaction."""
@@ -39,7 +39,7 @@ class CheckoutSessionTypedDict(TypedDict):
     r"""The unique identifier of an existing payment service. When provided, the created transaction will be processed by the given payment service and any routing rules will be skipped."""
     type: Literal["checkout-session"]
     r"""Always `checkout-session`"""
-    payment_method: NotRequired[Nullable[CheckoutSessionPaymentMethodOutputTypedDict]]
+    payment_method: NotRequired[Nullable[CheckoutSessionPaymentMethodTypedDict]]
     r"""Information about the payment method stored on the checkout session."""
 
 
@@ -56,7 +56,7 @@ class CheckoutSession(BaseModel):
     metadata: OptionalNullable[Dict[str, str]] = UNSET
     r"""Any additional information about the transaction that you would like to store as key-value pairs. This data is passed to payment service providers that support it."""
 
-    buyer: OptionalNullable[GuestBuyerOutput] = UNSET
+    buyer: OptionalNullable[GuestBuyer] = UNSET
     r"""Provide buyer details for the transaction. No buyer resource will be created on Gr4vy when used."""
 
     airline: OptionalNullable[Airline] = UNSET
@@ -80,7 +80,7 @@ class CheckoutSession(BaseModel):
     ] = "checkout-session"
     r"""Always `checkout-session`"""
 
-    payment_method: OptionalNullable[CheckoutSessionPaymentMethodOutput] = UNSET
+    payment_method: OptionalNullable[CheckoutSessionPaymentMethod] = UNSET
     r"""Information about the payment method stored on the checkout session."""
 
     @model_serializer(mode="wrap")

gr4vy/models/checkoutsessioncreate.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 from .airline import Airline, AirlineTypedDict
 from .cartitem import CartItem, CartItemTypedDict
-from .guestbuyer_input import GuestBuyerInput, GuestBuyerInputTypedDict
+from .guestbuyer import GuestBuyer, GuestBuyerTypedDict
 from gr4vy.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
 from pydantic import model_serializer
 from typing import Dict, List, Optional
@@ -15,7 +15,7 @@ class CheckoutSessionCreateTypedDict(TypedDict):
     r"""An array of cart items that represents the line items of a transaction."""
     metadata: NotRequired[Nullable[Dict[str, str]]]
     r"""Any additional information about the transaction that you would like to store as key-value pairs. This data is passed to payment service providers that support it."""
-    buyer: NotRequired[Nullable[GuestBuyerInputTypedDict]]
+    buyer: NotRequired[Nullable[GuestBuyerTypedDict]]
     r"""Provide buyer details for the transaction. No buyer resource will be created on Gr4vy when used."""
     airline: NotRequired[Nullable[AirlineTypedDict]]
     r"""The airline addendum data which describes the airline booking associated with this transaction."""
@@ -36,7 +36,7 @@ class CheckoutSessionCreate(BaseModel):
     metadata: OptionalNullable[Dict[str, str]] = UNSET
     r"""Any additional information about the transaction that you would like to store as key-value pairs. This data is passed to payment service providers that support it."""
 
-    buyer: OptionalNullable[GuestBuyerInput] = UNSET
+    buyer: OptionalNullable[GuestBuyer] = UNSET
     r"""Provide buyer details for the transaction. No buyer resource will be created on Gr4vy when used."""
 
     airline: OptionalNullable[Airline] = UNSET

gr4vy/models/{checkoutsessionpaymentmethod_output.py → checkoutsessionpaymentmethod.py}

@@ -15,7 +15,7 @@ from typing import Literal, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class CheckoutSessionPaymentMethodOutputTypedDict(TypedDict):
+class CheckoutSessionPaymentMethodTypedDict(TypedDict):
     type: Literal["payment-method"]
     r"""Always `payment-method`"""
     id: NotRequired[Nullable[str]]
@@ -32,7 +32,7 @@ class CheckoutSessionPaymentMethodOutputTypedDict(TypedDict):
     r"""The unique hash derived from the card number."""
 
 
-class CheckoutSessionPaymentMethodOutput(BaseModel):
+class CheckoutSessionPaymentMethod(BaseModel):
     TYPE: Annotated[
         Annotated[
             Optional[Literal["payment-method"]],

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/{guestbuyer_input.py → guestbuyer.py}

@@ -1,19 +1,19 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .billingdetails_input import BillingDetailsInput, BillingDetailsInputTypedDict
+from .billingdetails import BillingDetails, BillingDetailsTypedDict
 from .shippingdetailscreate import ShippingDetailsCreate, ShippingDetailsCreateTypedDict
 from gr4vy.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
 from pydantic import model_serializer
 from typing_extensions import NotRequired, TypedDict
 
 
-class GuestBuyerInputTypedDict(TypedDict):
+class GuestBuyerTypedDict(TypedDict):
     display_name: NotRequired[Nullable[str]]
     r"""The display name for the buyer."""
     external_identifier: NotRequired[Nullable[str]]
     r"""The merchant identifier for this buyer."""
-    billing_details: NotRequired[Nullable[BillingDetailsInputTypedDict]]
+    billing_details: NotRequired[Nullable[BillingDetailsTypedDict]]
     r"""The billing name, address, email, and other fields for this buyer."""
     account_number: NotRequired[Nullable[str]]
     r"""The buyer account number"""
@@ -21,14 +21,14 @@ class GuestBuyerInputTypedDict(TypedDict):
     r"""The optional shipping details for this buyer."""
 
 
-class GuestBuyerInput(BaseModel):
+class GuestBuyer(BaseModel):
     display_name: OptionalNullable[str] = UNSET
     r"""The display name for the buyer."""
 
     external_identifier: OptionalNullable[str] = UNSET
     r"""The merchant identifier for this buyer."""
 
-    billing_details: OptionalNullable[BillingDetailsInput] = UNSET
+    billing_details: OptionalNullable[BillingDetails] = UNSET
     r"""The billing name, address, email, and other fields for this buyer."""
 
     account_number: OptionalNullable[str] = UNSET

gr4vy/models/paymentlink.py

@@ -5,10 +5,7 @@ from .cartitem import CartItem, CartItemTypedDict
 from .paymentlinkstatus import PaymentLinkStatus
 from .shippingdetails import ShippingDetails, ShippingDetailsTypedDict
 from .statementdescriptor import StatementDescriptor, StatementDescriptorTypedDict
-from .transactionbuyer_output import (
-    TransactionBuyerOutput,
-    TransactionBuyerOutputTypedDict,
-)
+from .transactionbuyer import TransactionBuyer, TransactionBuyerTypedDict
 from .transactionintent import TransactionIntent
 from .transactionpaymentsource import TransactionPaymentSource
 from datetime import datetime
@@ -70,7 +67,7 @@ class PaymentLinkTypedDict(TypedDict):
     r"""The return URL after payment completion."""
     metadata: NotRequired[Nullable[Dict[str, Any]]]
     r"""Arbitrary metadata for the payment link."""
-    buyer: NotRequired[Nullable[TransactionBuyerOutputTypedDict]]
+    buyer: NotRequired[Nullable[TransactionBuyerTypedDict]]
     r"""The buyer associated with the payment link."""
     shipping_details: NotRequired[Nullable[ShippingDetailsTypedDict]]
     r"""The shipping details for the payment link."""
@@ -160,7 +157,7 @@ class PaymentLink(BaseModel):
     metadata: OptionalNullable[Dict[str, Any]] = UNSET
     r"""Arbitrary metadata for the payment link."""
 
-    buyer: OptionalNullable[TransactionBuyerOutput] = UNSET
+    buyer: OptionalNullable[TransactionBuyer] = UNSET
     r"""The buyer associated with the payment link."""
 
     shipping_details: OptionalNullable[ShippingDetails] = UNSET

gr4vy/models/paymentlinkcreate.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .cartitem import CartItem, CartItemTypedDict
-from .guestbuyer_input import GuestBuyerInput, GuestBuyerInputTypedDict
+from .guestbuyer import GuestBuyer, GuestBuyerTypedDict
 from .statementdescriptor import StatementDescriptor, StatementDescriptorTypedDict
 from .transactionconnectionoptions import (
     TransactionConnectionOptions,
@@ -26,7 +26,7 @@ class PaymentLinkCreateTypedDict(TypedDict):
     r"""The country code for the payment link."""
     currency: str
     r"""The currency code for the payment link."""
-    buyer: NotRequired[Nullable[GuestBuyerInputTypedDict]]
+    buyer: NotRequired[Nullable[GuestBuyerTypedDict]]
     r"""The guest buyer for the payment link."""
     expires_at: NotRequired[Nullable[datetime]]
     r"""The expiration date and time for the payment link."""
@@ -73,7 +73,7 @@ class PaymentLinkCreate(BaseModel):
     currency: str
     r"""The currency code for the payment link."""
 
-    buyer: OptionalNullable[GuestBuyerInput] = UNSET
+    buyer: OptionalNullable[GuestBuyer] = UNSET
     r"""The guest buyer for the payment link."""
 
     expires_at: OptionalNullable[datetime] = UNSET

gr4vy/models/paymentmethodsummaries.py

@@ -1,20 +1,17 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .paymentmethodsummary_output import (
-    PaymentMethodSummaryOutput,
-    PaymentMethodSummaryOutputTypedDict,
-)
+from .paymentmethodsummary import PaymentMethodSummary, PaymentMethodSummaryTypedDict
 from gr4vy.types import BaseModel
 from typing import List
 from typing_extensions import TypedDict
 
 
 class PaymentMethodSummariesTypedDict(TypedDict):
-    items: List[PaymentMethodSummaryOutputTypedDict]
+    items: List[PaymentMethodSummaryTypedDict]
     r"""A list of items returned for this request."""
 
 
 class PaymentMethodSummaries(BaseModel):
-    items: List[PaymentMethodSummaryOutput]
+    items: List[PaymentMethodSummary]
     r"""A list of items returned for this request."""

gr4vy/models/{paymentmethodsummary_output.py → paymentmethodsummary.py}

@@ -18,7 +18,7 @@ from typing import List, Literal, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class PaymentMethodSummaryOutputTypedDict(TypedDict):
+class PaymentMethodSummaryTypedDict(TypedDict):
     r"""Payment Method
 
     A summary of a payment method.
@@ -65,7 +65,7 @@ class PaymentMethodSummaryOutputTypedDict(TypedDict):
     r"""The timestamp when this payment method was last used in a transaction."""
 
 
-class PaymentMethodSummaryOutput(BaseModel):
+class PaymentMethodSummary(BaseModel):
     r"""Payment Method
 
     A summary of a payment method.

gr4vy/models/{paymentoption_output.py → paymentoption.py}

@@ -38,7 +38,7 @@ Context = TypeAliasType(
 )
 
 
-class PaymentOptionOutputTypedDict(TypedDict):
+class PaymentOptionTypedDict(TypedDict):
     method: str
     mode: Mode
     can_store_payment_method: bool
@@ -49,7 +49,7 @@ class PaymentOptionOutputTypedDict(TypedDict):
     context: NotRequired[Nullable[ContextTypedDict]]
 
 
-class PaymentOptionOutput(BaseModel):
+class PaymentOption(BaseModel):
     method: str
 
     mode: Annotated[Mode, PlainValidator(validate_open_enum(False))]

gr4vy/models/paymentoptions.py

@@ -1,17 +1,17 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .paymentoption_output import PaymentOptionOutput, PaymentOptionOutputTypedDict
+from .paymentoption import PaymentOption, PaymentOptionTypedDict
 from gr4vy.types import BaseModel
 from typing import List
 from typing_extensions import TypedDict
 
 
 class PaymentOptionsTypedDict(TypedDict):
-    items: List[PaymentOptionOutputTypedDict]
+    items: List[PaymentOptionTypedDict]
     r"""A list of items returned for this request."""
 
 
 class PaymentOptions(BaseModel):
-    items: List[PaymentOptionOutput]
+    items: List[PaymentOption]
     r"""A list of items returned for this request."""

gr4vy/models/payoutcreate.py

@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .guestbuyer_input import GuestBuyerInput, GuestBuyerInputTypedDict
+from .guestbuyer import GuestBuyer, GuestBuyerTypedDict
 from .paymentmethodcard import PaymentMethodCard, PaymentMethodCardTypedDict
 from .paymentmethodstoredcard import (
     PaymentMethodStoredCard,
@@ -54,7 +54,7 @@ class PayoutCreateTypedDict(TypedDict):
     r"""A value that can be used to match the payout against your own records."""
     buyer_id: NotRequired[Nullable[str]]
     r"""The `id` of a stored buyer to use for this payout Use this instead of the `buyer` or `buyer_external_identifier`."""
-    buyer: NotRequired[Nullable[GuestBuyerInputTypedDict]]
+    buyer: NotRequired[Nullable[GuestBuyerTypedDict]]
     r"""Inline buyer details for the payout. Use this instead of the `buyer_id` or `buyer_external_identifier`."""
     buyer_external_identifier: NotRequired[Nullable[str]]
     r"""The `external_identifier` of a stored buyer to use for this payout. Use this instead of the `buyer_id` or `buyer`."""
@@ -93,7 +93,7 @@ class PayoutCreate(BaseModel):
     buyer_id: OptionalNullable[str] = UNSET
     r"""The `id` of a stored buyer to use for this payout Use this instead of the `buyer` or `buyer_external_identifier`."""
 
-    buyer: OptionalNullable[GuestBuyerInput] = UNSET
+    buyer: OptionalNullable[GuestBuyer] = UNSET
     r"""Inline buyer details for the payout. Use this instead of the `buyer_id` or `buyer_external_identifier`."""
 
     buyer_external_identifier: OptionalNullable[str] = UNSET

gr4vy/models/payoutsummary.py

@@ -5,13 +5,10 @@ from .payoutcategory import PayoutCategory
 from .payoutmerchantsummary import PayoutMerchantSummary, PayoutMerchantSummaryTypedDict
 from .payoutpaymentservice import PayoutPaymentService, PayoutPaymentServiceTypedDict
 from .payoutstatus import PayoutStatus
-from .transactionbuyer_output import (
-    TransactionBuyerOutput,
-    TransactionBuyerOutputTypedDict,
-)
-from .transactionpaymentmethod_output import (
-    TransactionPaymentMethodOutput,
-    TransactionPaymentMethodOutputTypedDict,
+from .transactionbuyer import TransactionBuyer, TransactionBuyerTypedDict
+from .transactionpaymentmethod import (
+    TransactionPaymentMethod,
+    TransactionPaymentMethodTypedDict,
 )
 from datetime import datetime
 from gr4vy.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
@@ -35,7 +32,7 @@ class PayoutSummaryTypedDict(TypedDict):
     r"""The date this payout was created at."""
     currency: str
     r"""A supported ISO-4217 currency code."""
-    payment_method: TransactionPaymentMethodOutputTypedDict
+    payment_method: TransactionPaymentMethodTypedDict
     payment_service: PayoutPaymentServiceTypedDict
     status: PayoutStatus
     updated_at: datetime
@@ -44,7 +41,7 @@ class PayoutSummaryTypedDict(TypedDict):
     r"""Always `payout`."""
     id: NotRequired[Nullable[str]]
     r"""The ID for the payout."""
-    buyer: NotRequired[Nullable[TransactionBuyerOutputTypedDict]]
+    buyer: NotRequired[Nullable[TransactionBuyerTypedDict]]
     r"""The buyer used for this payout."""
     category: NotRequired[Nullable[PayoutCategory]]
     r"""The type of payout to process."""
@@ -73,7 +70,7 @@ class PayoutSummary(BaseModel):
     currency: str
     r"""A supported ISO-4217 currency code."""
 
-    payment_method: TransactionPaymentMethodOutput
+    payment_method: TransactionPaymentMethod
 
     payment_service: PayoutPaymentService
 
@@ -93,7 +90,7 @@ class PayoutSummary(BaseModel):
     id: OptionalNullable[str] = UNSET
     r"""The ID for the payout."""
 
-    buyer: OptionalNullable[TransactionBuyerOutput] = UNSET
+    buyer: OptionalNullable[TransactionBuyer] = UNSET
     r"""The buyer used for this payout."""
 
     category: Annotated[

gr4vy/models/{transaction_output.py → transaction.py}

@@ -13,15 +13,12 @@ from .method import Method
 from .recipient import Recipient, RecipientTypedDict
 from .shippingdetails import ShippingDetails, ShippingDetailsTypedDict
 from .statementdescriptor import StatementDescriptor, StatementDescriptorTypedDict
-from .transactionbuyer_output import (
-    TransactionBuyerOutput,
-    TransactionBuyerOutputTypedDict,
-)
+from .transactionbuyer import TransactionBuyer, TransactionBuyerTypedDict
 from .transactionintent import TransactionIntent
 from .transactionintentoutcome import TransactionIntentOutcome
-from .transactionpaymentmethod_output import (
-    TransactionPaymentMethodOutput,
-    TransactionPaymentMethodOutputTypedDict,
+from .transactionpaymentmethod import (
+    TransactionPaymentMethod,
+    TransactionPaymentMethodTypedDict,
 )
 from .transactionpaymentservice import (
     TransactionPaymentService,
@@ -29,9 +26,9 @@ from .transactionpaymentservice import (
 )
 from .transactionpaymentsource import TransactionPaymentSource
 from .transactionstatus import TransactionStatus
-from .transactionthreedsecuresummary_output import (
-    TransactionThreeDSecureSummaryOutput,
-    TransactionThreeDSecureSummaryOutputTypedDict,
+from .transactionthreedsecuresummary import (
+    TransactionThreeDSecureSummary,
+    TransactionThreeDSecureSummaryTypedDict,
 )
 from datetime import datetime
 from gr4vy.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
@@ -43,7 +40,7 @@ from typing import Dict, List, Literal, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class TransactionOutputTypedDict(TypedDict):
+class TransactionTypedDict(TypedDict):
     r"""A full transaction resource."""
 
     id: str
@@ -95,7 +92,7 @@ class TransactionOutputTypedDict(TypedDict):
     r"""The 2-letter ISO 3166-1 alpha-2 country code for the transaction. Used to filter payment services for processing."""
     external_identifier: NotRequired[Nullable[str]]
     r"""An external identifier that can be used to match the transaction against your own records."""
-    payment_method: NotRequired[Nullable[TransactionPaymentMethodOutputTypedDict]]
+    payment_method: NotRequired[Nullable[TransactionPaymentMethodTypedDict]]
     r"""The payment method used for this transaction."""
     method: NotRequired[Nullable[Method]]
     r"""The method used for the transaction."""
@@ -107,7 +104,7 @@ class TransactionOutputTypedDict(TypedDict):
     r"""The payment service used for this transaction."""
     pending_review: NotRequired[bool]
     r"""Whether a manual anti fraud review is pending with an anti fraud service."""
-    buyer: NotRequired[Nullable[TransactionBuyerOutputTypedDict]]
+    buyer: NotRequired[Nullable[TransactionBuyerTypedDict]]
     r"""The buyer used for this transaction."""
     raw_response_code: NotRequired[Nullable[str]]
     r"""This is the response code received from the payment service. This can be set to any value and is not standardized across different payment services."""
@@ -135,7 +132,7 @@ class TransactionOutputTypedDict(TypedDict):
     r"""The statement descriptor is the text to be shown on the buyer's statements."""
     scheme_transaction_id: NotRequired[Nullable[str]]
     r"""An identifier for the transaction used by the scheme itself, when available."""
-    three_d_secure: NotRequired[Nullable[TransactionThreeDSecureSummaryOutputTypedDict]]
+    three_d_secure: NotRequired[Nullable[TransactionThreeDSecureSummaryTypedDict]]
     r"""The 3-D Secure data that was sent to the payment service for the transaction."""
     payment_service_transaction_id: NotRequired[Nullable[str]]
     r"""The payment service's unique ID for the transaction."""
@@ -181,7 +178,7 @@ class TransactionOutputTypedDict(TypedDict):
     r"""Total shipping amount."""
 
 
-class TransactionOutput(BaseModel):
+class Transaction(BaseModel):
     r"""A full transaction resource."""
 
     id: str
@@ -269,7 +266,7 @@ class TransactionOutput(BaseModel):
     external_identifier: OptionalNullable[str] = UNSET
     r"""An external identifier that can be used to match the transaction against your own records."""
 
-    payment_method: OptionalNullable[TransactionPaymentMethodOutput] = UNSET
+    payment_method: OptionalNullable[TransactionPaymentMethod] = UNSET
     r"""The payment method used for this transaction."""
 
     method: Annotated[
@@ -291,7 +288,7 @@ class TransactionOutput(BaseModel):
     pending_review: Optional[bool] = False
     r"""Whether a manual anti fraud review is pending with an anti fraud service."""
 
-    buyer: OptionalNullable[TransactionBuyerOutput] = UNSET
+    buyer: OptionalNullable[TransactionBuyer] = UNSET
     r"""The buyer used for this transaction."""
 
     raw_response_code: OptionalNullable[str] = UNSET
@@ -339,7 +336,7 @@ class TransactionOutput(BaseModel):
     scheme_transaction_id: OptionalNullable[str] = UNSET
     r"""An identifier for the transaction used by the scheme itself, when available."""
 
-    three_d_secure: OptionalNullable[TransactionThreeDSecureSummaryOutput] = UNSET
+    three_d_secure: OptionalNullable[TransactionThreeDSecureSummary] = UNSET
     r"""The 3-D Secure data that was sent to the payment service for the transaction."""
 
     payment_service_transaction_id: OptionalNullable[str] = UNSET

gr4vy/models/{transactionbuyer_output.py → transactionbuyer.py}

@@ -1,7 +1,7 @@
 """Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT."""
 
 from __future__ import annotations
-from .billingdetails_output import BillingDetailsOutput, BillingDetailsOutputTypedDict
+from .billingdetails import BillingDetails, BillingDetailsTypedDict
 from gr4vy.types import BaseModel, Nullable, OptionalNullable, UNSET, UNSET_SENTINEL
 from gr4vy.utils import validate_const
 import pydantic
@@ -11,7 +11,7 @@ from typing import Literal, Optional
 from typing_extensions import Annotated, NotRequired, TypedDict
 
 
-class TransactionBuyerOutputTypedDict(TypedDict):
+class TransactionBuyerTypedDict(TypedDict):
     type: Literal["buyer"]
     r"""Always `buyer`."""
     id: NotRequired[Nullable[str]]
@@ -20,13 +20,13 @@ class TransactionBuyerOutputTypedDict(TypedDict):
     r"""The display name for the buyer."""
     external_identifier: NotRequired[Nullable[str]]
     r"""The merchant identifier for this buyer."""
-    billing_details: NotRequired[Nullable[BillingDetailsOutputTypedDict]]
+    billing_details: NotRequired[Nullable[BillingDetailsTypedDict]]
     r"""The billing name, address, email, and other fields for this buyer."""
     account_number: NotRequired[Nullable[str]]
     r"""The buyer account number."""
 
 
-class TransactionBuyerOutput(BaseModel):
+class TransactionBuyer(BaseModel):
     TYPE: Annotated[
         Annotated[Optional[Literal["buyer"]], AfterValidator(validate_const("buyer"))],
         pydantic.Field(alias="type"),
@@ -42,7 +42,7 @@ class TransactionBuyerOutput(BaseModel):
     external_identifier: OptionalNullable[str] = UNSET
     r"""The merchant identifier for this buyer."""
 
-    billing_details: OptionalNullable[BillingDetailsOutput] = UNSET
+    billing_details: OptionalNullable[BillingDetails] = UNSET
     r"""The billing name, address, email, and other fields for this buyer."""
 
     account_number: OptionalNullable[str] = UNSET

gr4vy/models/transactioncancel.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 from .cancelstatus import CancelStatus
-from .transaction_output import TransactionOutput, TransactionOutputTypedDict
+from .transaction import Transaction, TransactionTypedDict
 from gr4vy.types import BaseModel, Nullable, UNSET_SENTINEL
 from gr4vy.utils import validate_const, validate_open_enum
 import pydantic
@@ -20,7 +20,7 @@ class TransactionCancelTypedDict(TypedDict):
     r"""This is the response code received from the payment service. This can be set to any value and is not standardized across different payment services."""
     raw_response_description: Nullable[str]
     r"""This is the response description received from the payment service. This can be set to any value and is not standardized across different payment services."""
-    transaction: TransactionOutputTypedDict
+    transaction: TransactionTypedDict
     r"""A full transaction resource."""
     type: Literal["transaction-cancel"]
     r"""Always `transaction-cancel`."""
@@ -38,7 +38,7 @@ class TransactionCancel(BaseModel):
     raw_response_description: Nullable[str]
     r"""This is the response description received from the payment service. This can be set to any value and is not standardized across different payment services."""
 
-    transaction: TransactionOutput
+    transaction: Transaction
     r"""A full transaction resource."""
 
     TYPE: Annotated[