From 9d95dde7de5176e24fda35b49fee1589bb534716 Mon Sep 17 00:00:00 2001
From: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
Date: Fri, 8 Aug 2025 14:45:10 +0000
Subject: [PATCH 1/2] SDK regeneration

---
 .gitignore                                    |   4 +-
 poetry.lock                                   | 109 +-
 pyproject.toml                                |  26 +-
 requirements.txt                              |   2 +-
 src/square/__init__.py                        |   2 +
 src/square/apple_pay/__init__.py              |   2 +
 src/square/apple_pay/client.py                |  15 +-
 src/square/apple_pay/raw_client.py            |  21 +-
 src/square/bank_accounts/__init__.py          |   2 +
 src/square/bank_accounts/client.py            |  99 +-
 src/square/bank_accounts/raw_client.py        | 183 +++-
 src/square/bookings/__init__.py               |   2 +
 src/square/bookings/client.py                 | 205 ++--
 .../custom_attribute_definitions/__init__.py  |   2 +
 .../custom_attribute_definitions/client.py    | 115 +--
 .../raw_client.py                             | 191 +++-
 .../bookings/custom_attributes/__init__.py    |   2 +
 .../bookings/custom_attributes/client.py      | 134 +--
 .../bookings/custom_attributes/raw_client.py  | 227 +++-
 .../bookings/location_profiles/__init__.py    |   2 +
 .../bookings/location_profiles/client.py      |  79 +-
 .../bookings/location_profiles/raw_client.py  | 135 ++-
 src/square/bookings/raw_client.py             | 289 +++++-
 .../bookings/team_member_profiles/__init__.py |   2 +
 .../bookings/team_member_profiles/client.py   | 101 +-
 .../team_member_profiles/raw_client.py        | 173 +++-
 src/square/cards/__init__.py                  |   2 +
 src/square/cards/client.py                    | 127 +--
 src/square/cards/raw_client.py                | 220 +++-
 src/square/cash_drawers/__init__.py           |   2 +
 src/square/cash_drawers/client.py             |   9 +-
 src/square/cash_drawers/raw_client.py         |   3 +-
 src/square/cash_drawers/shifts/__init__.py    |   2 +
 src/square/cash_drawers/shifts/client.py      | 188 +---
 src/square/cash_drawers/shifts/raw_client.py  | 353 ++++++-
 src/square/catalog/__init__.py                |   2 +
 src/square/catalog/client.py                  | 167 +--
 src/square/catalog/images/__init__.py         |   2 +
 src/square/catalog/images/client.py           |  27 +-
 src/square/catalog/images/raw_client.py       |  39 +-
 src/square/catalog/object/__init__.py         |   2 +
 src/square/catalog/object/client.py           |  37 +-
 src/square/catalog/object/raw_client.py       |  43 +-
 src/square/catalog/raw_client.py              | 281 ++++-
 src/square/checkout/__init__.py               |   2 +
 src/square/checkout/client.py                 |  48 +-
 src/square/checkout/payment_links/__init__.py |   2 +
 src/square/checkout/payment_links/client.py   | 121 +--
 .../checkout/payment_links/raw_client.py      | 199 +++-
 src/square/checkout/raw_client.py             |  53 +-
 src/square/client.py                          | 120 +--
 src/square/core/__init__.py                   |   2 +
 src/square/core/client_wrapper.py             |  16 +-
 src/square/core/force_multipart.py            |  16 +
 src/square/core/http_client.py                |  94 +-
 src/square/core/http_response.py              |  30 +-
 src/square/core/pagination.py                 |  95 +-
 src/square/core/pydantic_utilities.py         | 179 ++--
 src/square/customers/__init__.py              |   2 +
 src/square/customers/cards/__init__.py        |   2 +
 src/square/customers/cards/client.py          |  25 +-
 src/square/customers/cards/raw_client.py      |  33 +-
 src/square/customers/client.py                | 202 ++--
 .../custom_attribute_definitions/__init__.py  |   2 +
 .../custom_attribute_definitions/client.py    | 135 +--
 .../raw_client.py                             | 217 +++-
 .../customers/custom_attributes/__init__.py   |   2 +
 .../customers/custom_attributes/client.py     | 114 +--
 .../customers/custom_attributes/raw_client.py | 217 +++-
 src/square/customers/groups/__init__.py       |   2 +
 src/square/customers/groups/client.py         | 135 +--
 src/square/customers/groups/raw_client.py     | 209 +++-
 src/square/customers/raw_client.py            | 297 +++++-
 src/square/customers/segments/__init__.py     |   2 +
 src/square/customers/segments/client.py       |  87 +-
 src/square/customers/segments/raw_client.py   | 161 ++-
 src/square/devices/__init__.py                |   2 +
 src/square/devices/client.py                  | 100 +-
 src/square/devices/codes/__init__.py          |   2 +
 src/square/devices/codes/client.py            | 113 +-
 src/square/devices/codes/raw_client.py        | 197 +++-
 src/square/devices/raw_client.py              | 184 +++-
 src/square/disputes/__init__.py               |   2 +
 src/square/disputes/client.py                 | 138 +--
 src/square/disputes/evidence/__init__.py      |   2 +
 src/square/disputes/evidence/client.py        |  96 +-
 src/square/disputes/evidence/raw_client.py    | 159 ++-
 src/square/disputes/raw_client.py             | 210 +++-
 src/square/employees/__init__.py              |   2 +
 src/square/employees/client.py                |  97 +-
 src/square/employees/raw_client.py            | 174 +++-
 src/square/events/__init__.py                 |   2 +
 src/square/events/client.py                   |  43 +-
 src/square/events/raw_client.py               |  47 +-
 src/square/gift_cards/__init__.py             |   2 +
 src/square/gift_cards/activities/__init__.py  |   2 +
 src/square/gift_cards/activities/client.py    | 125 +--
 .../gift_cards/activities/raw_client.py       | 253 ++++-
 src/square/gift_cards/client.py               | 146 +--
 src/square/gift_cards/raw_client.py           | 245 ++++-
 src/square/inventory/__init__.py              |   2 +
 src/square/inventory/client.py                | 426 ++------
 src/square/inventory/raw_client.py            | 966 ++++++++++++++++--
 src/square/invoices/__init__.py               |   2 +
 src/square/invoices/client.py                 | 173 +---
 src/square/invoices/raw_client.py             | 257 ++++-
 src/square/labor/__init__.py                  |   2 +
 src/square/labor/break_types/__init__.py      |   2 +
 src/square/labor/break_types/client.py        | 119 +--
 src/square/labor/break_types/raw_client.py    | 193 +++-
 src/square/labor/client.py                    | 132 ++-
 src/square/labor/employee_wages/__init__.py   |   2 +
 src/square/labor/employee_wages/client.py     |  91 +-
 src/square/labor/employee_wages/raw_client.py | 163 ++-
 src/square/labor/raw_client.py                | 123 ++-
 src/square/labor/shifts/__init__.py           |   2 +
 src/square/labor/shifts/client.py             |  55 +-
 src/square/labor/shifts/raw_client.py         |  61 +-
 .../labor/team_member_wages/__init__.py       |   2 +
 src/square/labor/team_member_wages/client.py  |  93 +-
 .../labor/team_member_wages/raw_client.py     | 165 ++-
 src/square/labor/workweek_configs/__init__.py |   2 +
 src/square/labor/workweek_configs/client.py   |  89 +-
 .../labor/workweek_configs/raw_client.py      | 151 ++-
 src/square/locations/__init__.py              |   2 +
 src/square/locations/client.py                |  66 +-
 .../custom_attribute_definitions/__init__.py  |   2 +
 .../custom_attribute_definitions/client.py    | 125 +--
 .../raw_client.py                             | 210 +++-
 .../locations/custom_attributes/__init__.py   |   2 +
 .../locations/custom_attributes/client.py     | 146 +--
 .../locations/custom_attributes/raw_client.py | 248 ++++-
 src/square/locations/raw_client.py            |  65 +-
 src/square/locations/transactions/__init__.py |   2 +
 src/square/locations/transactions/client.py   |  45 +-
 .../locations/transactions/raw_client.py      |  51 +-
 src/square/loyalty/__init__.py                |   2 +
 src/square/loyalty/accounts/__init__.py       |   2 +
 src/square/loyalty/accounts/client.py         |  59 +-
 src/square/loyalty/accounts/raw_client.py     |  65 +-
 src/square/loyalty/client.py                  |  26 +-
 src/square/loyalty/programs/__init__.py       |   2 +
 src/square/loyalty/programs/client.py         |  38 +-
 .../loyalty/programs/promotions/__init__.py   |   2 +
 .../loyalty/programs/promotions/client.py     | 116 +--
 .../loyalty/programs/promotions/raw_client.py | 208 +++-
 src/square/loyalty/programs/raw_client.py     |  41 +-
 src/square/loyalty/raw_client.py              |  23 +-
 src/square/loyalty/rewards/__init__.py        |   2 +
 src/square/loyalty/rewards/client.py          |  55 +-
 src/square/loyalty/rewards/raw_client.py      |  61 +-
 src/square/merchants/__init__.py              |   2 +
 src/square/merchants/client.py                |  91 +-
 .../custom_attribute_definitions/__init__.py  |   2 +
 .../custom_attribute_definitions/client.py    | 125 +--
 .../raw_client.py                             | 210 +++-
 .../merchants/custom_attributes/__init__.py   |   2 +
 .../merchants/custom_attributes/client.py     | 146 +--
 .../merchants/custom_attributes/raw_client.py | 248 ++++-
 src/square/merchants/raw_client.py            | 149 ++-
 src/square/mobile/__init__.py                 |   2 +
 src/square/mobile/client.py                   |  15 +-
 src/square/mobile/raw_client.py               |  21 +-
 src/square/o_auth/__init__.py                 |   2 +
 src/square/o_auth/client.py                   |  41 +-
 src/square/o_auth/raw_client.py               |  45 +-
 src/square/orders/__init__.py                 |   2 +
 src/square/orders/client.py                   |  89 +-
 .../custom_attribute_definitions/__init__.py  |   2 +
 .../custom_attribute_definitions/client.py    | 121 +--
 .../raw_client.py                             | 210 +++-
 .../orders/custom_attributes/__init__.py      |   2 +
 src/square/orders/custom_attributes/client.py | 146 +--
 .../orders/custom_attributes/raw_client.py    | 254 ++++-
 src/square/orders/raw_client.py               |  95 +-
 src/square/payments/__init__.py               |   2 +
 src/square/payments/client.py                 | 221 ++--
 src/square/payments/raw_client.py             | 430 +++++++-
 src/square/payouts/__init__.py                |   2 +
 src/square/payouts/client.py                  | 196 +---
 src/square/payouts/raw_client.py              | 398 +++++++-
 src/square/refunds/__init__.py                |   2 +
 src/square/refunds/client.py                  | 157 +--
 src/square/refunds/raw_client.py              | 346 ++++++-
 src/square/requests/__init__.py               |   2 +
 .../requests/accept_dispute_response.py       |   6 +-
 .../requests/accepted_payment_methods.py      |   4 +-
 .../accumulate_loyalty_points_response.py     |   4 +-
 src/square/requests/ach_details.py            |   4 +-
 .../add_group_to_customer_response.py         |   4 +-
 src/square/requests/additional_recipient.py   |   4 +-
 src/square/requests/address.py                |   4 +-
 .../adjust_loyalty_points_response.py         |   4 +-
 src/square/requests/afterpay_details.py       |   4 +-
 src/square/requests/application_details.py    |   4 +-
 src/square/requests/appointment_segment.py    |   4 +-
 src/square/requests/availability.py           |   4 +-
 src/square/requests/bank_account.py           |   8 +-
 .../requests/bank_account_created_event.py    |   4 +-
 .../bank_account_created_event_data.py        |   4 +-
 .../bank_account_created_event_object.py      |   1 -
 .../requests/bank_account_disabled_event.py   |   4 +-
 .../bank_account_disabled_event_data.py       |   4 +-
 .../bank_account_disabled_event_object.py     |   1 -
 .../requests/bank_account_payment_details.py  |   4 +-
 .../requests/bank_account_verified_event.py   |   4 +-
 .../bank_account_verified_event_data.py       |   4 +-
 .../bank_account_verified_event_object.py     |   1 -
 .../batch_change_inventory_request.py         |   4 +-
 .../batch_change_inventory_response.py        |   6 +-
 .../batch_create_team_members_response.py     |   4 +-
 .../requests/batch_create_vendors_response.py |   6 +-
 .../batch_delete_catalog_objects_response.py  |   4 +-
 .../batch_get_catalog_objects_response.py     |   6 +-
 .../batch_get_inventory_changes_response.py   |   4 +-
 .../batch_get_inventory_counts_request.py     |   4 +-
 .../batch_get_inventory_counts_response.py    |   4 +-
 .../requests/batch_get_orders_response.py     |   6 +-
 .../requests/batch_get_vendors_response.py    |   4 +-
 ...atch_retrieve_inventory_changes_request.py |   4 +-
 .../batch_update_team_members_response.py     |   6 +-
 .../requests/batch_update_vendors_response.py |   4 +-
 .../batch_upsert_catalog_objects_response.py  |   8 +-
 ...ustomer_custom_attribute_upsert_request.py |   4 +-
 ...ert_customer_custom_attributes_response.py |   4 +-
 ...stomer_custom_attribute_upsert_response.py |   4 +-
 src/square/requests/booking.py                |  10 +-
 src/square/requests/booking_created_event.py  |   4 +-
 .../requests/booking_created_event_data.py    |   4 +-
 .../requests/booking_created_event_object.py  |   1 -
 .../requests/booking_creator_details.py       |   1 -
 ...ttribute_definition_owned_created_event.py |   4 +-
 ...ttribute_definition_owned_deleted_event.py |   4 +-
 ...ttribute_definition_owned_updated_event.py |   4 +-
 ...ribute_definition_visible_created_event.py |   4 +-
 ...ribute_definition_visible_deleted_event.py |   4 +-
 ...ribute_definition_visible_updated_event.py |   4 +-
 ...ooking_custom_attribute_delete_response.py |   4 +-
 ...ng_custom_attribute_owned_deleted_event.py |   4 +-
 ...ng_custom_attribute_owned_updated_event.py |   4 +-
 ...booking_custom_attribute_upsert_request.py |   4 +-
 ...ooking_custom_attribute_upsert_response.py |   4 +-
 ..._custom_attribute_visible_deleted_event.py |   4 +-
 ..._custom_attribute_visible_updated_event.py |   4 +-
 src/square/requests/booking_updated_event.py  |   4 +-
 .../requests/booking_updated_event_data.py    |   4 +-
 .../requests/booking_updated_event_object.py  |   1 -
 src/square/requests/break_.py                 |   4 +-
 src/square/requests/break_type.py             |   1 -
 .../requests/bulk_create_customer_data.py     |   4 +-
 .../bulk_create_customers_response.py         |   4 +-
 ...lete_booking_custom_attributes_response.py |   4 +-
 .../bulk_delete_customers_response.py         |   4 +-
 ...ocation_custom_attribute_delete_request.py |   1 -
 ...ete_location_custom_attributes_response.py |   4 +-
 ...cation_custom_attribute_delete_response.py |   4 +-
 ...erchant_custom_attribute_delete_request.py |   1 -
 ...ete_merchant_custom_attributes_response.py |   4 +-
 ...rchant_custom_attribute_delete_response.py |   4 +-
 ...ributes_request_delete_custom_attribute.py |   1 -
 ...delete_order_custom_attributes_response.py |   6 +-
 .../bulk_publish_scheduled_shifts_data.py     |   1 -
 .../bulk_publish_scheduled_shifts_response.py |   6 +-
 .../bulk_retrieve_bookings_response.py        |   6 +-
 .../bulk_retrieve_customers_response.py       |   6 +-
 ...e_team_member_booking_profiles_response.py |   6 +-
 .../requests/bulk_swap_plan_response.py       |   4 +-
 .../requests/bulk_update_customer_data.py     |   4 +-
 .../bulk_update_customers_response.py         |   6 +-
 ...sert_booking_custom_attributes_response.py |   4 +-
 ...ocation_custom_attribute_upsert_request.py |   4 +-
 ...ert_location_custom_attributes_response.py |   4 +-
 ...cation_custom_attribute_upsert_response.py |   4 +-
 ...erchant_custom_attribute_upsert_request.py |   4 +-
 ...ert_merchant_custom_attributes_response.py |   4 +-
 ...rchant_custom_attribute_upsert_response.py |   4 +-
 ...ributes_request_upsert_custom_attribute.py |   4 +-
 ...upsert_order_custom_attributes_response.py |   4 +-
 .../requests/business_appointment_settings.py |   8 +-
 .../requests/business_booking_profile.py      |   6 +-
 src/square/requests/business_hours.py         |   4 +-
 src/square/requests/business_hours_period.py  |   4 +-
 .../requests/buy_now_pay_later_details.py     |   4 +-
 .../calculate_loyalty_points_response.py      |   4 +-
 .../requests/calculate_order_response.py      |   6 +-
 .../requests/cancel_booking_response.py       |   4 +-
 .../requests/cancel_invoice_response.py       |   6 +-
 .../cancel_loyalty_promotion_response.py      |   4 +-
 ...cel_payment_by_idempotency_key_response.py |   4 +-
 .../requests/cancel_payment_response.py       |   4 +-
 .../requests/cancel_subscription_response.py  |   4 +-
 .../cancel_terminal_action_response.py        |   4 +-
 .../cancel_terminal_checkout_response.py      |   4 +-
 .../cancel_terminal_refund_response.py        |   4 +-
 .../requests/capture_transaction_response.py  |   4 +-
 src/square/requests/card.py                   |  12 +-
 .../card_automatically_updated_event.py       |   4 +-
 .../card_automatically_updated_event_data.py  |   4 +-
 ...card_automatically_updated_event_object.py |   1 -
 src/square/requests/card_created_event.py     |   4 +-
 .../requests/card_created_event_data.py       |   4 +-
 .../requests/card_created_event_object.py     |   1 -
 src/square/requests/card_disabled_event.py    |   4 +-
 .../requests/card_disabled_event_data.py      |   4 +-
 .../requests/card_disabled_event_object.py    |   1 -
 src/square/requests/card_forgotten_event.py   |   4 +-
 .../requests/card_forgotten_event_card.py     |   4 +-
 .../requests/card_forgotten_event_data.py     |   4 +-
 .../requests/card_forgotten_event_object.py   |   1 -
 src/square/requests/card_payment_details.py   |   6 +-
 src/square/requests/card_payment_timeline.py  |   4 +-
 src/square/requests/card_updated_event.py     |   4 +-
 .../requests/card_updated_event_data.py       |   4 +-
 .../requests/card_updated_event_object.py     |   1 -
 src/square/requests/cash_app_details.py       |   4 +-
 src/square/requests/cash_drawer_device.py     |   4 +-
 src/square/requests/cash_drawer_shift.py      |   6 +-
 .../requests/cash_drawer_shift_event.py       |   4 +-
 .../requests/cash_drawer_shift_summary.py     |   4 +-
 src/square/requests/cash_payment_details.py   |   1 -
 .../requests/catalog_availability_period.py   |   4 +-
 src/square/requests/catalog_category.py       |   6 +-
 .../catalog_custom_attribute_definition.py    |  14 +-
 ...stom_attribute_definition_number_config.py |   4 +-
 ...m_attribute_definition_selection_config.py |   4 +-
 ...ction_config_custom_attribute_selection.py |   4 +-
 ...stom_attribute_definition_string_config.py |   4 +-
 .../catalog_custom_attribute_value.py         |   4 +-
 src/square/requests/catalog_discount.py       |   6 +-
 src/square/requests/catalog_ecom_seo_data.py  |   4 +-
 src/square/requests/catalog_id_mapping.py     |   4 +-
 src/square/requests/catalog_image.py          |   4 +-
 src/square/requests/catalog_info_response.py  |   6 +-
 .../requests/catalog_info_response_limits.py  |   4 +-
 src/square/requests/catalog_item.py           |  12 +-
 .../catalog_item_food_and_beverage_details.py |   4 +-
 ...and_beverage_details_dietary_preference.py |  10 +-
 ...em_food_and_beverage_details_ingredient.py |   4 +-
 .../catalog_item_modifier_list_info.py        |   4 +-
 src/square/requests/catalog_item_option.py    |   6 +-
 .../requests/catalog_item_option_for_item.py  |   4 +-
 .../requests/catalog_item_option_value.py     |   4 +-
 ...og_item_option_value_for_item_variation.py |   4 +-
 src/square/requests/catalog_item_variation.py |   8 +-
 .../requests/catalog_measurement_unit.py      |   4 +-
 src/square/requests/catalog_modifier.py       |   6 +-
 src/square/requests/catalog_modifier_list.py  |   8 +-
 .../requests/catalog_modifier_override.py     |   4 +-
 src/square/requests/catalog_object.py         |  23 +-
 .../catalog_object_availability_period.py     |   4 +-
 src/square/requests/catalog_object_base.py    |   6 +-
 src/square/requests/catalog_object_batch.py   |   3 +-
 .../requests/catalog_object_category.py       |   8 +-
 ...alog_object_custom_attribute_definition.py |   4 +-
 .../requests/catalog_object_discount.py       |   6 +-
 src/square/requests/catalog_object_image.py   |   6 +-
 src/square/requests/catalog_object_item.py    |   6 +-
 .../requests/catalog_object_item_option.py    |   6 +-
 .../catalog_object_item_option_value.py       |   6 +-
 .../requests/catalog_object_item_variation.py |   6 +-
 .../catalog_object_measurement_unit.py        |   6 +-
 .../requests/catalog_object_modifier.py       |   6 +-
 .../requests/catalog_object_modifier_list.py  |   6 +-
 .../requests/catalog_object_pricing_rule.py   |   6 +-
 .../requests/catalog_object_product_set.py    |   6 +-
 .../catalog_object_quick_amounts_settings.py  |   6 +-
 .../requests/catalog_object_reference.py      |   4 +-
 .../catalog_object_subscription_plan.py       |   6 +-
 ...alog_object_subscription_plan_variation.py |   6 +-
 src/square/requests/catalog_object_tax.py     |   6 +-
 .../requests/catalog_object_time_period.py    |   6 +-
 src/square/requests/catalog_pricing_rule.py   |   4 +-
 src/square/requests/catalog_product_set.py    |   4 +-
 src/square/requests/catalog_query.py          |  13 +-
 ..._item_variations_for_item_option_values.py |   4 +-
 .../catalog_query_items_for_item_options.py   |   4 +-
 .../catalog_query_items_for_modifier_list.py  |   3 +-
 .../requests/catalog_query_items_for_tax.py   |   3 +-
 src/square/requests/catalog_query_range.py    |   4 +-
 src/square/requests/catalog_query_set.py      |   3 +-
 .../catalog_query_sorted_attribute.py         |   4 +-
 src/square/requests/catalog_query_text.py     |   3 +-
 src/square/requests/catalog_quick_amount.py   |   4 +-
 .../catalog_quick_amounts_settings.py         |   4 +-
 .../requests/catalog_subscription_plan.py     |   6 +-
 .../catalog_subscription_plan_variation.py    |   4 +-
 src/square/requests/catalog_tax.py            |   4 +-
 src/square/requests/catalog_time_period.py    |   4 +-
 src/square/requests/catalog_v1id.py           |   4 +-
 .../requests/catalog_version_updated_event.py |   4 +-
 ...g_version_updated_event_catalog_version.py |   1 -
 .../catalog_version_updated_event_data.py     |   4 +-
 .../catalog_version_updated_event_object.py   |   1 -
 .../requests/category_path_to_root_node.py    |   4 +-
 .../change_billing_anchor_date_response.py    |   4 +-
 src/square/requests/checkout.py               |   6 +-
 .../requests/checkout_location_settings.py    |   8 +-
 .../checkout_location_settings_branding.py    |   6 +-
 .../checkout_location_settings_coupons.py     |   4 +-
 .../checkout_location_settings_policy.py      |   4 +-
 .../checkout_location_settings_tipping.py     |   4 +-
 .../requests/checkout_merchant_settings.py    |   1 -
 ...ckout_merchant_settings_payment_methods.py |   7 +-
 ...tings_payment_methods_afterpay_clearpay.py |   1 -
 ...settings_payment_methods_payment_method.py |   4 +-
 src/square/requests/checkout_options.py       |   6 +-
 src/square/requests/clearpay_details.py       |   4 +-
 src/square/requests/clone_order_response.py   |   6 +-
 src/square/requests/collected_data.py         |   1 -
 .../requests/complete_payment_response.py     |   4 +-
 src/square/requests/component.py              |   5 +-
 src/square/requests/confirmation_decision.py  |   1 -
 src/square/requests/confirmation_options.py   |   4 +-
 src/square/requests/coordinates.py            |   4 +-
 ...ng_custom_attribute_definition_response.py |   4 +-
 .../requests/create_booking_response.py       |   4 +-
 .../requests/create_break_type_response.py    |   4 +-
 src/square/requests/create_card_response.py   |   6 +-
 .../requests/create_catalog_image_request.py  |   1 -
 .../requests/create_catalog_image_response.py |   6 +-
 .../requests/create_checkout_response.py      |   4 +-
 .../requests/create_customer_card_response.py |   6 +-
 ...er_custom_attribute_definition_response.py |   4 +-
 .../create_customer_group_response.py         |   6 +-
 .../requests/create_customer_response.py      |   6 +-
 .../requests/create_device_code_response.py   |   6 +-
 .../create_dispute_evidence_file_request.py   |   1 -
 .../create_dispute_evidence_file_response.py  |   6 +-
 .../create_dispute_evidence_text_response.py  |   6 +-
 .../create_gift_card_activity_response.py     |   4 +-
 .../requests/create_gift_card_response.py     |   4 +-
 .../create_invoice_attachment_request_data.py |   1 -
 .../create_invoice_attachment_response.py     |   6 +-
 .../requests/create_invoice_response.py       |   6 +-
 src/square/requests/create_job_response.py    |   6 +-
 ...on_custom_attribute_definition_response.py |   4 +-
 .../requests/create_location_response.py      |   4 +-
 .../create_loyalty_account_response.py        |   4 +-
 .../create_loyalty_promotion_response.py      |   4 +-
 .../create_loyalty_reward_response.py         |   4 +-
 ...nt_custom_attribute_definition_response.py |   4 +-
 ...eate_mobile_authorization_code_response.py |   4 +-
 ...er_custom_attribute_definition_response.py |   4 +-
 src/square/requests/create_order_request.py   |   1 -
 src/square/requests/create_order_response.py  |   6 +-
 .../requests/create_payment_link_response.py  |   4 +-
 .../requests/create_payment_response.py       |   4 +-
 .../create_scheduled_shift_response.py        |   6 +-
 src/square/requests/create_shift_response.py  |   6 +-
 .../requests/create_subscription_response.py  |   4 +-
 .../requests/create_team_member_request.py    |   1 -
 .../requests/create_team_member_response.py   |   6 +-
 .../create_terminal_action_response.py        |   4 +-
 .../create_terminal_checkout_response.py      |   4 +-
 .../create_terminal_refund_response.py        |   4 +-
 .../requests/create_timecard_response.py      |   6 +-
 src/square/requests/create_vendor_response.py |   4 +-
 .../create_webhook_subscription_response.py   |   4 +-
 src/square/requests/custom_attribute.py       |   4 +-
 .../requests/custom_attribute_definition.py   |   4 +-
 .../custom_attribute_definition_event_data.py |   4 +-
 ..._attribute_definition_event_data_object.py |   1 -
 .../requests/custom_attribute_event_data.py   |   4 +-
 .../custom_attribute_event_data_object.py     |   1 -
 .../requests/custom_attribute_filter.py       |   4 +-
 src/square/requests/customer.py               |   6 +-
 .../requests/customer_address_filter.py       |   3 +-
 src/square/requests/customer_created_event.py |   4 +-
 .../requests/customer_created_event_data.py   |   4 +-
 .../customer_created_event_event_context.py   |   1 -
 ...tomer_created_event_event_context_merge.py |   4 +-
 .../requests/customer_created_event_object.py |   1 -
 .../customer_creation_source_filter.py        |   4 +-
 ...stom_attribute_definition_created_event.py |   4 +-
 ...tribute_definition_created_public_event.py |   4 +-
 ...stom_attribute_definition_deleted_event.py |   4 +-
 ...tribute_definition_deleted_public_event.py |   4 +-
 ...ttribute_definition_owned_created_event.py |   4 +-
 ...ttribute_definition_owned_deleted_event.py |   4 +-
 ...ttribute_definition_owned_updated_event.py |   4 +-
 ...stom_attribute_definition_updated_event.py |   4 +-
 ...tribute_definition_updated_public_event.py |   4 +-
 ...ribute_definition_visible_created_event.py |   4 +-
 ...ribute_definition_visible_deleted_event.py |   4 +-
 ...ribute_definition_visible_updated_event.py |   4 +-
 ...customer_custom_attribute_deleted_event.py |   4 +-
 ...r_custom_attribute_deleted_public_event.py |   4 +-
 .../customer_custom_attribute_filter.py       |   1 -
 .../customer_custom_attribute_filter_value.py |   8 +-
 .../customer_custom_attribute_filters.py      |   4 +-
 ...er_custom_attribute_owned_deleted_event.py |   4 +-
 ...er_custom_attribute_owned_updated_event.py |   4 +-
 ...customer_custom_attribute_updated_event.py |   4 +-
 ...r_custom_attribute_updated_public_event.py |   4 +-
 ..._custom_attribute_visible_deleted_event.py |   4 +-
 ..._custom_attribute_visible_updated_event.py |   4 +-
 src/square/requests/customer_deleted_event.py |   4 +-
 .../requests/customer_deleted_event_data.py   |   4 +-
 .../customer_deleted_event_event_context.py   |   1 -
 ...tomer_deleted_event_event_context_merge.py |   4 +-
 .../requests/customer_deleted_event_object.py |   1 -
 src/square/requests/customer_details.py       |   4 +-
 src/square/requests/customer_filter.py        |   5 +-
 src/square/requests/customer_group.py         |   1 -
 src/square/requests/customer_preferences.py   |   4 +-
 src/square/requests/customer_query.py         |   1 -
 src/square/requests/customer_segment.py       |   1 -
 src/square/requests/customer_sort.py          |   1 -
 src/square/requests/customer_tax_ids.py       |   4 +-
 src/square/requests/customer_text_filter.py   |   4 +-
 src/square/requests/customer_updated_event.py |   4 +-
 .../requests/customer_updated_event_data.py   |   4 +-
 .../requests/customer_updated_event_object.py |   1 -
 .../requests/data_collection_options.py       |   1 -
 src/square/requests/date_range.py             |   4 +-
 ...ng_custom_attribute_definition_response.py |   4 +-
 ...elete_booking_custom_attribute_response.py |   4 +-
 .../requests/delete_break_type_response.py    |   4 +-
 .../delete_catalog_object_response.py         |   4 +-
 .../requests/delete_customer_card_response.py |   4 +-
 ...er_custom_attribute_definition_response.py |   4 +-
 ...lete_customer_custom_attribute_response.py |   4 +-
 .../delete_customer_group_response.py         |   4 +-
 .../requests/delete_customer_response.py      |   4 +-
 .../delete_dispute_evidence_response.py       |   4 +-
 .../delete_invoice_attachment_response.py     |   4 +-
 .../requests/delete_invoice_response.py       |   4 +-
 ...on_custom_attribute_definition_response.py |   4 +-
 ...lete_location_custom_attribute_response.py |   4 +-
 .../delete_loyalty_reward_response.py         |   4 +-
 ...nt_custom_attribute_definition_response.py |   4 +-
 ...lete_merchant_custom_attribute_response.py |   4 +-
 ...er_custom_attribute_definition_response.py |   4 +-
 .../delete_order_custom_attribute_response.py |   4 +-
 .../requests/delete_payment_link_response.py  |   4 +-
 src/square/requests/delete_shift_response.py  |   4 +-
 .../requests/delete_snippet_response.py       |   4 +-
 .../delete_subscription_action_response.py    |   4 +-
 .../requests/delete_timecard_response.py      |   4 +-
 .../delete_webhook_subscription_response.py   |   4 +-
 src/square/requests/destination.py            |   1 -
 src/square/requests/destination_details.py    |   1 -
 ...destination_details_card_refund_details.py |   4 +-
 ...destination_details_cash_refund_details.py |   1 -
 ...ination_details_external_refund_details.py |   4 +-
 src/square/requests/device.py                 |   6 +-
 src/square/requests/device_attributes.py      |   4 +-
 .../requests/device_checkout_options.py       |   4 +-
 src/square/requests/device_code.py            |   6 +-
 .../requests/device_code_paired_event.py      |   4 +-
 .../requests/device_code_paired_event_data.py |   4 +-
 .../device_code_paired_event_object.py        |   1 -
 ...e_component_details_application_details.py |   4 +-
 ...evice_component_details_battery_details.py |   4 +-
 ...e_component_details_card_reader_details.py |   1 -
 ...vice_component_details_ethernet_details.py |   4 +-
 .../device_component_details_measurement.py   |   4 +-
 .../device_component_details_wi_fi_details.py |   4 +-
 src/square/requests/device_created_event.py   |   4 +-
 .../requests/device_created_event_data.py     |   4 +-
 .../requests/device_created_event_object.py   |   1 -
 src/square/requests/device_details.py         |   4 +-
 src/square/requests/device_metadata.py        |   4 +-
 src/square/requests/device_status.py          |   1 -
 src/square/requests/digital_wallet_details.py |   4 +-
 src/square/requests/disable_card_response.py  |   6 +-
 .../requests/disable_events_response.py       |   4 +-
 .../dismiss_terminal_action_response.py       |   4 +-
 .../dismiss_terminal_checkout_response.py     |   4 +-
 .../dismiss_terminal_refund_response.py       |   4 +-
 src/square/requests/dispute.py                |   8 +-
 src/square/requests/dispute_created_event.py  |   4 +-
 .../requests/dispute_created_event_data.py    |   4 +-
 .../requests/dispute_created_event_object.py  |   1 -
 src/square/requests/dispute_evidence.py       |   6 +-
 .../requests/dispute_evidence_added_event.py  |   4 +-
 .../dispute_evidence_added_event_data.py      |   4 +-
 .../dispute_evidence_added_event_object.py    |   1 -
 .../dispute_evidence_created_event.py         |   4 +-
 .../dispute_evidence_created_event_data.py    |   4 +-
 .../dispute_evidence_created_event_object.py  |   1 -
 .../dispute_evidence_deleted_event.py         |   4 +-
 .../dispute_evidence_deleted_event_data.py    |   4 +-
 .../dispute_evidence_deleted_event_object.py  |   1 -
 src/square/requests/dispute_evidence_file.py  |   4 +-
 .../dispute_evidence_removed_event.py         |   4 +-
 .../dispute_evidence_removed_event_data.py    |   4 +-
 .../dispute_evidence_removed_event_object.py  |   1 -
 .../requests/dispute_state_changed_event.py   |   4 +-
 .../dispute_state_changed_event_data.py       |   4 +-
 .../dispute_state_changed_event_object.py     |   1 -
 .../requests/dispute_state_updated_event.py   |   4 +-
 .../dispute_state_updated_event_data.py       |   4 +-
 .../dispute_state_updated_event_object.py     |   1 -
 src/square/requests/disputed_payment.py       |   4 +-
 src/square/requests/employee.py               |   4 +-
 src/square/requests/employee_wage.py          |   4 +-
 src/square/requests/enable_events_response.py |   4 +-
 src/square/requests/error.py                  |   1 -
 src/square/requests/event.py                  |   4 +-
 src/square/requests/event_data.py             |   4 +-
 src/square/requests/event_metadata.py         |   4 +-
 src/square/requests/event_type_metadata.py    |   1 -
 .../requests/external_payment_details.py      |   4 +-
 src/square/requests/filter_value.py           |   4 +-
 src/square/requests/float_number_range.py     |   4 +-
 src/square/requests/fulfillment.py            |  10 +-
 .../requests/fulfillment_delivery_details.py  |   6 +-
 .../requests/fulfillment_fulfillment_entry.py |   4 +-
 .../requests/fulfillment_pickup_details.py    |   6 +-
 ..._pickup_details_curbside_pickup_details.py |   4 +-
 src/square/requests/fulfillment_recipient.py  |   4 +-
 .../requests/fulfillment_shipment_details.py  |   4 +-
 .../get_bank_account_by_v1id_response.py      |   6 +-
 .../requests/get_bank_account_response.py     |   6 +-
 src/square/requests/get_booking_response.py   |   4 +-
 .../requests/get_break_type_response.py       |   4 +-
 .../get_business_booking_profile_response.py  |   4 +-
 src/square/requests/get_card_response.py      |   6 +-
 .../get_cash_drawer_shift_response.py         |   4 +-
 .../requests/get_catalog_object_response.py   |   6 +-
 ...er_custom_attribute_definition_response.py |   4 +-
 .../get_customer_custom_attribute_response.py |   4 +-
 .../requests/get_customer_group_response.py   |   6 +-
 src/square/requests/get_customer_response.py  |   6 +-
 .../requests/get_customer_segment_response.py |   6 +-
 .../requests/get_device_code_response.py      |   6 +-
 src/square/requests/get_device_response.py    |   6 +-
 .../requests/get_dispute_evidence_response.py |   6 +-
 src/square/requests/get_dispute_response.py   |   6 +-
 src/square/requests/get_employee_response.py  |   4 +-
 .../requests/get_employee_wage_response.py    |   4 +-
 .../get_gift_card_from_gan_response.py        |   4 +-
 .../get_gift_card_from_nonce_response.py      |   4 +-
 src/square/requests/get_gift_card_response.py |   4 +-
 .../get_inventory_adjustment_response.py      |   4 +-
 .../get_inventory_changes_response.py         |   4 +-
 .../requests/get_inventory_count_response.py  |   4 +-
 .../get_inventory_physical_count_response.py  |   4 +-
 .../get_inventory_transfer_response.py        |   4 +-
 src/square/requests/get_invoice_response.py   |   6 +-
 src/square/requests/get_location_response.py  |   4 +-
 .../requests/get_loyalty_account_response.py  |   4 +-
 .../requests/get_loyalty_program_response.py  |   4 +-
 .../get_loyalty_promotion_response.py         |   4 +-
 .../requests/get_loyalty_reward_response.py   |   4 +-
 src/square/requests/get_merchant_response.py  |   4 +-
 src/square/requests/get_order_response.py     |   6 +-
 .../requests/get_payment_link_response.py     |   4 +-
 .../requests/get_payment_refund_response.py   |   4 +-
 src/square/requests/get_payment_response.py   |   4 +-
 src/square/requests/get_payout_response.py    |   6 +-
 src/square/requests/get_shift_response.py     |   6 +-
 src/square/requests/get_snippet_response.py   |   4 +-
 .../requests/get_subscription_response.py     |   4 +-
 ...et_team_member_booking_profile_response.py |   6 +-
 .../requests/get_team_member_response.py      |   6 +-
 .../requests/get_team_member_wage_response.py |   6 +-
 .../requests/get_terminal_action_response.py  |   4 +-
 .../get_terminal_checkout_response.py         |   4 +-
 .../requests/get_terminal_refund_response.py  |   4 +-
 .../requests/get_transaction_response.py      |   4 +-
 src/square/requests/get_vendor_response.py    |   4 +-
 .../requests/get_wage_setting_response.py     |   6 +-
 .../get_webhook_subscription_response.py      |   4 +-
 src/square/requests/gift_card.py              |   6 +-
 src/square/requests/gift_card_activity.py     |  24 +-
 .../requests/gift_card_activity_activate.py   |   4 +-
 .../gift_card_activity_adjust_decrement.py    |   2 +-
 .../gift_card_activity_adjust_increment.py    |   2 +-
 .../gift_card_activity_created_event.py       |   4 +-
 .../gift_card_activity_created_event_data.py  |   4 +-
 ...gift_card_activity_created_event_object.py |   1 -
 .../requests/gift_card_activity_load.py       |   4 +-
 .../requests/gift_card_activity_redeem.py     |   6 +-
 .../requests/gift_card_activity_refund.py     |   4 +-
 ..._card_activity_unlinked_activity_refund.py |   4 +-
 .../gift_card_activity_updated_event.py       |   4 +-
 .../gift_card_activity_updated_event_data.py  |   4 +-
 ...gift_card_activity_updated_event_object.py |   1 -
 .../requests/gift_card_created_event.py       |   4 +-
 .../requests/gift_card_created_event_data.py  |   4 +-
 .../gift_card_created_event_object.py         |   1 -
 .../gift_card_customer_linked_event.py        |   4 +-
 .../gift_card_customer_linked_event_data.py   |   4 +-
 .../gift_card_customer_linked_event_object.py |   4 +-
 .../gift_card_customer_unlinked_event.py      |   4 +-
 .../gift_card_customer_unlinked_event_data.py |   4 +-
 ...ift_card_customer_unlinked_event_object.py |   4 +-
 .../requests/gift_card_updated_event.py       |   4 +-
 .../requests/gift_card_updated_event_data.py  |   4 +-
 .../gift_card_updated_event_object.py         |   1 -
 src/square/requests/inventory_adjustment.py   |   6 +-
 .../requests/inventory_adjustment_group.py    |   1 -
 src/square/requests/inventory_change.py       |   5 +-
 src/square/requests/inventory_count.py        |   4 +-
 .../requests/inventory_count_updated_event.py |   4 +-
 .../inventory_count_updated_event_data.py     |   4 +-
 .../inventory_count_updated_event_object.py   |   4 +-
 .../requests/inventory_physical_count.py      |   4 +-
 src/square/requests/inventory_transfer.py     |   4 +-
 src/square/requests/invoice.py                |  12 +-
 .../invoice_accepted_payment_methods.py       |   4 +-
 src/square/requests/invoice_attachment.py     |   1 -
 src/square/requests/invoice_canceled_event.py |   4 +-
 .../requests/invoice_canceled_event_data.py   |   4 +-
 .../requests/invoice_canceled_event_object.py |   1 -
 src/square/requests/invoice_created_event.py  |   4 +-
 .../requests/invoice_created_event_data.py    |   4 +-
 .../requests/invoice_created_event_object.py  |   1 -
 src/square/requests/invoice_custom_field.py   |   4 +-
 src/square/requests/invoice_deleted_event.py  |   4 +-
 .../requests/invoice_deleted_event_data.py    |   4 +-
 src/square/requests/invoice_filter.py         |   2 +-
 .../requests/invoice_payment_made_event.py    |   4 +-
 .../invoice_payment_made_event_data.py        |   4 +-
 .../invoice_payment_made_event_object.py      |   1 -
 .../requests/invoice_payment_reminder.py      |   4 +-
 .../requests/invoice_payment_request.py       |   8 +-
 .../requests/invoice_published_event.py       |   4 +-
 .../requests/invoice_published_event_data.py  |   4 +-
 .../invoice_published_event_object.py         |   1 -
 src/square/requests/invoice_query.py          |   1 -
 src/square/requests/invoice_recipient.py      |   4 +-
 .../requests/invoice_recipient_tax_ids.py     |   1 -
 src/square/requests/invoice_refunded_event.py |   4 +-
 .../requests/invoice_refunded_event_data.py   |   4 +-
 .../requests/invoice_refunded_event_object.py |   1 -
 .../invoice_scheduled_charge_failed_event.py  |   4 +-
 ...oice_scheduled_charge_failed_event_data.py |   4 +-
 ...ce_scheduled_charge_failed_event_object.py |   1 -
 src/square/requests/invoice_sort.py           |   1 -
 src/square/requests/invoice_updated_event.py  |   4 +-
 .../requests/invoice_updated_event_data.py    |   4 +-
 .../requests/invoice_updated_event_object.py  |   1 -
 .../item_variation_location_overrides.py      |   6 +-
 src/square/requests/job.py                    |   4 +-
 src/square/requests/job_assignment.py         |   4 +-
 src/square/requests/job_created_event.py      |   4 +-
 src/square/requests/job_created_event_data.py |   4 +-
 .../requests/job_created_event_object.py      |   1 -
 src/square/requests/job_updated_event.py      |   4 +-
 src/square/requests/job_updated_event_data.py |   4 +-
 .../requests/job_updated_event_object.py      |   1 -
 .../labor_scheduled_shift_created_event.py    |   4 +-
 ...abor_scheduled_shift_created_event_data.py |   4 +-
 ...or_scheduled_shift_created_event_object.py |   3 +-
 .../labor_scheduled_shift_deleted_event.py    |   4 +-
 ...abor_scheduled_shift_deleted_event_data.py |   4 +-
 .../labor_scheduled_shift_published_event.py  |   4 +-
 ...or_scheduled_shift_published_event_data.py |   4 +-
 ..._scheduled_shift_published_event_object.py |   3 +-
 .../labor_scheduled_shift_updated_event.py    |   4 +-
 ...abor_scheduled_shift_updated_event_data.py |   4 +-
 ...or_scheduled_shift_updated_event_object.py |   3 +-
 .../requests/labor_shift_created_event.py     |   4 +-
 .../labor_shift_created_event_data.py         |   4 +-
 .../labor_shift_created_event_object.py       |   1 -
 .../requests/labor_shift_deleted_event.py     |   4 +-
 .../labor_shift_deleted_event_data.py         |   4 +-
 .../requests/labor_shift_updated_event.py     |   4 +-
 .../labor_shift_updated_event_data.py         |   4 +-
 .../labor_shift_updated_event_object.py       |   1 -
 .../requests/labor_timecard_created_event.py  |   4 +-
 .../labor_timecard_created_event_data.py      |   4 +-
 .../labor_timecard_created_event_object.py    |   1 -
 .../requests/labor_timecard_deleted_event.py  |   4 +-
 .../labor_timecard_deleted_event_data.py      |   4 +-
 .../requests/labor_timecard_updated_event.py  |   4 +-
 .../labor_timecard_updated_event_data.py      |   4 +-
 .../labor_timecard_updated_event_object.py    |   1 -
 .../link_customer_to_gift_card_response.py    |   4 +-
 .../requests/list_bank_accounts_response.py   |   6 +-
 ...g_custom_attribute_definitions_response.py |   4 +-
 ...list_booking_custom_attributes_response.py |   4 +-
 src/square/requests/list_bookings_response.py |   4 +-
 .../requests/list_break_types_response.py     |   4 +-
 src/square/requests/list_cards_response.py    |   6 +-
 .../list_cash_drawer_shift_events_response.py |   6 +-
 .../list_cash_drawer_shifts_response.py       |   6 +-
 src/square/requests/list_catalog_response.py  |   6 +-
 ...r_custom_attribute_definitions_response.py |   4 +-
 ...ist_customer_custom_attributes_response.py |   4 +-
 .../requests/list_customer_groups_response.py |   6 +-
 .../list_customer_segments_response.py        |   6 +-
 .../requests/list_customers_response.py       |   6 +-
 .../requests/list_device_codes_response.py    |   6 +-
 src/square/requests/list_devices_response.py  |   6 +-
 .../list_dispute_evidence_response.py         |   4 +-
 src/square/requests/list_disputes_response.py |   6 +-
 .../requests/list_employee_wages_response.py  |   4 +-
 .../requests/list_employees_response.py       |   4 +-
 .../requests/list_event_types_response.py     |   4 +-
 .../list_gift_card_activities_response.py     |   4 +-
 .../requests/list_gift_cards_response.py      |   4 +-
 src/square/requests/list_invoices_response.py |   6 +-
 src/square/requests/list_jobs_response.py     |   6 +-
 ...list_location_booking_profiles_response.py |   6 +-
 ...n_custom_attribute_definitions_response.py |   4 +-
 ...ist_location_custom_attributes_response.py |   4 +-
 .../requests/list_locations_response.py       |   4 +-
 .../list_loyalty_programs_response.py         |   4 +-
 .../list_loyalty_promotions_response.py       |   4 +-
 ...t_custom_attribute_definitions_response.py |   4 +-
 ...ist_merchant_custom_attributes_response.py |   4 +-
 .../requests/list_merchants_response.py       |   4 +-
 ...r_custom_attribute_definitions_response.py |   4 +-
 .../list_order_custom_attributes_response.py  |   4 +-
 .../requests/list_payment_links_response.py   |   4 +-
 .../requests/list_payment_refunds_response.py |   4 +-
 src/square/requests/list_payments_response.py |   4 +-
 .../requests/list_payout_entries_response.py  |   6 +-
 src/square/requests/list_payouts_response.py  |   6 +-
 src/square/requests/list_sites_response.py    |   4 +-
 .../list_subscription_events_response.py      |   4 +-
 ...t_team_member_booking_profiles_response.py |   6 +-
 .../list_team_member_wages_response.py        |   6 +-
 .../requests/list_transactions_response.py    |   4 +-
 .../list_webhook_event_types_response.py      |   4 +-
 .../list_webhook_subscriptions_response.py    |   4 +-
 .../list_workweek_configs_response.py         |   6 +-
 src/square/requests/location.py               |  10 +-
 .../requests/location_booking_profile.py      |   4 +-
 src/square/requests/location_created_event.py |   4 +-
 .../requests/location_created_event_data.py   |   4 +-
 ...ttribute_definition_owned_created_event.py |   4 +-
 ...ttribute_definition_owned_deleted_event.py |   4 +-
 ...ttribute_definition_owned_updated_event.py |   4 +-
 ...ribute_definition_visible_created_event.py |   4 +-
 ...ribute_definition_visible_deleted_event.py |   4 +-
 ...ribute_definition_visible_updated_event.py |   4 +-
 ...on_custom_attribute_owned_deleted_event.py |   4 +-
 ...on_custom_attribute_owned_updated_event.py |   4 +-
 ..._custom_attribute_visible_deleted_event.py |   4 +-
 ..._custom_attribute_visible_updated_event.py |   4 +-
 .../location_settings_updated_event.py        |   4 +-
 .../location_settings_updated_event_data.py   |   4 +-
 .../location_settings_updated_event_object.py |   1 -
 src/square/requests/location_updated_event.py |   4 +-
 .../requests/location_updated_event_data.py   |   4 +-
 src/square/requests/loyalty_account.py        |   6 +-
 .../requests/loyalty_account_created_event.py |   4 +-
 .../loyalty_account_created_event_data.py     |   4 +-
 .../loyalty_account_created_event_object.py   |   1 -
 .../requests/loyalty_account_deleted_event.py |   4 +-
 .../loyalty_account_deleted_event_data.py     |   4 +-
 .../loyalty_account_deleted_event_object.py   |   1 -
 .../requests/loyalty_account_mapping.py       |   4 +-
 .../requests/loyalty_account_updated_event.py |   4 +-
 .../loyalty_account_updated_event_data.py     |   4 +-
 .../loyalty_account_updated_event_object.py   |   1 -
 src/square/requests/loyalty_event.py          |   9 +-
 .../loyalty_event_accumulate_points.py        |   4 +-
 ...yalty_event_accumulate_promotion_points.py |   1 -
 .../requests/loyalty_event_adjust_points.py   |   4 +-
 .../requests/loyalty_event_create_reward.py   |   1 -
 .../requests/loyalty_event_created_event.py   |   4 +-
 .../loyalty_event_created_event_data.py       |   4 +-
 .../loyalty_event_created_event_object.py     |   1 -
 .../requests/loyalty_event_delete_reward.py   |   1 -
 .../requests/loyalty_event_expire_points.py   |   1 -
 src/square/requests/loyalty_event_filter.py   |   5 +-
 .../requests/loyalty_event_location_filter.py |   3 +-
 src/square/requests/loyalty_event_other.py    |   1 -
 src/square/requests/loyalty_event_query.py    |   1 -
 .../requests/loyalty_event_redeem_reward.py   |   1 -
 .../requests/loyalty_event_type_filter.py     |   3 +-
 src/square/requests/loyalty_program.py        |   8 +-
 .../requests/loyalty_program_accrual_rule.py  |  10 +-
 ...loyalty_program_accrual_rule_spend_data.py |   6 +-
 ...loyalty_program_accrual_rule_visit_data.py |   3 +-
 .../requests/loyalty_program_created_event.py |   4 +-
 .../loyalty_program_created_event_data.py     |   4 +-
 .../loyalty_program_created_event_object.py   |   1 -
 .../requests/loyalty_program_reward_tier.py   |   1 -
 .../requests/loyalty_program_updated_event.py |   4 +-
 .../loyalty_program_updated_event_data.py     |   4 +-
 .../loyalty_program_updated_event_object.py   |   1 -
 src/square/requests/loyalty_promotion.py      |   8 +-
 .../loyalty_promotion_available_time_data.py  |   4 +-
 .../loyalty_promotion_created_event.py        |   4 +-
 .../loyalty_promotion_created_event_data.py   |   4 +-
 .../loyalty_promotion_created_event_object.py |   1 -
 .../requests/loyalty_promotion_incentive.py   |   3 +-
 ...motion_incentive_points_multiplier_data.py |   4 +-
 .../loyalty_promotion_trigger_limit.py        |   1 -
 .../loyalty_promotion_updated_event.py        |   4 +-
 .../loyalty_promotion_updated_event_data.py   |   4 +-
 .../loyalty_promotion_updated_event_object.py |   1 -
 src/square/requests/loyalty_reward.py         |   4 +-
 src/square/requests/measurement_unit.py       |   9 +-
 src/square/requests/merchant.py               |   4 +-
 ...ttribute_definition_owned_created_event.py |   4 +-
 ...ttribute_definition_owned_deleted_event.py |   4 +-
 ...ttribute_definition_owned_updated_event.py |   4 +-
 ...ribute_definition_visible_created_event.py |   4 +-
 ...ribute_definition_visible_deleted_event.py |   4 +-
 ...ribute_definition_visible_updated_event.py |   4 +-
 ...nt_custom_attribute_owned_deleted_event.py |   4 +-
 ...nt_custom_attribute_owned_updated_event.py |   4 +-
 ..._custom_attribute_visible_deleted_event.py |   4 +-
 ..._custom_attribute_visible_updated_event.py |   4 +-
 .../merchant_settings_updated_event.py        |   4 +-
 .../merchant_settings_updated_event_data.py   |   4 +-
 .../merchant_settings_updated_event_object.py |   1 -
 .../requests/modifier_location_overrides.py   |   4 +-
 src/square/requests/money.py                  |   4 +-
 .../oauth_authorization_revoked_event.py      |   4 +-
 .../oauth_authorization_revoked_event_data.py |   4 +-
 ...auth_authorization_revoked_event_object.py |   1 -
 ...ization_revoked_event_revocation_object.py |   4 +-
 src/square/requests/obtain_token_response.py  |   4 +-
 .../requests/offline_payment_details.py       |   1 -
 src/square/requests/order.py                  |  24 +-
 src/square/requests/order_created.py          |   4 +-
 src/square/requests/order_created_event.py    |   4 +-
 .../requests/order_created_event_data.py      |   4 +-
 src/square/requests/order_created_object.py   |   1 -
 ...ttribute_definition_owned_created_event.py |   4 +-
 ...ttribute_definition_owned_deleted_event.py |   4 +-
 ...ttribute_definition_owned_updated_event.py |   4 +-
 ...ribute_definition_visible_created_event.py |   4 +-
 ...ribute_definition_visible_deleted_event.py |   4 +-
 ...ribute_definition_visible_updated_event.py |   4 +-
 ...er_custom_attribute_owned_deleted_event.py |   4 +-
 ...er_custom_attribute_owned_updated_event.py |   4 +-
 ..._custom_attribute_visible_deleted_event.py |   4 +-
 ..._custom_attribute_visible_updated_event.py |   4 +-
 src/square/requests/order_entry.py            |   4 +-
 .../requests/order_fulfillment_updated.py     |   4 +-
 .../order_fulfillment_updated_event.py        |   4 +-
 .../order_fulfillment_updated_event_data.py   |   4 +-
 .../order_fulfillment_updated_object.py       |   1 -
 .../order_fulfillment_updated_update.py       |   4 +-
 src/square/requests/order_line_item.py        |  12 +-
 .../order_line_item_applied_discount.py       |   4 +-
 .../order_line_item_applied_service_charge.py |   4 +-
 .../requests/order_line_item_applied_tax.py   |   4 +-
 .../requests/order_line_item_discount.py      |   6 +-
 .../requests/order_line_item_modifier.py      |   4 +-
 .../order_line_item_pricing_blocklists.py     |   4 +-
 ...tem_pricing_blocklists_blocked_discount.py |   4 +-
 ...ine_item_pricing_blocklists_blocked_tax.py |   4 +-
 src/square/requests/order_line_item_tax.py    |   6 +-
 src/square/requests/order_money_amounts.py    |   1 -
 src/square/requests/order_pricing_options.py  |   4 +-
 src/square/requests/order_quantity_unit.py    |   4 +-
 src/square/requests/order_return.py           |   8 +-
 src/square/requests/order_return_discount.py  |   6 +-
 src/square/requests/order_return_line_item.py |  12 +-
 .../order_return_line_item_modifier.py        |   4 +-
 .../requests/order_return_service_charge.py   |  10 +-
 src/square/requests/order_return_tax.py       |   6 +-
 src/square/requests/order_return_tip.py       |   4 +-
 .../requests/order_rounding_adjustment.py     |   4 +-
 src/square/requests/order_service_charge.py   |  12 +-
 src/square/requests/order_source.py           |   4 +-
 src/square/requests/order_updated.py          |   4 +-
 src/square/requests/order_updated_event.py    |   4 +-
 .../requests/order_updated_event_data.py      |   4 +-
 src/square/requests/order_updated_object.py   |   1 -
 .../requests/pause_subscription_response.py   |   4 +-
 src/square/requests/pay_order_response.py     |   4 +-
 src/square/requests/payment.py                |  24 +-
 ..._balance_activity_app_fee_refund_detail.py |   4 +-
 ...balance_activity_app_fee_revenue_detail.py |   4 +-
 ...lance_activity_automatic_savings_detail.py |   4 +-
 ...ivity_automatic_savings_reversed_detail.py |   4 +-
 .../payment_balance_activity_charge_detail.py |   4 +-
 ...ent_balance_activity_deposit_fee_detail.py |   4 +-
 ...ce_activity_deposit_fee_reversed_detail.py |   4 +-
 ...payment_balance_activity_dispute_detail.py |   4 +-
 .../payment_balance_activity_fee_detail.py    |   4 +-
 ...balance_activity_free_processing_detail.py |   4 +-
 ...balance_activity_hold_adjustment_detail.py |   4 +-
 ...nt_balance_activity_open_dispute_detail.py |   4 +-
 ...alance_activity_other_adjustment_detail.py |   4 +-
 .../payment_balance_activity_other_detail.py  |   4 +-
 .../payment_balance_activity_refund_detail.py |   4 +-
 ...ance_activity_release_adjustment_detail.py |   4 +-
 ...nt_balance_activity_reserve_hold_detail.py |   4 +-
 ...balance_activity_reserve_release_detail.py |   4 +-
 ..._activity_square_capital_payment_detail.py |   4 +-
 ..._square_capital_reversed_payment_detail.py |   4 +-
 ...activity_square_payroll_transfer_detail.py |   4 +-
 ...square_payroll_transfer_reversed_detail.py |   4 +-
 ...ment_balance_activity_tax_on_fee_detail.py |   4 +-
 ...balance_activity_third_party_fee_detail.py |   4 +-
 ..._activity_third_party_fee_refund_detail.py |   4 +-
 src/square/requests/payment_created_event.py  |   4 +-
 .../requests/payment_created_event_data.py    |   4 +-
 .../requests/payment_created_event_object.py  |   1 -
 src/square/requests/payment_link.py           |   4 +-
 .../payment_link_related_resources.py         |   6 +-
 src/square/requests/payment_options.py        |   4 +-
 src/square/requests/payment_refund.py         |   4 +-
 src/square/requests/payment_updated_event.py  |   4 +-
 .../requests/payment_updated_event_data.py    |   4 +-
 .../requests/payment_updated_event_object.py  |   1 -
 src/square/requests/payout.py                 |   8 +-
 src/square/requests/payout_entry.py           |  18 +-
 src/square/requests/payout_failed_event.py    |   4 +-
 .../requests/payout_failed_event_data.py      |   4 +-
 .../requests/payout_failed_event_object.py    |   1 -
 src/square/requests/payout_fee.py             |   6 +-
 src/square/requests/payout_paid_event.py      |   4 +-
 src/square/requests/payout_paid_event_data.py |   4 +-
 .../requests/payout_paid_event_object.py      |   1 -
 src/square/requests/payout_sent_event.py      |   4 +-
 src/square/requests/payout_sent_event_data.py |   4 +-
 .../requests/payout_sent_event_object.py      |   1 -
 src/square/requests/phase.py                  |   4 +-
 src/square/requests/phase_input.py            |   4 +-
 src/square/requests/pre_populated_data.py     |   4 +-
 src/square/requests/processing_fee.py         |   4 +-
 .../requests/publish_invoice_response.py      |   6 +-
 .../publish_scheduled_shift_response.py       |   6 +-
 src/square/requests/range.py                  |   4 +-
 src/square/requests/receipt_options.py        |   4 +-
 .../redeem_loyalty_reward_response.py         |   4 +-
 src/square/requests/refund.py                 |   6 +-
 src/square/requests/refund_created_event.py   |   4 +-
 .../requests/refund_created_event_data.py     |   4 +-
 .../requests/refund_created_event_object.py   |   1 -
 .../requests/refund_payment_response.py       |   4 +-
 src/square/requests/refund_updated_event.py   |   4 +-
 .../requests/refund_updated_event_data.py     |   4 +-
 .../requests/refund_updated_event_object.py   |   1 -
 .../requests/register_domain_response.py      |   6 +-
 .../remove_group_from_customer_response.py    |   4 +-
 .../requests/resume_subscription_response.py  |   4 +-
 ...ng_custom_attribute_definition_response.py |   4 +-
 ...rieve_booking_custom_attribute_response.py |   4 +-
 src/square/requests/retrieve_job_response.py  |   6 +-
 ...rieve_location_booking_profile_response.py |   6 +-
 ...on_custom_attribute_definition_response.py |   4 +-
 ...ieve_location_custom_attribute_response.py |   4 +-
 .../retrieve_location_settings_response.py    |   6 +-
 ...nt_custom_attribute_definition_response.py |   4 +-
 ...ieve_merchant_custom_attribute_response.py |   4 +-
 .../retrieve_merchant_settings_response.py    |   6 +-
 ...er_custom_attribute_definition_response.py |   4 +-
 ...etrieve_order_custom_attribute_response.py |   4 +-
 .../retrieve_scheduled_shift_response.py      |   6 +-
 .../requests/retrieve_timecard_response.py    |   6 +-
 .../retrieve_token_status_response.py         |   4 +-
 src/square/requests/revoke_token_response.py  |   4 +-
 src/square/requests/risk_evaluation.py        |   1 -
 src/square/requests/save_card_options.py      |   4 +-
 src/square/requests/scheduled_shift.py        |   1 -
 .../requests/scheduled_shift_details.py       |   4 +-
 src/square/requests/scheduled_shift_filter.py |   8 +-
 src/square/requests/scheduled_shift_query.py  |   1 -
 src/square/requests/scheduled_shift_sort.py   |   1 -
 .../requests/scheduled_shift_workday.py       |   6 +-
 .../requests/search_availability_filter.py    |   6 +-
 .../requests/search_availability_response.py  |   4 +-
 .../requests/search_catalog_items_response.py |   6 +-
 .../search_catalog_objects_response.py        |   6 +-
 .../requests/search_customers_response.py     |   6 +-
 src/square/requests/search_events_filter.py   |   4 +-
 src/square/requests/search_events_query.py    |   1 -
 src/square/requests/search_events_response.py |   4 +-
 src/square/requests/search_events_sort.py     |   1 -
 .../requests/search_invoices_response.py      |   6 +-
 ..._accounts_request_loyalty_account_query.py |   4 +-
 .../search_loyalty_accounts_response.py       |   4 +-
 .../search_loyalty_events_response.py         |   4 +-
 ...ty_rewards_request_loyalty_reward_query.py |   1 -
 .../search_loyalty_rewards_response.py        |   4 +-
 .../requests/search_orders_customer_filter.py |   4 +-
 .../search_orders_date_time_filter.py         |   1 -
 src/square/requests/search_orders_filter.py   |   5 +-
 .../search_orders_fulfillment_filter.py       |   6 +-
 src/square/requests/search_orders_query.py    |   1 -
 src/square/requests/search_orders_response.py |   8 +-
 src/square/requests/search_orders_sort.py     |   1 -
 .../requests/search_orders_source_filter.py   |   4 +-
 .../requests/search_orders_state_filter.py    |   3 +-
 .../search_scheduled_shifts_response.py       |   6 +-
 src/square/requests/search_shifts_response.py |   6 +-
 .../requests/search_subscriptions_filter.py   |   4 +-
 .../requests/search_subscriptions_query.py    |   1 -
 .../requests/search_subscriptions_response.py |   4 +-
 .../requests/search_team_members_filter.py    |   4 +-
 .../requests/search_team_members_query.py     |   1 -
 .../requests/search_team_members_response.py  |   6 +-
 .../search_terminal_actions_response.py       |   4 +-
 .../search_terminal_checkouts_response.py     |   4 +-
 .../search_terminal_refunds_response.py       |   4 +-
 .../requests/search_timecards_response.py     |   6 +-
 .../requests/search_vendors_request_filter.py |   4 +-
 .../requests/search_vendors_request_sort.py   |   1 -
 .../requests/search_vendors_response.py       |   4 +-
 src/square/requests/segment_filter.py         |   1 -
 src/square/requests/select_options.py         |   4 +-
 src/square/requests/shift.py                  |   8 +-
 src/square/requests/shift_filter.py           |   6 +-
 src/square/requests/shift_query.py            |   1 -
 src/square/requests/shift_sort.py             |   1 -
 src/square/requests/shift_wage.py             |   4 +-
 src/square/requests/shift_workday.py          |   6 +-
 src/square/requests/shipping_fee.py           |   4 +-
 src/square/requests/signature_image.py        |   1 -
 src/square/requests/signature_options.py      |   4 +-
 src/square/requests/site.py                   |   4 +-
 src/square/requests/snippet.py                |   1 -
 src/square/requests/source_application.py     |   4 +-
 src/square/requests/square_account_details.py |   4 +-
 .../requests/standard_unit_description.py     |   4 +-
 .../standard_unit_description_group.py        |   4 +-
 .../requests/submit_evidence_response.py      |   6 +-
 src/square/requests/subscription.py           |   8 +-
 src/square/requests/subscription_action.py    |   4 +-
 .../requests/subscription_created_event.py    |   4 +-
 .../subscription_created_event_data.py        |   4 +-
 .../subscription_created_event_object.py      |   1 -
 src/square/requests/subscription_event.py     |   6 +-
 .../requests/subscription_event_info.py       |   4 +-
 src/square/requests/subscription_phase.py     |   4 +-
 src/square/requests/subscription_pricing.py   |   4 +-
 src/square/requests/subscription_source.py    |   4 +-
 .../requests/subscription_test_result.py      |   4 +-
 .../requests/subscription_updated_event.py    |   4 +-
 .../subscription_updated_event_data.py        |   4 +-
 .../subscription_updated_event_object.py      |   1 -
 src/square/requests/swap_plan_response.py     |   4 +-
 src/square/requests/tax_ids.py                |   1 -
 src/square/requests/team_member.py            |   4 +-
 .../team_member_assigned_locations.py         |   4 +-
 .../requests/team_member_booking_profile.py   |   4 +-
 .../requests/team_member_created_event.py     |   4 +-
 .../team_member_created_event_data.py         |   4 +-
 .../team_member_created_event_object.py       |   1 -
 .../requests/team_member_updated_event.py     |   4 +-
 .../team_member_updated_event_data.py         |   4 +-
 .../team_member_updated_event_object.py       |   1 -
 src/square/requests/team_member_wage.py       |   4 +-
 .../team_member_wage_setting_updated_event.py |   4 +-
 ..._member_wage_setting_updated_event_data.py |   4 +-
 ...ember_wage_setting_updated_event_object.py |   1 -
 src/square/requests/tender.py                 |  12 +-
 .../requests/tender_bank_account_details.py   |   1 -
 .../tender_buy_now_pay_later_details.py       |   1 -
 src/square/requests/tender_card_details.py    |   3 +-
 src/square/requests/tender_cash_details.py    |   1 -
 .../requests/tender_square_account_details.py |   1 -
 src/square/requests/terminal_action.py        |  14 +-
 .../requests/terminal_action_created_event.py |   4 +-
 .../terminal_action_created_event_data.py     |   4 +-
 .../terminal_action_created_event_object.py   |   1 -
 src/square/requests/terminal_action_query.py  |   1 -
 .../requests/terminal_action_query_filter.py  |   6 +-
 .../requests/terminal_action_query_sort.py    |   1 -
 .../requests/terminal_action_updated_event.py |   4 +-
 .../terminal_action_updated_event_data.py     |   4 +-
 .../terminal_action_updated_event_object.py   |   1 -
 src/square/requests/terminal_checkout.py      |  10 +-
 .../terminal_checkout_created_event.py        |   4 +-
 .../terminal_checkout_created_event_data.py   |   4 +-
 .../terminal_checkout_created_event_object.py |   1 -
 .../requests/terminal_checkout_query.py       |   1 -
 .../terminal_checkout_query_filter.py         |   4 +-
 .../requests/terminal_checkout_query_sort.py  |   1 -
 .../terminal_checkout_updated_event.py        |   4 +-
 .../terminal_checkout_updated_event_data.py   |   4 +-
 .../terminal_checkout_updated_event_object.py |   1 -
 src/square/requests/terminal_refund.py        |   6 +-
 .../requests/terminal_refund_created_event.py |   4 +-
 .../terminal_refund_created_event_data.py     |   4 +-
 .../terminal_refund_created_event_object.py   |   1 -
 src/square/requests/terminal_refund_query.py  |   1 -
 .../requests/terminal_refund_query_filter.py  |   4 +-
 .../requests/terminal_refund_query_sort.py    |   4 +-
 .../requests/terminal_refund_updated_event.py |   4 +-
 .../terminal_refund_updated_event_data.py     |   4 +-
 .../terminal_refund_updated_event_object.py   |   1 -
 .../test_webhook_subscription_response.py     |   4 +-
 src/square/requests/time_range.py             |   4 +-
 src/square/requests/timecard.py               |   8 +-
 src/square/requests/timecard_filter.py        |   4 +-
 src/square/requests/timecard_query.py         |   1 -
 src/square/requests/timecard_sort.py          |   3 +-
 src/square/requests/timecard_wage.py          |   4 +-
 src/square/requests/timecard_workday.py       |   6 +-
 src/square/requests/tip_settings.py           |   4 +-
 src/square/requests/transaction.py            |   8 +-
 ...unlink_customer_from_gift_card_response.py |   4 +-
 ...ng_custom_attribute_definition_response.py |   4 +-
 .../requests/update_booking_response.py       |   4 +-
 .../requests/update_break_type_response.py    |   4 +-
 .../requests/update_catalog_image_response.py |   6 +-
 ...er_custom_attribute_definition_response.py |   4 +-
 .../update_customer_group_response.py         |   6 +-
 .../requests/update_customer_response.py      |   6 +-
 .../requests/update_invoice_response.py       |   6 +-
 .../update_item_modifier_lists_response.py    |   4 +-
 .../requests/update_item_taxes_response.py    |   4 +-
 src/square/requests/update_job_response.py    |   6 +-
 ...on_custom_attribute_definition_response.py |   4 +-
 .../requests/update_location_response.py      |   4 +-
 .../update_location_settings_response.py      |   6 +-
 ...nt_custom_attribute_definition_response.py |   4 +-
 .../update_merchant_settings_response.py      |   6 +-
 ...er_custom_attribute_definition_response.py |   4 +-
 src/square/requests/update_order_response.py  |   6 +-
 .../requests/update_payment_link_response.py  |   4 +-
 .../requests/update_payment_response.py       |   4 +-
 .../update_scheduled_shift_response.py        |   6 +-
 src/square/requests/update_shift_response.py  |   6 +-
 .../requests/update_subscription_response.py  |   4 +-
 .../requests/update_team_member_request.py    |   1 -
 .../requests/update_team_member_response.py   |   6 +-
 .../requests/update_timecard_response.py      |   6 +-
 src/square/requests/update_vendor_request.py  |   4 +-
 src/square/requests/update_vendor_response.py |   4 +-
 .../requests/update_wage_setting_response.py  |   6 +-
 .../update_webhook_subscription_response.py   |   4 +-
 ...ook_subscription_signature_key_response.py |   4 +-
 .../update_workweek_config_response.py        |   6 +-
 ...psert_booking_custom_attribute_response.py |   4 +-
 .../upsert_catalog_object_response.py         |   8 +-
 ...sert_customer_custom_attribute_response.py |   4 +-
 ...sert_location_custom_attribute_response.py |   4 +-
 ...sert_merchant_custom_attribute_response.py |   4 +-
 .../upsert_order_custom_attribute_response.py |   4 +-
 .../requests/upsert_snippet_response.py       |   4 +-
 src/square/requests/v1money.py                |   4 +-
 src/square/requests/v1order.py                |   8 +-
 src/square/requests/v1order_history_entry.py  |   1 -
 src/square/requests/v1tender.py               |   6 +-
 src/square/requests/vendor.py                 |   6 +-
 src/square/requests/vendor_contact.py         |   4 +-
 src/square/requests/vendor_created_event.py   |   4 +-
 .../requests/vendor_created_event_data.py     |   4 +-
 .../requests/vendor_created_event_object.py   |   1 -
 src/square/requests/vendor_updated_event.py   |   4 +-
 .../requests/vendor_updated_event_data.py     |   4 +-
 .../requests/vendor_updated_event_object.py   |   1 -
 .../requests/void_transaction_response.py     |   4 +-
 src/square/requests/wage_setting.py           |   4 +-
 src/square/requests/webhook_subscription.py   |   4 +-
 src/square/requests/workweek_config.py        |   1 -
 src/square/sites/__init__.py                  |   2 +
 src/square/sites/client.py                    |  15 +-
 src/square/sites/raw_client.py                |  21 +-
 src/square/snippets/__init__.py               |   2 +
 src/square/snippets/client.py                 |  35 +-
 src/square/snippets/raw_client.py             |  43 +-
 src/square/subscriptions/__init__.py          |   2 +
 src/square/subscriptions/client.py            | 192 ++--
 src/square/subscriptions/raw_client.py        | 269 +++--
 src/square/team/__init__.py                   |   2 +
 src/square/team/client.py                     |  41 +-
 src/square/team/raw_client.py                 |  49 +-
 src/square/team_members/__init__.py           |   2 +
 src/square/team_members/client.py             |  68 +-
 src/square/team_members/raw_client.py         |  83 +-
 .../team_members/wage_setting/__init__.py     |   2 +
 .../team_members/wage_setting/client.py       |  25 +-
 .../team_members/wage_setting/raw_client.py   |  33 +-
 src/square/terminal/__init__.py               |   2 +
 src/square/terminal/actions/__init__.py       |   2 +
 src/square/terminal/actions/client.py         |  47 +-
 src/square/terminal/actions/raw_client.py     |  53 +-
 src/square/terminal/checkouts/__init__.py     |   2 +
 src/square/terminal/checkouts/client.py       |  47 +-
 src/square/terminal/checkouts/raw_client.py   |  53 +-
 src/square/terminal/client.py                 |  40 +-
 src/square/terminal/raw_client.py             |  39 +-
 src/square/terminal/refunds/__init__.py       |   2 +
 src/square/terminal/refunds/client.py         |  47 +-
 src/square/terminal/refunds/raw_client.py     |  53 +-
 src/square/types/__init__.py                  |   2 +
 src/square/types/accept_dispute_response.py   |   7 +-
 src/square/types/accepted_payment_methods.py  |   3 +-
 .../accumulate_loyalty_points_response.py     |   7 +-
 src/square/types/ach_details.py               |   3 +-
 .../types/add_group_to_customer_response.py   |   5 +-
 src/square/types/additional_recipient.py      |   7 +-
 src/square/types/address.py                   |   9 +-
 .../types/adjust_loyalty_points_response.py   |   7 +-
 src/square/types/afterpay_details.py          |   3 +-
 src/square/types/application_details.py       |   5 +-
 src/square/types/appointment_segment.py       |   3 +-
 src/square/types/availability.py              |   5 +-
 src/square/types/bank_account.py              |  11 +-
 .../types/bank_account_created_event.py       |   5 +-
 .../types/bank_account_created_event_data.py  |   5 +-
 .../bank_account_created_event_object.py      |   5 +-
 .../types/bank_account_disabled_event.py      |   5 +-
 .../types/bank_account_disabled_event_data.py |   5 +-
 .../bank_account_disabled_event_object.py     |   5 +-
 .../types/bank_account_payment_details.py     |   5 +-
 .../types/bank_account_verified_event.py      |   5 +-
 .../types/bank_account_verified_event_data.py |   5 +-
 .../bank_account_verified_event_object.py     |   5 +-
 .../types/batch_change_inventory_request.py   |   7 +-
 .../types/batch_change_inventory_response.py  |   9 +-
 .../batch_create_team_members_response.py     |   7 +-
 .../types/batch_create_vendors_response.py    |   7 +-
 .../batch_delete_catalog_objects_response.py  |   5 +-
 .../batch_get_catalog_objects_response.py     |  39 +-
 .../batch_get_inventory_changes_response.py   |   7 +-
 .../batch_get_inventory_counts_request.py     |   5 +-
 .../batch_get_inventory_counts_response.py    |   7 +-
 src/square/types/batch_get_orders_response.py |   7 +-
 .../types/batch_get_vendors_response.py       |   7 +-
 ...atch_retrieve_inventory_changes_request.py |   5 +-
 .../batch_update_team_members_response.py     |   7 +-
 .../types/batch_update_vendors_response.py    |   7 +-
 .../batch_upsert_catalog_objects_response.py  |  37 +-
 ...ustomer_custom_attribute_upsert_request.py |   7 +-
 ...ert_customer_custom_attributes_response.py |   7 +-
 ...stomer_custom_attribute_upsert_response.py |   5 +-
 src/square/types/booking.py                   |  13 +-
 src/square/types/booking_created_event.py     |   5 +-
 .../types/booking_created_event_data.py       |   5 +-
 .../types/booking_created_event_object.py     |   5 +-
 src/square/types/booking_creator_details.py   |   5 +-
 ...ttribute_definition_owned_created_event.py |   5 +-
 ...ttribute_definition_owned_deleted_event.py |   5 +-
 ...ttribute_definition_owned_updated_event.py |   5 +-
 ...ribute_definition_visible_created_event.py |   5 +-
 ...ribute_definition_visible_deleted_event.py |   5 +-
 ...ribute_definition_visible_updated_event.py |   5 +-
 ...booking_custom_attribute_delete_request.py |   5 +-
 ...ooking_custom_attribute_delete_response.py |   5 +-
 ...ng_custom_attribute_owned_deleted_event.py |   5 +-
 ...ng_custom_attribute_owned_updated_event.py |   5 +-
 ...booking_custom_attribute_upsert_request.py |   7 +-
 ...ooking_custom_attribute_upsert_response.py |   5 +-
 ..._custom_attribute_visible_deleted_event.py |   5 +-
 ..._custom_attribute_visible_updated_event.py |   5 +-
 src/square/types/booking_updated_event.py     |   5 +-
 .../types/booking_updated_event_data.py       |   5 +-
 .../types/booking_updated_event_object.py     |   5 +-
 src/square/types/break_.py                    |   3 +-
 src/square/types/break_type.py                |   3 +-
 src/square/types/bulk_create_customer_data.py |   5 +-
 .../types/bulk_create_customers_response.py   |   7 +-
 ...lete_booking_custom_attributes_response.py |   7 +-
 .../types/bulk_delete_customers_response.py   |   7 +-
 ...ocation_custom_attribute_delete_request.py |   3 +-
 ...ete_location_custom_attributes_response.py |   7 +-
 ...cation_custom_attribute_delete_response.py |   5 +-
 ...erchant_custom_attribute_delete_request.py |   3 +-
 ...ete_merchant_custom_attributes_response.py |   7 +-
 ...rchant_custom_attribute_delete_response.py |   5 +-
 ...ributes_request_delete_custom_attribute.py |   3 +-
 ...delete_order_custom_attributes_response.py |   7 +-
 .../bulk_publish_scheduled_shifts_data.py     |   3 +-
 .../bulk_publish_scheduled_shifts_response.py |   7 +-
 .../types/bulk_retrieve_bookings_response.py  |   7 +-
 .../types/bulk_retrieve_customers_response.py |   7 +-
 ...e_team_member_booking_profiles_response.py |   7 +-
 src/square/types/bulk_swap_plan_response.py   |   5 +-
 src/square/types/bulk_update_customer_data.py |   5 +-
 .../types/bulk_update_customers_response.py   |   7 +-
 ...sert_booking_custom_attributes_response.py |   7 +-
 ...ocation_custom_attribute_upsert_request.py |   7 +-
 ...ert_location_custom_attributes_response.py |   7 +-
 ...cation_custom_attribute_upsert_response.py |   5 +-
 ...erchant_custom_attribute_upsert_request.py |   7 +-
 ...ert_merchant_custom_attributes_response.py |   7 +-
 ...rchant_custom_attribute_upsert_response.py |   5 +-
 ...ributes_request_upsert_custom_attribute.py |   7 +-
 ...upsert_order_custom_attributes_response.py |   7 +-
 .../types/business_appointment_settings.py    |   9 +-
 src/square/types/business_booking_profile.py  |   9 +-
 src/square/types/business_hours.py            |   5 +-
 src/square/types/business_hours_period.py     |   5 +-
 src/square/types/buy_now_pay_later_details.py |   5 +-
 .../calculate_loyalty_points_response.py      |   5 +-
 src/square/types/calculate_order_response.py  |   7 +-
 src/square/types/cancel_booking_response.py   |   7 +-
 src/square/types/cancel_invoice_response.py   |   7 +-
 .../cancel_loyalty_promotion_response.py      |   7 +-
 ...cel_payment_by_idempotency_key_response.py |   5 +-
 src/square/types/cancel_payment_response.py   |   7 +-
 .../types/cancel_subscription_response.py     |   7 +-
 .../types/cancel_terminal_action_response.py  |   7 +-
 .../cancel_terminal_checkout_response.py      |   7 +-
 .../types/cancel_terminal_refund_response.py  |   7 +-
 .../types/capture_transaction_response.py     |   5 +-
 src/square/types/card.py                      |  11 +-
 .../types/card_automatically_updated_event.py |   5 +-
 .../card_automatically_updated_event_data.py  |   5 +-
 ...card_automatically_updated_event_object.py |   5 +-
 src/square/types/card_created_event.py        |   5 +-
 src/square/types/card_created_event_data.py   |   5 +-
 src/square/types/card_created_event_object.py |   5 +-
 src/square/types/card_disabled_event.py       |   5 +-
 src/square/types/card_disabled_event_data.py  |   5 +-
 .../types/card_disabled_event_object.py       |   5 +-
 src/square/types/card_forgotten_event.py      |   5 +-
 src/square/types/card_forgotten_event_card.py |   3 +-
 src/square/types/card_forgotten_event_data.py |   5 +-
 .../types/card_forgotten_event_object.py      |   5 +-
 src/square/types/card_payment_details.py      |   7 +-
 src/square/types/card_payment_timeline.py     |   3 +-
 src/square/types/card_updated_event.py        |   5 +-
 src/square/types/card_updated_event_data.py   |   5 +-
 src/square/types/card_updated_event_object.py |   5 +-
 src/square/types/cash_app_details.py          |   3 +-
 src/square/types/cash_drawer_device.py        |   3 +-
 src/square/types/cash_drawer_shift.py         |   7 +-
 src/square/types/cash_drawer_shift_event.py   |   5 +-
 src/square/types/cash_drawer_shift_summary.py |   5 +-
 src/square/types/cash_payment_details.py      |   7 +-
 .../types/catalog_availability_period.py      |   5 +-
 src/square/types/catalog_category.py          |   9 +-
 .../catalog_custom_attribute_definition.py    |  17 +-
 ...stom_attribute_definition_number_config.py |   3 +-
 ...m_attribute_definition_selection_config.py |   5 +-
 ...ction_config_custom_attribute_selection.py |   3 +-
 ...stom_attribute_definition_string_config.py |   3 +-
 .../types/catalog_custom_attribute_value.py   |   5 +-
 src/square/types/catalog_discount.py          |   7 +-
 src/square/types/catalog_ecom_seo_data.py     |   3 +-
 src/square/types/catalog_id_mapping.py        |   3 +-
 src/square/types/catalog_image.py             |   3 +-
 src/square/types/catalog_info_response.py     |   7 +-
 .../types/catalog_info_response_limits.py     |   3 +-
 src/square/types/catalog_item.py              |  37 +-
 .../catalog_item_food_and_beverage_details.py |   5 +-
 ...and_beverage_details_dietary_preference.py |  11 +-
 ...em_food_and_beverage_details_ingredient.py |   7 +-
 .../types/catalog_item_modifier_list_info.py  |   7 +-
 src/square/types/catalog_item_option.py       |  27 +-
 .../types/catalog_item_option_for_item.py     |   3 +-
 src/square/types/catalog_item_option_value.py |   3 +-
 ...og_item_option_value_for_item_variation.py |   3 +-
 src/square/types/catalog_item_variation.py    |  13 +-
 src/square/types/catalog_measurement_unit.py  |   5 +-
 src/square/types/catalog_modifier.py          |   7 +-
 src/square/types/catalog_modifier_list.py     |  29 +-
 src/square/types/catalog_modifier_override.py |   5 +-
 src/square/types/catalog_object.py            |  23 +-
 .../catalog_object_availability_period.py     |  11 +-
 src/square/types/catalog_object_base.py       |  13 +-
 src/square/types/catalog_object_batch.py      |  35 +-
 src/square/types/catalog_object_category.py   |  13 +-
 ...alog_object_custom_attribute_definition.py |  11 +-
 src/square/types/catalog_object_discount.py   |  11 +-
 src/square/types/catalog_object_image.py      |  11 +-
 src/square/types/catalog_object_item.py       |  29 +-
 .../types/catalog_object_item_option.py       |  29 +-
 .../types/catalog_object_item_option_value.py |  11 +-
 .../types/catalog_object_item_variation.py    |  11 +-
 .../types/catalog_object_measurement_unit.py  |  11 +-
 src/square/types/catalog_object_modifier.py   |  11 +-
 .../types/catalog_object_modifier_list.py     |  29 +-
 .../types/catalog_object_pricing_rule.py      |  11 +-
 .../types/catalog_object_product_set.py       |  11 +-
 .../catalog_object_quick_amounts_settings.py  |  11 +-
 src/square/types/catalog_object_reference.py  |   3 +-
 .../types/catalog_object_subscription_plan.py |  29 +-
 ...alog_object_subscription_plan_variation.py |  11 +-
 src/square/types/catalog_object_tax.py        |  11 +-
 .../types/catalog_object_time_period.py       |  11 +-
 src/square/types/catalog_pricing_rule.py      |   5 +-
 src/square/types/catalog_product_set.py       |   3 +-
 src/square/types/catalog_query.py             |  17 +-
 src/square/types/catalog_query_exact.py       |   5 +-
 ..._item_variations_for_item_option_values.py |   3 +-
 .../catalog_query_items_for_item_options.py   |   3 +-
 .../catalog_query_items_for_modifier_list.py  |   3 +-
 .../types/catalog_query_items_for_tax.py      |   3 +-
 src/square/types/catalog_query_prefix.py      |   5 +-
 src/square/types/catalog_query_range.py       |   5 +-
 src/square/types/catalog_query_set.py         |   5 +-
 .../types/catalog_query_sorted_attribute.py   |   7 +-
 src/square/types/catalog_query_text.py        |   3 +-
 src/square/types/catalog_quick_amount.py      |   7 +-
 .../types/catalog_quick_amounts_settings.py   |   9 +-
 src/square/types/catalog_stock_conversion.py  |   5 +-
 src/square/types/catalog_subscription_plan.py |  29 +-
 .../catalog_subscription_plan_variation.py    |   7 +-
 src/square/types/catalog_tax.py               |   5 +-
 src/square/types/catalog_time_period.py       |   3 +-
 src/square/types/catalog_v1id.py              |   7 +-
 .../types/catalog_version_updated_event.py    |   5 +-
 ...g_version_updated_event_catalog_version.py |   3 +-
 .../catalog_version_updated_event_data.py     |   5 +-
 .../catalog_version_updated_event_object.py   |   5 +-
 .../types/category_path_to_root_node.py       |   3 +-
 .../change_billing_anchor_date_response.py    |   7 +-
 .../charge_request_additional_recipient.py    |   7 +-
 src/square/types/checkout.py                  |   7 +-
 .../types/checkout_location_settings.py       |   9 +-
 .../checkout_location_settings_branding.py    |   7 +-
 .../checkout_location_settings_coupons.py     |   3 +-
 .../checkout_location_settings_policy.py      |   3 +-
 .../checkout_location_settings_tipping.py     |   5 +-
 .../types/checkout_merchant_settings.py       |   5 +-
 ...ckout_merchant_settings_payment_methods.py |  13 +-
 ...tings_payment_methods_afterpay_clearpay.py |   7 +-
 ...ods_afterpay_clearpay_eligibility_range.py |   7 +-
 ...settings_payment_methods_payment_method.py |   3 +-
 src/square/types/checkout_options.py          |   7 +-
 src/square/types/clearpay_details.py          |   3 +-
 src/square/types/clone_order_response.py      |   7 +-
 src/square/types/collected_data.py            |   3 +-
 src/square/types/complete_payment_response.py |   7 +-
 src/square/types/component.py                 |  11 +-
 src/square/types/confirmation_decision.py     |   3 +-
 src/square/types/confirmation_options.py      |   7 +-
 src/square/types/coordinates.py               |   3 +-
 ...ng_custom_attribute_definition_response.py |   7 +-
 src/square/types/create_booking_response.py   |   7 +-
 .../types/create_break_type_response.py       |   7 +-
 src/square/types/create_card_response.py      |   7 +-
 .../types/create_catalog_image_request.py     |  37 +-
 .../types/create_catalog_image_response.py    |  37 +-
 src/square/types/create_checkout_response.py  |   7 +-
 .../types/create_customer_card_response.py    |   7 +-
 ...er_custom_attribute_definition_response.py |   7 +-
 .../types/create_customer_group_response.py   |   7 +-
 src/square/types/create_customer_response.py  |   7 +-
 .../types/create_device_code_response.py      |   7 +-
 .../create_dispute_evidence_file_request.py   |   7 +-
 .../create_dispute_evidence_file_response.py  |   7 +-
 .../create_dispute_evidence_text_response.py  |   7 +-
 .../create_gift_card_activity_response.py     |   7 +-
 src/square/types/create_gift_card_response.py |   7 +-
 .../create_invoice_attachment_request_data.py |   3 +-
 .../create_invoice_attachment_response.py     |   7 +-
 src/square/types/create_invoice_response.py   |   7 +-
 src/square/types/create_job_response.py       |   7 +-
 ...on_custom_attribute_definition_response.py |   7 +-
 src/square/types/create_location_response.py  |   7 +-
 .../types/create_loyalty_account_response.py  |   7 +-
 .../create_loyalty_promotion_response.py      |   7 +-
 .../types/create_loyalty_reward_response.py   |   7 +-
 ...nt_custom_attribute_definition_response.py |   7 +-
 ...eate_mobile_authorization_code_response.py |   5 +-
 ...er_custom_attribute_definition_response.py |   7 +-
 src/square/types/create_order_request.py      |   5 +-
 src/square/types/create_order_response.py     |   7 +-
 .../types/create_payment_link_response.py     |  33 +-
 src/square/types/create_payment_response.py   |   7 +-
 .../types/create_scheduled_shift_response.py  |   7 +-
 src/square/types/create_shift_response.py     |   7 +-
 .../types/create_subscription_response.py     |   7 +-
 .../types/create_team_member_request.py       |   5 +-
 .../types/create_team_member_response.py      |   7 +-
 .../types/create_terminal_action_response.py  |   7 +-
 .../create_terminal_checkout_response.py      |   7 +-
 .../types/create_terminal_refund_response.py  |   7 +-
 src/square/types/create_timecard_response.py  |   7 +-
 src/square/types/create_vendor_response.py    |   7 +-
 .../create_webhook_subscription_response.py   |   7 +-
 src/square/types/custom_attribute.py          |   7 +-
 .../types/custom_attribute_definition.py      |   5 +-
 .../custom_attribute_definition_event_data.py |   5 +-
 ..._attribute_definition_event_data_object.py |   5 +-
 .../types/custom_attribute_event_data.py      |   5 +-
 .../custom_attribute_event_data_object.py     |   5 +-
 src/square/types/custom_attribute_filter.py   |   5 +-
 src/square/types/custom_field.py              |   5 +-
 src/square/types/customer.py                  |   7 +-
 src/square/types/customer_address_filter.py   |   7 +-
 src/square/types/customer_created_event.py    |   5 +-
 .../types/customer_created_event_data.py      |   5 +-
 .../customer_created_event_event_context.py   |   5 +-
 ...tomer_created_event_event_context_merge.py |   3 +-
 .../types/customer_created_event_object.py    |   7 +-
 .../types/customer_creation_source_filter.py  |   7 +-
 ...stom_attribute_definition_created_event.py |   5 +-
 ...tribute_definition_created_public_event.py |   5 +-
 ...stom_attribute_definition_deleted_event.py |   5 +-
 ...tribute_definition_deleted_public_event.py |   5 +-
 ...ttribute_definition_owned_created_event.py |   5 +-
 ...ttribute_definition_owned_deleted_event.py |   5 +-
 ...ttribute_definition_owned_updated_event.py |   5 +-
 ...stom_attribute_definition_updated_event.py |   5 +-
 ...tribute_definition_updated_public_event.py |   5 +-
 ...ribute_definition_visible_created_event.py |   5 +-
 ...ribute_definition_visible_deleted_event.py |   5 +-
 ...ribute_definition_visible_updated_event.py |   5 +-
 ...customer_custom_attribute_deleted_event.py |   5 +-
 ...r_custom_attribute_deleted_public_event.py |   5 +-
 .../types/customer_custom_attribute_filter.py |   7 +-
 .../customer_custom_attribute_filter_value.py |  11 +-
 .../customer_custom_attribute_filters.py      |   5 +-
 ...er_custom_attribute_owned_deleted_event.py |   5 +-
 ...er_custom_attribute_owned_updated_event.py |   5 +-
 ...customer_custom_attribute_updated_event.py |   5 +-
 ...r_custom_attribute_updated_public_event.py |   5 +-
 ..._custom_attribute_visible_deleted_event.py |   5 +-
 ..._custom_attribute_visible_updated_event.py |   5 +-
 src/square/types/customer_deleted_event.py    |   5 +-
 .../types/customer_deleted_event_data.py      |   5 +-
 .../customer_deleted_event_event_context.py   |   5 +-
 ...tomer_deleted_event_event_context_merge.py |   3 +-
 .../types/customer_deleted_event_object.py    |   7 +-
 src/square/types/customer_details.py          |   3 +-
 src/square/types/customer_filter.py           |  11 +-
 src/square/types/customer_group.py            |   3 +-
 src/square/types/customer_preferences.py      |   3 +-
 src/square/types/customer_query.py            |   7 +-
 src/square/types/customer_segment.py          |   3 +-
 src/square/types/customer_sort.py             |   7 +-
 src/square/types/customer_tax_ids.py          |   3 +-
 src/square/types/customer_text_filter.py      |   3 +-
 src/square/types/customer_updated_event.py    |   5 +-
 .../types/customer_updated_event_data.py      |   5 +-
 .../types/customer_updated_event_object.py    |   5 +-
 src/square/types/data_collection_options.py   |   9 +-
 src/square/types/date_range.py                |   3 +-
 ...ng_custom_attribute_definition_response.py |   5 +-
 ...elete_booking_custom_attribute_response.py |   5 +-
 .../types/delete_break_type_response.py       |   5 +-
 .../types/delete_catalog_object_response.py   |   5 +-
 .../types/delete_customer_card_response.py    |   5 +-
 ...er_custom_attribute_definition_response.py |   5 +-
 ...lete_customer_custom_attribute_response.py |   5 +-
 .../types/delete_customer_group_response.py   |   5 +-
 src/square/types/delete_customer_response.py  |   5 +-
 .../types/delete_dispute_evidence_response.py |   5 +-
 .../delete_invoice_attachment_response.py     |   5 +-
 src/square/types/delete_invoice_response.py   |   5 +-
 ...on_custom_attribute_definition_response.py |   5 +-
 ...lete_location_custom_attribute_response.py |   5 +-
 .../types/delete_loyalty_reward_response.py   |   5 +-
 ...nt_custom_attribute_definition_response.py |   5 +-
 ...lete_merchant_custom_attribute_response.py |   5 +-
 ...er_custom_attribute_definition_response.py |   5 +-
 .../delete_order_custom_attribute_response.py |   5 +-
 .../types/delete_payment_link_response.py     |   5 +-
 src/square/types/delete_shift_response.py     |   5 +-
 src/square/types/delete_snippet_response.py   |   5 +-
 .../delete_subscription_action_response.py    |   7 +-
 src/square/types/delete_timecard_response.py  |   5 +-
 .../delete_webhook_subscription_response.py   |   5 +-
 src/square/types/destination.py               |   5 +-
 src/square/types/destination_details.py       |   7 +-
 ...destination_details_card_refund_details.py |   5 +-
 ...destination_details_cash_refund_details.py |   7 +-
 ...ination_details_external_refund_details.py |   5 +-
 src/square/types/device.py                    |   7 +-
 src/square/types/device_attributes.py         |   7 +-
 src/square/types/device_checkout_options.py   |   7 +-
 src/square/types/device_code.py               |   7 +-
 src/square/types/device_code_paired_event.py  |   5 +-
 .../types/device_code_paired_event_data.py    |   5 +-
 .../types/device_code_paired_event_object.py  |   5 +-
 ...e_component_details_application_details.py |   5 +-
 ...evice_component_details_battery_details.py |   5 +-
 ...e_component_details_card_reader_details.py |   3 +-
 ...vice_component_details_ethernet_details.py |   3 +-
 .../device_component_details_measurement.py   |   5 +-
 .../device_component_details_wi_fi_details.py |   5 +-
 src/square/types/device_created_event.py      |   5 +-
 src/square/types/device_created_event_data.py |   5 +-
 .../types/device_created_event_object.py      |   5 +-
 src/square/types/device_details.py            |   3 +-
 src/square/types/device_metadata.py           |   3 +-
 src/square/types/device_status.py             |   5 +-
 src/square/types/digital_wallet_details.py    |   5 +-
 src/square/types/disable_card_response.py     |   7 +-
 src/square/types/disable_events_response.py   |   5 +-
 .../types/dismiss_terminal_action_response.py |   7 +-
 .../dismiss_terminal_checkout_response.py     |   7 +-
 .../types/dismiss_terminal_refund_response.py |   7 +-
 src/square/types/dispute.py                   |   9 +-
 src/square/types/dispute_created_event.py     |   5 +-
 .../types/dispute_created_event_data.py       |   5 +-
 .../types/dispute_created_event_object.py     |   5 +-
 src/square/types/dispute_evidence.py          |   5 +-
 .../types/dispute_evidence_added_event.py     |   5 +-
 .../dispute_evidence_added_event_data.py      |   5 +-
 .../dispute_evidence_added_event_object.py    |   5 +-
 .../types/dispute_evidence_created_event.py   |   5 +-
 .../dispute_evidence_created_event_data.py    |   5 +-
 .../dispute_evidence_created_event_object.py  |   5 +-
 .../types/dispute_evidence_deleted_event.py   |   5 +-
 .../dispute_evidence_deleted_event_data.py    |   5 +-
 .../dispute_evidence_deleted_event_object.py  |   5 +-
 src/square/types/dispute_evidence_file.py     |   3 +-
 .../types/dispute_evidence_removed_event.py   |   5 +-
 .../dispute_evidence_removed_event_data.py    |   5 +-
 .../dispute_evidence_removed_event_object.py  |   5 +-
 .../types/dispute_state_changed_event.py      |   5 +-
 .../types/dispute_state_changed_event_data.py |   5 +-
 .../dispute_state_changed_event_object.py     |   5 +-
 .../types/dispute_state_updated_event.py      |   5 +-
 .../types/dispute_state_updated_event_data.py |   5 +-
 .../dispute_state_updated_event_object.py     |   5 +-
 src/square/types/disputed_payment.py          |   3 +-
 src/square/types/employee.py                  |   5 +-
 src/square/types/employee_wage.py             |   5 +-
 src/square/types/enable_events_response.py    |   5 +-
 src/square/types/error.py                     |   7 +-
 src/square/types/event.py                     |   5 +-
 src/square/types/event_data.py                |   3 +-
 src/square/types/event_metadata.py            |   3 +-
 src/square/types/event_type_metadata.py       |   3 +-
 src/square/types/external_payment_details.py  |   7 +-
 src/square/types/filter_value.py              |   7 +-
 src/square/types/float_number_range.py        |   3 +-
 src/square/types/fulfillment.py               |  13 +-
 .../types/fulfillment_delivery_details.py     |   7 +-
 .../types/fulfillment_fulfillment_entry.py    |   3 +-
 .../types/fulfillment_pickup_details.py       |   9 +-
 ..._pickup_details_curbside_pickup_details.py |   3 +-
 src/square/types/fulfillment_recipient.py     |   5 +-
 .../types/fulfillment_shipment_details.py     |   5 +-
 .../get_bank_account_by_v1id_response.py      |   7 +-
 src/square/types/get_bank_account_response.py |   7 +-
 src/square/types/get_booking_response.py      |   7 +-
 src/square/types/get_break_type_response.py   |   7 +-
 .../get_business_booking_profile_response.py  |   7 +-
 src/square/types/get_card_response.py         |   7 +-
 .../types/get_cash_drawer_shift_response.py   |   7 +-
 .../types/get_catalog_object_response.py      |  39 +-
 ...er_custom_attribute_definition_response.py |   7 +-
 .../get_customer_custom_attribute_response.py |   7 +-
 .../types/get_customer_group_response.py      |   7 +-
 src/square/types/get_customer_response.py     |   7 +-
 .../types/get_customer_segment_response.py    |   7 +-
 src/square/types/get_device_code_response.py  |   7 +-
 src/square/types/get_device_response.py       |   7 +-
 .../types/get_dispute_evidence_response.py    |   7 +-
 src/square/types/get_dispute_response.py      |   7 +-
 src/square/types/get_employee_response.py     |   7 +-
 .../types/get_employee_wage_response.py       |   7 +-
 .../types/get_gift_card_from_gan_response.py  |   7 +-
 .../get_gift_card_from_nonce_response.py      |   7 +-
 src/square/types/get_gift_card_response.py    |   7 +-
 .../get_inventory_adjustment_response.py      |   7 +-
 .../types/get_inventory_changes_response.py   |   7 +-
 .../types/get_inventory_count_response.py     |   7 +-
 .../get_inventory_physical_count_response.py  |   7 +-
 .../types/get_inventory_transfer_response.py  |   7 +-
 src/square/types/get_invoice_response.py      |   7 +-
 src/square/types/get_location_response.py     |   7 +-
 .../types/get_loyalty_account_response.py     |   7 +-
 .../types/get_loyalty_program_response.py     |   7 +-
 .../types/get_loyalty_promotion_response.py   |   7 +-
 .../types/get_loyalty_reward_response.py      |   7 +-
 src/square/types/get_merchant_response.py     |   7 +-
 src/square/types/get_order_response.py        |   7 +-
 src/square/types/get_payment_link_response.py |   7 +-
 .../types/get_payment_refund_response.py      |   7 +-
 src/square/types/get_payment_response.py      |   7 +-
 src/square/types/get_payout_response.py       |   7 +-
 src/square/types/get_shift_response.py        |   7 +-
 src/square/types/get_snippet_response.py      |   7 +-
 src/square/types/get_subscription_response.py |   7 +-
 ...et_team_member_booking_profile_response.py |   7 +-
 src/square/types/get_team_member_response.py  |   7 +-
 .../types/get_team_member_wage_response.py    |   7 +-
 .../types/get_terminal_action_response.py     |   7 +-
 .../types/get_terminal_checkout_response.py   |   7 +-
 .../types/get_terminal_refund_response.py     |   7 +-
 src/square/types/get_transaction_response.py  |   7 +-
 src/square/types/get_vendor_response.py       |   7 +-
 src/square/types/get_wage_setting_response.py |   7 +-
 .../get_webhook_subscription_response.py      |   7 +-
 src/square/types/gift_card.py                 |   7 +-
 src/square/types/gift_card_activity.py        |  27 +-
 .../types/gift_card_activity_activate.py      |   5 +-
 .../gift_card_activity_adjust_decrement.py    |   9 +-
 .../gift_card_activity_adjust_increment.py    |   9 +-
 src/square/types/gift_card_activity_block.py  |   7 +-
 .../types/gift_card_activity_clear_balance.py |   7 +-
 .../types/gift_card_activity_created_event.py |   5 +-
 .../gift_card_activity_created_event_data.py  |   5 +-
 ...gift_card_activity_created_event_object.py |   5 +-
 .../types/gift_card_activity_deactivate.py    |   7 +-
 src/square/types/gift_card_activity_import.py |   7 +-
 .../gift_card_activity_import_reversal.py     |   7 +-
 src/square/types/gift_card_activity_load.py   |   5 +-
 src/square/types/gift_card_activity_redeem.py |   9 +-
 src/square/types/gift_card_activity_refund.py |   5 +-
 ...ift_card_activity_transfer_balance_from.py |   7 +-
 .../gift_card_activity_transfer_balance_to.py |   7 +-
 .../types/gift_card_activity_unblock.py       |   7 +-
 ..._card_activity_unlinked_activity_refund.py |   7 +-
 .../types/gift_card_activity_updated_event.py |   5 +-
 .../gift_card_activity_updated_event_data.py  |   5 +-
 ...gift_card_activity_updated_event_object.py |   5 +-
 src/square/types/gift_card_created_event.py   |   5 +-
 .../types/gift_card_created_event_data.py     |   5 +-
 .../types/gift_card_created_event_object.py   |   5 +-
 .../types/gift_card_customer_linked_event.py  |   5 +-
 .../gift_card_customer_linked_event_data.py   |   5 +-
 .../gift_card_customer_linked_event_object.py |   5 +-
 .../gift_card_customer_unlinked_event.py      |   5 +-
 .../gift_card_customer_unlinked_event_data.py |   5 +-
 ...ift_card_customer_unlinked_event_object.py |   5 +-
 src/square/types/gift_card_updated_event.py   |   5 +-
 .../types/gift_card_updated_event_data.py     |   5 +-
 .../types/gift_card_updated_event_object.py   |   5 +-
 src/square/types/inventory_adjustment.py      |   7 +-
 .../types/inventory_adjustment_group.py       |   5 +-
 src/square/types/inventory_change.py          |  11 +-
 src/square/types/inventory_count.py           |   5 +-
 .../types/inventory_count_updated_event.py    |   5 +-
 .../inventory_count_updated_event_data.py     |   5 +-
 .../inventory_count_updated_event_object.py   |   5 +-
 src/square/types/inventory_physical_count.py  |   5 +-
 src/square/types/inventory_transfer.py        |   5 +-
 src/square/types/invoice.py                   |  17 +-
 .../types/invoice_accepted_payment_methods.py |   3 +-
 src/square/types/invoice_attachment.py        |   3 +-
 src/square/types/invoice_canceled_event.py    |   5 +-
 .../types/invoice_canceled_event_data.py      |   5 +-
 .../types/invoice_canceled_event_object.py    |   5 +-
 src/square/types/invoice_created_event.py     |   5 +-
 .../types/invoice_created_event_data.py       |   5 +-
 .../types/invoice_created_event_object.py     |   5 +-
 src/square/types/invoice_custom_field.py      |   5 +-
 src/square/types/invoice_deleted_event.py     |   5 +-
 .../types/invoice_deleted_event_data.py       |   3 +-
 src/square/types/invoice_filter.py            |   3 +-
 .../types/invoice_payment_made_event.py       |   5 +-
 .../types/invoice_payment_made_event_data.py  |   5 +-
 .../invoice_payment_made_event_object.py      |   5 +-
 src/square/types/invoice_payment_reminder.py  |   5 +-
 src/square/types/invoice_payment_request.py   |   9 +-
 src/square/types/invoice_published_event.py   |   5 +-
 .../types/invoice_published_event_data.py     |   5 +-
 .../types/invoice_published_event_object.py   |   5 +-
 src/square/types/invoice_query.py             |   7 +-
 src/square/types/invoice_recipient.py         |   5 +-
 src/square/types/invoice_recipient_tax_ids.py |   3 +-
 src/square/types/invoice_refunded_event.py    |   5 +-
 .../types/invoice_refunded_event_data.py      |   5 +-
 .../types/invoice_refunded_event_object.py    |   5 +-
 .../invoice_scheduled_charge_failed_event.py  |   5 +-
 ...oice_scheduled_charge_failed_event_data.py |   5 +-
 ...ce_scheduled_charge_failed_event_object.py |   5 +-
 src/square/types/invoice_sort.py              |   7 +-
 src/square/types/invoice_updated_event.py     |   5 +-
 .../types/invoice_updated_event_data.py       |   5 +-
 .../types/invoice_updated_event_object.py     |   5 +-
 .../item_variation_location_overrides.py      |   7 +-
 src/square/types/job.py                       |   3 +-
 src/square/types/job_assignment.py            |   5 +-
 src/square/types/job_created_event.py         |   5 +-
 src/square/types/job_created_event_data.py    |   5 +-
 src/square/types/job_created_event_object.py  |   5 +-
 src/square/types/job_updated_event.py         |   5 +-
 src/square/types/job_updated_event_data.py    |   5 +-
 src/square/types/job_updated_event_object.py  |   5 +-
 .../labor_scheduled_shift_created_event.py    |   5 +-
 ...abor_scheduled_shift_created_event_data.py |   5 +-
 ...or_scheduled_shift_created_event_object.py |   9 +-
 .../labor_scheduled_shift_deleted_event.py    |   5 +-
 ...abor_scheduled_shift_deleted_event_data.py |   3 +-
 .../labor_scheduled_shift_published_event.py  |   5 +-
 ...or_scheduled_shift_published_event_data.py |   5 +-
 ..._scheduled_shift_published_event_object.py |   9 +-
 .../labor_scheduled_shift_updated_event.py    |   5 +-
 ...abor_scheduled_shift_updated_event_data.py |   5 +-
 ...or_scheduled_shift_updated_event_object.py |   9 +-
 src/square/types/labor_shift_created_event.py |   5 +-
 .../types/labor_shift_created_event_data.py   |   5 +-
 .../types/labor_shift_created_event_object.py |   5 +-
 src/square/types/labor_shift_deleted_event.py |   5 +-
 .../types/labor_shift_deleted_event_data.py   |   3 +-
 src/square/types/labor_shift_updated_event.py |   5 +-
 .../types/labor_shift_updated_event_data.py   |   5 +-
 .../types/labor_shift_updated_event_object.py |   5 +-
 .../types/labor_timecard_created_event.py     |   5 +-
 .../labor_timecard_created_event_data.py      |   5 +-
 .../labor_timecard_created_event_object.py    |   5 +-
 .../types/labor_timecard_deleted_event.py     |   5 +-
 .../labor_timecard_deleted_event_data.py      |   3 +-
 .../types/labor_timecard_updated_event.py     |   5 +-
 .../labor_timecard_updated_event_data.py      |   5 +-
 .../labor_timecard_updated_event_object.py    |   5 +-
 .../link_customer_to_gift_card_response.py    |   7 +-
 .../types/list_bank_accounts_response.py      |   7 +-
 ...g_custom_attribute_definitions_response.py |   7 +-
 ...list_booking_custom_attributes_response.py |   7 +-
 src/square/types/list_bookings_response.py    |   7 +-
 src/square/types/list_break_types_response.py |   7 +-
 src/square/types/list_cards_response.py       |   7 +-
 .../list_cash_drawer_shift_events_response.py |   7 +-
 .../types/list_cash_drawer_shifts_response.py |   7 +-
 src/square/types/list_catalog_response.py     |  37 +-
 ...r_custom_attribute_definitions_response.py |   7 +-
 ...ist_customer_custom_attributes_response.py |   7 +-
 .../types/list_customer_groups_response.py    |   7 +-
 .../types/list_customer_segments_response.py  |   7 +-
 src/square/types/list_customers_response.py   |   7 +-
 .../types/list_device_codes_response.py       |   7 +-
 src/square/types/list_devices_response.py     |   7 +-
 .../types/list_dispute_evidence_response.py   |   7 +-
 src/square/types/list_disputes_response.py    |   7 +-
 .../types/list_employee_wages_response.py     |   7 +-
 src/square/types/list_employees_response.py   |   7 +-
 src/square/types/list_event_types_response.py |   7 +-
 .../list_gift_card_activities_response.py     |   7 +-
 src/square/types/list_gift_cards_response.py  |   7 +-
 src/square/types/list_invoices_response.py    |   7 +-
 src/square/types/list_jobs_response.py        |   7 +-
 ...list_location_booking_profiles_response.py |   7 +-
 ...n_custom_attribute_definitions_response.py |   7 +-
 ...ist_location_custom_attributes_response.py |   7 +-
 src/square/types/list_locations_response.py   |   7 +-
 .../types/list_loyalty_programs_response.py   |   7 +-
 .../types/list_loyalty_promotions_response.py |   7 +-
 ...t_custom_attribute_definitions_response.py |   7 +-
 ...ist_merchant_custom_attributes_response.py |   7 +-
 src/square/types/list_merchants_response.py   |   7 +-
 ...r_custom_attribute_definitions_response.py |   7 +-
 .../list_order_custom_attributes_response.py  |   7 +-
 .../types/list_payment_links_response.py      |   7 +-
 .../types/list_payment_refunds_response.py    |   7 +-
 src/square/types/list_payments_response.py    |   7 +-
 .../types/list_payout_entries_response.py     |   7 +-
 src/square/types/list_payouts_response.py     |   7 +-
 src/square/types/list_sites_response.py       |   7 +-
 .../list_subscription_events_response.py      |   7 +-
 ...t_team_member_booking_profiles_response.py |   7 +-
 .../types/list_team_member_wages_response.py  |   7 +-
 .../types/list_transactions_response.py       |   7 +-
 .../list_webhook_event_types_response.py      |   7 +-
 .../list_webhook_subscriptions_response.py    |   7 +-
 .../types/list_workweek_configs_response.py   |   7 +-
 src/square/types/location.py                  |  13 +-
 src/square/types/location_booking_profile.py  |   3 +-
 src/square/types/location_created_event.py    |   5 +-
 .../types/location_created_event_data.py      |   3 +-
 ...ttribute_definition_owned_created_event.py |   5 +-
 ...ttribute_definition_owned_deleted_event.py |   5 +-
 ...ttribute_definition_owned_updated_event.py |   5 +-
 ...ribute_definition_visible_created_event.py |   5 +-
 ...ribute_definition_visible_deleted_event.py |   5 +-
 ...ribute_definition_visible_updated_event.py |   5 +-
 ...on_custom_attribute_owned_deleted_event.py |   5 +-
 ...on_custom_attribute_owned_updated_event.py |   5 +-
 ..._custom_attribute_visible_deleted_event.py |   5 +-
 ..._custom_attribute_visible_updated_event.py |   5 +-
 .../types/location_settings_updated_event.py  |   5 +-
 .../location_settings_updated_event_data.py   |   5 +-
 .../location_settings_updated_event_object.py |   5 +-
 src/square/types/location_updated_event.py    |   5 +-
 .../types/location_updated_event_data.py      |   3 +-
 src/square/types/loyalty_account.py           |   7 +-
 .../types/loyalty_account_created_event.py    |   5 +-
 .../loyalty_account_created_event_data.py     |   5 +-
 .../loyalty_account_created_event_object.py   |   5 +-
 .../types/loyalty_account_deleted_event.py    |   5 +-
 .../loyalty_account_deleted_event_data.py     |   5 +-
 .../loyalty_account_deleted_event_object.py   |   5 +-
 ...loyalty_account_expiring_point_deadline.py |   5 +-
 src/square/types/loyalty_account_mapping.py   |   3 +-
 .../types/loyalty_account_updated_event.py    |   5 +-
 .../loyalty_account_updated_event_data.py     |   5 +-
 .../loyalty_account_updated_event_object.py   |   5 +-
 src/square/types/loyalty_event.py             |  15 +-
 .../types/loyalty_event_accumulate_points.py  |   3 +-
 ...yalty_event_accumulate_promotion_points.py |   3 +-
 .../types/loyalty_event_adjust_points.py      |   3 +-
 .../types/loyalty_event_create_reward.py      |   3 +-
 .../types/loyalty_event_created_event.py      |   5 +-
 .../types/loyalty_event_created_event_data.py |   5 +-
 .../loyalty_event_created_event_object.py     |   5 +-
 .../types/loyalty_event_date_time_filter.py   |   7 +-
 .../types/loyalty_event_delete_reward.py      |   3 +-
 .../types/loyalty_event_expire_points.py      |   3 +-
 src/square/types/loyalty_event_filter.py      |   9 +-
 .../types/loyalty_event_location_filter.py    |   3 +-
 .../loyalty_event_loyalty_account_filter.py   |   5 +-
 .../types/loyalty_event_order_filter.py       |   5 +-
 src/square/types/loyalty_event_other.py       |   3 +-
 src/square/types/loyalty_event_query.py       |   5 +-
 .../types/loyalty_event_redeem_reward.py      |   3 +-
 src/square/types/loyalty_event_type_filter.py |   5 +-
 src/square/types/loyalty_program.py           |  11 +-
 .../types/loyalty_program_accrual_rule.py     |  13 +-
 ...alty_program_accrual_rule_category_data.py |   5 +-
 ...rogram_accrual_rule_item_variation_data.py |   5 +-
 ...loyalty_program_accrual_rule_spend_data.py |   9 +-
 ...loyalty_program_accrual_rule_visit_data.py |   7 +-
 .../types/loyalty_program_created_event.py    |   5 +-
 .../loyalty_program_created_event_data.py     |   5 +-
 .../loyalty_program_created_event_object.py   |   5 +-
 .../loyalty_program_expiration_policy.py      |   5 +-
 .../types/loyalty_program_reward_tier.py      |   5 +-
 .../types/loyalty_program_terminology.py      |   5 +-
 .../types/loyalty_program_updated_event.py    |   5 +-
 .../loyalty_program_updated_event_data.py     |   5 +-
 .../loyalty_program_updated_event_object.py   |   5 +-
 src/square/types/loyalty_promotion.py         |   9 +-
 .../loyalty_promotion_available_time_data.py  |   3 +-
 .../types/loyalty_promotion_created_event.py  |   5 +-
 .../loyalty_promotion_created_event_data.py   |   5 +-
 .../loyalty_promotion_created_event_object.py |   5 +-
 .../types/loyalty_promotion_incentive.py      |  11 +-
 ...romotion_incentive_points_addition_data.py |   5 +-
 ...motion_incentive_points_multiplier_data.py |   3 +-
 .../types/loyalty_promotion_trigger_limit.py  |   7 +-
 .../types/loyalty_promotion_updated_event.py  |   5 +-
 .../loyalty_promotion_updated_event_data.py   |   5 +-
 .../loyalty_promotion_updated_event_object.py |   5 +-
 src/square/types/loyalty_reward.py            |   5 +-
 src/square/types/measurement_unit.py          |  13 +-
 src/square/types/measurement_unit_custom.py   |   5 +-
 src/square/types/merchant.py                  |   5 +-
 ...ttribute_definition_owned_created_event.py |   5 +-
 ...ttribute_definition_owned_deleted_event.py |   5 +-
 ...ttribute_definition_owned_updated_event.py |   5 +-
 ...ribute_definition_visible_created_event.py |   5 +-
 ...ribute_definition_visible_deleted_event.py |   5 +-
 ...ribute_definition_visible_updated_event.py |   5 +-
 ...nt_custom_attribute_owned_deleted_event.py |   5 +-
 ...nt_custom_attribute_owned_updated_event.py |   5 +-
 ..._custom_attribute_visible_deleted_event.py |   5 +-
 ..._custom_attribute_visible_updated_event.py |   5 +-
 .../types/merchant_settings_updated_event.py  |   5 +-
 .../merchant_settings_updated_event_data.py   |   5 +-
 .../merchant_settings_updated_event_object.py |   5 +-
 .../types/modifier_location_overrides.py      |   5 +-
 src/square/types/money.py                     |   5 +-
 .../oauth_authorization_revoked_event.py      |   5 +-
 .../oauth_authorization_revoked_event_data.py |   5 +-
 ...auth_authorization_revoked_event_object.py |   5 +-
 ...ization_revoked_event_revocation_object.py |   5 +-
 src/square/types/obtain_token_response.py     |   5 +-
 src/square/types/offline_payment_details.py   |   3 +-
 src/square/types/order.py                     |  25 +-
 src/square/types/order_created.py             |   5 +-
 src/square/types/order_created_event.py       |   5 +-
 src/square/types/order_created_event_data.py  |   5 +-
 src/square/types/order_created_object.py      |   5 +-
 ...ttribute_definition_owned_created_event.py |   5 +-
 ...ttribute_definition_owned_deleted_event.py |   5 +-
 ...ttribute_definition_owned_updated_event.py |   5 +-
 ...ribute_definition_visible_created_event.py |   5 +-
 ...ribute_definition_visible_deleted_event.py |   5 +-
 ...ribute_definition_visible_updated_event.py |   5 +-
 ...er_custom_attribute_owned_deleted_event.py |   5 +-
 ...er_custom_attribute_owned_updated_event.py |   5 +-
 ..._custom_attribute_visible_deleted_event.py |   5 +-
 ..._custom_attribute_visible_updated_event.py |   5 +-
 src/square/types/order_entry.py               |   3 +-
 src/square/types/order_fulfillment_updated.py |   7 +-
 .../types/order_fulfillment_updated_event.py  |   5 +-
 .../order_fulfillment_updated_event_data.py   |   5 +-
 .../types/order_fulfillment_updated_object.py |   5 +-
 .../types/order_fulfillment_updated_update.py |   5 +-
 src/square/types/order_line_item.py           |  15 +-
 .../types/order_line_item_applied_discount.py |   5 +-
 .../order_line_item_applied_service_charge.py |   5 +-
 .../types/order_line_item_applied_tax.py      |   5 +-
 src/square/types/order_line_item_discount.py  |   7 +-
 src/square/types/order_line_item_modifier.py  |   5 +-
 .../order_line_item_pricing_blocklists.py     |   7 +-
 ...tem_pricing_blocklists_blocked_discount.py |   3 +-
 ...ine_item_pricing_blocklists_blocked_tax.py |   3 +-
 src/square/types/order_line_item_tax.py       |   7 +-
 src/square/types/order_money_amounts.py       |   5 +-
 src/square/types/order_pricing_options.py     |   3 +-
 src/square/types/order_quantity_unit.py       |   5 +-
 src/square/types/order_return.py              |   9 +-
 src/square/types/order_return_discount.py     |   7 +-
 src/square/types/order_return_line_item.py    |  15 +-
 .../types/order_return_line_item_modifier.py  |   5 +-
 .../types/order_return_service_charge.py      |   9 +-
 src/square/types/order_return_tax.py          |   7 +-
 src/square/types/order_return_tip.py          |   5 +-
 src/square/types/order_reward.py              |   5 +-
 src/square/types/order_rounding_adjustment.py |   5 +-
 src/square/types/order_service_charge.py      |  11 +-
 src/square/types/order_source.py              |   3 +-
 src/square/types/order_updated.py             |   5 +-
 src/square/types/order_updated_event.py       |   5 +-
 src/square/types/order_updated_event_data.py  |   5 +-
 src/square/types/order_updated_object.py      |   5 +-
 .../types/pause_subscription_response.py      |   7 +-
 src/square/types/pay_order_response.py        |   7 +-
 src/square/types/payment.py                   |  25 +-
 ..._balance_activity_app_fee_refund_detail.py |   3 +-
 ...balance_activity_app_fee_revenue_detail.py |   3 +-
 ...lance_activity_automatic_savings_detail.py |   3 +-
 ...ivity_automatic_savings_reversed_detail.py |   3 +-
 .../payment_balance_activity_charge_detail.py |   3 +-
 ...ent_balance_activity_deposit_fee_detail.py |   3 +-
 ...ce_activity_deposit_fee_reversed_detail.py |   3 +-
 ...payment_balance_activity_dispute_detail.py |   3 +-
 .../payment_balance_activity_fee_detail.py    |   3 +-
 ...balance_activity_free_processing_detail.py |   3 +-
 ...balance_activity_hold_adjustment_detail.py |   3 +-
 ...nt_balance_activity_open_dispute_detail.py |   3 +-
 ...alance_activity_other_adjustment_detail.py |   3 +-
 .../payment_balance_activity_other_detail.py  |   3 +-
 .../payment_balance_activity_refund_detail.py |   3 +-
 ...ance_activity_release_adjustment_detail.py |   3 +-
 ...nt_balance_activity_reserve_hold_detail.py |   3 +-
 ...balance_activity_reserve_release_detail.py |   3 +-
 ..._activity_square_capital_payment_detail.py |   3 +-
 ..._square_capital_reversed_payment_detail.py |   3 +-
 ...activity_square_payroll_transfer_detail.py |   3 +-
 ...square_payroll_transfer_reversed_detail.py |   3 +-
 ...ment_balance_activity_tax_on_fee_detail.py |   3 +-
 ...balance_activity_third_party_fee_detail.py |   3 +-
 ..._activity_third_party_fee_refund_detail.py |   3 +-
 src/square/types/payment_created_event.py     |   5 +-
 .../types/payment_created_event_data.py       |   5 +-
 .../types/payment_created_event_object.py     |   5 +-
 src/square/types/payment_link.py              |   5 +-
 .../types/payment_link_related_resources.py   |  37 +-
 src/square/types/payment_options.py           |   5 +-
 src/square/types/payment_refund.py            |   7 +-
 src/square/types/payment_updated_event.py     |   5 +-
 .../types/payment_updated_event_data.py       |   5 +-
 .../types/payment_updated_event_object.py     |   5 +-
 src/square/types/payout.py                    |  13 +-
 src/square/types/payout_entry.py              |  17 +-
 src/square/types/payout_failed_event.py       |   5 +-
 src/square/types/payout_failed_event_data.py  |   5 +-
 .../types/payout_failed_event_object.py       |   5 +-
 src/square/types/payout_fee.py                |   7 +-
 src/square/types/payout_paid_event.py         |   5 +-
 src/square/types/payout_paid_event_data.py    |   5 +-
 src/square/types/payout_paid_event_object.py  |   5 +-
 src/square/types/payout_sent_event.py         |   5 +-
 src/square/types/payout_sent_event_data.py    |   5 +-
 src/square/types/payout_sent_event_object.py  |   5 +-
 src/square/types/phase.py                     |   3 +-
 src/square/types/phase_input.py               |   5 +-
 src/square/types/pre_populated_data.py        |   5 +-
 src/square/types/processing_fee.py            |   5 +-
 src/square/types/publish_invoice_response.py  |   7 +-
 .../types/publish_scheduled_shift_response.py |   7 +-
 src/square/types/qr_code_options.py           |   5 +-
 src/square/types/quick_pay.py                 |   7 +-
 src/square/types/range.py                     |   3 +-
 src/square/types/receipt_options.py           |   5 +-
 .../types/redeem_loyalty_reward_response.py   |   7 +-
 src/square/types/refund.py                    |   9 +-
 src/square/types/refund_created_event.py      |   5 +-
 src/square/types/refund_created_event_data.py |   5 +-
 .../types/refund_created_event_object.py      |   5 +-
 src/square/types/refund_payment_response.py   |   7 +-
 src/square/types/refund_updated_event.py      |   5 +-
 src/square/types/refund_updated_event_data.py |   5 +-
 .../types/refund_updated_event_object.py      |   5 +-
 src/square/types/register_domain_response.py  |   7 +-
 .../remove_group_from_customer_response.py    |   5 +-
 .../types/resume_subscription_response.py     |   7 +-
 ...ng_custom_attribute_definition_response.py |   7 +-
 ...rieve_booking_custom_attribute_response.py |   7 +-
 src/square/types/retrieve_job_response.py     |   7 +-
 ...rieve_location_booking_profile_response.py |   7 +-
 ...on_custom_attribute_definition_response.py |   7 +-
 ...ieve_location_custom_attribute_response.py |   7 +-
 .../retrieve_location_settings_response.py    |   7 +-
 ...nt_custom_attribute_definition_response.py |   7 +-
 ...ieve_merchant_custom_attribute_response.py |   7 +-
 .../retrieve_merchant_settings_response.py    |   7 +-
 ...er_custom_attribute_definition_response.py |   7 +-
 ...etrieve_order_custom_attribute_response.py |   7 +-
 .../retrieve_scheduled_shift_response.py      |   7 +-
 .../types/retrieve_timecard_response.py       |   7 +-
 .../types/retrieve_token_status_response.py   |   5 +-
 src/square/types/revoke_token_response.py     |   5 +-
 src/square/types/risk_evaluation.py           |   5 +-
 src/square/types/save_card_options.py         |   5 +-
 src/square/types/scheduled_shift.py           |   5 +-
 src/square/types/scheduled_shift_details.py   |   3 +-
 src/square/types/scheduled_shift_filter.py    |   9 +-
 src/square/types/scheduled_shift_query.py     |   7 +-
 src/square/types/scheduled_shift_sort.py      |   7 +-
 src/square/types/scheduled_shift_workday.py   |   7 +-
 .../types/search_availability_filter.py       |   9 +-
 src/square/types/search_availability_query.py |   7 +-
 .../types/search_availability_response.py     |   7 +-
 .../types/search_catalog_items_response.py    |  37 +-
 .../types/search_catalog_objects_response.py  |  39 +-
 src/square/types/search_customers_response.py |   7 +-
 src/square/types/search_events_filter.py      |   5 +-
 src/square/types/search_events_query.py       |   7 +-
 src/square/types/search_events_response.py    |   7 +-
 src/square/types/search_events_sort.py        |   7 +-
 src/square/types/search_invoices_response.py  |   7 +-
 ..._accounts_request_loyalty_account_query.py |   5 +-
 .../types/search_loyalty_accounts_response.py |   7 +-
 .../types/search_loyalty_events_response.py   |   7 +-
 ...ty_rewards_request_loyalty_reward_query.py |   7 +-
 .../types/search_loyalty_rewards_response.py  |   7 +-
 .../types/search_orders_customer_filter.py    |   3 +-
 .../types/search_orders_date_time_filter.py   |   5 +-
 src/square/types/search_orders_filter.py      |   9 +-
 .../types/search_orders_fulfillment_filter.py |   7 +-
 src/square/types/search_orders_query.py       |   7 +-
 src/square/types/search_orders_response.py    |   9 +-
 src/square/types/search_orders_sort.py        |   7 +-
 .../types/search_orders_source_filter.py      |   3 +-
 .../types/search_orders_state_filter.py       |   5 +-
 .../types/search_scheduled_shifts_response.py |   7 +-
 src/square/types/search_shifts_response.py    |   7 +-
 .../types/search_subscriptions_filter.py      |   3 +-
 .../types/search_subscriptions_query.py       |   5 +-
 .../types/search_subscriptions_response.py    |   7 +-
 .../types/search_team_members_filter.py       |   5 +-
 src/square/types/search_team_members_query.py |   5 +-
 .../types/search_team_members_response.py     |   7 +-
 .../types/search_terminal_actions_response.py |   7 +-
 .../search_terminal_checkouts_response.py     |   7 +-
 .../types/search_terminal_refunds_response.py |   7 +-
 src/square/types/search_timecards_response.py |   7 +-
 .../types/search_vendors_request_filter.py    |   5 +-
 .../types/search_vendors_request_sort.py      |   7 +-
 src/square/types/search_vendors_response.py   |   7 +-
 src/square/types/segment_filter.py            |   7 +-
 src/square/types/select_option.py             |   5 +-
 src/square/types/select_options.py            |   7 +-
 src/square/types/shift.py                     |   9 +-
 src/square/types/shift_filter.py              |   7 +-
 src/square/types/shift_query.py               |   7 +-
 src/square/types/shift_sort.py                |   7 +-
 src/square/types/shift_wage.py                |   5 +-
 src/square/types/shift_workday.py             |   7 +-
 src/square/types/shipping_fee.py              |   5 +-
 src/square/types/signature_image.py           |   3 +-
 src/square/types/signature_options.py         |   7 +-
 src/square/types/site.py                      |   3 +-
 src/square/types/snippet.py                   |   3 +-
 src/square/types/source_application.py        |   5 +-
 src/square/types/square_account_details.py    |   5 +-
 src/square/types/standard_unit_description.py |   5 +-
 .../types/standard_unit_description_group.py  |   5 +-
 src/square/types/submit_evidence_response.py  |   7 +-
 src/square/types/subscription.py              |  11 +-
 src/square/types/subscription_action.py       |   7 +-
 .../types/subscription_created_event.py       |   5 +-
 .../types/subscription_created_event_data.py  |   5 +-
 .../subscription_created_event_object.py      |   5 +-
 src/square/types/subscription_event.py        |  11 +-
 src/square/types/subscription_event_info.py   |   5 +-
 src/square/types/subscription_phase.py        |   7 +-
 src/square/types/subscription_pricing.py      |   7 +-
 src/square/types/subscription_source.py       |   3 +-
 src/square/types/subscription_test_result.py  |   3 +-
 .../types/subscription_updated_event.py       |   5 +-
 .../types/subscription_updated_event_data.py  |   5 +-
 .../subscription_updated_event_object.py      |   5 +-
 src/square/types/swap_plan_response.py        |   7 +-
 src/square/types/tax_ids.py                   |   3 +-
 src/square/types/team_member.py               |   7 +-
 .../types/team_member_assigned_locations.py   |   5 +-
 .../types/team_member_booking_profile.py      |   3 +-
 src/square/types/team_member_created_event.py |   5 +-
 .../types/team_member_created_event_data.py   |   5 +-
 .../types/team_member_created_event_object.py |   5 +-
 src/square/types/team_member_updated_event.py |   5 +-
 .../types/team_member_updated_event_data.py   |   5 +-
 .../types/team_member_updated_event_object.py |   5 +-
 src/square/types/team_member_wage.py          |   5 +-
 .../team_member_wage_setting_updated_event.py |   5 +-
 ..._member_wage_setting_updated_event_data.py |   5 +-
 ...ember_wage_setting_updated_event_object.py |   5 +-
 src/square/types/tender.py                    |  13 +-
 .../types/tender_bank_account_details.py      |   5 +-
 .../types/tender_buy_now_pay_later_details.py |   7 +-
 src/square/types/tender_card_details.py       |   7 +-
 src/square/types/tender_cash_details.py       |   5 +-
 .../types/tender_square_account_details.py    |   5 +-
 src/square/types/terminal_action.py           |  17 +-
 .../types/terminal_action_created_event.py    |   5 +-
 .../terminal_action_created_event_data.py     |   5 +-
 .../terminal_action_created_event_object.py   |   5 +-
 src/square/types/terminal_action_query.py     |   7 +-
 .../types/terminal_action_query_filter.py     |   7 +-
 .../types/terminal_action_query_sort.py       |   5 +-
 .../types/terminal_action_updated_event.py    |   5 +-
 .../terminal_action_updated_event_data.py     |   5 +-
 .../terminal_action_updated_event_object.py   |   5 +-
 src/square/types/terminal_checkout.py         |  11 +-
 .../types/terminal_checkout_created_event.py  |   5 +-
 .../terminal_checkout_created_event_data.py   |   5 +-
 .../terminal_checkout_created_event_object.py |   5 +-
 src/square/types/terminal_checkout_query.py   |   7 +-
 .../types/terminal_checkout_query_filter.py   |   5 +-
 .../types/terminal_checkout_query_sort.py     |   5 +-
 .../types/terminal_checkout_updated_event.py  |   5 +-
 .../terminal_checkout_updated_event_data.py   |   5 +-
 .../terminal_checkout_updated_event_object.py |   5 +-
 src/square/types/terminal_refund.py           |   7 +-
 .../types/terminal_refund_created_event.py    |   5 +-
 .../terminal_refund_created_event_data.py     |   5 +-
 .../terminal_refund_created_event_object.py   |   5 +-
 src/square/types/terminal_refund_query.py     |   7 +-
 .../types/terminal_refund_query_filter.py     |   5 +-
 .../types/terminal_refund_query_sort.py       |   3 +-
 .../types/terminal_refund_updated_event.py    |   5 +-
 .../terminal_refund_updated_event_data.py     |   5 +-
 .../terminal_refund_updated_event_object.py   |   5 +-
 .../test_webhook_subscription_response.py     |   7 +-
 src/square/types/time_range.py                |   3 +-
 src/square/types/timecard.py                  |   9 +-
 src/square/types/timecard_filter.py           |   7 +-
 src/square/types/timecard_query.py            |   7 +-
 src/square/types/timecard_sort.py             |   7 +-
 src/square/types/timecard_wage.py             |   5 +-
 src/square/types/timecard_workday.py          |   7 +-
 src/square/types/tip_settings.py              |   3 +-
 src/square/types/transaction.py               |   9 +-
 ...unlink_customer_from_gift_card_response.py |   7 +-
 ...ng_custom_attribute_definition_response.py |   7 +-
 src/square/types/update_booking_response.py   |   7 +-
 .../types/update_break_type_response.py       |   7 +-
 .../types/update_catalog_image_request.py     |   5 +-
 .../types/update_catalog_image_response.py    |  37 +-
 ...er_custom_attribute_definition_response.py |   7 +-
 .../types/update_customer_group_response.py   |   7 +-
 src/square/types/update_customer_response.py  |   7 +-
 src/square/types/update_invoice_response.py   |   7 +-
 .../update_item_modifier_lists_response.py    |   5 +-
 .../types/update_item_taxes_response.py       |   5 +-
 src/square/types/update_job_response.py       |   7 +-
 ...on_custom_attribute_definition_response.py |   7 +-
 src/square/types/update_location_response.py  |   7 +-
 .../update_location_settings_response.py      |   7 +-
 ...nt_custom_attribute_definition_response.py |   7 +-
 .../update_merchant_settings_response.py      |   7 +-
 ...er_custom_attribute_definition_response.py |   7 +-
 src/square/types/update_order_response.py     |   7 +-
 .../types/update_payment_link_response.py     |   7 +-
 src/square/types/update_payment_response.py   |   7 +-
 .../types/update_scheduled_shift_response.py  |   7 +-
 src/square/types/update_shift_response.py     |   7 +-
 .../types/update_subscription_response.py     |   7 +-
 .../types/update_team_member_request.py       |   5 +-
 .../types/update_team_member_response.py      |   7 +-
 src/square/types/update_timecard_response.py  |   7 +-
 src/square/types/update_vendor_request.py     |   5 +-
 src/square/types/update_vendor_response.py    |   7 +-
 .../types/update_wage_setting_response.py     |   7 +-
 .../update_webhook_subscription_response.py   |   7 +-
 ...ook_subscription_signature_key_response.py |   5 +-
 .../types/update_workweek_config_response.py  |   7 +-
 ...psert_booking_custom_attribute_response.py |   7 +-
 .../types/upsert_catalog_object_response.py   |  37 +-
 ...sert_customer_custom_attribute_response.py |   7 +-
 ...sert_location_custom_attribute_response.py |   7 +-
 ...sert_merchant_custom_attribute_response.py |   7 +-
 .../upsert_order_custom_attribute_response.py |   7 +-
 src/square/types/upsert_snippet_response.py   |   7 +-
 src/square/types/v1money.py                   |   5 +-
 src/square/types/v1order.py                   |  11 +-
 src/square/types/v1order_history_entry.py     |   5 +-
 src/square/types/v1tender.py                  |   9 +-
 src/square/types/vendor.py                    |   5 +-
 src/square/types/vendor_contact.py            |   3 +-
 src/square/types/vendor_created_event.py      |   5 +-
 src/square/types/vendor_created_event_data.py |   5 +-
 .../types/vendor_created_event_object.py      |   7 +-
 src/square/types/vendor_updated_event.py      |   5 +-
 src/square/types/vendor_updated_event_data.py |   5 +-
 .../types/vendor_updated_event_object.py      |   7 +-
 src/square/types/void_transaction_response.py |   5 +-
 src/square/types/wage_setting.py              |   5 +-
 src/square/types/webhook_subscription.py      |   3 +-
 src/square/types/workweek_config.py           |   5 +-
 src/square/v1transactions/__init__.py         |   2 +
 src/square/v1transactions/client.py           |  33 +-
 src/square/v1transactions/raw_client.py       |  41 +-
 src/square/vendors/__init__.py                |   2 +
 src/square/vendors/client.py                  |  73 +-
 src/square/vendors/raw_client.py              |  87 +-
 src/square/webhooks/__init__.py               |   2 +
 src/square/webhooks/client.py                 |  12 +-
 src/square/webhooks/event_types/__init__.py   |   2 +
 src/square/webhooks/event_types/client.py     |  15 +-
 src/square/webhooks/event_types/raw_client.py |  21 +-
 src/square/webhooks/raw_client.py             |   3 +-
 src/square/webhooks/subscriptions/__init__.py |   2 +
 src/square/webhooks/subscriptions/client.py   | 147 +--
 .../webhooks/subscriptions/raw_client.py      | 238 ++++-
 tests/custom/test_client.py                   |   2 +-
 tests/utils/assets/models/__init__.py         |   2 +-
 tests/utils/assets/models/circle.py           |   2 +-
 .../assets/models/object_with_defaults.py     |   1 -
 .../models/object_with_optional_field.py      |   9 +-
 tests/utils/assets/models/shape.py            |   6 +-
 tests/utils/assets/models/square.py           |   2 +-
 .../assets/models/undiscriminated_shape.py    |   1 +
 tests/utils/test_query_encoding.py            |   2 +-
 tests/utils/test_serialization.py             |   6 +-
 2388 files changed, 18453 insertions(+), 12497 deletions(-)
 create mode 100644 src/square/core/force_multipart.py

diff --git a/.gitignore b/.gitignore
index 0da665fe..d2e4ca80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
-dist/
 .mypy_cache/
+.ruff_cache/
 __pycache__/
+dist/
 poetry.toml
-.ruff_cache/
diff --git a/poetry.lock b/poetry.lock
index dfe67d2f..7f8488fc 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -158,48 +158,55 @@ files = [
 
 [[package]]
 name = "mypy"
-version = "1.0.1"
+version = "1.13.0"
 description = "Optional static typing for Python"
 optional = false
-python-versions = ">=3.7"
+python-versions = ">=3.8"
 files = [
-    {file = "mypy-1.0.1-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:71a808334d3f41ef011faa5a5cd8153606df5fc0b56de5b2e89566c8093a0c9a"},
-    {file = "mypy-1.0.1-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:920169f0184215eef19294fa86ea49ffd4635dedfdea2b57e45cb4ee85d5ccaf"},
-    {file = "mypy-1.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:27a0f74a298769d9fdc8498fcb4f2beb86f0564bcdb1a37b58cbbe78e55cf8c0"},
-    {file = "mypy-1.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:65b122a993d9c81ea0bfde7689b3365318a88bde952e4dfa1b3a8b4ac05d168b"},
-    {file = "mypy-1.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:5deb252fd42a77add936b463033a59b8e48eb2eaec2976d76b6878d031933fe4"},
-    {file = "mypy-1.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:2013226d17f20468f34feddd6aae4635a55f79626549099354ce641bc7d40262"},
-    {file = "mypy-1.0.1-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:48525aec92b47baed9b3380371ab8ab6e63a5aab317347dfe9e55e02aaad22e8"},
-    {file = "mypy-1.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:c96b8a0c019fe29040d520d9257d8c8f122a7343a8307bf8d6d4a43f5c5bfcc8"},
-    {file = "mypy-1.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:448de661536d270ce04f2d7dddaa49b2fdba6e3bd8a83212164d4174ff43aa65"},
-    {file = "mypy-1.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:d42a98e76070a365a1d1c220fcac8aa4ada12ae0db679cb4d910fabefc88b994"},
-    {file = "mypy-1.0.1-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:e64f48c6176e243ad015e995de05af7f22bbe370dbb5b32bd6988438ec873919"},
-    {file = "mypy-1.0.1-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5fdd63e4f50e3538617887e9aee91855368d9fc1dea30da743837b0df7373bc4"},
-    {file = "mypy-1.0.1-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:dbeb24514c4acbc78d205f85dd0e800f34062efcc1f4a4857c57e4b4b8712bff"},
-    {file = "mypy-1.0.1-cp37-cp37m-win_amd64.whl", hash = "sha256:a2948c40a7dd46c1c33765718936669dc1f628f134013b02ff5ac6c7ef6942bf"},
-    {file = "mypy-1.0.1-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:5bc8d6bd3b274dd3846597855d96d38d947aedba18776aa998a8d46fabdaed76"},
-    {file = "mypy-1.0.1-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:17455cda53eeee0a4adb6371a21dd3dbf465897de82843751cf822605d152c8c"},
-    {file = "mypy-1.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:e831662208055b006eef68392a768ff83596035ffd6d846786578ba1714ba8f6"},
-    {file = "mypy-1.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:e60d0b09f62ae97a94605c3f73fd952395286cf3e3b9e7b97f60b01ddfbbda88"},
-    {file = "mypy-1.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:0af4f0e20706aadf4e6f8f8dc5ab739089146b83fd53cb4a7e0e850ef3de0bb6"},
-    {file = "mypy-1.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:24189f23dc66f83b839bd1cce2dfc356020dfc9a8bae03978477b15be61b062e"},
-    {file = "mypy-1.0.1-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:93a85495fb13dc484251b4c1fd7a5ac370cd0d812bbfc3b39c1bafefe95275d5"},
-    {file = "mypy-1.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:5f546ac34093c6ce33f6278f7c88f0f147a4849386d3bf3ae193702f4fe31407"},
-    {file = "mypy-1.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:c6c2ccb7af7154673c591189c3687b013122c5a891bb5651eca3db8e6c6c55bd"},
-    {file = "mypy-1.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:15b5a824b58c7c822c51bc66308e759243c32631896743f030daf449fe3677f3"},
-    {file = "mypy-1.0.1-py3-none-any.whl", hash = "sha256:eda5c8b9949ed411ff752b9a01adda31afe7eae1e53e946dbdf9db23865e66c4"},
-    {file = "mypy-1.0.1.tar.gz", hash = "sha256:28cea5a6392bb43d266782983b5a4216c25544cd7d80be681a155ddcdafd152d"},
+    {file = "mypy-1.13.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:6607e0f1dd1fb7f0aca14d936d13fd19eba5e17e1cd2a14f808fa5f8f6d8f60a"},
+    {file = "mypy-1.13.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:8a21be69bd26fa81b1f80a61ee7ab05b076c674d9b18fb56239d72e21d9f4c80"},
+    {file = "mypy-1.13.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7b2353a44d2179846a096e25691d54d59904559f4232519d420d64da6828a3a7"},
+    {file = "mypy-1.13.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:0730d1c6a2739d4511dc4253f8274cdd140c55c32dfb0a4cf8b7a43f40abfa6f"},
+    {file = "mypy-1.13.0-cp310-cp310-win_amd64.whl", hash = "sha256:c5fc54dbb712ff5e5a0fca797e6e0aa25726c7e72c6a5850cfd2adbc1eb0a372"},
+    {file = "mypy-1.13.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:581665e6f3a8a9078f28d5502f4c334c0c8d802ef55ea0e7276a6e409bc0d82d"},
+    {file = "mypy-1.13.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:3ddb5b9bf82e05cc9a627e84707b528e5c7caaa1c55c69e175abb15a761cec2d"},
+    {file = "mypy-1.13.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:20c7ee0bc0d5a9595c46f38beb04201f2620065a93755704e141fcac9f59db2b"},
+    {file = "mypy-1.13.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:3790ded76f0b34bc9c8ba4def8f919dd6a46db0f5a6610fb994fe8efdd447f73"},
+    {file = "mypy-1.13.0-cp311-cp311-win_amd64.whl", hash = "sha256:51f869f4b6b538229c1d1bcc1dd7d119817206e2bc54e8e374b3dfa202defcca"},
+    {file = "mypy-1.13.0-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5c7051a3461ae84dfb5dd15eff5094640c61c5f22257c8b766794e6dd85e72d5"},
+    {file = "mypy-1.13.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:39bb21c69a5d6342f4ce526e4584bc5c197fd20a60d14a8624d8743fffb9472e"},
+    {file = "mypy-1.13.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:164f28cb9d6367439031f4c81e84d3ccaa1e19232d9d05d37cb0bd880d3f93c2"},
+    {file = "mypy-1.13.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:a4c1bfcdbce96ff5d96fc9b08e3831acb30dc44ab02671eca5953eadad07d6d0"},
+    {file = "mypy-1.13.0-cp312-cp312-win_amd64.whl", hash = "sha256:a0affb3a79a256b4183ba09811e3577c5163ed06685e4d4b46429a271ba174d2"},
+    {file = "mypy-1.13.0-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:a7b44178c9760ce1a43f544e595d35ed61ac2c3de306599fa59b38a6048e1aa7"},
+    {file = "mypy-1.13.0-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:5d5092efb8516d08440e36626f0153b5006d4088c1d663d88bf79625af3d1d62"},
+    {file = "mypy-1.13.0-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:de2904956dac40ced10931ac967ae63c5089bd498542194b436eb097a9f77bc8"},
+    {file = "mypy-1.13.0-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:7bfd8836970d33c2105562650656b6846149374dc8ed77d98424b40b09340ba7"},
+    {file = "mypy-1.13.0-cp313-cp313-win_amd64.whl", hash = "sha256:9f73dba9ec77acb86457a8fc04b5239822df0c14a082564737833d2963677dbc"},
+    {file = "mypy-1.13.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:100fac22ce82925f676a734af0db922ecfea991e1d7ec0ceb1e115ebe501301a"},
+    {file = "mypy-1.13.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:7bcb0bb7f42a978bb323a7c88f1081d1b5dee77ca86f4100735a6f541299d8fb"},
+    {file = "mypy-1.13.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:bde31fc887c213e223bbfc34328070996061b0833b0a4cfec53745ed61f3519b"},
+    {file = "mypy-1.13.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:07de989f89786f62b937851295ed62e51774722e5444a27cecca993fc3f9cd74"},
+    {file = "mypy-1.13.0-cp38-cp38-win_amd64.whl", hash = "sha256:4bde84334fbe19bad704b3f5b78c4abd35ff1026f8ba72b29de70dda0916beb6"},
+    {file = "mypy-1.13.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:0246bcb1b5de7f08f2826451abd947bf656945209b140d16ed317f65a17dc7dc"},
+    {file = "mypy-1.13.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:7f5b7deae912cf8b77e990b9280f170381fdfbddf61b4ef80927edd813163732"},
+    {file = "mypy-1.13.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:7029881ec6ffb8bc233a4fa364736789582c738217b133f1b55967115288a2bc"},
+    {file = "mypy-1.13.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:3e38b980e5681f28f033f3be86b099a247b13c491f14bb8b1e1e134d23bb599d"},
+    {file = "mypy-1.13.0-cp39-cp39-win_amd64.whl", hash = "sha256:a6789be98a2017c912ae6ccb77ea553bbaf13d27605d2ca20a76dfbced631b24"},
+    {file = "mypy-1.13.0-py3-none-any.whl", hash = "sha256:9c250883f9fd81d212e0952c92dbfcc96fc237f4b7c92f56ac81fd48460b3e5a"},
+    {file = "mypy-1.13.0.tar.gz", hash = "sha256:0291a61b6fbf3e6673e3405cfcc0e7650bebc7939659fdca2702958038bd835e"},
 ]
 
 [package.dependencies]
-mypy-extensions = ">=0.4.3"
+mypy-extensions = ">=1.0.0"
 tomli = {version = ">=1.1.0", markers = "python_version < \"3.11\""}
-typing-extensions = ">=3.10"
+typing-extensions = ">=4.6.0"
 
 [package.extras]
 dmypy = ["psutil (>=4.0)"]
+faster-cache = ["orjson"]
 install-types = ["pip"]
-python2 = ["typed-ast (>=1.4.0,<2)"]
+mypyc = ["setuptools (>=50)"]
 reports = ["lxml"]
 
 [[package]]
@@ -427,29 +434,29 @@ six = ">=1.5"
 
 [[package]]
 name = "ruff"
-version = "0.5.7"
+version = "0.11.5"
 description = "An extremely fast Python linter and code formatter, written in Rust."
 optional = false
 python-versions = ">=3.7"
 files = [
-    {file = "ruff-0.5.7-py3-none-linux_armv6l.whl", hash = "sha256:548992d342fc404ee2e15a242cdbea4f8e39a52f2e7752d0e4cbe88d2d2f416a"},
-    {file = "ruff-0.5.7-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:00cc8872331055ee017c4f1071a8a31ca0809ccc0657da1d154a1d2abac5c0be"},
-    {file = "ruff-0.5.7-py3-none-macosx_11_0_arm64.whl", hash = "sha256:eaf3d86a1fdac1aec8a3417a63587d93f906c678bb9ed0b796da7b59c1114a1e"},
-    {file = "ruff-0.5.7-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a01c34400097b06cf8a6e61b35d6d456d5bd1ae6961542de18ec81eaf33b4cb8"},
-    {file = "ruff-0.5.7-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:fcc8054f1a717e2213500edaddcf1dbb0abad40d98e1bd9d0ad364f75c763eea"},
-    {file = "ruff-0.5.7-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:7f70284e73f36558ef51602254451e50dd6cc479f8b6f8413a95fcb5db4a55fc"},
-    {file = "ruff-0.5.7-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:a78ad870ae3c460394fc95437d43deb5c04b5c29297815a2a1de028903f19692"},
-    {file = "ruff-0.5.7-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9ccd078c66a8e419475174bfe60a69adb36ce04f8d4e91b006f1329d5cd44bcf"},
-    {file = "ruff-0.5.7-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7e31c9bad4ebf8fdb77b59cae75814440731060a09a0e0077d559a556453acbb"},
-    {file = "ruff-0.5.7-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:8d796327eed8e168164346b769dd9a27a70e0298d667b4ecee6877ce8095ec8e"},
-    {file = "ruff-0.5.7-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:4a09ea2c3f7778cc635e7f6edf57d566a8ee8f485f3c4454db7771efb692c499"},
-    {file = "ruff-0.5.7-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:a36d8dcf55b3a3bc353270d544fb170d75d2dff41eba5df57b4e0b67a95bb64e"},
-    {file = "ruff-0.5.7-py3-none-musllinux_1_2_i686.whl", hash = "sha256:9369c218f789eefbd1b8d82a8cf25017b523ac47d96b2f531eba73770971c9e5"},
-    {file = "ruff-0.5.7-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:b88ca3db7eb377eb24fb7c82840546fb7acef75af4a74bd36e9ceb37a890257e"},
-    {file = "ruff-0.5.7-py3-none-win32.whl", hash = "sha256:33d61fc0e902198a3e55719f4be6b375b28f860b09c281e4bdbf783c0566576a"},
-    {file = "ruff-0.5.7-py3-none-win_amd64.whl", hash = "sha256:083bbcbe6fadb93cd86709037acc510f86eed5a314203079df174c40bbbca6b3"},
-    {file = "ruff-0.5.7-py3-none-win_arm64.whl", hash = "sha256:2dca26154ff9571995107221d0aeaad0e75a77b5a682d6236cf89a58c70b76f4"},
-    {file = "ruff-0.5.7.tar.gz", hash = "sha256:8dfc0a458797f5d9fb622dd0efc52d796f23f0a1493a9527f4e49a550ae9a7e5"},
+    {file = "ruff-0.11.5-py3-none-linux_armv6l.whl", hash = "sha256:2561294e108eb648e50f210671cc56aee590fb6167b594144401532138c66c7b"},
+    {file = "ruff-0.11.5-py3-none-macosx_10_12_x86_64.whl", hash = "sha256:ac12884b9e005c12d0bd121f56ccf8033e1614f736f766c118ad60780882a077"},
+    {file = "ruff-0.11.5-py3-none-macosx_11_0_arm64.whl", hash = "sha256:4bfd80a6ec559a5eeb96c33f832418bf0fb96752de0539905cf7b0cc1d31d779"},
+    {file = "ruff-0.11.5-py3-none-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:0947c0a1afa75dcb5db4b34b070ec2bccee869d40e6cc8ab25aca11a7d527794"},
+    {file = "ruff-0.11.5-py3-none-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:ad871ff74b5ec9caa66cb725b85d4ef89b53f8170f47c3406e32ef040400b038"},
+    {file = "ruff-0.11.5-py3-none-manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e6cf918390cfe46d240732d4d72fa6e18e528ca1f60e318a10835cf2fa3dc19f"},
+    {file = "ruff-0.11.5-py3-none-manylinux_2_17_ppc64.manylinux2014_ppc64.whl", hash = "sha256:56145ee1478582f61c08f21076dc59153310d606ad663acc00ea3ab5b2125f82"},
+    {file = "ruff-0.11.5-py3-none-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:e5f66f8f1e8c9fc594cbd66fbc5f246a8d91f916cb9667e80208663ec3728304"},
+    {file = "ruff-0.11.5-py3-none-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:80b4df4d335a80315ab9afc81ed1cff62be112bd165e162b5eed8ac55bfc8470"},
+    {file = "ruff-0.11.5-py3-none-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:3068befab73620b8a0cc2431bd46b3cd619bc17d6f7695a3e1bb166b652c382a"},
+    {file = "ruff-0.11.5-py3-none-musllinux_1_2_aarch64.whl", hash = "sha256:f5da2e710a9641828e09aa98b92c9ebbc60518fdf3921241326ca3e8f8e55b8b"},
+    {file = "ruff-0.11.5-py3-none-musllinux_1_2_armv7l.whl", hash = "sha256:ef39f19cb8ec98cbc762344921e216f3857a06c47412030374fffd413fb8fd3a"},
+    {file = "ruff-0.11.5-py3-none-musllinux_1_2_i686.whl", hash = "sha256:b2a7cedf47244f431fd11aa5a7e2806dda2e0c365873bda7834e8f7d785ae159"},
+    {file = "ruff-0.11.5-py3-none-musllinux_1_2_x86_64.whl", hash = "sha256:81be52e7519f3d1a0beadcf8e974715b2dfc808ae8ec729ecfc79bddf8dbb783"},
+    {file = "ruff-0.11.5-py3-none-win32.whl", hash = "sha256:e268da7b40f56e3eca571508a7e567e794f9bfcc0f412c4b607931d3af9c4afe"},
+    {file = "ruff-0.11.5-py3-none-win_amd64.whl", hash = "sha256:6c6dc38af3cfe2863213ea25b6dc616d679205732dc0fb673356c2d69608f800"},
+    {file = "ruff-0.11.5-py3-none-win_arm64.whl", hash = "sha256:67e241b4314f4eacf14a601d586026a962f4002a475aa702c69980a38087aa4e"},
+    {file = "ruff-0.11.5.tar.gz", hash = "sha256:cae2e2439cb88853e421901ec040a758960b576126dab520fa08e9de431d1bef"},
 ]
 
 [[package]]
@@ -540,4 +547,4 @@ files = [
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8"
-content-hash = "6f6c191c1028d17a97fdfa84cedfd3cef94b5d63d98b8c1d333b3398eeea9055"
+content-hash = "9c462a453d491f6c13e77f216c114935f5785c9e0c2288839fb0862ea2551003"
diff --git a/pyproject.toml b/pyproject.toml
index 6162d311..a0346d67 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -41,13 +41,13 @@ pydantic = ">= 1.9.2"
 pydantic-core = "^2.18.2"
 typing_extensions = ">= 4.0.0"
 
-[tool.poetry.dev-dependencies]
-mypy = "1.0.1"
+[tool.poetry.group.dev.dependencies]
+mypy = "==1.13.0"
 pytest = "^7.4.0"
 pytest-asyncio = "^0.23.5"
 python-dateutil = "^2.9.0"
 types-python-dateutil = "^2.9.0.20240316"
-ruff = "^0.5.6"
+ruff = "==0.11.5"
 
 [tool.pytest.ini_options]
 testpaths = [ "tests" ]
@@ -59,6 +59,26 @@ plugins = ["pydantic.mypy"]
 [tool.ruff]
 line-length = 120
 
+[tool.ruff.lint]
+select = [
+    "E",  # pycodestyle errors
+    "F",  # pyflakes
+    "I",  # isort
+]
+ignore = [
+    "E402",  # Module level import not at top of file
+    "E501",  # Line too long
+    "E711",  # Comparison to `None` should be `cond is not None`
+    "E712",  # Avoid equality comparisons to `True`; use `if ...:` checks
+    "E721",  # Use `is` and `is not` for type comparisons, or `isinstance()` for insinstance checks
+    "E722",  # Do not use bare `except`
+    "E731",  # Do not assign a `lambda` expression, use a `def`
+    "F821",  # Undefined name
+    "F841"   # Local variable ... is assigned to but never used
+]
+
+[tool.ruff.lint.isort]
+section-order = ["future", "standard-library", "third-party", "first-party"]
 
 [build-system]
 requires = ["poetry-core"]
diff --git a/requirements.txt b/requirements.txt
index f502f1b0..170f5122 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 httpx>=0.21.2
 pydantic>= 1.9.2
-pydantic-core==^2.18.2
+pydantic-core==2.18.2
 typing_extensions>= 4.0.0
diff --git a/src/square/__init__.py b/src/square/__init__.py
index 33d63e6f..22c3a097 100644
--- a/src/square/__init__.py
+++ b/src/square/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import (
     apple_pay,
     bank_accounts,
diff --git a/src/square/apple_pay/__init__.py b/src/square/apple_pay/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/apple_pay/__init__.py
+++ b/src/square/apple_pay/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/apple_pay/client.py b/src/square/apple_pay/client.py
index e2179ebc..6dd11b9c 100644
--- a/src/square/apple_pay/client.py
+++ b/src/square/apple_pay/client.py
@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawApplePayClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
 from ..types.register_domain_response import RegisterDomainResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawApplePayClient
+from .raw_client import AsyncRawApplePayClient, RawApplePayClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -70,8 +69,8 @@ def register_domain(
             domain_name="example.com",
         )
         """
-        response = self._raw_client.register_domain(domain_name=domain_name, request_options=request_options)
-        return response.data
+        _response = self._raw_client.register_domain(domain_name=domain_name, request_options=request_options)
+        return _response.data
 
 
 class AsyncApplePayClient:
@@ -140,5 +139,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.register_domain(domain_name=domain_name, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.register_domain(domain_name=domain_name, request_options=request_options)
+        return _response.data
diff --git a/src/square/apple_pay/raw_client.py b/src/square/apple_pay/raw_client.py
index a0afefc9..f4192cfa 100644
--- a/src/square/apple_pay/raw_client.py
+++ b/src/square/apple_pay/raw_client.py
@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.register_domain_response import RegisterDomainResponse
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.register_domain_response import RegisterDomainResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -75,8 +74,8 @@ def register_domain(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawApplePayClient:
@@ -139,5 +138,5 @@ async def register_domain(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/bank_accounts/__init__.py b/src/square/bank_accounts/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/bank_accounts/__init__.py
+++ b/src/square/bank_accounts/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/bank_accounts/client.py b/src/square/bank_accounts/client.py
index 2a70599f..91e251af 100644
--- a/src/square/bank_accounts/client.py
+++ b/src/square/bank_accounts/client.py
@@ -1,20 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawBankAccountsClient
 import typing
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
 from ..types.bank_account import BankAccount
-from ..types.list_bank_accounts_response import ListBankAccountsResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..types.get_bank_account_by_v1id_response import GetBankAccountByV1IdResponse
 from ..types.get_bank_account_response import GetBankAccountResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawBankAccountsClient
-from ..core.pagination import AsyncPager
+from .raw_client import AsyncRawBankAccountsClient, RawBankAccountsClient
 
 
 class BankAccountsClient:
@@ -83,39 +77,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bank-accounts",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-                "location_id": location_id,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            cursor=cursor, limit=limit, location_id=location_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBankAccountsResponse,
-                    construct_type(
-                        type_=ListBankAccountsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    location_id=location_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.bank_accounts
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get_by_v1id(
         self, v1bank_account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -148,8 +112,8 @@ def get_by_v1id(
             v1bank_account_id="v1_bank_account_id",
         )
         """
-        response = self._raw_client.get_by_v1id(v1bank_account_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get_by_v1id(v1bank_account_id, request_options=request_options)
+        return _response.data
 
     def get(
         self, bank_account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -182,8 +146,8 @@ def get(
             bank_account_id="bank_account_id",
         )
         """
-        response = self._raw_client.get(bank_account_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(bank_account_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncBankAccountsClient:
@@ -253,6 +217,7 @@ async def main() -> None:
             response = await client.bank_accounts.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -260,39 +225,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bank-accounts",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-                "location_id": location_id,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            cursor=cursor, limit=limit, location_id=location_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBankAccountsResponse,
-                    construct_type(
-                        type_=ListBankAccountsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    location_id=location_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.bank_accounts
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get_by_v1id(
         self, v1bank_account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -333,8 +268,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get_by_v1id(v1bank_account_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get_by_v1id(v1bank_account_id, request_options=request_options)
+        return _response.data
 
     async def get(
         self, bank_account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -375,5 +310,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(bank_account_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(bank_account_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/bank_accounts/raw_client.py b/src/square/bank_accounts/raw_client.py
index 079fc0c0..1cf95c31 100644
--- a/src/square/bank_accounts/raw_client.py
+++ b/src/square/bank_accounts/raw_client.py
@@ -1,23 +1,98 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
 import typing
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.get_bank_account_by_v1id_response import GetBankAccountByV1IdResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.bank_account import BankAccount
+from ..types.get_bank_account_by_v1id_response import GetBankAccountByV1IdResponse
 from ..types.get_bank_account_response import GetBankAccountResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.list_bank_accounts_response import ListBankAccountsResponse
 
 
 class RawBankAccountsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        location_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[BankAccount]:
+        """
+        Returns a list of [BankAccount](entity:BankAccount) objects linked to a Square account.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            The pagination cursor returned by a previous call to this endpoint.
+            Use it in the next `ListBankAccounts` request to retrieve the next set
+            of results.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
+
+        limit : typing.Optional[int]
+            Upper limit on the number of bank accounts to return in the response.
+            Currently, 1000 is the largest supported limit. You can specify a limit
+            of up to 1000 bank accounts. This is also the default limit.
+
+        location_id : typing.Optional[str]
+            Location ID. You can specify this optional filter
+            to retrieve only the linked bank accounts belonging to a specific location.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[BankAccount]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/bank-accounts",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+                "location_id": location_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBankAccountsResponse,
+                    construct_type(
+                        type_=ListBankAccountsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.bank_accounts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    limit=limit,
+                    location_id=location_id,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get_by_v1id(
         self, v1bank_account_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetBankAccountByV1IdResponse]:
@@ -55,8 +130,8 @@ def get_by_v1id(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, bank_account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -95,14 +170,90 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawBankAccountsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        location_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[BankAccount]:
+        """
+        Returns a list of [BankAccount](entity:BankAccount) objects linked to a Square account.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            The pagination cursor returned by a previous call to this endpoint.
+            Use it in the next `ListBankAccounts` request to retrieve the next set
+            of results.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
+
+        limit : typing.Optional[int]
+            Upper limit on the number of bank accounts to return in the response.
+            Currently, 1000 is the largest supported limit. You can specify a limit
+            of up to 1000 bank accounts. This is also the default limit.
+
+        location_id : typing.Optional[str]
+            Location ID. You can specify this optional filter
+            to retrieve only the linked bank accounts belonging to a specific location.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[BankAccount]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/bank-accounts",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+                "location_id": location_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBankAccountsResponse,
+                    construct_type(
+                        type_=ListBankAccountsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.bank_accounts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        limit=limit,
+                        location_id=location_id,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get_by_v1id(
         self, v1bank_account_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetBankAccountByV1IdResponse]:
@@ -140,8 +291,8 @@ async def get_by_v1id(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, bank_account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -180,5 +331,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/bookings/__init__.py b/src/square/bookings/__init__.py
index 1dd96f75..96ceaa83 100644
--- a/src/square/bookings/__init__.py
+++ b/src/square/bookings/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import custom_attribute_definitions, custom_attributes, location_profiles, team_member_profiles
 
 __all__ = ["custom_attribute_definitions", "custom_attributes", "location_profiles", "team_member_profiles"]
diff --git a/src/square/bookings/client.py b/src/square/bookings/client.py
index c67ce3f4..72660501 100644
--- a/src/square/bookings/client.py
+++ b/src/square/bookings/client.py
@@ -1,37 +1,27 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawBookingsClient
-from .custom_attribute_definitions.client import CustomAttributeDefinitionsClient
-from .custom_attributes.client import CustomAttributesClient
-from .location_profiles.client import LocationProfilesClient
-from .team_member_profiles.client import TeamMemberProfilesClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.booking import Booking
-from ..types.list_bookings_response import ListBookingsResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..requests.booking import BookingParams
-from ..types.create_booking_response import CreateBookingResponse
 from ..requests.search_availability_query import SearchAvailabilityQueryParams
-from ..types.search_availability_response import SearchAvailabilityResponse
+from ..types.booking import Booking
 from ..types.bulk_retrieve_bookings_response import BulkRetrieveBookingsResponse
-from ..types.get_business_booking_profile_response import GetBusinessBookingProfileResponse
-from ..types.retrieve_location_booking_profile_response import RetrieveLocationBookingProfileResponse
 from ..types.bulk_retrieve_team_member_booking_profiles_response import BulkRetrieveTeamMemberBookingProfilesResponse
+from ..types.cancel_booking_response import CancelBookingResponse
+from ..types.create_booking_response import CreateBookingResponse
 from ..types.get_booking_response import GetBookingResponse
+from ..types.get_business_booking_profile_response import GetBusinessBookingProfileResponse
+from ..types.retrieve_location_booking_profile_response import RetrieveLocationBookingProfileResponse
+from ..types.search_availability_response import SearchAvailabilityResponse
 from ..types.update_booking_response import UpdateBookingResponse
-from ..types.cancel_booking_response import CancelBookingResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawBookingsClient
-from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient
-from .custom_attributes.client import AsyncCustomAttributesClient
-from .location_profiles.client import AsyncLocationProfilesClient
-from .team_member_profiles.client import AsyncTeamMemberProfilesClient
-from ..core.pagination import AsyncPager
+from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient, CustomAttributeDefinitionsClient
+from .custom_attributes.client import AsyncCustomAttributesClient, CustomAttributesClient
+from .location_profiles.client import AsyncLocationProfilesClient, LocationProfilesClient
+from .raw_client import AsyncRawBookingsClient, RawBookingsClient
+from .team_member_profiles.client import AsyncTeamMemberProfilesClient, TeamMemberProfilesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -122,47 +112,16 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bookings",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-                "customer_id": customer_id,
-                "team_member_id": team_member_id,
-                "location_id": location_id,
-                "start_at_min": start_at_min,
-                "start_at_max": start_at_max,
-            },
+        return self._raw_client.list(
+            limit=limit,
+            cursor=cursor,
+            customer_id=customer_id,
+            team_member_id=team_member_id,
+            location_id=location_id,
+            start_at_min=start_at_min,
+            start_at_max=start_at_max,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBookingsResponse,
-                    construct_type(
-                        type_=ListBookingsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    customer_id=customer_id,
-                    team_member_id=team_member_id,
-                    location_id=location_id,
-                    start_at_min=start_at_min,
-                    start_at_max=start_at_max,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.bookings
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -214,10 +173,10 @@ def create(
             booking={},
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             booking=booking, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search_availability(
         self, *, query: SearchAvailabilityQueryParams, request_options: typing.Optional[RequestOptions] = None
@@ -252,8 +211,8 @@ def search_availability(
             query={"filter": {"start_at_range": {}}},
         )
         """
-        response = self._raw_client.search_availability(query=query, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search_availability(query=query, request_options=request_options)
+        return _response.data
 
     def bulk_retrieve_bookings(
         self, *, booking_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -288,8 +247,8 @@ def bulk_retrieve_bookings(
             booking_ids=["booking_ids"],
         )
         """
-        response = self._raw_client.bulk_retrieve_bookings(booking_ids=booking_ids, request_options=request_options)
-        return response.data
+        _response = self._raw_client.bulk_retrieve_bookings(booking_ids=booking_ids, request_options=request_options)
+        return _response.data
 
     def get_business_profile(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -316,8 +275,8 @@ def get_business_profile(
         )
         client.bookings.get_business_profile()
         """
-        response = self._raw_client.get_business_profile(request_options=request_options)
-        return response.data
+        _response = self._raw_client.get_business_profile(request_options=request_options)
+        return _response.data
 
     def retrieve_location_booking_profile(
         self, location_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -349,8 +308,8 @@ def retrieve_location_booking_profile(
             location_id="location_id",
         )
         """
-        response = self._raw_client.retrieve_location_booking_profile(location_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.retrieve_location_booking_profile(location_id, request_options=request_options)
+        return _response.data
 
     def bulk_retrieve_team_member_booking_profiles(
         self, *, team_member_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -382,10 +341,10 @@ def bulk_retrieve_team_member_booking_profiles(
             team_member_ids=["team_member_ids"],
         )
         """
-        response = self._raw_client.bulk_retrieve_team_member_booking_profiles(
+        _response = self._raw_client.bulk_retrieve_team_member_booking_profiles(
             team_member_ids=team_member_ids, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(self, booking_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetBookingResponse:
         """
@@ -418,8 +377,8 @@ def get(self, booking_id: str, *, request_options: typing.Optional[RequestOption
             booking_id="booking_id",
         )
         """
-        response = self._raw_client.get(booking_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(booking_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -469,10 +428,10 @@ def update(
             booking={},
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             booking_id, booking=booking, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def cancel(
         self,
@@ -521,13 +480,13 @@ def cancel(
             booking_id="booking_id",
         )
         """
-        response = self._raw_client.cancel(
+        _response = self._raw_client.cancel(
             booking_id,
             idempotency_key=idempotency_key,
             booking_version=booking_version,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
 
 class AsyncBookingsClient:
@@ -616,6 +575,7 @@ async def main() -> None:
             response = await client.bookings.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -623,47 +583,16 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bookings",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-                "customer_id": customer_id,
-                "team_member_id": team_member_id,
-                "location_id": location_id,
-                "start_at_min": start_at_min,
-                "start_at_max": start_at_max,
-            },
+        return await self._raw_client.list(
+            limit=limit,
+            cursor=cursor,
+            customer_id=customer_id,
+            team_member_id=team_member_id,
+            location_id=location_id,
+            start_at_min=start_at_min,
+            start_at_max=start_at_max,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBookingsResponse,
-                    construct_type(
-                        type_=ListBookingsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    customer_id=customer_id,
-                    team_member_id=team_member_id,
-                    location_id=location_id,
-                    start_at_min=start_at_min,
-                    start_at_max=start_at_max,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.bookings
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -723,10 +652,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             booking=booking, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search_availability(
         self, *, query: SearchAvailabilityQueryParams, request_options: typing.Optional[RequestOptions] = None
@@ -769,8 +698,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search_availability(query=query, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.search_availability(query=query, request_options=request_options)
+        return _response.data
 
     async def bulk_retrieve_bookings(
         self, *, booking_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -813,10 +742,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.bulk_retrieve_bookings(
+        _response = await self._raw_client.bulk_retrieve_bookings(
             booking_ids=booking_ids, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get_business_profile(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -851,8 +780,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get_business_profile(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get_business_profile(request_options=request_options)
+        return _response.data
 
     async def retrieve_location_booking_profile(
         self, location_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -892,10 +821,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.retrieve_location_booking_profile(
+        _response = await self._raw_client.retrieve_location_booking_profile(
             location_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def bulk_retrieve_team_member_booking_profiles(
         self, *, team_member_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -935,10 +864,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.bulk_retrieve_team_member_booking_profiles(
+        _response = await self._raw_client.bulk_retrieve_team_member_booking_profiles(
             team_member_ids=team_member_ids, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, booking_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -981,8 +910,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(booking_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(booking_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -1040,10 +969,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             booking_id, booking=booking, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def cancel(
         self,
@@ -1100,10 +1029,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.cancel(
+        _response = await self._raw_client.cancel(
             booking_id,
             idempotency_key=idempotency_key,
             booking_version=booking_version,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
diff --git a/src/square/bookings/custom_attribute_definitions/__init__.py b/src/square/bookings/custom_attribute_definitions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/bookings/custom_attribute_definitions/__init__.py
+++ b/src/square/bookings/custom_attribute_definitions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/bookings/custom_attribute_definitions/client.py b/src/square/bookings/custom_attribute_definitions/client.py
index f11d269b..120ad244 100644
--- a/src/square/bookings/custom_attribute_definitions/client.py
+++ b/src/square/bookings/custom_attribute_definitions/client.py
@@ -1,25 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributeDefinitionsClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.custom_attribute_definition import CustomAttributeDefinition
-from ...types.list_booking_custom_attribute_definitions_response import ListBookingCustomAttributeDefinitionsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
 from ...types.create_booking_custom_attribute_definition_response import CreateBookingCustomAttributeDefinitionResponse
+from ...types.custom_attribute_definition import CustomAttributeDefinition
+from ...types.delete_booking_custom_attribute_definition_response import DeleteBookingCustomAttributeDefinitionResponse
 from ...types.retrieve_booking_custom_attribute_definition_response import (
     RetrieveBookingCustomAttributeDefinitionResponse,
 )
 from ...types.update_booking_custom_attribute_definition_response import UpdateBookingCustomAttributeDefinitionResponse
-from ...types.delete_booking_custom_attribute_definition_response import DeleteBookingCustomAttributeDefinitionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributeDefinitionsClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawCustomAttributeDefinitionsClient, RawCustomAttributeDefinitionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -87,37 +81,7 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bookings/custom-attribute-definitions",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBookingCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListBookingCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return self._raw_client.list(limit=limit, cursor=cursor, request_options=request_options)
 
     def create(
         self,
@@ -177,12 +141,12 @@ def create(
             custom_attribute_definition={},
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -224,8 +188,8 @@ def get(
             key="key",
         )
         """
-        response = self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -287,13 +251,13 @@ def update(
             custom_attribute_definition={},
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -331,8 +295,8 @@ def delete(
             key="key",
         )
         """
-        response = self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(key, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributeDefinitionsClient:
@@ -398,6 +362,7 @@ async def main() -> None:
             response = await client.bookings.custom_attribute_definitions.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -405,37 +370,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bookings/custom-attribute-definitions",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBookingCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListBookingCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return await self._raw_client.list(limit=limit, cursor=cursor, request_options=request_options)
 
     async def create(
         self,
@@ -503,12 +438,12 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -558,8 +493,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -629,13 +564,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -681,5 +616,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(key, request_options=request_options)
+        return _response.data
diff --git a/src/square/bookings/custom_attribute_definitions/raw_client.py b/src/square/bookings/custom_attribute_definitions/raw_client.py
index 72eb0db3..d2567958 100644
--- a/src/square/bookings/custom_attribute_definitions/raw_client.py
+++ b/src/square/bookings/custom_attribute_definitions/raw_client.py
@@ -1,23 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_booking_custom_attribute_definition_response import CreateBookingCustomAttributeDefinitionResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
+from ...types.create_booking_custom_attribute_definition_response import CreateBookingCustomAttributeDefinitionResponse
+from ...types.custom_attribute_definition import CustomAttributeDefinition
+from ...types.delete_booking_custom_attribute_definition_response import DeleteBookingCustomAttributeDefinitionResponse
+from ...types.list_booking_custom_attribute_definitions_response import ListBookingCustomAttributeDefinitionsResponse
 from ...types.retrieve_booking_custom_attribute_definition_response import (
     RetrieveBookingCustomAttributeDefinitionResponse,
 )
-from ...core.jsonable_encoder import jsonable_encoder
 from ...types.update_booking_custom_attribute_definition_response import UpdateBookingCustomAttributeDefinitionResponse
-from ...types.delete_booking_custom_attribute_definition_response import DeleteBookingCustomAttributeDefinitionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -27,6 +29,73 @@ class RawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttributeDefinition]:
+        """
+        Get all bookings custom attribute definitions.
+
+        To call this endpoint with buyer-level permissions, set `APPOINTMENTS_READ` for the OAuth scope.
+        To call this endpoint with seller-level permissions, set `APPOINTMENTS_ALL_READ` and `APPOINTMENTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/bookings/custom-attribute-definitions",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBookingCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListBookingCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -101,8 +170,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -153,8 +222,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -231,8 +300,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -276,14 +345,84 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttributeDefinition]:
+        """
+        Get all bookings custom attribute definitions.
+
+        To call this endpoint with buyer-level permissions, set `APPOINTMENTS_READ` for the OAuth scope.
+        To call this endpoint with seller-level permissions, set `APPOINTMENTS_ALL_READ` and `APPOINTMENTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/bookings/custom-attribute-definitions",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBookingCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListBookingCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -358,8 +497,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -410,8 +549,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -488,8 +627,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -533,5 +672,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/bookings/custom_attributes/__init__.py b/src/square/bookings/custom_attributes/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/bookings/custom_attributes/__init__.py
+++ b/src/square/bookings/custom_attributes/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/bookings/custom_attributes/client.py b/src/square/bookings/custom_attributes/client.py
index 9b66e8b2..5b4c1a66 100644
--- a/src/square/bookings/custom_attributes/client.py
+++ b/src/square/bookings/custom_attributes/client.py
@@ -1,27 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributesClient
-from ...requests.booking_custom_attribute_delete_request import BookingCustomAttributeDeleteRequestParams
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...types.bulk_delete_booking_custom_attributes_response import BulkDeleteBookingCustomAttributesResponse
+from ...requests.booking_custom_attribute_delete_request import BookingCustomAttributeDeleteRequestParams
 from ...requests.booking_custom_attribute_upsert_request import BookingCustomAttributeUpsertRequestParams
+from ...requests.custom_attribute import CustomAttributeParams
+from ...types.bulk_delete_booking_custom_attributes_response import BulkDeleteBookingCustomAttributesResponse
 from ...types.bulk_upsert_booking_custom_attributes_response import BulkUpsertBookingCustomAttributesResponse
-from ...core.pagination import SyncPager
 from ...types.custom_attribute import CustomAttribute
-from ...core.jsonable_encoder import jsonable_encoder
-from ...types.list_booking_custom_attributes_response import ListBookingCustomAttributesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...types.delete_booking_custom_attribute_response import DeleteBookingCustomAttributeResponse
 from ...types.retrieve_booking_custom_attribute_response import RetrieveBookingCustomAttributeResponse
-from ...requests.custom_attribute import CustomAttributeParams
 from ...types.upsert_booking_custom_attribute_response import UpsertBookingCustomAttributeResponse
-from ...types.delete_booking_custom_attribute_response import DeleteBookingCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributesClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawCustomAttributesClient, RawCustomAttributesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -83,8 +76,8 @@ def batch_delete(
             values={"key": {"booking_id": "booking_id", "key": "key"}},
         )
         """
-        response = self._raw_client.batch_delete(values=values, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_delete(values=values, request_options=request_options)
+        return _response.data
 
     def batch_upsert(
         self,
@@ -127,8 +120,8 @@ def batch_upsert(
             values={"key": {"booking_id": "booking_id", "custom_attribute": {}}},
         )
         """
-        response = self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
 
     def list(
         self,
@@ -189,40 +182,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/bookings/{jsonable_encoder(booking_id)}/custom-attributes",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-                "with_definitions": with_definitions,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            booking_id, limit=limit, cursor=cursor, with_definitions=with_definitions, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBookingCustomAttributesResponse,
-                    construct_type(
-                        type_=ListBookingCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    booking_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(
         self,
@@ -280,10 +242,10 @@ def get(
             key="key",
         )
         """
-        response = self._raw_client.get(
+        _response = self._raw_client.get(
             booking_id, key, with_definition=with_definition, version=version, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def upsert(
         self,
@@ -348,14 +310,14 @@ def upsert(
             custom_attribute={},
         )
         """
-        response = self._raw_client.upsert(
+        _response = self._raw_client.upsert(
             booking_id,
             key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, booking_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -399,8 +361,8 @@ def delete(
             key="key",
         )
         """
-        response = self._raw_client.delete(booking_id, key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(booking_id, key, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributesClient:
@@ -467,8 +429,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_delete(values=values, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_delete(values=values, request_options=request_options)
+        return _response.data
 
     async def batch_upsert(
         self,
@@ -519,8 +481,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
 
     async def list(
         self,
@@ -582,6 +544,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -589,40 +552,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/bookings/{jsonable_encoder(booking_id)}/custom-attributes",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-                "with_definitions": with_definitions,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            booking_id, limit=limit, cursor=cursor, with_definitions=with_definitions, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBookingCustomAttributesResponse,
-                    construct_type(
-                        type_=ListBookingCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    booking_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self,
@@ -688,10 +620,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(
+        _response = await self._raw_client.get(
             booking_id, key, with_definition=with_definition, version=version, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def upsert(
         self,
@@ -764,14 +696,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.upsert(
+        _response = await self._raw_client.upsert(
             booking_id,
             key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, booking_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -823,5 +755,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(booking_id, key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(booking_id, key, request_options=request_options)
+        return _response.data
diff --git a/src/square/bookings/custom_attributes/raw_client.py b/src/square/bookings/custom_attributes/raw_client.py
index 3e61fa87..fa0525e2 100644
--- a/src/square/bookings/custom_attributes/raw_client.py
+++ b/src/square/bookings/custom_attributes/raw_client.py
@@ -1,24 +1,26 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.booking_custom_attribute_delete_request import BookingCustomAttributeDeleteRequestParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.bulk_delete_booking_custom_attributes_response import BulkDeleteBookingCustomAttributesResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.booking_custom_attribute_delete_request import BookingCustomAttributeDeleteRequestParams
 from ...requests.booking_custom_attribute_upsert_request import BookingCustomAttributeUpsertRequestParams
+from ...requests.custom_attribute import CustomAttributeParams
+from ...types.bulk_delete_booking_custom_attributes_response import BulkDeleteBookingCustomAttributesResponse
 from ...types.bulk_upsert_booking_custom_attributes_response import BulkUpsertBookingCustomAttributesResponse
+from ...types.custom_attribute import CustomAttribute
+from ...types.delete_booking_custom_attribute_response import DeleteBookingCustomAttributeResponse
+from ...types.list_booking_custom_attributes_response import ListBookingCustomAttributesResponse
 from ...types.retrieve_booking_custom_attribute_response import RetrieveBookingCustomAttributeResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...requests.custom_attribute import CustomAttributeParams
 from ...types.upsert_booking_custom_attribute_response import UpsertBookingCustomAttributeResponse
-from ...types.delete_booking_custom_attribute_response import DeleteBookingCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -86,8 +88,8 @@ def batch_delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_upsert(
         self,
@@ -147,8 +149,88 @@ def batch_upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def list(
+        self,
+        booking_id: str,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttribute]:
+        """
+        Lists a booking's custom attributes.
+
+        To call this endpoint with buyer-level permissions, set `APPOINTMENTS_READ` for the OAuth scope.
+        To call this endpoint with seller-level permissions, set `APPOINTMENTS_ALL_READ` and `APPOINTMENTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        booking_id : str
+            The ID of the target [booking](entity:Booking).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request. For more
+            information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom
+            attribute, information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttribute]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/bookings/{jsonable_encoder(booking_id)}/custom-attributes",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBookingCustomAttributesResponse,
+                    construct_type(
+                        type_=ListBookingCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    booking_id,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    with_definitions=with_definitions,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self,
@@ -215,8 +297,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def upsert(
         self,
@@ -295,8 +377,8 @@ def upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, booking_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -345,8 +427,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributesClient:
@@ -411,8 +493,8 @@ async def batch_delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_upsert(
         self,
@@ -472,8 +554,91 @@ async def batch_upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def list(
+        self,
+        booking_id: str,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttribute]:
+        """
+        Lists a booking's custom attributes.
+
+        To call this endpoint with buyer-level permissions, set `APPOINTMENTS_READ` for the OAuth scope.
+        To call this endpoint with seller-level permissions, set `APPOINTMENTS_ALL_READ` and `APPOINTMENTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        booking_id : str
+            The ID of the target [booking](entity:Booking).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request. For more
+            information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom
+            attribute, information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttribute]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/bookings/{jsonable_encoder(booking_id)}/custom-attributes",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBookingCustomAttributesResponse,
+                    construct_type(
+                        type_=ListBookingCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        booking_id,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        with_definitions=with_definitions,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self,
@@ -540,8 +705,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def upsert(
         self,
@@ -620,8 +785,8 @@ async def upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, booking_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -670,5 +835,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/bookings/location_profiles/__init__.py b/src/square/bookings/location_profiles/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/bookings/location_profiles/__init__.py
+++ b/src/square/bookings/location_profiles/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/bookings/location_profiles/client.py b/src/square/bookings/location_profiles/client.py
index 35da0863..4aef41c6 100644
--- a/src/square/bookings/location_profiles/client.py
+++ b/src/square/bookings/location_profiles/client.py
@@ -1,18 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawLocationProfilesClient
 import typing
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
 from ...types.location_booking_profile import LocationBookingProfile
-from ...types.list_location_booking_profiles_response import ListLocationBookingProfilesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawLocationProfilesClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawLocationProfilesClient, RawLocationProfilesClient
 
 
 class LocationProfilesClient:
@@ -70,37 +64,7 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bookings/location-booking-profiles",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListLocationBookingProfilesResponse,
-                    construct_type(
-                        type_=ListLocationBookingProfilesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.location_booking_profiles
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return self._raw_client.list(limit=limit, cursor=cursor, request_options=request_options)
 
 
 class AsyncLocationProfilesClient:
@@ -159,6 +123,7 @@ async def main() -> None:
             response = await client.bookings.location_profiles.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -166,34 +131,4 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bookings/location-booking-profiles",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListLocationBookingProfilesResponse,
-                    construct_type(
-                        type_=ListLocationBookingProfilesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.location_booking_profiles
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return await self._raw_client.list(limit=limit, cursor=cursor, request_options=request_options)
diff --git a/src/square/bookings/location_profiles/raw_client.py b/src/square/bookings/location_profiles/raw_client.py
index 58a7ab18..22d7d6be 100644
--- a/src/square/bookings/location_profiles/raw_client.py
+++ b/src/square/bookings/location_profiles/raw_client.py
@@ -1,14 +1,145 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from ...core.client_wrapper import AsyncClientWrapper
+import typing
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.unchecked_base_model import construct_type
+from ...types.list_location_booking_profiles_response import ListLocationBookingProfilesResponse
+from ...types.location_booking_profile import LocationBookingProfile
 
 
 class RawLocationProfilesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[LocationBookingProfile]:
+        """
+        Lists location booking profiles of a seller.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of results to return in a paged response.
+
+        cursor : typing.Optional[str]
+            The pagination cursor from the preceding response to return the next page of the results. Do not set this when retrieving the first page of the results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[LocationBookingProfile]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/bookings/location-booking-profiles",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListLocationBookingProfilesResponse,
+                    construct_type(
+                        type_=ListLocationBookingProfilesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.location_booking_profiles
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
 
 class AsyncRawLocationProfilesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
+
+    async def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[LocationBookingProfile]:
+        """
+        Lists location booking profiles of a seller.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of results to return in a paged response.
+
+        cursor : typing.Optional[str]
+            The pagination cursor from the preceding response to return the next page of the results. Do not set this when retrieving the first page of the results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[LocationBookingProfile]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/bookings/location-booking-profiles",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListLocationBookingProfilesResponse,
+                    construct_type(
+                        type_=ListLocationBookingProfilesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.location_booking_profiles
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/bookings/raw_client.py b/src/square/bookings/raw_client.py
index c1cd027a..307d72d8 100644
--- a/src/square/bookings/raw_client.py
+++ b/src/square/bookings/raw_client.py
@@ -1,27 +1,29 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.booking import BookingParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_booking_response import CreateBookingResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
+from ..requests.booking import BookingParams
 from ..requests.search_availability_query import SearchAvailabilityQueryParams
-from ..types.search_availability_response import SearchAvailabilityResponse
+from ..types.booking import Booking
 from ..types.bulk_retrieve_bookings_response import BulkRetrieveBookingsResponse
-from ..types.get_business_booking_profile_response import GetBusinessBookingProfileResponse
-from ..types.retrieve_location_booking_profile_response import RetrieveLocationBookingProfileResponse
-from ..core.jsonable_encoder import jsonable_encoder
 from ..types.bulk_retrieve_team_member_booking_profiles_response import BulkRetrieveTeamMemberBookingProfilesResponse
+from ..types.cancel_booking_response import CancelBookingResponse
+from ..types.create_booking_response import CreateBookingResponse
 from ..types.get_booking_response import GetBookingResponse
+from ..types.get_business_booking_profile_response import GetBusinessBookingProfileResponse
+from ..types.list_bookings_response import ListBookingsResponse
+from ..types.retrieve_location_booking_profile_response import RetrieveLocationBookingProfileResponse
+from ..types.search_availability_response import SearchAvailabilityResponse
 from ..types.update_booking_response import UpdateBookingResponse
-from ..types.cancel_booking_response import CancelBookingResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -31,6 +33,99 @@ class RawBookingsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        customer_id: typing.Optional[str] = None,
+        team_member_id: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        start_at_min: typing.Optional[str] = None,
+        start_at_max: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[Booking]:
+        """
+        Retrieve a collection of bookings.
+
+        To call this endpoint with buyer-level permissions, set `APPOINTMENTS_READ` for the OAuth scope.
+        To call this endpoint with seller-level permissions, set `APPOINTMENTS_ALL_READ` and `APPOINTMENTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of results per page to return in a paged response.
+
+        cursor : typing.Optional[str]
+            The pagination cursor from the preceding response to return the next page of the results. Do not set this when retrieving the first page of the results.
+
+        customer_id : typing.Optional[str]
+            The [customer](entity:Customer) for whom to retrieve bookings. If this is not set, bookings for all customers are retrieved.
+
+        team_member_id : typing.Optional[str]
+            The team member for whom to retrieve bookings. If this is not set, bookings of all members are retrieved.
+
+        location_id : typing.Optional[str]
+            The location for which to retrieve bookings. If this is not set, all locations' bookings are retrieved.
+
+        start_at_min : typing.Optional[str]
+            The RFC 3339 timestamp specifying the earliest of the start time. If this is not set, the current time is used.
+
+        start_at_max : typing.Optional[str]
+            The RFC 3339 timestamp specifying the latest of the start time. If this is not set, the time of 31 days after `start_at_min` is used.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Booking]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/bookings",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+                "customer_id": customer_id,
+                "team_member_id": team_member_id,
+                "location_id": location_id,
+                "start_at_min": start_at_min,
+                "start_at_max": start_at_max,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBookingsResponse,
+                    construct_type(
+                        type_=ListBookingsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.bookings
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    limit=limit,
+                    cursor=_parsed_next,
+                    customer_id=customer_id,
+                    team_member_id=team_member_id,
+                    location_id=location_id,
+                    start_at_min=start_at_min,
+                    start_at_max=start_at_max,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -97,8 +192,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search_availability(
         self, *, query: SearchAvailabilityQueryParams, request_options: typing.Optional[RequestOptions] = None
@@ -148,8 +243,8 @@ def search_availability(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def bulk_retrieve_bookings(
         self, *, booking_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -197,8 +292,8 @@ def bulk_retrieve_bookings(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get_business_profile(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -233,8 +328,8 @@ def get_business_profile(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def retrieve_location_booking_profile(
         self, location_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -272,8 +367,8 @@ def retrieve_location_booking_profile(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def bulk_retrieve_team_member_booking_profiles(
         self, *, team_member_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -318,8 +413,8 @@ def bulk_retrieve_team_member_booking_profiles(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, booking_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -360,8 +455,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -426,8 +521,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def cancel(
         self,
@@ -490,14 +585,110 @@ def cancel(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawBookingsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        customer_id: typing.Optional[str] = None,
+        team_member_id: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        start_at_min: typing.Optional[str] = None,
+        start_at_max: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[Booking]:
+        """
+        Retrieve a collection of bookings.
+
+        To call this endpoint with buyer-level permissions, set `APPOINTMENTS_READ` for the OAuth scope.
+        To call this endpoint with seller-level permissions, set `APPOINTMENTS_ALL_READ` and `APPOINTMENTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of results per page to return in a paged response.
+
+        cursor : typing.Optional[str]
+            The pagination cursor from the preceding response to return the next page of the results. Do not set this when retrieving the first page of the results.
+
+        customer_id : typing.Optional[str]
+            The [customer](entity:Customer) for whom to retrieve bookings. If this is not set, bookings for all customers are retrieved.
+
+        team_member_id : typing.Optional[str]
+            The team member for whom to retrieve bookings. If this is not set, bookings of all members are retrieved.
+
+        location_id : typing.Optional[str]
+            The location for which to retrieve bookings. If this is not set, all locations' bookings are retrieved.
+
+        start_at_min : typing.Optional[str]
+            The RFC 3339 timestamp specifying the earliest of the start time. If this is not set, the current time is used.
+
+        start_at_max : typing.Optional[str]
+            The RFC 3339 timestamp specifying the latest of the start time. If this is not set, the time of 31 days after `start_at_min` is used.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Booking]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/bookings",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+                "customer_id": customer_id,
+                "team_member_id": team_member_id,
+                "location_id": location_id,
+                "start_at_min": start_at_min,
+                "start_at_max": start_at_max,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBookingsResponse,
+                    construct_type(
+                        type_=ListBookingsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.bookings
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        limit=limit,
+                        cursor=_parsed_next,
+                        customer_id=customer_id,
+                        team_member_id=team_member_id,
+                        location_id=location_id,
+                        start_at_min=start_at_min,
+                        start_at_max=start_at_max,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -564,8 +755,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search_availability(
         self, *, query: SearchAvailabilityQueryParams, request_options: typing.Optional[RequestOptions] = None
@@ -615,8 +806,8 @@ async def search_availability(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def bulk_retrieve_bookings(
         self, *, booking_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -664,8 +855,8 @@ async def bulk_retrieve_bookings(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get_business_profile(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -700,8 +891,8 @@ async def get_business_profile(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def retrieve_location_booking_profile(
         self, location_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -739,8 +930,8 @@ async def retrieve_location_booking_profile(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def bulk_retrieve_team_member_booking_profiles(
         self, *, team_member_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -785,8 +976,8 @@ async def bulk_retrieve_team_member_booking_profiles(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, booking_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -827,8 +1018,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -893,8 +1084,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def cancel(
         self,
@@ -957,5 +1148,5 @@ async def cancel(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/bookings/team_member_profiles/__init__.py b/src/square/bookings/team_member_profiles/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/bookings/team_member_profiles/__init__.py
+++ b/src/square/bookings/team_member_profiles/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/bookings/team_member_profiles/client.py b/src/square/bookings/team_member_profiles/client.py
index 64328e88..9ad7bcde 100644
--- a/src/square/bookings/team_member_profiles/client.py
+++ b/src/square/bookings/team_member_profiles/client.py
@@ -1,19 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawTeamMemberProfilesClient
 import typing
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.team_member_booking_profile import TeamMemberBookingProfile
-from ...types.list_team_member_booking_profiles_response import ListTeamMemberBookingProfilesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...types.get_team_member_booking_profile_response import GetTeamMemberBookingProfileResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawTeamMemberProfilesClient
-from ...core.pagination import AsyncPager
+from ...types.team_member_booking_profile import TeamMemberBookingProfile
+from .raw_client import AsyncRawTeamMemberProfilesClient, RawTeamMemberProfilesClient
 
 
 class TeamMemberProfilesClient:
@@ -79,41 +73,13 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bookings/team-member-booking-profiles",
-            method="GET",
-            params={
-                "bookable_only": bookable_only,
-                "limit": limit,
-                "cursor": cursor,
-                "location_id": location_id,
-            },
+        return self._raw_client.list(
+            bookable_only=bookable_only,
+            limit=limit,
+            cursor=cursor,
+            location_id=location_id,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListTeamMemberBookingProfilesResponse,
-                    construct_type(
-                        type_=ListTeamMemberBookingProfilesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    bookable_only=bookable_only,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    location_id=location_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.team_member_booking_profiles
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(
         self, team_member_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -145,8 +111,8 @@ def get(
             team_member_id="team_member_id",
         )
         """
-        response = self._raw_client.get(team_member_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(team_member_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncTeamMemberProfilesClient:
@@ -213,6 +179,7 @@ async def main() -> None:
             response = await client.bookings.team_member_profiles.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -220,41 +187,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/bookings/team-member-booking-profiles",
-            method="GET",
-            params={
-                "bookable_only": bookable_only,
-                "limit": limit,
-                "cursor": cursor,
-                "location_id": location_id,
-            },
+        return await self._raw_client.list(
+            bookable_only=bookable_only,
+            limit=limit,
+            cursor=cursor,
+            location_id=location_id,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListTeamMemberBookingProfilesResponse,
-                    construct_type(
-                        type_=ListTeamMemberBookingProfilesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    bookable_only=bookable_only,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    location_id=location_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.team_member_booking_profiles
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self, team_member_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -294,5 +233,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(team_member_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(team_member_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/bookings/team_member_profiles/raw_client.py b/src/square/bookings/team_member_profiles/raw_client.py
index 5c127ca7..99feb486 100644
--- a/src/square/bookings/team_member_profiles/raw_client.py
+++ b/src/square/bookings/team_member_profiles/raw_client.py
@@ -1,22 +1,96 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
 import typing
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.get_team_member_booking_profile_response import GetTeamMemberBookingProfileResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.unchecked_base_model import construct_type
+from ...types.get_team_member_booking_profile_response import GetTeamMemberBookingProfileResponse
+from ...types.list_team_member_booking_profiles_response import ListTeamMemberBookingProfilesResponse
+from ...types.team_member_booking_profile import TeamMemberBookingProfile
 
 
 class RawTeamMemberProfilesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        bookable_only: typing.Optional[bool] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[TeamMemberBookingProfile]:
+        """
+        Lists booking profiles for team members.
+
+        Parameters
+        ----------
+        bookable_only : typing.Optional[bool]
+            Indicates whether to include only bookable team members in the returned result (`true`) or not (`false`).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a paged response.
+
+        cursor : typing.Optional[str]
+            The pagination cursor from the preceding response to return the next page of the results. Do not set this when retrieving the first page of the results.
+
+        location_id : typing.Optional[str]
+            Indicates whether to include only team members enabled at the given location in the returned result.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[TeamMemberBookingProfile]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/bookings/team-member-booking-profiles",
+            method="GET",
+            params={
+                "bookable_only": bookable_only,
+                "limit": limit,
+                "cursor": cursor,
+                "location_id": location_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListTeamMemberBookingProfilesResponse,
+                    construct_type(
+                        type_=ListTeamMemberBookingProfilesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.team_member_booking_profiles
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    bookable_only=bookable_only,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    location_id=location_id,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, team_member_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetTeamMemberBookingProfileResponse]:
@@ -53,14 +127,89 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawTeamMemberProfilesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        bookable_only: typing.Optional[bool] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[TeamMemberBookingProfile]:
+        """
+        Lists booking profiles for team members.
+
+        Parameters
+        ----------
+        bookable_only : typing.Optional[bool]
+            Indicates whether to include only bookable team members in the returned result (`true`) or not (`false`).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a paged response.
+
+        cursor : typing.Optional[str]
+            The pagination cursor from the preceding response to return the next page of the results. Do not set this when retrieving the first page of the results.
+
+        location_id : typing.Optional[str]
+            Indicates whether to include only team members enabled at the given location in the returned result.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[TeamMemberBookingProfile]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/bookings/team-member-booking-profiles",
+            method="GET",
+            params={
+                "bookable_only": bookable_only,
+                "limit": limit,
+                "cursor": cursor,
+                "location_id": location_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListTeamMemberBookingProfilesResponse,
+                    construct_type(
+                        type_=ListTeamMemberBookingProfilesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.team_member_booking_profiles
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        bookable_only=bookable_only,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        location_id=location_id,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, team_member_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetTeamMemberBookingProfileResponse]:
@@ -97,5 +246,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/cards/__init__.py b/src/square/cards/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/cards/__init__.py
+++ b/src/square/cards/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/cards/client.py b/src/square/cards/client.py
index 27502298..acca8951 100644
--- a/src/square/cards/client.py
+++ b/src/square/cards/client.py
@@ -1,23 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCardsClient
-from ..types.sort_order import SortOrder
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.card import Card
-from ..types.list_cards_response import ListCardsResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..requests.card import CardParams
+from ..types.card import Card
 from ..types.create_card_response import CreateCardResponse
-from ..types.get_card_response import GetCardResponse
 from ..types.disable_card_response import DisableCardResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCardsClient
-from ..core.pagination import AsyncPager
+from ..types.get_card_response import GetCardResponse
+from ..types.sort_order import SortOrder
+from .raw_client import AsyncRawCardsClient, RawCardsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -97,43 +91,14 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/cards",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "customer_id": customer_id,
-                "include_disabled": include_disabled,
-                "reference_id": reference_id,
-                "sort_order": sort_order,
-            },
+        return self._raw_client.list(
+            cursor=cursor,
+            customer_id=customer_id,
+            include_disabled=include_disabled,
+            reference_id=reference_id,
+            sort_order=sort_order,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCardsResponse,
-                    construct_type(
-                        type_=ListCardsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    customer_id=customer_id,
-                    include_disabled=include_disabled,
-                    reference_id=reference_id,
-                    sort_order=sort_order,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.cards
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -203,14 +168,14 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key,
             source_id=source_id,
             card=card,
             verification_token=verification_token,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(self, card_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetCardResponse:
         """
@@ -240,8 +205,8 @@ def get(self, card_id: str, *, request_options: typing.Optional[RequestOptions]
             card_id="card_id",
         )
         """
-        response = self._raw_client.get(card_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(card_id, request_options=request_options)
+        return _response.data
 
     def disable(self, card_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> DisableCardResponse:
         """
@@ -272,8 +237,8 @@ def disable(self, card_id: str, *, request_options: typing.Optional[RequestOptio
             card_id="card_id",
         )
         """
-        response = self._raw_client.disable(card_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.disable(card_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncCardsClient:
@@ -351,6 +316,7 @@ async def main() -> None:
             response = await client.cards.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -358,43 +324,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/cards",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "customer_id": customer_id,
-                "include_disabled": include_disabled,
-                "reference_id": reference_id,
-                "sort_order": sort_order,
-            },
+        return await self._raw_client.list(
+            cursor=cursor,
+            customer_id=customer_id,
+            include_disabled=include_disabled,
+            reference_id=reference_id,
+            sort_order=sort_order,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCardsResponse,
-                    construct_type(
-                        type_=ListCardsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    customer_id=customer_id,
-                    include_disabled=include_disabled,
-                    reference_id=reference_id,
-                    sort_order=sort_order,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.cards
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -472,14 +409,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key,
             source_id=source_id,
             card=card,
             verification_token=verification_token,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(self, card_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetCardResponse:
         """
@@ -517,8 +454,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(card_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(card_id, request_options=request_options)
+        return _response.data
 
     async def disable(
         self, card_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -559,5 +496,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.disable(card_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.disable(card_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/cards/raw_client.py b/src/square/cards/raw_client.py
index 50b5ac26..3056d8d0 100644
--- a/src/square/cards/raw_client.py
+++ b/src/square/cards/raw_client.py
@@ -1,20 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.card import CardParams
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_card_response import CreateCardResponse
-from ..core.serialization import convert_and_respect_annotation_metadata
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..types.get_card_response import GetCardResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
 from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.serialization import convert_and_respect_annotation_metadata
+from ..core.unchecked_base_model import construct_type
+from ..requests.card import CardParams
+from ..types.card import Card
+from ..types.create_card_response import CreateCardResponse
 from ..types.disable_card_response import DisableCardResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.get_card_response import GetCardResponse
+from ..types.list_cards_response import ListCardsResponse
+from ..types.sort_order import SortOrder
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -24,6 +27,91 @@ class RawCardsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        customer_id: typing.Optional[str] = None,
+        include_disabled: typing.Optional[bool] = None,
+        reference_id: typing.Optional[str] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[Card]:
+        """
+        Retrieves a list of cards owned by the account making the request.
+        A max of 25 cards will be returned.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for your original query.
+
+            See [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination) for more information.
+
+        customer_id : typing.Optional[str]
+            Limit results to cards associated with the customer supplied.
+            By default, all cards owned by the merchant are returned.
+
+        include_disabled : typing.Optional[bool]
+            Includes disabled cards.
+            By default, all enabled cards owned by the merchant are returned.
+
+        reference_id : typing.Optional[str]
+            Limit results to cards associated with the reference_id supplied.
+
+        sort_order : typing.Optional[SortOrder]
+            Sorts the returned list by when the card was created with the specified order.
+            This field defaults to ASC.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Card]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/cards",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "customer_id": customer_id,
+                "include_disabled": include_disabled,
+                "reference_id": reference_id,
+                "sort_order": sort_order,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCardsResponse,
+                    construct_type(
+                        type_=ListCardsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.cards
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    customer_id=customer_id,
+                    include_disabled=include_disabled,
+                    reference_id=reference_id,
+                    sort_order=sort_order,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -94,8 +182,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, card_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -133,8 +221,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def disable(
         self, card_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -173,14 +261,102 @@ def disable(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCardsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        customer_id: typing.Optional[str] = None,
+        include_disabled: typing.Optional[bool] = None,
+        reference_id: typing.Optional[str] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[Card]:
+        """
+        Retrieves a list of cards owned by the account making the request.
+        A max of 25 cards will be returned.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for your original query.
+
+            See [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination) for more information.
+
+        customer_id : typing.Optional[str]
+            Limit results to cards associated with the customer supplied.
+            By default, all cards owned by the merchant are returned.
+
+        include_disabled : typing.Optional[bool]
+            Includes disabled cards.
+            By default, all enabled cards owned by the merchant are returned.
+
+        reference_id : typing.Optional[str]
+            Limit results to cards associated with the reference_id supplied.
+
+        sort_order : typing.Optional[SortOrder]
+            Sorts the returned list by when the card was created with the specified order.
+            This field defaults to ASC.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Card]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/cards",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "customer_id": customer_id,
+                "include_disabled": include_disabled,
+                "reference_id": reference_id,
+                "sort_order": sort_order,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCardsResponse,
+                    construct_type(
+                        type_=ListCardsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.cards
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        customer_id=customer_id,
+                        include_disabled=include_disabled,
+                        reference_id=reference_id,
+                        sort_order=sort_order,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -251,8 +427,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, card_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -290,8 +466,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def disable(
         self, card_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -330,5 +506,5 @@ async def disable(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/cash_drawers/__init__.py b/src/square/cash_drawers/__init__.py
index 284e922e..4b2d2334 100644
--- a/src/square/cash_drawers/__init__.py
+++ b/src/square/cash_drawers/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import shifts
 
 __all__ = ["shifts"]
diff --git a/src/square/cash_drawers/client.py b/src/square/cash_drawers/client.py
index 2f057c5c..063f3629 100644
--- a/src/square/cash_drawers/client.py
+++ b/src/square/cash_drawers/client.py
@@ -1,11 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCashDrawersClient
-from .shifts.client import ShiftsClient
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCashDrawersClient
-from .shifts.client import AsyncShiftsClient
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from .raw_client import AsyncRawCashDrawersClient, RawCashDrawersClient
+from .shifts.client import AsyncShiftsClient, ShiftsClient
 
 
 class CashDrawersClient:
diff --git a/src/square/cash_drawers/raw_client.py b/src/square/cash_drawers/raw_client.py
index 04b334d5..38eebe66 100644
--- a/src/square/cash_drawers/raw_client.py
+++ b/src/square/cash_drawers/raw_client.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.client_wrapper import AsyncClientWrapper
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 
 
 class RawCashDrawersClient:
diff --git a/src/square/cash_drawers/shifts/__init__.py b/src/square/cash_drawers/shifts/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/cash_drawers/shifts/__init__.py
+++ b/src/square/cash_drawers/shifts/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/cash_drawers/shifts/client.py b/src/square/cash_drawers/shifts/client.py
index 05dcdf70..5a4e7b17 100644
--- a/src/square/cash_drawers/shifts/client.py
+++ b/src/square/cash_drawers/shifts/client.py
@@ -1,23 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawShiftsClient
 import typing
-from ...types.sort_order import SortOrder
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
+from ...types.cash_drawer_shift_event import CashDrawerShiftEvent
 from ...types.cash_drawer_shift_summary import CashDrawerShiftSummary
-from ...types.list_cash_drawer_shifts_response import ListCashDrawerShiftsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...types.get_cash_drawer_shift_response import GetCashDrawerShiftResponse
-from ...types.cash_drawer_shift_event import CashDrawerShiftEvent
-from ...core.jsonable_encoder import jsonable_encoder
-from ...types.list_cash_drawer_shift_events_response import ListCashDrawerShiftEventsResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawShiftsClient
-from ...core.pagination import AsyncPager
+from ...types.sort_order import SortOrder
+from .raw_client import AsyncRawShiftsClient, RawShiftsClient
 
 
 class ShiftsClient:
@@ -96,45 +88,15 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/cash-drawers/shifts",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "sort_order": sort_order,
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "limit": limit,
-                "cursor": cursor,
-            },
+        return self._raw_client.list(
+            location_id=location_id,
+            sort_order=sort_order,
+            begin_time=begin_time,
+            end_time=end_time,
+            limit=limit,
+            cursor=cursor,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCashDrawerShiftsResponse,
-                    construct_type(
-                        type_=ListCashDrawerShiftsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    sort_order=sort_order,
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.cash_drawer_shifts
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(
         self, shift_id: str, *, location_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -171,8 +133,8 @@ def get(
             location_id="location_id",
         )
         """
-        response = self._raw_client.get(shift_id, location_id=location_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(shift_id, location_id=location_id, request_options=request_options)
+        return _response.data
 
     def list_events(
         self,
@@ -226,40 +188,9 @@ def list_events(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/cash-drawers/shifts/{jsonable_encoder(shift_id)}/events",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return self._raw_client.list_events(
+            shift_id, location_id=location_id, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCashDrawerShiftEventsResponse,
-                    construct_type(
-                        type_=ListCashDrawerShiftEventsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list_events(
-                    shift_id,
-                    location_id=location_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.cash_drawer_shift_events
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
 
 class AsyncShiftsClient:
@@ -339,6 +270,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -346,45 +278,15 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/cash-drawers/shifts",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "sort_order": sort_order,
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "limit": limit,
-                "cursor": cursor,
-            },
+        return await self._raw_client.list(
+            location_id=location_id,
+            sort_order=sort_order,
+            begin_time=begin_time,
+            end_time=end_time,
+            limit=limit,
+            cursor=cursor,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCashDrawerShiftsResponse,
-                    construct_type(
-                        type_=ListCashDrawerShiftsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    sort_order=sort_order,
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.cash_drawer_shifts
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self, shift_id: str, *, location_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -429,8 +331,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(shift_id, location_id=location_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(shift_id, location_id=location_id, request_options=request_options)
+        return _response.data
 
     async def list_events(
         self,
@@ -485,6 +387,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -492,37 +395,6 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/cash-drawers/shifts/{jsonable_encoder(shift_id)}/events",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return await self._raw_client.list_events(
+            shift_id, location_id=location_id, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCashDrawerShiftEventsResponse,
-                    construct_type(
-                        type_=ListCashDrawerShiftEventsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list_events(
-                    shift_id,
-                    location_id=location_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.cash_drawer_shift_events
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
diff --git a/src/square/cash_drawers/shifts/raw_client.py b/src/square/cash_drawers/shifts/raw_client.py
index 82391a83..facd1eba 100644
--- a/src/square/cash_drawers/shifts/raw_client.py
+++ b/src/square/cash_drawers/shifts/raw_client.py
@@ -1,22 +1,114 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
 import typing
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.get_cash_drawer_shift_response import GetCashDrawerShiftResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.unchecked_base_model import construct_type
+from ...types.cash_drawer_shift_event import CashDrawerShiftEvent
+from ...types.cash_drawer_shift_summary import CashDrawerShiftSummary
+from ...types.get_cash_drawer_shift_response import GetCashDrawerShiftResponse
+from ...types.list_cash_drawer_shift_events_response import ListCashDrawerShiftEventsResponse
+from ...types.list_cash_drawer_shifts_response import ListCashDrawerShiftsResponse
+from ...types.sort_order import SortOrder
 
 
 class RawShiftsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        location_id: str,
+        sort_order: typing.Optional[SortOrder] = None,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CashDrawerShiftSummary]:
+        """
+        Provides the details for all of the cash drawer shifts for a location
+        in a date range.
+
+        Parameters
+        ----------
+        location_id : str
+            The ID of the location to query for a list of cash drawer shifts.
+
+        sort_order : typing.Optional[SortOrder]
+            The order in which cash drawer shifts are listed in the response,
+            based on their opened_at field. Default value: ASC
+
+        begin_time : typing.Optional[str]
+            The inclusive start time of the query on opened_at, in ISO 8601 format.
+
+        end_time : typing.Optional[str]
+            The exclusive end date of the query on opened_at, in ISO 8601 format.
+
+        limit : typing.Optional[int]
+            Number of cash drawer shift events in a page of results (200 by
+            default, 1000 max).
+
+        cursor : typing.Optional[str]
+            Opaque cursor for fetching the next page of results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CashDrawerShiftSummary]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/cash-drawers/shifts",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "sort_order": sort_order,
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCashDrawerShiftsResponse,
+                    construct_type(
+                        type_=ListCashDrawerShiftsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.cash_drawer_shifts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    location_id=location_id,
+                    sort_order=sort_order,
+                    begin_time=begin_time,
+                    end_time=end_time,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, shift_id: str, *, location_id: str, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetCashDrawerShiftResponse]:
@@ -60,14 +152,176 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def list_events(
+        self,
+        shift_id: str,
+        *,
+        location_id: str,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CashDrawerShiftEvent]:
+        """
+        Provides a paginated list of events for a single cash drawer shift.
+
+        Parameters
+        ----------
+        shift_id : str
+            The shift ID.
+
+        location_id : str
+            The ID of the location to list cash drawer shifts for.
+
+        limit : typing.Optional[int]
+            Number of resources to be returned in a page of results (200 by
+            default, 1000 max).
+
+        cursor : typing.Optional[str]
+            Opaque cursor for fetching the next page of results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CashDrawerShiftEvent]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/cash-drawers/shifts/{jsonable_encoder(shift_id)}/events",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCashDrawerShiftEventsResponse,
+                    construct_type(
+                        type_=ListCashDrawerShiftEventsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.cash_drawer_shift_events
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list_events(
+                    shift_id,
+                    location_id=location_id,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawShiftsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        location_id: str,
+        sort_order: typing.Optional[SortOrder] = None,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CashDrawerShiftSummary]:
+        """
+        Provides the details for all of the cash drawer shifts for a location
+        in a date range.
+
+        Parameters
+        ----------
+        location_id : str
+            The ID of the location to query for a list of cash drawer shifts.
+
+        sort_order : typing.Optional[SortOrder]
+            The order in which cash drawer shifts are listed in the response,
+            based on their opened_at field. Default value: ASC
+
+        begin_time : typing.Optional[str]
+            The inclusive start time of the query on opened_at, in ISO 8601 format.
+
+        end_time : typing.Optional[str]
+            The exclusive end date of the query on opened_at, in ISO 8601 format.
+
+        limit : typing.Optional[int]
+            Number of cash drawer shift events in a page of results (200 by
+            default, 1000 max).
+
+        cursor : typing.Optional[str]
+            Opaque cursor for fetching the next page of results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CashDrawerShiftSummary]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/cash-drawers/shifts",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "sort_order": sort_order,
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCashDrawerShiftsResponse,
+                    construct_type(
+                        type_=ListCashDrawerShiftsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.cash_drawer_shifts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        location_id=location_id,
+                        sort_order=sort_order,
+                        begin_time=begin_time,
+                        end_time=end_time,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, shift_id: str, *, location_id: str, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetCashDrawerShiftResponse]:
@@ -111,5 +365,80 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def list_events(
+        self,
+        shift_id: str,
+        *,
+        location_id: str,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CashDrawerShiftEvent]:
+        """
+        Provides a paginated list of events for a single cash drawer shift.
+
+        Parameters
+        ----------
+        shift_id : str
+            The shift ID.
+
+        location_id : str
+            The ID of the location to list cash drawer shifts for.
+
+        limit : typing.Optional[int]
+            Number of resources to be returned in a page of results (200 by
+            default, 1000 max).
+
+        cursor : typing.Optional[str]
+            Opaque cursor for fetching the next page of results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CashDrawerShiftEvent]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/cash-drawers/shifts/{jsonable_encoder(shift_id)}/events",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCashDrawerShiftEventsResponse,
+                    construct_type(
+                        type_=ListCashDrawerShiftEventsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.cash_drawer_shift_events
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list_events(
+                        shift_id,
+                        location_id=location_id,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/catalog/__init__.py b/src/square/catalog/__init__.py
index cc665ef2..9a90551e 100644
--- a/src/square/catalog/__init__.py
+++ b/src/square/catalog/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import images, object
 
 __all__ = ["images", "object"]
diff --git a/src/square/catalog/client.py b/src/square/catalog/client.py
index 1e1c149c..b48b77ce 100644
--- a/src/square/catalog/client.py
+++ b/src/square/catalog/client.py
@@ -1,38 +1,30 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCatalogClient
-from .images.client import ImagesClient
-from .object.client import ObjectClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
+from ..requests.catalog_object_batch import CatalogObjectBatchParams
+from ..requests.catalog_query import CatalogQueryParams
+from ..requests.custom_attribute_filter import CustomAttributeFilterParams
+from ..types.archived_state import ArchivedState
 from ..types.batch_delete_catalog_objects_response import BatchDeleteCatalogObjectsResponse
 from ..types.batch_get_catalog_objects_response import BatchGetCatalogObjectsResponse
-from ..requests.catalog_object_batch import CatalogObjectBatchParams
 from ..types.batch_upsert_catalog_objects_response import BatchUpsertCatalogObjectsResponse
 from ..types.catalog_info_response import CatalogInfoResponse
-from ..core.pagination import SyncPager
+from ..types.catalog_item_product_type import CatalogItemProductType
 from ..types.catalog_object import CatalogObject
-from ..types.list_catalog_response import ListCatalogResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..types.catalog_object_type import CatalogObjectType
-from ..requests.catalog_query import CatalogQueryParams
-from ..types.search_catalog_objects_response import SearchCatalogObjectsResponse
 from ..types.search_catalog_items_request_stock_level import SearchCatalogItemsRequestStockLevel
-from ..types.sort_order import SortOrder
-from ..types.catalog_item_product_type import CatalogItemProductType
-from ..requests.custom_attribute_filter import CustomAttributeFilterParams
-from ..types.archived_state import ArchivedState
 from ..types.search_catalog_items_response import SearchCatalogItemsResponse
+from ..types.search_catalog_objects_response import SearchCatalogObjectsResponse
+from ..types.sort_order import SortOrder
 from ..types.update_item_modifier_lists_response import UpdateItemModifierListsResponse
 from ..types.update_item_taxes_response import UpdateItemTaxesResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCatalogClient
-from .images.client import AsyncImagesClient
-from .object.client import AsyncObjectClient
-from ..core.pagination import AsyncPager
+from .images.client import AsyncImagesClient, ImagesClient
+from .object.client import AsyncObjectClient, ObjectClient
+from .raw_client import AsyncRawCatalogClient, RawCatalogClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -101,8 +93,8 @@ def batch_delete(
             object_ids=["W62UWFY35CWMYGVWK6TWJDNI", "AA27W3M2GGTF3H6AVPNB77CK"],
         )
         """
-        response = self._raw_client.batch_delete(object_ids=object_ids, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_delete(object_ids=object_ids, request_options=request_options)
+        return _response.data
 
     def batch_get(
         self,
@@ -178,7 +170,7 @@ def batch_get(
             include_related_objects=True,
         )
         """
-        response = self._raw_client.batch_get(
+        _response = self._raw_client.batch_get(
             object_ids=object_ids,
             include_related_objects=include_related_objects,
             catalog_version=catalog_version,
@@ -186,7 +178,7 @@ def batch_get(
             include_category_path_to_root=include_category_path_to_root,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def batch_upsert(
         self,
@@ -299,10 +291,10 @@ def batch_upsert(
             ],
         )
         """
-        response = self._raw_client.batch_upsert(
+        _response = self._raw_client.batch_upsert(
             idempotency_key=idempotency_key, batches=batches, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def info(self, *, request_options: typing.Optional[RequestOptions] = None) -> CatalogInfoResponse:
         """
@@ -328,8 +320,8 @@ def info(self, *, request_options: typing.Optional[RequestOptions] = None) -> Ca
         )
         client.catalog.info()
         """
-        response = self._raw_client.info(request_options=request_options)
-        return response.data
+        _response = self._raw_client.info(request_options=request_options)
+        return _response.data
 
     def list(
         self,
@@ -400,39 +392,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/catalog/list",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "types": types,
-                "catalog_version": catalog_version,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            cursor=cursor, types=types, catalog_version=catalog_version, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCatalogResponse,
-                    construct_type(
-                        type_=ListCatalogResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    types=types,
-                    catalog_version=catalog_version,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.objects
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def search(
         self,
@@ -539,7 +501,7 @@ def search(
             limit=100,
         )
         """
-        response = self._raw_client.search(
+        _response = self._raw_client.search(
             cursor=cursor,
             object_types=object_types,
             include_deleted_objects=include_deleted_objects,
@@ -550,7 +512,7 @@ def search(
             include_category_path_to_root=include_category_path_to_root,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def search_items(
         self,
@@ -654,7 +616,7 @@ def search_items(
             ],
         )
         """
-        response = self._raw_client.search_items(
+        _response = self._raw_client.search_items(
             text_filter=text_filter,
             category_ids=category_ids,
             stock_levels=stock_levels,
@@ -667,7 +629,7 @@ def search_items(
             archived_state=archived_state,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def update_item_modifier_lists(
         self,
@@ -719,13 +681,13 @@ def update_item_modifier_lists(
             modifier_lists_to_disable=["7WRC16CJZDVLSNDQ35PP6YAD"],
         )
         """
-        response = self._raw_client.update_item_modifier_lists(
+        _response = self._raw_client.update_item_modifier_lists(
             item_ids=item_ids,
             modifier_lists_to_enable=modifier_lists_to_enable,
             modifier_lists_to_disable=modifier_lists_to_disable,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def update_item_taxes(
         self,
@@ -775,13 +737,13 @@ def update_item_taxes(
             taxes_to_disable=["AQCEGCEBBQONINDOHRGZISEX"],
         )
         """
-        response = self._raw_client.update_item_taxes(
+        _response = self._raw_client.update_item_taxes(
             item_ids=item_ids,
             taxes_to_enable=taxes_to_enable,
             taxes_to_disable=taxes_to_disable,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
 
 class AsyncCatalogClient:
@@ -855,8 +817,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_delete(object_ids=object_ids, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_delete(object_ids=object_ids, request_options=request_options)
+        return _response.data
 
     async def batch_get(
         self,
@@ -940,7 +902,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_get(
+        _response = await self._raw_client.batch_get(
             object_ids=object_ids,
             include_related_objects=include_related_objects,
             catalog_version=catalog_version,
@@ -948,7 +910,7 @@ async def main() -> None:
             include_category_path_to_root=include_category_path_to_root,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def batch_upsert(
         self,
@@ -1069,10 +1031,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_upsert(
+        _response = await self._raw_client.batch_upsert(
             idempotency_key=idempotency_key, batches=batches, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def info(self, *, request_options: typing.Optional[RequestOptions] = None) -> CatalogInfoResponse:
         """
@@ -1106,8 +1068,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.info(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.info(request_options=request_options)
+        return _response.data
 
     async def list(
         self,
@@ -1179,6 +1141,7 @@ async def main() -> None:
             response = await client.catalog.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -1186,39 +1149,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/catalog/list",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "types": types,
-                "catalog_version": catalog_version,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            cursor=cursor, types=types, catalog_version=catalog_version, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCatalogResponse,
-                    construct_type(
-                        type_=ListCatalogResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    types=types,
-                    catalog_version=catalog_version,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.objects
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def search(
         self,
@@ -1336,7 +1269,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             cursor=cursor,
             object_types=object_types,
             include_deleted_objects=include_deleted_objects,
@@ -1347,7 +1280,7 @@ async def main() -> None:
             include_category_path_to_root=include_category_path_to_root,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def search_items(
         self,
@@ -1459,7 +1392,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search_items(
+        _response = await self._raw_client.search_items(
             text_filter=text_filter,
             category_ids=category_ids,
             stock_levels=stock_levels,
@@ -1472,7 +1405,7 @@ async def main() -> None:
             archived_state=archived_state,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def update_item_modifier_lists(
         self,
@@ -1532,13 +1465,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update_item_modifier_lists(
+        _response = await self._raw_client.update_item_modifier_lists(
             item_ids=item_ids,
             modifier_lists_to_enable=modifier_lists_to_enable,
             modifier_lists_to_disable=modifier_lists_to_disable,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def update_item_taxes(
         self,
@@ -1596,10 +1529,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update_item_taxes(
+        _response = await self._raw_client.update_item_taxes(
             item_ids=item_ids,
             taxes_to_enable=taxes_to_enable,
             taxes_to_disable=taxes_to_disable,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
diff --git a/src/square/catalog/images/__init__.py b/src/square/catalog/images/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/catalog/images/__init__.py
+++ b/src/square/catalog/images/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/catalog/images/client.py b/src/square/catalog/images/client.py
index 9f4f1d77..d69679d7 100644
--- a/src/square/catalog/images/client.py
+++ b/src/square/catalog/images/client.py
@@ -1,16 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawImagesClient
-from ...requests.create_catalog_image_request import CreateCatalogImageRequestParams
+
 from ... import core
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.create_catalog_image_response import CreateCatalogImageResponse
+from ...requests.create_catalog_image_request import CreateCatalogImageRequestParams
 from ...requests.update_catalog_image_request import UpdateCatalogImageRequestParams
+from ...types.create_catalog_image_response import CreateCatalogImageResponse
 from ...types.update_catalog_image_response import UpdateCatalogImageResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawImagesClient
+from .raw_client import AsyncRawImagesClient, RawImagesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -70,8 +69,8 @@ def create(
         )
         client.catalog.images.create()
         """
-        response = self._raw_client.create(request=request, image_file=image_file, request_options=request_options)
-        return response.data
+        _response = self._raw_client.create(request=request, image_file=image_file, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -116,10 +115,10 @@ def update(
             image_id="image_id",
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             image_id, request=request, image_file=image_file, request_options=request_options
         )
-        return response.data
+        return _response.data
 
 
 class AsyncImagesClient:
@@ -184,10 +183,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             request=request, image_file=image_file, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def update(
         self,
@@ -240,7 +239,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             image_id, request=request, image_file=image_file, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/catalog/images/raw_client.py b/src/square/catalog/images/raw_client.py
index 41b2bac1..c803f7a2 100644
--- a/src/square/catalog/images/raw_client.py
+++ b/src/square/catalog/images/raw_client.py
@@ -1,21 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import json
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.create_catalog_image_request import CreateCatalogImageRequestParams
+from json.decoder import JSONDecodeError
+
 from ... import core
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_catalog_image_response import CreateCatalogImageResponse
-import json
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
 from ...core.jsonable_encoder import jsonable_encoder
+from ...core.request_options import RequestOptions
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.create_catalog_image_request import CreateCatalogImageRequestParams
 from ...requests.update_catalog_image_request import UpdateCatalogImageRequestParams
+from ...types.create_catalog_image_response import CreateCatalogImageResponse
 from ...types.update_catalog_image_response import UpdateCatalogImageResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -73,6 +72,7 @@ def create(
             },
             request_options=request_options,
             omit=OMIT,
+            force_multipart=True,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -86,8 +86,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -139,6 +139,7 @@ def update(
             },
             request_options=request_options,
             omit=OMIT,
+            force_multipart=True,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -152,8 +153,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawImagesClient:
@@ -208,6 +209,7 @@ async def create(
             },
             request_options=request_options,
             omit=OMIT,
+            force_multipart=True,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -221,8 +223,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -274,6 +276,7 @@ async def update(
             },
             request_options=request_options,
             omit=OMIT,
+            force_multipart=True,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -287,5 +290,5 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/catalog/object/__init__.py b/src/square/catalog/object/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/catalog/object/__init__.py
+++ b/src/square/catalog/object/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/catalog/object/client.py b/src/square/catalog/object/client.py
index cfa7fa0e..31251336 100644
--- a/src/square/catalog/object/client.py
+++ b/src/square/catalog/object/client.py
@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawObjectClient
-from ...requests.catalog_object import CatalogObjectParams
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.upsert_catalog_object_response import UpsertCatalogObjectResponse
-from ...types.get_catalog_object_response import GetCatalogObjectResponse
+from ...requests.catalog_object import CatalogObjectParams
 from ...types.delete_catalog_object_response import DeleteCatalogObjectResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawObjectClient
+from ...types.get_catalog_object_response import GetCatalogObjectResponse
+from ...types.upsert_catalog_object_response import UpsertCatalogObjectResponse
+from .raw_client import AsyncRawObjectClient, RawObjectClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -84,10 +83,10 @@ def upsert(
             object={"type": "IMAGE", "id": "#Cocoa"},
         )
         """
-        response = self._raw_client.upsert(
+        _response = self._raw_client.upsert(
             idempotency_key=idempotency_key, object=object, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(
         self,
@@ -159,14 +158,14 @@ def get(
             object_id="object_id",
         )
         """
-        response = self._raw_client.get(
+        _response = self._raw_client.get(
             object_id,
             include_related_objects=include_related_objects,
             catalog_version=catalog_version,
             include_category_path_to_root=include_category_path_to_root,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, object_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -209,8 +208,8 @@ def delete(
             object_id="object_id",
         )
         """
-        response = self._raw_client.delete(object_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(object_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncObjectClient:
@@ -290,10 +289,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.upsert(
+        _response = await self._raw_client.upsert(
             idempotency_key=idempotency_key, object=object, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self,
@@ -373,14 +372,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(
+        _response = await self._raw_client.get(
             object_id,
             include_related_objects=include_related_objects,
             catalog_version=catalog_version,
             include_category_path_to_root=include_category_path_to_root,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, object_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -431,5 +430,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(object_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(object_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/catalog/object/raw_client.py b/src/square/catalog/object/raw_client.py
index af5011ae..507bcd98 100644
--- a/src/square/catalog/object/raw_client.py
+++ b/src/square/catalog/object/raw_client.py
@@ -1,20 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.catalog_object import CatalogObjectParams
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.upsert_catalog_object_response import UpsertCatalogObjectResponse
-from ...core.serialization import convert_and_respect_annotation_metadata
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...types.get_catalog_object_response import GetCatalogObjectResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
 from ...core.jsonable_encoder import jsonable_encoder
+from ...core.request_options import RequestOptions
+from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.unchecked_base_model import construct_type
+from ...requests.catalog_object import CatalogObjectParams
 from ...types.delete_catalog_object_response import DeleteCatalogObjectResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.get_catalog_object_response import GetCatalogObjectResponse
+from ...types.upsert_catalog_object_response import UpsertCatalogObjectResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -93,8 +92,8 @@ def upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self,
@@ -177,8 +176,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, object_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -227,8 +226,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawObjectClient:
@@ -304,8 +303,8 @@ async def upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self,
@@ -388,8 +387,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, object_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -438,5 +437,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/catalog/raw_client.py b/src/square/catalog/raw_client.py
index 88473d77..8c408b9a 100644
--- a/src/square/catalog/raw_client.py
+++ b/src/square/catalog/raw_client.py
@@ -1,31 +1,33 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.batch_delete_catalog_objects_response import BatchDeleteCatalogObjectsResponse
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..types.batch_get_catalog_objects_response import BatchGetCatalogObjectsResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.serialization import convert_and_respect_annotation_metadata
+from ..core.unchecked_base_model import construct_type
 from ..requests.catalog_object_batch import CatalogObjectBatchParams
+from ..requests.catalog_query import CatalogQueryParams
+from ..requests.custom_attribute_filter import CustomAttributeFilterParams
+from ..types.archived_state import ArchivedState
+from ..types.batch_delete_catalog_objects_response import BatchDeleteCatalogObjectsResponse
+from ..types.batch_get_catalog_objects_response import BatchGetCatalogObjectsResponse
 from ..types.batch_upsert_catalog_objects_response import BatchUpsertCatalogObjectsResponse
-from ..core.serialization import convert_and_respect_annotation_metadata
 from ..types.catalog_info_response import CatalogInfoResponse
+from ..types.catalog_item_product_type import CatalogItemProductType
+from ..types.catalog_object import CatalogObject
 from ..types.catalog_object_type import CatalogObjectType
-from ..requests.catalog_query import CatalogQueryParams
-from ..types.search_catalog_objects_response import SearchCatalogObjectsResponse
+from ..types.list_catalog_response import ListCatalogResponse
 from ..types.search_catalog_items_request_stock_level import SearchCatalogItemsRequestStockLevel
-from ..types.sort_order import SortOrder
-from ..types.catalog_item_product_type import CatalogItemProductType
-from ..requests.custom_attribute_filter import CustomAttributeFilterParams
-from ..types.archived_state import ArchivedState
 from ..types.search_catalog_items_response import SearchCatalogItemsResponse
+from ..types.search_catalog_objects_response import SearchCatalogObjectsResponse
+from ..types.sort_order import SortOrder
 from ..types.update_item_modifier_lists_response import UpdateItemModifierListsResponse
 from ..types.update_item_taxes_response import UpdateItemTaxesResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -93,8 +95,8 @@ def batch_delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_get(
         self,
@@ -186,8 +188,8 @@ def batch_get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_upsert(
         self,
@@ -282,8 +284,8 @@ def batch_upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def info(self, *, request_options: typing.Optional[RequestOptions] = None) -> HttpResponse[CatalogInfoResponse]:
         """
@@ -317,8 +319,99 @@ def info(self, *, request_options: typing.Optional[RequestOptions] = None) -> Ht
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        types: typing.Optional[str] = None,
+        catalog_version: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CatalogObject]:
+        """
+        Returns a list of all [CatalogObject](entity:CatalogObject)s of the specified types in the catalog.
+
+        The `types` parameter is specified as a comma-separated list of the [CatalogObjectType](entity:CatalogObjectType) values,
+        for example, "`ITEM`, `ITEM_VARIATION`, `MODIFIER`, `MODIFIER_LIST`, `CATEGORY`, `DISCOUNT`, `TAX`, `IMAGE`".
+
+        __Important:__ ListCatalog does not return deleted catalog items. To retrieve
+        deleted catalog items, use [SearchCatalogObjects](api-endpoint:Catalog-SearchCatalogObjects)
+        and set the `include_deleted_objects` attribute value to `true`.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            The pagination cursor returned in the previous response. Leave unset for an initial request.
+            The page size is currently set to be 100.
+            See [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination) for more information.
+
+        types : typing.Optional[str]
+            An optional case-insensitive, comma-separated list of object types to retrieve.
+
+            The valid values are defined in the [CatalogObjectType](entity:CatalogObjectType) enum, for example,
+            `ITEM`, `ITEM_VARIATION`, `CATEGORY`, `DISCOUNT`, `TAX`,
+            `MODIFIER`, `MODIFIER_LIST`, `IMAGE`, etc.
+
+            If this is unspecified, the operation returns objects of all the top level types at the version
+            of the Square API used to make the request. Object types that are nested onto other object types
+            are not included in the defaults.
+
+            At the current API version the default object types are:
+            ITEM, CATEGORY, TAX, DISCOUNT, MODIFIER_LIST,
+            PRICING_RULE, PRODUCT_SET, TIME_PERIOD, MEASUREMENT_UNIT,
+            SUBSCRIPTION_PLAN, ITEM_OPTION, CUSTOM_ATTRIBUTE_DEFINITION, QUICK_AMOUNT_SETTINGS.
+
+        catalog_version : typing.Optional[int]
+            The specific version of the catalog objects to be included in the response.
+            This allows you to retrieve historical versions of objects. The specified version value is matched against
+            the [CatalogObject](entity:CatalogObject)s' `version` attribute.  If not included, results will be from the
+            current version of the catalog.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CatalogObject]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/catalog/list",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "types": types,
+                "catalog_version": catalog_version,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCatalogResponse,
+                    construct_type(
+                        type_=ListCatalogResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.objects
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    types=types,
+                    catalog_version=catalog_version,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -443,8 +536,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search_items(
         self,
@@ -556,8 +649,8 @@ def search_items(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update_item_modifier_lists(
         self,
@@ -619,8 +712,8 @@ def update_item_modifier_lists(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update_item_taxes(
         self,
@@ -683,8 +776,8 @@ def update_item_taxes(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCatalogClient:
@@ -749,8 +842,8 @@ async def batch_delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_get(
         self,
@@ -842,8 +935,8 @@ async def batch_get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_upsert(
         self,
@@ -938,8 +1031,8 @@ async def batch_upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def info(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -975,8 +1068,102 @@ async def info(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        types: typing.Optional[str] = None,
+        catalog_version: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CatalogObject]:
+        """
+        Returns a list of all [CatalogObject](entity:CatalogObject)s of the specified types in the catalog.
+
+        The `types` parameter is specified as a comma-separated list of the [CatalogObjectType](entity:CatalogObjectType) values,
+        for example, "`ITEM`, `ITEM_VARIATION`, `MODIFIER`, `MODIFIER_LIST`, `CATEGORY`, `DISCOUNT`, `TAX`, `IMAGE`".
+
+        __Important:__ ListCatalog does not return deleted catalog items. To retrieve
+        deleted catalog items, use [SearchCatalogObjects](api-endpoint:Catalog-SearchCatalogObjects)
+        and set the `include_deleted_objects` attribute value to `true`.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            The pagination cursor returned in the previous response. Leave unset for an initial request.
+            The page size is currently set to be 100.
+            See [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination) for more information.
+
+        types : typing.Optional[str]
+            An optional case-insensitive, comma-separated list of object types to retrieve.
+
+            The valid values are defined in the [CatalogObjectType](entity:CatalogObjectType) enum, for example,
+            `ITEM`, `ITEM_VARIATION`, `CATEGORY`, `DISCOUNT`, `TAX`,
+            `MODIFIER`, `MODIFIER_LIST`, `IMAGE`, etc.
+
+            If this is unspecified, the operation returns objects of all the top level types at the version
+            of the Square API used to make the request. Object types that are nested onto other object types
+            are not included in the defaults.
+
+            At the current API version the default object types are:
+            ITEM, CATEGORY, TAX, DISCOUNT, MODIFIER_LIST,
+            PRICING_RULE, PRODUCT_SET, TIME_PERIOD, MEASUREMENT_UNIT,
+            SUBSCRIPTION_PLAN, ITEM_OPTION, CUSTOM_ATTRIBUTE_DEFINITION, QUICK_AMOUNT_SETTINGS.
+
+        catalog_version : typing.Optional[int]
+            The specific version of the catalog objects to be included in the response.
+            This allows you to retrieve historical versions of objects. The specified version value is matched against
+            the [CatalogObject](entity:CatalogObject)s' `version` attribute.  If not included, results will be from the
+            current version of the catalog.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CatalogObject]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/catalog/list",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "types": types,
+                "catalog_version": catalog_version,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCatalogResponse,
+                    construct_type(
+                        type_=ListCatalogResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.objects
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        types=types,
+                        catalog_version=catalog_version,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -1101,8 +1288,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search_items(
         self,
@@ -1214,8 +1401,8 @@ async def search_items(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update_item_modifier_lists(
         self,
@@ -1277,8 +1464,8 @@ async def update_item_modifier_lists(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update_item_taxes(
         self,
@@ -1341,5 +1528,5 @@ async def update_item_taxes(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/checkout/__init__.py b/src/square/checkout/__init__.py
index 0e857b81..d303cc94 100644
--- a/src/square/checkout/__init__.py
+++ b/src/square/checkout/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import payment_links
 
 __all__ = ["payment_links"]
diff --git a/src/square/checkout/client.py b/src/square/checkout/client.py
index 960fe5e6..a6620b12 100644
--- a/src/square/checkout/client.py
+++ b/src/square/checkout/client.py
@@ -1,19 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCheckoutClient
-from .payment_links.client import PaymentLinksClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.retrieve_location_settings_response import RetrieveLocationSettingsResponse
 from ..requests.checkout_location_settings import CheckoutLocationSettingsParams
-from ..types.update_location_settings_response import UpdateLocationSettingsResponse
-from ..types.retrieve_merchant_settings_response import RetrieveMerchantSettingsResponse
 from ..requests.checkout_merchant_settings import CheckoutMerchantSettingsParams
+from ..types.retrieve_location_settings_response import RetrieveLocationSettingsResponse
+from ..types.retrieve_merchant_settings_response import RetrieveMerchantSettingsResponse
+from ..types.update_location_settings_response import UpdateLocationSettingsResponse
 from ..types.update_merchant_settings_response import UpdateMerchantSettingsResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCheckoutClient
-from .payment_links.client import AsyncPaymentLinksClient
+from .payment_links.client import AsyncPaymentLinksClient, PaymentLinksClient
+from .raw_client import AsyncRawCheckoutClient, RawCheckoutClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -65,8 +63,8 @@ def retrieve_location_settings(
             location_id="location_id",
         )
         """
-        response = self._raw_client.retrieve_location_settings(location_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.retrieve_location_settings(location_id, request_options=request_options)
+        return _response.data
 
     def update_location_settings(
         self,
@@ -106,10 +104,10 @@ def update_location_settings(
             location_settings={},
         )
         """
-        response = self._raw_client.update_location_settings(
+        _response = self._raw_client.update_location_settings(
             location_id, location_settings=location_settings, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def retrieve_merchant_settings(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -136,8 +134,8 @@ def retrieve_merchant_settings(
         )
         client.checkout.retrieve_merchant_settings()
         """
-        response = self._raw_client.retrieve_merchant_settings(request_options=request_options)
-        return response.data
+        _response = self._raw_client.retrieve_merchant_settings(request_options=request_options)
+        return _response.data
 
     def update_merchant_settings(
         self,
@@ -172,10 +170,10 @@ def update_merchant_settings(
             merchant_settings={},
         )
         """
-        response = self._raw_client.update_merchant_settings(
+        _response = self._raw_client.update_merchant_settings(
             merchant_settings=merchant_settings, request_options=request_options
         )
-        return response.data
+        return _response.data
 
 
 class AsyncCheckoutClient:
@@ -232,8 +230,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.retrieve_location_settings(location_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.retrieve_location_settings(location_id, request_options=request_options)
+        return _response.data
 
     async def update_location_settings(
         self,
@@ -281,10 +279,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update_location_settings(
+        _response = await self._raw_client.update_location_settings(
             location_id, location_settings=location_settings, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def retrieve_merchant_settings(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -319,8 +317,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.retrieve_merchant_settings(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.retrieve_merchant_settings(request_options=request_options)
+        return _response.data
 
     async def update_merchant_settings(
         self,
@@ -363,7 +361,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update_merchant_settings(
+        _response = await self._raw_client.update_merchant_settings(
             merchant_settings=merchant_settings, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/checkout/payment_links/__init__.py b/src/square/checkout/payment_links/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/checkout/payment_links/__init__.py
+++ b/src/square/checkout/payment_links/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/checkout/payment_links/client.py b/src/square/checkout/payment_links/client.py
index ca2bfacd..00d6e9a8 100644
--- a/src/square/checkout/payment_links/client.py
+++ b/src/square/checkout/payment_links/client.py
@@ -1,27 +1,21 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawPaymentLinksClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.payment_link import PaymentLink
-from ...types.list_payment_links_response import ListPaymentLinksResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
-from ...requests.quick_pay import QuickPayParams
-from ...requests.order import OrderParams
 from ...requests.checkout_options import CheckoutOptionsParams
+from ...requests.order import OrderParams
+from ...requests.payment_link import PaymentLinkParams
 from ...requests.pre_populated_data import PrePopulatedDataParams
+from ...requests.quick_pay import QuickPayParams
 from ...types.create_payment_link_response import CreatePaymentLinkResponse
+from ...types.delete_payment_link_response import DeletePaymentLinkResponse
 from ...types.get_payment_link_response import GetPaymentLinkResponse
-from ...requests.payment_link import PaymentLinkParams
+from ...types.payment_link import PaymentLink
 from ...types.update_payment_link_response import UpdatePaymentLinkResponse
-from ...types.delete_payment_link_response import DeletePaymentLinkResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawPaymentLinksClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawPaymentLinksClient, RawPaymentLinksClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -89,37 +83,7 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/online-checkout/payment-links",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPaymentLinksResponse,
-                    construct_type(
-                        type_=ListPaymentLinksResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.payment_links
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return self._raw_client.list(cursor=cursor, limit=limit, request_options=request_options)
 
     def create(
         self,
@@ -195,7 +159,7 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key,
             description=description,
             quick_pay=quick_pay,
@@ -205,7 +169,7 @@ def create(
             payment_note=payment_note,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetPaymentLinkResponse:
         """
@@ -235,8 +199,8 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             id="id",
         )
         """
-        response = self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
     def update(
         self, id: str, *, payment_link: PaymentLinkParams, request_options: typing.Optional[RequestOptions] = None
@@ -278,8 +242,8 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(id, payment_link=payment_link, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update(id, payment_link=payment_link, request_options=request_options)
+        return _response.data
 
     def delete(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> DeletePaymentLinkResponse:
         """
@@ -309,8 +273,8 @@ def delete(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             id="id",
         )
         """
-        response = self._raw_client.delete(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(id, request_options=request_options)
+        return _response.data
 
 
 class AsyncPaymentLinksClient:
@@ -376,6 +340,7 @@ async def main() -> None:
             response = await client.checkout.payment_links.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -383,37 +348,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/online-checkout/payment-links",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPaymentLinksResponse,
-                    construct_type(
-                        type_=ListPaymentLinksResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.payment_links
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return await self._raw_client.list(cursor=cursor, limit=limit, request_options=request_options)
 
     async def create(
         self,
@@ -497,7 +432,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key,
             description=description,
             quick_pay=quick_pay,
@@ -507,7 +442,7 @@ async def main() -> None:
             payment_note=payment_note,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetPaymentLinkResponse:
         """
@@ -545,8 +480,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
     async def update(
         self, id: str, *, payment_link: PaymentLinkParams, request_options: typing.Optional[RequestOptions] = None
@@ -596,8 +531,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(id, payment_link=payment_link, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.update(id, payment_link=payment_link, request_options=request_options)
+        return _response.data
 
     async def delete(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -637,5 +572,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(id, request_options=request_options)
+        return _response.data
diff --git a/src/square/checkout/payment_links/raw_client.py b/src/square/checkout/payment_links/raw_client.py
index bba44612..d1ff1b26 100644
--- a/src/square/checkout/payment_links/raw_client.py
+++ b/src/square/checkout/payment_links/raw_client.py
@@ -1,25 +1,27 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.quick_pay import QuickPayParams
-from ...requests.order import OrderParams
-from ...requests.checkout_options import CheckoutOptionsParams
-from ...requests.pre_populated_data import PrePopulatedDataParams
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_payment_link_response import CreatePaymentLinkResponse
-from ...core.serialization import convert_and_respect_annotation_metadata
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...types.get_payment_link_response import GetPaymentLinkResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
 from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.unchecked_base_model import construct_type
+from ...requests.checkout_options import CheckoutOptionsParams
+from ...requests.order import OrderParams
 from ...requests.payment_link import PaymentLinkParams
-from ...types.update_payment_link_response import UpdatePaymentLinkResponse
+from ...requests.pre_populated_data import PrePopulatedDataParams
+from ...requests.quick_pay import QuickPayParams
+from ...types.create_payment_link_response import CreatePaymentLinkResponse
 from ...types.delete_payment_link_response import DeletePaymentLinkResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.get_payment_link_response import GetPaymentLinkResponse
+from ...types.list_payment_links_response import ListPaymentLinksResponse
+from ...types.payment_link import PaymentLink
+from ...types.update_payment_link_response import UpdatePaymentLinkResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -29,6 +31,73 @@ class RawPaymentLinksClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[PaymentLink]:
+        """
+        Lists all payment links.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            If a cursor is not provided, the endpoint returns the first page of the results.
+            For more  information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            A limit on the number of results to return per page. The limit is advisory and
+            the implementation might return more or less results. If the supplied limit is negative, zero, or
+            greater than the maximum limit of 1000, it is ignored.
+
+            Default value: `100`
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[PaymentLink]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/online-checkout/payment-links",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPaymentLinksResponse,
+                    construct_type(
+                        type_=ListPaymentLinksResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.payment_links
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -125,8 +194,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -164,8 +233,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self, id: str, *, payment_link: PaymentLinkParams, request_options: typing.Optional[RequestOptions] = None
@@ -218,8 +287,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -257,14 +326,84 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawPaymentLinksClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[PaymentLink]:
+        """
+        Lists all payment links.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            If a cursor is not provided, the endpoint returns the first page of the results.
+            For more  information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            A limit on the number of results to return per page. The limit is advisory and
+            the implementation might return more or less results. If the supplied limit is negative, zero, or
+            greater than the maximum limit of 1000, it is ignored.
+
+            Default value: `100`
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[PaymentLink]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/online-checkout/payment-links",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPaymentLinksResponse,
+                    construct_type(
+                        type_=ListPaymentLinksResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.payment_links
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -361,8 +500,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -400,8 +539,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self, id: str, *, payment_link: PaymentLinkParams, request_options: typing.Optional[RequestOptions] = None
@@ -454,8 +593,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -493,5 +632,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/checkout/raw_client.py b/src/square/checkout/raw_client.py
index 753d0cee..2a4d122e 100644
--- a/src/square/checkout/raw_client.py
+++ b/src/square/checkout/raw_client.py
@@ -1,22 +1,21 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.retrieve_location_settings_response import RetrieveLocationSettingsResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..requests.checkout_location_settings import CheckoutLocationSettingsParams
-from ..types.update_location_settings_response import UpdateLocationSettingsResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.request_options import RequestOptions
 from ..core.serialization import convert_and_respect_annotation_metadata
-from ..types.retrieve_merchant_settings_response import RetrieveMerchantSettingsResponse
+from ..core.unchecked_base_model import construct_type
+from ..requests.checkout_location_settings import CheckoutLocationSettingsParams
 from ..requests.checkout_merchant_settings import CheckoutMerchantSettingsParams
+from ..types.retrieve_location_settings_response import RetrieveLocationSettingsResponse
+from ..types.retrieve_merchant_settings_response import RetrieveMerchantSettingsResponse
+from ..types.update_location_settings_response import UpdateLocationSettingsResponse
 from ..types.update_merchant_settings_response import UpdateMerchantSettingsResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -62,8 +61,8 @@ def retrieve_location_settings(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update_location_settings(
         self,
@@ -117,8 +116,8 @@ def update_location_settings(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def retrieve_merchant_settings(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -153,8 +152,8 @@ def retrieve_merchant_settings(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update_merchant_settings(
         self,
@@ -204,8 +203,8 @@ def update_merchant_settings(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCheckoutClient:
@@ -248,8 +247,8 @@ async def retrieve_location_settings(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update_location_settings(
         self,
@@ -303,8 +302,8 @@ async def update_location_settings(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def retrieve_merchant_settings(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -339,8 +338,8 @@ async def retrieve_merchant_settings(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update_merchant_settings(
         self,
@@ -390,5 +389,5 @@ async def update_merchant_settings(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/client.py b/src/square/client.py
index d00177ed..307d6d2a 100644
--- a/src/square/client.py
+++ b/src/square/client.py
@@ -1,79 +1,45 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
-from .environment import SquareEnvironment
 import os
+import typing
+
 import httpx
-from .core.client_wrapper import SyncClientWrapper
-from .mobile.client import MobileClient
-from .o_auth.client import OAuthClient
-from .v1transactions.client import V1TransactionsClient
-from .apple_pay.client import ApplePayClient
-from .bank_accounts.client import BankAccountsClient
-from .bookings.client import BookingsClient
-from .cards.client import CardsClient
-from .catalog.client import CatalogClient
-from .customers.client import CustomersClient
-from .devices.client import DevicesClient
-from .disputes.client import DisputesClient
-from .employees.client import EmployeesClient
-from .events.client import EventsClient
-from .gift_cards.client import GiftCardsClient
-from .inventory.client import InventoryClient
-from .invoices.client import InvoicesClient
-from .labor.client import LaborClient
-from .locations.client import LocationsClient
-from .loyalty.client import LoyaltyClient
-from .merchants.client import MerchantsClient
-from .checkout.client import CheckoutClient
-from .orders.client import OrdersClient
-from .payments.client import PaymentsClient
-from .payouts.client import PayoutsClient
-from .refunds.client import RefundsClient
-from .sites.client import SitesClient
-from .snippets.client import SnippetsClient
-from .subscriptions.client import SubscriptionsClient
-from .team_members.client import TeamMembersClient
-from .team.client import TeamClient
-from .terminal.client import TerminalClient
-from .vendors.client import VendorsClient
-from .cash_drawers.client import CashDrawersClient
-from .webhooks.client import WebhooksClient
-from .core.client_wrapper import AsyncClientWrapper
-from .mobile.client import AsyncMobileClient
-from .o_auth.client import AsyncOAuthClient
-from .v1transactions.client import AsyncV1TransactionsClient
-from .apple_pay.client import AsyncApplePayClient
-from .bank_accounts.client import AsyncBankAccountsClient
-from .bookings.client import AsyncBookingsClient
-from .cards.client import AsyncCardsClient
-from .catalog.client import AsyncCatalogClient
-from .customers.client import AsyncCustomersClient
-from .devices.client import AsyncDevicesClient
-from .disputes.client import AsyncDisputesClient
-from .employees.client import AsyncEmployeesClient
-from .events.client import AsyncEventsClient
-from .gift_cards.client import AsyncGiftCardsClient
-from .inventory.client import AsyncInventoryClient
-from .invoices.client import AsyncInvoicesClient
-from .labor.client import AsyncLaborClient
-from .locations.client import AsyncLocationsClient
-from .loyalty.client import AsyncLoyaltyClient
-from .merchants.client import AsyncMerchantsClient
-from .checkout.client import AsyncCheckoutClient
-from .orders.client import AsyncOrdersClient
-from .payments.client import AsyncPaymentsClient
-from .payouts.client import AsyncPayoutsClient
-from .refunds.client import AsyncRefundsClient
-from .sites.client import AsyncSitesClient
-from .snippets.client import AsyncSnippetsClient
-from .subscriptions.client import AsyncSubscriptionsClient
-from .team_members.client import AsyncTeamMembersClient
-from .team.client import AsyncTeamClient
-from .terminal.client import AsyncTerminalClient
-from .vendors.client import AsyncVendorsClient
-from .cash_drawers.client import AsyncCashDrawersClient
-from .webhooks.client import AsyncWebhooksClient
+from .apple_pay.client import ApplePayClient, AsyncApplePayClient
+from .bank_accounts.client import AsyncBankAccountsClient, BankAccountsClient
+from .bookings.client import AsyncBookingsClient, BookingsClient
+from .cards.client import AsyncCardsClient, CardsClient
+from .cash_drawers.client import AsyncCashDrawersClient, CashDrawersClient
+from .catalog.client import AsyncCatalogClient, CatalogClient
+from .checkout.client import AsyncCheckoutClient, CheckoutClient
+from .core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from .customers.client import AsyncCustomersClient, CustomersClient
+from .devices.client import AsyncDevicesClient, DevicesClient
+from .disputes.client import AsyncDisputesClient, DisputesClient
+from .employees.client import AsyncEmployeesClient, EmployeesClient
+from .environment import SquareEnvironment
+from .events.client import AsyncEventsClient, EventsClient
+from .gift_cards.client import AsyncGiftCardsClient, GiftCardsClient
+from .inventory.client import AsyncInventoryClient, InventoryClient
+from .invoices.client import AsyncInvoicesClient, InvoicesClient
+from .labor.client import AsyncLaborClient, LaborClient
+from .locations.client import AsyncLocationsClient, LocationsClient
+from .loyalty.client import AsyncLoyaltyClient, LoyaltyClient
+from .merchants.client import AsyncMerchantsClient, MerchantsClient
+from .mobile.client import AsyncMobileClient, MobileClient
+from .o_auth.client import AsyncOAuthClient, OAuthClient
+from .orders.client import AsyncOrdersClient, OrdersClient
+from .payments.client import AsyncPaymentsClient, PaymentsClient
+from .payouts.client import AsyncPayoutsClient, PayoutsClient
+from .refunds.client import AsyncRefundsClient, RefundsClient
+from .sites.client import AsyncSitesClient, SitesClient
+from .snippets.client import AsyncSnippetsClient, SnippetsClient
+from .subscriptions.client import AsyncSubscriptionsClient, SubscriptionsClient
+from .team.client import AsyncTeamClient, TeamClient
+from .team_members.client import AsyncTeamMembersClient, TeamMembersClient
+from .terminal.client import AsyncTerminalClient, TerminalClient
+from .v1transactions.client import AsyncV1TransactionsClient, V1TransactionsClient
+from .vendors.client import AsyncVendorsClient, VendorsClient
+from .webhooks.client import AsyncWebhooksClient, WebhooksClient
 
 
 class Square:
@@ -95,6 +61,9 @@ class Square:
 
 
     token : typing.Optional[typing.Union[str, typing.Callable[[], str]]]
+    headers : typing.Optional[typing.Dict[str, str]]
+        Additional headers to send with every request.
+
     timeout : typing.Optional[float]
         The timeout to be used, in seconds, for requests. By default the timeout is 60 seconds, unless a custom httpx client is used, in which case this default is not enforced.
 
@@ -120,6 +89,7 @@ def __init__(
         base_url: typing.Optional[str] = None,
         environment: SquareEnvironment = SquareEnvironment.PRODUCTION,
         token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = os.getenv("SQUARE_TOKEN"),
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         timeout: typing.Optional[float] = None,
         follow_redirects: typing.Optional[bool] = True,
         httpx_client: typing.Optional[httpx.Client] = None,
@@ -131,6 +101,7 @@ def __init__(
         self._client_wrapper = SyncClientWrapper(
             base_url=_get_base_url(base_url=base_url, environment=environment),
             token=token,
+            headers=headers,
             httpx_client=httpx_client
             if httpx_client is not None
             else httpx.Client(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
@@ -194,6 +165,9 @@ class AsyncSquare:
 
 
     token : typing.Optional[typing.Union[str, typing.Callable[[], str]]]
+    headers : typing.Optional[typing.Dict[str, str]]
+        Additional headers to send with every request.
+
     timeout : typing.Optional[float]
         The timeout to be used, in seconds, for requests. By default the timeout is 60 seconds, unless a custom httpx client is used, in which case this default is not enforced.
 
@@ -219,6 +193,7 @@ def __init__(
         base_url: typing.Optional[str] = None,
         environment: SquareEnvironment = SquareEnvironment.PRODUCTION,
         token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = os.getenv("SQUARE_TOKEN"),
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         timeout: typing.Optional[float] = None,
         follow_redirects: typing.Optional[bool] = True,
         httpx_client: typing.Optional[httpx.AsyncClient] = None,
@@ -230,6 +205,7 @@ def __init__(
         self._client_wrapper = AsyncClientWrapper(
             base_url=_get_base_url(base_url=base_url, environment=environment),
             token=token,
+            headers=headers,
             httpx_client=httpx_client
             if httpx_client is not None
             else httpx.AsyncClient(timeout=_defaulted_timeout, follow_redirects=follow_redirects)
diff --git a/src/square/core/__init__.py b/src/square/core/__init__.py
index e1f8fa4c..73955ba0 100644
--- a/src/square/core/__init__.py
+++ b/src/square/core/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from .file import File, with_content_type
 
 __all__ = ["File", "with_content_type"]
diff --git a/src/square/core/client_wrapper.py b/src/square/core/client_wrapper.py
index 1cffdff2..2a749183 100644
--- a/src/square/core/client_wrapper.py
+++ b/src/square/core/client_wrapper.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
+
 import httpx
-from .http_client import HttpClient
-from .http_client import AsyncHttpClient
+from .http_client import AsyncHttpClient, HttpClient
 
 
 class BaseClientWrapper:
@@ -11,11 +11,13 @@ def __init__(
         self,
         *,
         token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         base_url: str,
         timeout: typing.Optional[float] = None,
         version: typing.Optional[str] = None,
     ):
         self._token = token
+        self._headers = headers
         self._base_url = base_url
         self._timeout = timeout
         self._version = version
@@ -26,6 +28,7 @@ def get_headers(self) -> typing.Dict[str, str]:
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "squareup",
             "X-Fern-SDK-Version": "43.0.1.20250716",
+            **(self.get_custom_headers() or {}),
         }
         token = self._get_token()
         if token is not None:
@@ -39,6 +42,9 @@ def _get_token(self) -> typing.Optional[str]:
         else:
             return self._token()
 
+    def get_custom_headers(self) -> typing.Optional[typing.Dict[str, str]]:
+        return self._headers
+
     def get_base_url(self) -> str:
         return self._base_url
 
@@ -51,12 +57,13 @@ def __init__(
         self,
         *,
         token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         base_url: str,
         timeout: typing.Optional[float] = None,
         version: typing.Optional[str] = None,
         httpx_client: httpx.Client,
     ):
-        super().__init__(token=token, base_url=base_url, timeout=timeout, version=version)
+        super().__init__(token=token, headers=headers, base_url=base_url, timeout=timeout, version=version)
         self.httpx_client = HttpClient(
             httpx_client=httpx_client,
             base_headers=self.get_headers,
@@ -70,12 +77,13 @@ def __init__(
         self,
         *,
         token: typing.Optional[typing.Union[str, typing.Callable[[], str]]] = None,
+        headers: typing.Optional[typing.Dict[str, str]] = None,
         base_url: str,
         timeout: typing.Optional[float] = None,
         version: typing.Optional[str] = None,
         httpx_client: httpx.AsyncClient,
     ):
-        super().__init__(token=token, base_url=base_url, timeout=timeout, version=version)
+        super().__init__(token=token, headers=headers, base_url=base_url, timeout=timeout, version=version)
         self.httpx_client = AsyncHttpClient(
             httpx_client=httpx_client,
             base_headers=self.get_headers,
diff --git a/src/square/core/force_multipart.py b/src/square/core/force_multipart.py
new file mode 100644
index 00000000..ae24ccff
--- /dev/null
+++ b/src/square/core/force_multipart.py
@@ -0,0 +1,16 @@
+# This file was auto-generated by Fern from our API Definition.
+
+
+class ForceMultipartDict(dict):
+    """
+    A dictionary subclass that always evaluates to True in boolean contexts.
+
+    This is used to force multipart/form-data encoding in HTTP requests even when
+    the dictionary is empty, which would normally evaluate to False.
+    """
+
+    def __bool__(self):
+        return True
+
+
+FORCE_MULTIPART = ForceMultipartDict()
diff --git a/src/square/core/http_client.py b/src/square/core/http_client.py
index e7bd4f79..e4173f99 100644
--- a/src/square/core/http_client.py
+++ b/src/square/core/http_client.py
@@ -11,10 +11,12 @@
 
 import httpx
 from .file import File, convert_file_dict_to_httpx_tuples
+from .force_multipart import FORCE_MULTIPART
 from .jsonable_encoder import jsonable_encoder
 from .query_encoder import encode_query
 from .remove_none_from_dict import remove_none_from_dict
 from .request_options import RequestOptions
+from httpx._types import RequestFiles
 
 INITIAL_RETRY_DELAY_SECONDS = 0.5
 MAX_RETRY_DELAY_SECONDS = 10
@@ -178,11 +180,17 @@ def request(
         json: typing.Optional[typing.Any] = None,
         data: typing.Optional[typing.Any] = None,
         content: typing.Optional[typing.Union[bytes, typing.Iterator[bytes], typing.AsyncIterator[bytes]]] = None,
-        files: typing.Optional[typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]]] = None,
+        files: typing.Optional[
+            typing.Union[
+                typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]],
+                typing.List[typing.Tuple[str, File]],
+            ]
+        ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
         retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
+        force_multipart: typing.Optional[bool] = None,
     ) -> httpx.Response:
         base_url = self.get_base_url(base_url)
         timeout = (
@@ -193,6 +201,15 @@ def request(
 
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
 
+        request_files: typing.Optional[RequestFiles] = (
+            convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+            if (files is not None and files is not omit and isinstance(files, dict))
+            else None
+        )
+
+        if (request_files is None or len(request_files) == 0) and force_multipart:
+            request_files = FORCE_MULTIPART
+
         response = self.httpx_client.request(
             method=method,
             url=urllib.parse.urljoin(f"{base_url}/", path),
@@ -225,11 +242,7 @@ def request(
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
-                if (files is not None and files is not omit)
-                else None
-            ),
+            files=request_files,
             timeout=timeout,
         )
 
@@ -264,11 +277,17 @@ def stream(
         json: typing.Optional[typing.Any] = None,
         data: typing.Optional[typing.Any] = None,
         content: typing.Optional[typing.Union[bytes, typing.Iterator[bytes], typing.AsyncIterator[bytes]]] = None,
-        files: typing.Optional[typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]]] = None,
+        files: typing.Optional[
+            typing.Union[
+                typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]],
+                typing.List[typing.Tuple[str, File]],
+            ]
+        ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
         retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
+        force_multipart: typing.Optional[bool] = None,
     ) -> typing.Iterator[httpx.Response]:
         base_url = self.get_base_url(base_url)
         timeout = (
@@ -277,6 +296,15 @@ def stream(
             else self.base_timeout()
         )
 
+        request_files: typing.Optional[RequestFiles] = (
+            convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+            if (files is not None and files is not omit and isinstance(files, dict))
+            else None
+        )
+
+        if (request_files is None or len(request_files) == 0) and force_multipart:
+            request_files = FORCE_MULTIPART
+
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
 
         with self.httpx_client.stream(
@@ -311,11 +339,7 @@ def stream(
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
-                if (files is not None and files is not omit)
-                else None
-            ),
+            files=request_files,
             timeout=timeout,
         ) as stream:
             yield stream
@@ -354,11 +378,17 @@ async def request(
         json: typing.Optional[typing.Any] = None,
         data: typing.Optional[typing.Any] = None,
         content: typing.Optional[typing.Union[bytes, typing.Iterator[bytes], typing.AsyncIterator[bytes]]] = None,
-        files: typing.Optional[typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]]] = None,
+        files: typing.Optional[
+            typing.Union[
+                typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]],
+                typing.List[typing.Tuple[str, File]],
+            ]
+        ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
         retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
+        force_multipart: typing.Optional[bool] = None,
     ) -> httpx.Response:
         base_url = self.get_base_url(base_url)
         timeout = (
@@ -367,6 +397,15 @@ async def request(
             else self.base_timeout()
         )
 
+        request_files: typing.Optional[RequestFiles] = (
+            convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+            if (files is not None and files is not omit and isinstance(files, dict))
+            else None
+        )
+
+        if (request_files is None or len(request_files) == 0) and force_multipart:
+            request_files = FORCE_MULTIPART
+
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
 
         # Add the input to each of these and do None-safety checks
@@ -402,11 +441,7 @@ async def request(
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
-                if files is not None
-                else None
-            ),
+            files=request_files,
             timeout=timeout,
         )
 
@@ -440,11 +475,17 @@ async def stream(
         json: typing.Optional[typing.Any] = None,
         data: typing.Optional[typing.Any] = None,
         content: typing.Optional[typing.Union[bytes, typing.Iterator[bytes], typing.AsyncIterator[bytes]]] = None,
-        files: typing.Optional[typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]]] = None,
+        files: typing.Optional[
+            typing.Union[
+                typing.Dict[str, typing.Optional[typing.Union[File, typing.List[File]]]],
+                typing.List[typing.Tuple[str, File]],
+            ]
+        ] = None,
         headers: typing.Optional[typing.Dict[str, typing.Any]] = None,
         request_options: typing.Optional[RequestOptions] = None,
         retries: int = 2,
         omit: typing.Optional[typing.Any] = None,
+        force_multipart: typing.Optional[bool] = None,
     ) -> typing.AsyncIterator[httpx.Response]:
         base_url = self.get_base_url(base_url)
         timeout = (
@@ -453,6 +494,15 @@ async def stream(
             else self.base_timeout()
         )
 
+        request_files: typing.Optional[RequestFiles] = (
+            convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
+            if (files is not None and files is not omit and isinstance(files, dict))
+            else None
+        )
+
+        if (request_files is None or len(request_files) == 0) and force_multipart:
+            request_files = FORCE_MULTIPART
+
         json_body, data_body = get_request_body(json=json, data=data, request_options=request_options, omit=omit)
 
         async with self.httpx_client.stream(
@@ -487,11 +537,7 @@ async def stream(
             json=json_body,
             data=data_body,
             content=content,
-            files=(
-                convert_file_dict_to_httpx_tuples(remove_omit_from_dict(remove_none_from_dict(files), omit))
-                if files is not None
-                else None
-            ),
+            files=request_files,
             timeout=timeout,
         ) as stream:
             yield stream
diff --git a/src/square/core/http_response.py b/src/square/core/http_response.py
index c72a9130..48a1798a 100644
--- a/src/square/core/http_response.py
+++ b/src/square/core/http_response.py
@@ -5,20 +5,31 @@
 import httpx
 
 T = TypeVar("T")
+"""Generic to represent the underlying type of the data wrapped by the HTTP response."""
 
 
-class HttpResponse(Generic[T]):
+class BaseHttpResponse:
+    """Minimalist HTTP response wrapper that exposes response headers."""
+
     _response: httpx.Response
-    _data: T
 
-    def __init__(self, response: httpx.Response, data: T):
+    def __init__(self, response: httpx.Response):
         self._response = response
-        self._data = data
 
     @property
     def headers(self) -> Dict[str, str]:
         return dict(self._response.headers)
 
+
+class HttpResponse(Generic[T], BaseHttpResponse):
+    """HTTP response wrapper that exposes response headers and data."""
+
+    _data: T
+
+    def __init__(self, response: httpx.Response, data: T):
+        super().__init__(response)
+        self._data = data
+
     @property
     def data(self) -> T:
         return self._data
@@ -27,18 +38,15 @@ def close(self) -> None:
         self._response.close()
 
 
-class AsyncHttpResponse(Generic[T]):
-    _response: httpx.Response
+class AsyncHttpResponse(Generic[T], BaseHttpResponse):
+    """HTTP response wrapper that exposes response headers and data."""
+
     _data: T
 
     def __init__(self, response: httpx.Response, data: T):
-        self._response = response
+        super().__init__(response)
         self._data = data
 
-    @property
-    def headers(self) -> Dict[str, str]:
-        return dict(self._response.headers)
-
     @property
     def data(self) -> T:
         return self._data
diff --git a/src/square/core/pagination.py b/src/square/core/pagination.py
index e7e31291..209a1ff1 100644
--- a/src/square/core/pagination.py
+++ b/src/square/core/pagination.py
@@ -1,12 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing
+from __future__ import annotations
 
-import pydantic
-from typing_extensions import Self
+from dataclasses import dataclass
+from typing import AsyncIterator, Awaitable, Callable, Generic, Iterator, List, Optional, TypeVar
 
-# Generic to represent the underlying type of the results within a page
-T = typing.TypeVar("T")
+from .http_response import BaseHttpResponse
+
+T = TypeVar("T")
+"""Generic to represent the underlying type of the results within a page"""
 
 
 # SDKs implement a Page ABC per-pagination request, the endpoint then returns a pager that wraps this type
@@ -18,70 +20,63 @@
 #     # This should be the outer function that returns the SyncPager again
 #     get_next=lambda: list(..., cursor: response.cursor) (or list(..., offset: offset + 1))
 # )
-class BasePage(pydantic.BaseModel, typing.Generic[T]):
-    has_next: bool
-    items: typing.Optional[typing.List[T]]
-
-
-class SyncPage(BasePage[T], typing.Generic[T]):
-    get_next: typing.Optional[typing.Callable[[], typing.Optional[Self]]]
-
 
-class AsyncPage(BasePage[T], typing.Generic[T]):
-    get_next: typing.Optional[typing.Callable[[], typing.Awaitable[typing.Optional[Self]]]]
-
-
-# ----------------------------
 
+@dataclass(frozen=True)
+class SyncPager(Generic[T]):
+    get_next: Optional[Callable[[], Optional[SyncPager[T]]]]
+    has_next: bool
+    items: Optional[List[T]]
+    response: Optional[BaseHttpResponse]
 
-class SyncPager(SyncPage[T], typing.Generic[T]):
     # Here we type ignore the iterator to avoid a mypy error
     # caused by the type conflict with Pydanitc's __iter__ method
     # brought in by extending the base model
-    def __iter__(self) -> typing.Iterator[T]:  # type: ignore
+    def __iter__(self) -> Iterator[T]:  # type: ignore[override]
         for page in self.iter_pages():
             if page.items is not None:
-                for item in page.items:
-                    yield item
+                yield from page.items
+
+    def iter_pages(self) -> Iterator[SyncPager[T]]:
+        page: Optional[SyncPager[T]] = self
+        while page is not None:
+            yield page
 
-    def iter_pages(self) -> typing.Iterator[SyncPage[T]]:
-        page: typing.Union[SyncPager[T], None] = self
-        while True:
-            if page is not None:
-                yield page
-                if page.has_next and page.get_next is not None:
-                    page = page.get_next()
-                    if page is None or page.items is None or len(page.items) == 0:
-                        return
-                else:
-                    return
-            else:
+            if not page.has_next or page.get_next is None:
                 return
 
-    def next_page(self) -> typing.Optional[SyncPage[T]]:
+            page = page.get_next()
+            if page is None or page.items is None or len(page.items) == 0:
+                return
+
+    def next_page(self) -> Optional[SyncPager[T]]:
         return self.get_next() if self.get_next is not None else None
 
 
-class AsyncPager(AsyncPage[T], typing.Generic[T]):
-    async def __aiter__(self) -> typing.AsyncIterator[T]:  # type: ignore
+@dataclass(frozen=True)
+class AsyncPager(Generic[T]):
+    get_next: Optional[Callable[[], Awaitable[Optional[AsyncPager[T]]]]]
+    has_next: bool
+    items: Optional[List[T]]
+    response: Optional[BaseHttpResponse]
+
+    async def __aiter__(self) -> AsyncIterator[T]:
         async for page in self.iter_pages():
             if page.items is not None:
                 for item in page.items:
                     yield item
 
-    async def iter_pages(self) -> typing.AsyncIterator[AsyncPage[T]]:
-        page: typing.Union[AsyncPager[T], None] = self
-        while True:
-            if page is not None:
-                yield page
-                if page is not None and page.has_next and page.get_next is not None:
-                    page = await page.get_next()
-                    if page is None or page.items is None or len(page.items) == 0:
-                        return
-                else:
-                    return
-            else:
+    async def iter_pages(self) -> AsyncIterator[AsyncPager[T]]:
+        page: Optional[AsyncPager[T]] = self
+        while page is not None:
+            yield page
+
+            if not page.has_next or page.get_next is None:
+                return
+
+            page = await page.get_next()
+            if page is None or page.items is None or len(page.items) == 0:
                 return
 
-    async def next_page(self) -> typing.Optional[AsyncPage[T]]:
+    async def next_page(self) -> Optional[AsyncPager[T]]:
         return await self.get_next() if self.get_next is not None else None
diff --git a/src/square/core/pydantic_utilities.py b/src/square/core/pydantic_utilities.py
index f7467bcc..7db29500 100644
--- a/src/square/core/pydantic_utilities.py
+++ b/src/square/core/pydantic_utilities.py
@@ -2,88 +2,66 @@
 
 # nopycln: file
 import datetime as dt
-import typing
 from collections import defaultdict
+from typing import Any, Callable, ClassVar, Dict, List, Mapping, Optional, Set, Tuple, Type, TypeVar, Union, cast
 
 import pydantic
-import typing_extensions
-from .datetime_utils import serialize_datetime
-from .serialization import convert_and_respect_annotation_metadata
 
 IS_PYDANTIC_V2 = pydantic.VERSION.startswith("2.")
 
 if IS_PYDANTIC_V2:
-    # isort will try to reformat the comments on these imports, which breaks mypy
-    # isort: off
-    from pydantic.v1.datetime_parse import (  # type: ignore # pyright: ignore[reportMissingImports] # Pydantic v2
-        parse_date as parse_date,
-    )
-    from pydantic.v1.datetime_parse import (  # pyright: ignore[reportMissingImports] # Pydantic v2
-        parse_datetime as parse_datetime,
-    )
-    from pydantic.v1.json import (  # type: ignore # pyright: ignore[reportMissingImports] # Pydantic v2
-        ENCODERS_BY_TYPE as encoders_by_type,
-    )
-    from pydantic.v1.typing import (  # type: ignore # pyright: ignore[reportMissingImports] # Pydantic v2
-        get_args as get_args,
-    )
-    from pydantic.v1.typing import (  # pyright: ignore[reportMissingImports] # Pydantic v2
-        get_origin as get_origin,
-    )
-    from pydantic.v1.typing import (  # pyright: ignore[reportMissingImports] # Pydantic v2
-        is_literal_type as is_literal_type,
-    )
-    from pydantic.v1.typing import (  # pyright: ignore[reportMissingImports] # Pydantic v2
-        is_union as is_union,
-    )
-    from pydantic.v1.fields import ModelField as ModelField  # type: ignore # pyright: ignore[reportMissingImports] # Pydantic v2
+    from pydantic.v1.datetime_parse import parse_date as parse_date
+    from pydantic.v1.datetime_parse import parse_datetime as parse_datetime
+    from pydantic.v1.fields import ModelField as ModelField
+    from pydantic.v1.json import ENCODERS_BY_TYPE as encoders_by_type  # type: ignore[attr-defined]
+    from pydantic.v1.typing import get_args as get_args
+    from pydantic.v1.typing import get_origin as get_origin
+    from pydantic.v1.typing import is_literal_type as is_literal_type
+    from pydantic.v1.typing import is_union as is_union
 else:
-    from pydantic.datetime_parse import parse_date as parse_date  # type: ignore # Pydantic v1
-    from pydantic.datetime_parse import parse_datetime as parse_datetime  # type: ignore # Pydantic v1
-    from pydantic.fields import ModelField as ModelField  # type: ignore # Pydantic v1
-    from pydantic.json import ENCODERS_BY_TYPE as encoders_by_type  # type: ignore # Pydantic v1
-    from pydantic.typing import get_args as get_args  # type: ignore # Pydantic v1
-    from pydantic.typing import get_origin as get_origin  # type: ignore # Pydantic v1
-    from pydantic.typing import is_literal_type as is_literal_type  # type: ignore # Pydantic v1
-    from pydantic.typing import is_union as is_union  # type: ignore # Pydantic v1
-
-    # isort: on
+    from pydantic.datetime_parse import parse_date as parse_date  # type: ignore[no-redef]
+    from pydantic.datetime_parse import parse_datetime as parse_datetime  # type: ignore[no-redef]
+    from pydantic.fields import ModelField as ModelField  # type: ignore[attr-defined, no-redef]
+    from pydantic.json import ENCODERS_BY_TYPE as encoders_by_type  # type: ignore[no-redef]
+    from pydantic.typing import get_args as get_args  # type: ignore[no-redef]
+    from pydantic.typing import get_origin as get_origin  # type: ignore[no-redef]
+    from pydantic.typing import is_literal_type as is_literal_type  # type: ignore[no-redef]
+    from pydantic.typing import is_union as is_union  # type: ignore[no-redef]
 
+from .datetime_utils import serialize_datetime
+from .serialization import convert_and_respect_annotation_metadata
+from typing_extensions import TypeAlias
 
-T = typing.TypeVar("T")
-Model = typing.TypeVar("Model", bound=pydantic.BaseModel)
+T = TypeVar("T")
+Model = TypeVar("Model", bound=pydantic.BaseModel)
 
 
-def parse_obj_as(type_: typing.Type[T], object_: typing.Any) -> T:
+def parse_obj_as(type_: Type[T], object_: Any) -> T:
     dealiased_object = convert_and_respect_annotation_metadata(object_=object_, annotation=type_, direction="read")
     if IS_PYDANTIC_V2:
-        adapter = pydantic.TypeAdapter(type_)  # type: ignore # Pydantic v2
+        adapter = pydantic.TypeAdapter(type_)  # type: ignore[attr-defined]
         return adapter.validate_python(dealiased_object)
-    else:
-        return pydantic.parse_obj_as(type_, dealiased_object)
+    return pydantic.parse_obj_as(type_, dealiased_object)
 
 
-def to_jsonable_with_fallback(
-    obj: typing.Any, fallback_serializer: typing.Callable[[typing.Any], typing.Any]
-) -> typing.Any:
+def to_jsonable_with_fallback(obj: Any, fallback_serializer: Callable[[Any], Any]) -> Any:
     if IS_PYDANTIC_V2:
         from pydantic_core import to_jsonable_python
 
         return to_jsonable_python(obj, fallback=fallback_serializer)
-    else:
-        return fallback_serializer(obj)
+    return fallback_serializer(obj)
 
 
 class UniversalBaseModel(pydantic.BaseModel):
     if IS_PYDANTIC_V2:
-        model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(
+        model_config: ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(  # type: ignore[typeddict-unknown-key]
             # Allow fields beginning with `model_` to be used in the model
             protected_namespaces=(),
-        )  # type: ignore # Pydantic v2
+        )
 
-        @pydantic.model_serializer(mode="wrap", when_used="json")  # type: ignore # Pydantic v2
-        def serialize_model(self, handler: pydantic.SerializerFunctionWrapHandler) -> typing.Any:  # type: ignore # Pydantic v2
-            serialized = handler(self)
+        @pydantic.model_serializer(mode="plain", when_used="json")  # type: ignore[attr-defined]
+        def serialize_model(self) -> Any:  # type: ignore[name-defined]
+            serialized = self.model_dump()
             data = {k: serialize_datetime(v) if isinstance(v, dt.datetime) else v for k, v in serialized.items()}
             return data
 
@@ -94,34 +72,28 @@ class Config:
             json_encoders = {dt.datetime: serialize_datetime}
 
     @classmethod
-    def model_construct(
-        cls: typing.Type["Model"], _fields_set: typing.Optional[typing.Set[str]] = None, **values: typing.Any
-    ) -> "Model":
+    def model_construct(cls: Type["Model"], _fields_set: Optional[Set[str]] = None, **values: Any) -> "Model":
         dealiased_object = convert_and_respect_annotation_metadata(object_=values, annotation=cls, direction="read")
         return cls.construct(_fields_set, **dealiased_object)
 
     @classmethod
-    def construct(
-        cls: typing.Type["Model"], _fields_set: typing.Optional[typing.Set[str]] = None, **values: typing.Any
-    ) -> "Model":
+    def construct(cls: Type["Model"], _fields_set: Optional[Set[str]] = None, **values: Any) -> "Model":
         dealiased_object = convert_and_respect_annotation_metadata(object_=values, annotation=cls, direction="read")
         if IS_PYDANTIC_V2:
-            return super().model_construct(_fields_set, **dealiased_object)  # type: ignore # Pydantic v2
-        else:
-            return super().construct(_fields_set, **dealiased_object)
+            return super().model_construct(_fields_set, **dealiased_object)  # type: ignore[misc]
+        return super().construct(_fields_set, **dealiased_object)
 
-    def json(self, **kwargs: typing.Any) -> str:
-        kwargs_with_defaults: typing.Any = {
+    def json(self, **kwargs: Any) -> str:
+        kwargs_with_defaults = {
             "by_alias": True,
             "exclude_unset": True,
             **kwargs,
         }
         if IS_PYDANTIC_V2:
-            return super().model_dump_json(**kwargs_with_defaults)  # type: ignore # Pydantic v2
-        else:
-            return super().json(**kwargs_with_defaults)
+            return super().model_dump_json(**kwargs_with_defaults)  # type: ignore[misc]
+        return super().json(**kwargs_with_defaults)
 
-    def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
+    def dict(self, **kwargs: Any) -> Dict[str, Any]:
         """
         Override the default dict method to `exclude_unset` by default. This function patches
         `exclude_unset` to work include fields within non-None default values.
@@ -132,21 +104,21 @@ def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
         # We'd ideally do the same for Pydantic V2, but it shells out to a library to serialize models
         # that we have less control over, and this is less intrusive than custom serializers for now.
         if IS_PYDANTIC_V2:
-            kwargs_with_defaults_exclude_unset: typing.Any = {
+            kwargs_with_defaults_exclude_unset = {
                 **kwargs,
                 "by_alias": True,
                 "exclude_unset": True,
                 "exclude_none": False,
             }
-            kwargs_with_defaults_exclude_none: typing.Any = {
+            kwargs_with_defaults_exclude_none = {
                 **kwargs,
                 "by_alias": True,
                 "exclude_none": True,
                 "exclude_unset": False,
             }
             dict_dump = deep_union_pydantic_dicts(
-                super().model_dump(**kwargs_with_defaults_exclude_unset),  # type: ignore # Pydantic v2
-                super().model_dump(**kwargs_with_defaults_exclude_none),  # type: ignore # Pydantic v2
+                super().model_dump(**kwargs_with_defaults_exclude_unset),  # type: ignore[misc]
+                super().model_dump(**kwargs_with_defaults_exclude_none),  # type: ignore[misc]
             )
 
         else:
@@ -166,7 +138,7 @@ def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
                         if default is not None:
                             self.__fields_set__.add(name)
 
-            kwargs_with_defaults_exclude_unset_include_fields: typing.Any = {
+            kwargs_with_defaults_exclude_unset_include_fields = {
                 "by_alias": True,
                 "exclude_unset": True,
                 "include": _fields_set,
@@ -178,12 +150,10 @@ def dict(self, **kwargs: typing.Any) -> typing.Dict[str, typing.Any]:
         return convert_and_respect_annotation_metadata(object_=dict_dump, annotation=self.__class__, direction="write")
 
 
-def _union_list_of_pydantic_dicts(
-    source: typing.List[typing.Any], destination: typing.List[typing.Any]
-) -> typing.List[typing.Any]:
-    converted_list: typing.List[typing.Any] = []
+def _union_list_of_pydantic_dicts(source: List[Any], destination: List[Any]) -> List[Any]:
+    converted_list: List[Any] = []
     for i, item in enumerate(source):
-        destination_value = destination[i]  # type: ignore
+        destination_value = destination[i]
         if isinstance(item, dict):
             converted_list.append(deep_union_pydantic_dicts(item, destination_value))
         elif isinstance(item, list):
@@ -193,9 +163,7 @@ def _union_list_of_pydantic_dicts(
     return converted_list
 
 
-def deep_union_pydantic_dicts(
-    source: typing.Dict[str, typing.Any], destination: typing.Dict[str, typing.Any]
-) -> typing.Dict[str, typing.Any]:
+def deep_union_pydantic_dicts(source: Dict[str, Any], destination: Dict[str, Any]) -> Dict[str, Any]:
     for key, value in source.items():
         node = destination.setdefault(key, {})
         if isinstance(value, dict):
@@ -213,18 +181,16 @@ def deep_union_pydantic_dicts(
 
 if IS_PYDANTIC_V2:
 
-    class V2RootModel(UniversalBaseModel, pydantic.RootModel):  # type: ignore # Pydantic v2
+    class V2RootModel(UniversalBaseModel, pydantic.RootModel):  # type: ignore[misc, name-defined, type-arg]
         pass
 
-    UniversalRootModel: typing_extensions.TypeAlias = V2RootModel  # type: ignore
+    UniversalRootModel: TypeAlias = V2RootModel  # type: ignore[misc]
 else:
-    UniversalRootModel: typing_extensions.TypeAlias = UniversalBaseModel  # type: ignore
+    UniversalRootModel: TypeAlias = UniversalBaseModel  # type: ignore[misc, no-redef]
 
 
-def encode_by_type(o: typing.Any) -> typing.Any:
-    encoders_by_class_tuples: typing.Dict[typing.Callable[[typing.Any], typing.Any], typing.Tuple[typing.Any, ...]] = (
-        defaultdict(tuple)
-    )
+def encode_by_type(o: Any) -> Any:
+    encoders_by_class_tuples: Dict[Callable[[Any], Any], Tuple[Any, ...]] = defaultdict(tuple)
     for type_, encoder in encoders_by_type.items():
         encoders_by_class_tuples[encoder] += (type_,)
 
@@ -235,54 +201,49 @@ def encode_by_type(o: typing.Any) -> typing.Any:
             return encoder(o)
 
 
-def update_forward_refs(model: typing.Type["Model"], **localns: typing.Any) -> None:
+def update_forward_refs(model: Type["Model"], **localns: Any) -> None:
     if IS_PYDANTIC_V2:
-        model.model_rebuild(raise_errors=False)  # type: ignore # Pydantic v2
+        model.model_rebuild(raise_errors=False)  # type: ignore[attr-defined]
     else:
         model.update_forward_refs(**localns)
 
 
 # Mirrors Pydantic's internal typing
-AnyCallable = typing.Callable[..., typing.Any]
+AnyCallable = Callable[..., Any]
 
 
 def universal_root_validator(
     pre: bool = False,
-) -> typing.Callable[[AnyCallable], AnyCallable]:
+) -> Callable[[AnyCallable], AnyCallable]:
     def decorator(func: AnyCallable) -> AnyCallable:
         if IS_PYDANTIC_V2:
-            return pydantic.model_validator(mode="before" if pre else "after")(func)  # type: ignore # Pydantic v2
-        else:
-            return pydantic.root_validator(pre=pre)(func)  # type: ignore # Pydantic v1
+            return cast(AnyCallable, pydantic.model_validator(mode="before" if pre else "after")(func))  # type: ignore[attr-defined]
+        return cast(AnyCallable, pydantic.root_validator(pre=pre)(func))  # type: ignore[call-overload]
 
     return decorator
 
 
-def universal_field_validator(field_name: str, pre: bool = False) -> typing.Callable[[AnyCallable], AnyCallable]:
+def universal_field_validator(field_name: str, pre: bool = False) -> Callable[[AnyCallable], AnyCallable]:
     def decorator(func: AnyCallable) -> AnyCallable:
         if IS_PYDANTIC_V2:
-            return pydantic.field_validator(field_name, mode="before" if pre else "after")(func)  # type: ignore # Pydantic v2
-        else:
-            return pydantic.validator(field_name, pre=pre)(func)  # type: ignore # Pydantic v1
+            return cast(AnyCallable, pydantic.field_validator(field_name, mode="before" if pre else "after")(func))  # type: ignore[attr-defined]
+        return cast(AnyCallable, pydantic.validator(field_name, pre=pre)(func))
 
     return decorator
 
 
-PydanticField = typing.Union[ModelField, pydantic.fields.FieldInfo]
+PydanticField = Union[ModelField, pydantic.fields.FieldInfo]
 
 
-def _get_model_fields(
-    model: typing.Type["Model"],
-) -> typing.Mapping[str, PydanticField]:
+def _get_model_fields(model: Type["Model"]) -> Mapping[str, PydanticField]:
     if IS_PYDANTIC_V2:
-        return model.model_fields  # type: ignore # Pydantic v2
-    else:
-        return model.__fields__  # type: ignore # Pydantic v1
+        return cast(Mapping[str, PydanticField], model.model_fields)  # type: ignore[attr-defined]
+    return cast(Mapping[str, PydanticField], model.__fields__)
 
 
-def _get_field_default(field: PydanticField) -> typing.Any:
+def _get_field_default(field: PydanticField) -> Any:
     try:
-        value = field.get_default()  # type: ignore # Pydantic < v1.10.15
+        value = field.get_default()  # type: ignore[union-attr]
     except:
         value = field.default
     if IS_PYDANTIC_V2:
diff --git a/src/square/customers/__init__.py b/src/square/customers/__init__.py
index 6b3e506c..322c5dab 100644
--- a/src/square/customers/__init__.py
+++ b/src/square/customers/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import cards, custom_attribute_definitions, custom_attributes, groups, segments
 
 __all__ = ["cards", "custom_attribute_definitions", "custom_attributes", "groups", "segments"]
diff --git a/src/square/customers/cards/__init__.py b/src/square/customers/cards/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/customers/cards/__init__.py
+++ b/src/square/customers/cards/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/customers/cards/client.py b/src/square/customers/cards/client.py
index 90364144..7e121427 100644
--- a/src/square/customers/cards/client.py
+++ b/src/square/customers/cards/client.py
@@ -1,14 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCardsClient
-from ...requests.address import AddressParams
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
+from ...requests.address import AddressParams
 from ...types.create_customer_card_response import CreateCustomerCardResponse
 from ...types.delete_customer_card_response import DeleteCustomerCardResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCardsClient
+from .raw_client import AsyncRawCardsClient, RawCardsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -105,7 +104,7 @@ def create(
             cardholder_name="Amelia Earhart",
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             customer_id,
             card_nonce=card_nonce,
             billing_address=billing_address,
@@ -113,7 +112,7 @@ def create(
             verification_token=verification_token,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, customer_id: str, card_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -149,8 +148,8 @@ def delete(
             card_id="card_id",
         )
         """
-        response = self._raw_client.delete(customer_id, card_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(customer_id, card_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncCardsClient:
@@ -252,7 +251,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             customer_id,
             card_nonce=card_nonce,
             billing_address=billing_address,
@@ -260,7 +259,7 @@ async def main() -> None:
             verification_token=verification_token,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, customer_id: str, card_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -304,5 +303,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(customer_id, card_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(customer_id, card_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/customers/cards/raw_client.py b/src/square/customers/cards/raw_client.py
index e83cc619..7de85233 100644
--- a/src/square/customers/cards/raw_client.py
+++ b/src/square/customers/cards/raw_client.py
@@ -1,19 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.address import AddressParams
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_customer_card_response import CreateCustomerCardResponse
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
 from ...core.jsonable_encoder import jsonable_encoder
+from ...core.request_options import RequestOptions
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.address import AddressParams
+from ...types.create_customer_card_response import CreateCustomerCardResponse
 from ...types.delete_customer_card_response import DeleteCustomerCardResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -107,8 +106,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, customer_id: str, card_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -149,8 +148,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCardsClient:
@@ -241,8 +240,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, customer_id: str, card_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -283,5 +282,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/customers/client.py b/src/square/customers/client.py
index 95d83b2a..f341df40 100644
--- a/src/square/customers/client.py
+++ b/src/square/customers/client.py
@@ -1,44 +1,33 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomersClient
-from .custom_attribute_definitions.client import CustomAttributeDefinitionsClient
-from .groups.client import GroupsClient
-from .segments.client import SegmentsClient
-from .cards.client import CardsClient
-from .custom_attributes.client import CustomAttributesClient
-from ..types.customer_sort_field import CustomerSortField
-from ..types.sort_order import SortOrder
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.customer import Customer
-from ..types.list_customers_response import ListCustomersResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..requests.address import AddressParams
-from ..requests.customer_tax_ids import CustomerTaxIdsParams
-from ..types.create_customer_response import CreateCustomerResponse
 from ..requests.bulk_create_customer_data import BulkCreateCustomerDataParams
+from ..requests.bulk_update_customer_data import BulkUpdateCustomerDataParams
+from ..requests.customer_query import CustomerQueryParams
+from ..requests.customer_tax_ids import CustomerTaxIdsParams
 from ..types.bulk_create_customers_response import BulkCreateCustomersResponse
 from ..types.bulk_delete_customers_response import BulkDeleteCustomersResponse
 from ..types.bulk_retrieve_customers_response import BulkRetrieveCustomersResponse
-from ..requests.bulk_update_customer_data import BulkUpdateCustomerDataParams
 from ..types.bulk_update_customers_response import BulkUpdateCustomersResponse
-from ..requests.customer_query import CustomerQueryParams
-from ..types.search_customers_response import SearchCustomersResponse
+from ..types.create_customer_response import CreateCustomerResponse
+from ..types.customer import Customer
+from ..types.customer_sort_field import CustomerSortField
+from ..types.delete_customer_response import DeleteCustomerResponse
 from ..types.get_customer_response import GetCustomerResponse
+from ..types.search_customers_response import SearchCustomersResponse
+from ..types.sort_order import SortOrder
 from ..types.update_customer_response import UpdateCustomerResponse
-from ..types.delete_customer_response import DeleteCustomerResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomersClient
-from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient
-from .groups.client import AsyncGroupsClient
-from .segments.client import AsyncSegmentsClient
-from .cards.client import AsyncCardsClient
-from .custom_attributes.client import AsyncCustomAttributesClient
-from ..core.pagination import AsyncPager
+from .cards.client import AsyncCardsClient, CardsClient
+from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient, CustomAttributeDefinitionsClient
+from .custom_attributes.client import AsyncCustomAttributesClient, CustomAttributesClient
+from .groups.client import AsyncGroupsClient, GroupsClient
+from .raw_client import AsyncRawCustomersClient, RawCustomersClient
+from .segments.client import AsyncSegmentsClient, SegmentsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -137,43 +126,14 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/customers",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-                "sort_field": sort_field,
-                "sort_order": sort_order,
-                "count": count,
-            },
+        return self._raw_client.list(
+            cursor=cursor,
+            limit=limit,
+            sort_field=sort_field,
+            sort_order=sort_order,
+            count=count,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomersResponse,
-                    construct_type(
-                        type_=ListCustomersResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    sort_field=sort_field,
-                    sort_order=sort_order,
-                    count=count,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.customers
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -296,7 +256,7 @@ def create(
             note="a customer",
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key,
             given_name=given_name,
             family_name=family_name,
@@ -311,7 +271,7 @@ def create(
             tax_ids=tax_ids,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def batch_create(
         self,
@@ -394,8 +354,8 @@ def batch_create(
             },
         )
         """
-        response = self._raw_client.batch_create(customers=customers, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_create(customers=customers, request_options=request_options)
+        return _response.data
 
     def bulk_delete_customers(
         self, *, customer_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -433,8 +393,8 @@ def bulk_delete_customers(
             ],
         )
         """
-        response = self._raw_client.bulk_delete_customers(customer_ids=customer_ids, request_options=request_options)
-        return response.data
+        _response = self._raw_client.bulk_delete_customers(customer_ids=customer_ids, request_options=request_options)
+        return _response.data
 
     def bulk_retrieve_customers(
         self, *, customer_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -472,8 +432,8 @@ def bulk_retrieve_customers(
             ],
         )
         """
-        response = self._raw_client.bulk_retrieve_customers(customer_ids=customer_ids, request_options=request_options)
-        return response.data
+        _response = self._raw_client.bulk_retrieve_customers(customer_ids=customer_ids, request_options=request_options)
+        return _response.data
 
     def bulk_update_customers(
         self,
@@ -528,8 +488,8 @@ def bulk_update_customers(
             },
         )
         """
-        response = self._raw_client.bulk_update_customers(customers=customers, request_options=request_options)
-        return response.data
+        _response = self._raw_client.bulk_update_customers(customers=customers, request_options=request_options)
+        return _response.data
 
     def search(
         self,
@@ -605,10 +565,10 @@ def search(
             },
         )
         """
-        response = self._raw_client.search(
+        _response = self._raw_client.search(
             cursor=cursor, limit=limit, query=query, count=count, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(self, customer_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetCustomerResponse:
         """
@@ -638,8 +598,8 @@ def get(self, customer_id: str, *, request_options: typing.Optional[RequestOptio
             customer_id="customer_id",
         )
         """
-        response = self._raw_client.get(customer_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(customer_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -752,7 +712,7 @@ def update(
             version=2,
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             customer_id,
             given_name=given_name,
             family_name=family_name,
@@ -768,7 +728,7 @@ def update(
             tax_ids=tax_ids,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self,
@@ -811,8 +771,8 @@ def delete(
             customer_id="customer_id",
         )
         """
-        response = self._raw_client.delete(customer_id, version=version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(customer_id, version=version, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomersClient:
@@ -909,6 +869,7 @@ async def main() -> None:
             response = await client.customers.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -916,43 +877,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/customers",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-                "sort_field": sort_field,
-                "sort_order": sort_order,
-                "count": count,
-            },
+        return await self._raw_client.list(
+            cursor=cursor,
+            limit=limit,
+            sort_field=sort_field,
+            sort_order=sort_order,
+            count=count,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomersResponse,
-                    construct_type(
-                        type_=ListCustomersResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    sort_field=sort_field,
-                    sort_order=sort_order,
-                    count=count,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.customers
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -1083,7 +1015,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key,
             given_name=given_name,
             family_name=family_name,
@@ -1098,7 +1030,7 @@ async def main() -> None:
             tax_ids=tax_ids,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def batch_create(
         self,
@@ -1189,8 +1121,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_create(customers=customers, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_create(customers=customers, request_options=request_options)
+        return _response.data
 
     async def bulk_delete_customers(
         self, *, customer_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -1236,10 +1168,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.bulk_delete_customers(
+        _response = await self._raw_client.bulk_delete_customers(
             customer_ids=customer_ids, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def bulk_retrieve_customers(
         self, *, customer_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -1285,10 +1217,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.bulk_retrieve_customers(
+        _response = await self._raw_client.bulk_retrieve_customers(
             customer_ids=customer_ids, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def bulk_update_customers(
         self,
@@ -1351,8 +1283,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.bulk_update_customers(customers=customers, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.bulk_update_customers(customers=customers, request_options=request_options)
+        return _response.data
 
     async def search(
         self,
@@ -1439,10 +1371,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             cursor=cursor, limit=limit, query=query, count=count, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, customer_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1482,8 +1414,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(customer_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(customer_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -1604,7 +1536,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             customer_id,
             given_name=given_name,
             family_name=family_name,
@@ -1620,7 +1552,7 @@ async def main() -> None:
             tax_ids=tax_ids,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self,
@@ -1671,5 +1603,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(customer_id, version=version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(customer_id, version=version, request_options=request_options)
+        return _response.data
diff --git a/src/square/customers/custom_attribute_definitions/__init__.py b/src/square/customers/custom_attribute_definitions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/customers/custom_attribute_definitions/__init__.py
+++ b/src/square/customers/custom_attribute_definitions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/customers/custom_attribute_definitions/client.py b/src/square/customers/custom_attribute_definitions/client.py
index 4ff99540..6410ee95 100644
--- a/src/square/customers/custom_attribute_definitions/client.py
+++ b/src/square/customers/custom_attribute_definitions/client.py
@@ -1,33 +1,27 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributeDefinitionsClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.custom_attribute_definition import CustomAttributeDefinition
-from ...types.list_customer_custom_attribute_definitions_response import ListCustomerCustomAttributeDefinitionsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request import (
+    BatchUpsertCustomerCustomAttributesRequestCustomerCustomAttributeUpsertRequestParams,
+)
 from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
+from ...types.batch_upsert_customer_custom_attributes_response import BatchUpsertCustomerCustomAttributesResponse
 from ...types.create_customer_custom_attribute_definition_response import (
     CreateCustomerCustomAttributeDefinitionResponse,
 )
-from ...types.get_customer_custom_attribute_definition_response import GetCustomerCustomAttributeDefinitionResponse
-from ...types.update_customer_custom_attribute_definition_response import (
-    UpdateCustomerCustomAttributeDefinitionResponse,
-)
+from ...types.custom_attribute_definition import CustomAttributeDefinition
 from ...types.delete_customer_custom_attribute_definition_response import (
     DeleteCustomerCustomAttributeDefinitionResponse,
 )
-from ...requests.batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request import (
-    BatchUpsertCustomerCustomAttributesRequestCustomerCustomAttributeUpsertRequestParams,
+from ...types.get_customer_custom_attribute_definition_response import GetCustomerCustomAttributeDefinitionResponse
+from ...types.update_customer_custom_attribute_definition_response import (
+    UpdateCustomerCustomAttributeDefinitionResponse,
 )
-from ...types.batch_upsert_customer_custom_attributes_response import BatchUpsertCustomerCustomAttributesResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributeDefinitionsClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawCustomAttributeDefinitionsClient, RawCustomAttributeDefinitionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -97,37 +91,7 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/customers/custom-attribute-definitions",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomerCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListCustomerCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return self._raw_client.list(limit=limit, cursor=cursor, request_options=request_options)
 
     def create(
         self,
@@ -190,12 +154,12 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -238,8 +202,8 @@ def get(
             key="key",
         )
         """
-        response = self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -307,13 +271,13 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -350,8 +314,8 @@ def delete(
             key="key",
         )
         """
-        response = self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(key, request_options=request_options)
+        return _response.data
 
     def batch_upsert(
         self,
@@ -428,8 +392,8 @@ def batch_upsert(
             },
         )
         """
-        response = self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributeDefinitionsClient:
@@ -497,6 +461,7 @@ async def main() -> None:
             response = await client.customers.custom_attribute_definitions.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -504,37 +469,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/customers/custom-attribute-definitions",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomerCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListCustomerCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return await self._raw_client.list(limit=limit, cursor=cursor, request_options=request_options)
 
     async def create(
         self,
@@ -605,12 +540,12 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -661,8 +596,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -738,13 +673,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -789,8 +724,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(key, request_options=request_options)
+        return _response.data
 
     async def batch_upsert(
         self,
@@ -878,5 +813,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
diff --git a/src/square/customers/custom_attribute_definitions/raw_client.py b/src/square/customers/custom_attribute_definitions/raw_client.py
index 1330e59e..0a60225d 100644
--- a/src/square/customers/custom_attribute_definitions/raw_client.py
+++ b/src/square/customers/custom_attribute_definitions/raw_client.py
@@ -1,31 +1,33 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_customer_custom_attribute_definition_response import (
-    CreateCustomerCustomAttributeDefinitionResponse,
-)
-from ...core.serialization import convert_and_respect_annotation_metadata
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...types.get_customer_custom_attribute_definition_response import GetCustomerCustomAttributeDefinitionResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
 from ...core.jsonable_encoder import jsonable_encoder
-from ...types.update_customer_custom_attribute_definition_response import (
-    UpdateCustomerCustomAttributeDefinitionResponse,
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.unchecked_base_model import construct_type
+from ...requests.batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request import (
+    BatchUpsertCustomerCustomAttributesRequestCustomerCustomAttributeUpsertRequestParams,
+)
+from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
+from ...types.batch_upsert_customer_custom_attributes_response import BatchUpsertCustomerCustomAttributesResponse
+from ...types.create_customer_custom_attribute_definition_response import (
+    CreateCustomerCustomAttributeDefinitionResponse,
 )
+from ...types.custom_attribute_definition import CustomAttributeDefinition
 from ...types.delete_customer_custom_attribute_definition_response import (
     DeleteCustomerCustomAttributeDefinitionResponse,
 )
-from ...requests.batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request import (
-    BatchUpsertCustomerCustomAttributesRequestCustomerCustomAttributeUpsertRequestParams,
+from ...types.get_customer_custom_attribute_definition_response import GetCustomerCustomAttributeDefinitionResponse
+from ...types.list_customer_custom_attribute_definitions_response import ListCustomerCustomAttributeDefinitionsResponse
+from ...types.update_customer_custom_attribute_definition_response import (
+    UpdateCustomerCustomAttributeDefinitionResponse,
 )
-from ...types.batch_upsert_customer_custom_attributes_response import BatchUpsertCustomerCustomAttributesResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -35,6 +37,75 @@ class RawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttributeDefinition]:
+        """
+        Lists the customer-related [custom attribute definitions](entity:CustomAttributeDefinition) that belong to a Square seller account.
+
+        When all response pages are retrieved, the results include all custom attribute definitions
+        that are visible to the requesting application, including those that are created by other
+        applications and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`. Note that
+        seller-defined custom attributes (also known as custom fields) are always set to `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/customers/custom-attribute-definitions",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomerCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListCustomerCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -104,8 +175,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -157,8 +228,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -238,8 +309,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -282,8 +353,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_upsert(
         self,
@@ -352,14 +423,86 @@ def batch_upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttributeDefinition]:
+        """
+        Lists the customer-related [custom attribute definitions](entity:CustomAttributeDefinition) that belong to a Square seller account.
+
+        When all response pages are retrieved, the results include all custom attribute definitions
+        that are visible to the requesting application, including those that are created by other
+        applications and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`. Note that
+        seller-defined custom attributes (also known as custom fields) are always set to `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/customers/custom-attribute-definitions",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomerCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListCustomerCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -429,8 +572,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -482,8 +625,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -563,8 +706,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -607,8 +750,8 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_upsert(
         self,
@@ -677,5 +820,5 @@ async def batch_upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/customers/custom_attributes/__init__.py b/src/square/customers/custom_attributes/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/customers/custom_attributes/__init__.py
+++ b/src/square/customers/custom_attributes/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/customers/custom_attributes/client.py b/src/square/customers/custom_attributes/client.py
index fa57cc6a..2415370c 100644
--- a/src/square/customers/custom_attributes/client.py
+++ b/src/square/customers/custom_attributes/client.py
@@ -1,23 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributesClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
+from ...requests.custom_attribute import CustomAttributeParams
 from ...types.custom_attribute import CustomAttribute
-from ...core.jsonable_encoder import jsonable_encoder
-from ...types.list_customer_custom_attributes_response import ListCustomerCustomAttributesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...types.delete_customer_custom_attribute_response import DeleteCustomerCustomAttributeResponse
 from ...types.get_customer_custom_attribute_response import GetCustomerCustomAttributeResponse
-from ...requests.custom_attribute import CustomAttributeParams
 from ...types.upsert_customer_custom_attribute_response import UpsertCustomerCustomAttributeResponse
-from ...types.delete_customer_custom_attribute_response import DeleteCustomerCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributesClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawCustomAttributesClient, RawCustomAttributesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -101,40 +94,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/customers/{jsonable_encoder(customer_id)}/custom-attributes",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-                "with_definitions": with_definitions,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            customer_id, limit=limit, cursor=cursor, with_definitions=with_definitions, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomerCustomAttributesResponse,
-                    construct_type(
-                        type_=ListCustomerCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    customer_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(
         self,
@@ -196,10 +158,10 @@ def get(
             key="key",
         )
         """
-        response = self._raw_client.get(
+        _response = self._raw_client.get(
             customer_id, key, with_definition=with_definition, version=version, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def upsert(
         self,
@@ -266,14 +228,14 @@ def upsert(
             custom_attribute={"value": "Dune"},
         )
         """
-        response = self._raw_client.upsert(
+        _response = self._raw_client.upsert(
             customer_id,
             key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, customer_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -315,8 +277,8 @@ def delete(
             key="key",
         )
         """
-        response = self._raw_client.delete(customer_id, key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(customer_id, key, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributesClient:
@@ -398,6 +360,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -405,40 +368,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/customers/{jsonable_encoder(customer_id)}/custom-attributes",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-                "with_definitions": with_definitions,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            customer_id, limit=limit, cursor=cursor, with_definitions=with_definitions, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomerCustomAttributesResponse,
-                    construct_type(
-                        type_=ListCustomerCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    customer_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self,
@@ -508,10 +440,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(
+        _response = await self._raw_client.get(
             customer_id, key, with_definition=with_definition, version=version, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def upsert(
         self,
@@ -586,14 +518,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.upsert(
+        _response = await self._raw_client.upsert(
             customer_id,
             key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, customer_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -643,5 +575,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(customer_id, key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(customer_id, key, request_options=request_options)
+        return _response.data
diff --git a/src/square/customers/custom_attributes/raw_client.py b/src/square/customers/custom_attributes/raw_client.py
index 4b8f6fa9..02b43b97 100644
--- a/src/square/customers/custom_attributes/raw_client.py
+++ b/src/square/customers/custom_attributes/raw_client.py
@@ -1,20 +1,22 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.get_customer_custom_attribute_response import GetCustomerCustomAttributeResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...requests.custom_attribute import CustomAttributeParams
-from ...types.upsert_customer_custom_attribute_response import UpsertCustomerCustomAttributeResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
 from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.unchecked_base_model import construct_type
+from ...requests.custom_attribute import CustomAttributeParams
+from ...types.custom_attribute import CustomAttribute
 from ...types.delete_customer_custom_attribute_response import DeleteCustomerCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.get_customer_custom_attribute_response import GetCustomerCustomAttributeResponse
+from ...types.list_customer_custom_attributes_response import ListCustomerCustomAttributesResponse
+from ...types.upsert_customer_custom_attribute_response import UpsertCustomerCustomAttributeResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -24,6 +26,90 @@ class RawCustomAttributesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        customer_id: str,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttribute]:
+        """
+        Lists the [custom attributes](entity:CustomAttribute) associated with a customer profile.
+
+        You can use the `with_definitions` query parameter to also retrieve custom attribute definitions
+        in the same call.
+
+        When all response pages are retrieved, the results include all custom attributes that are
+        visible to the requesting application, including those that are owned by other applications
+        and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        customer_id : str
+            The ID of the target [customer profile](entity:Customer).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request. For more
+            information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom
+            attribute, information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttribute]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/customers/{jsonable_encoder(customer_id)}/custom-attributes",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomerCustomAttributesResponse,
+                    construct_type(
+                        type_=ListCustomerCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    customer_id,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    with_definitions=with_definitions,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self,
         customer_id: str,
@@ -93,8 +179,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def upsert(
         self,
@@ -175,8 +261,8 @@ def upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, customer_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -223,14 +309,101 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        customer_id: str,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttribute]:
+        """
+        Lists the [custom attributes](entity:CustomAttribute) associated with a customer profile.
+
+        You can use the `with_definitions` query parameter to also retrieve custom attribute definitions
+        in the same call.
+
+        When all response pages are retrieved, the results include all custom attributes that are
+        visible to the requesting application, including those that are owned by other applications
+        and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        customer_id : str
+            The ID of the target [customer profile](entity:Customer).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request. For more
+            information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom
+            attribute, information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttribute]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/customers/{jsonable_encoder(customer_id)}/custom-attributes",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomerCustomAttributesResponse,
+                    construct_type(
+                        type_=ListCustomerCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        customer_id,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        with_definitions=with_definitions,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self,
         customer_id: str,
@@ -300,8 +473,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def upsert(
         self,
@@ -382,8 +555,8 @@ async def upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, customer_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -430,5 +603,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/customers/groups/__init__.py b/src/square/customers/groups/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/customers/groups/__init__.py
+++ b/src/square/customers/groups/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/customers/groups/client.py b/src/square/customers/groups/client.py
index 89caccdd..a7bb0b1b 100644
--- a/src/square/customers/groups/client.py
+++ b/src/square/customers/groups/client.py
@@ -1,25 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawGroupsClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.customer_group import CustomerGroup
-from ...types.list_customer_groups_response import ListCustomerGroupsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.customer_group import CustomerGroupParams
+from ...types.add_group_to_customer_response import AddGroupToCustomerResponse
 from ...types.create_customer_group_response import CreateCustomerGroupResponse
-from ...types.get_customer_group_response import GetCustomerGroupResponse
-from ...types.update_customer_group_response import UpdateCustomerGroupResponse
+from ...types.customer_group import CustomerGroup
 from ...types.delete_customer_group_response import DeleteCustomerGroupResponse
-from ...types.add_group_to_customer_response import AddGroupToCustomerResponse
+from ...types.get_customer_group_response import GetCustomerGroupResponse
 from ...types.remove_group_from_customer_response import RemoveGroupFromCustomerResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawGroupsClient
-from ...core.pagination import AsyncPager
+from ...types.update_customer_group_response import UpdateCustomerGroupResponse
+from .raw_client import AsyncRawGroupsClient, RawGroupsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -86,37 +80,7 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/customers/groups",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomerGroupsResponse,
-                    construct_type(
-                        type_=ListCustomerGroupsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.groups
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return self._raw_client.list(cursor=cursor, limit=limit, request_options=request_options)
 
     def create(
         self,
@@ -157,10 +121,10 @@ def create(
             group={"name": "Loyal Customers"},
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             group=group, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(
         self, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -192,8 +156,8 @@ def get(
             group_id="group_id",
         )
         """
-        response = self._raw_client.get(group_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(group_id, request_options=request_options)
+        return _response.data
 
     def update(
         self, group_id: str, *, group: CustomerGroupParams, request_options: typing.Optional[RequestOptions] = None
@@ -229,8 +193,8 @@ def update(
             group={"name": "Loyal Customers"},
         )
         """
-        response = self._raw_client.update(group_id, group=group, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update(group_id, group=group, request_options=request_options)
+        return _response.data
 
     def delete(
         self, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -262,8 +226,8 @@ def delete(
             group_id="group_id",
         )
         """
-        response = self._raw_client.delete(group_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(group_id, request_options=request_options)
+        return _response.data
 
     def add(
         self, customer_id: str, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -302,8 +266,8 @@ def add(
             group_id="group_id",
         )
         """
-        response = self._raw_client.add(customer_id, group_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.add(customer_id, group_id, request_options=request_options)
+        return _response.data
 
     def remove(
         self, customer_id: str, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -342,8 +306,8 @@ def remove(
             group_id="group_id",
         )
         """
-        response = self._raw_client.remove(customer_id, group_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.remove(customer_id, group_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncGroupsClient:
@@ -408,6 +372,7 @@ async def main() -> None:
             response = await client.customers.groups.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -415,37 +380,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/customers/groups",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomerGroupsResponse,
-                    construct_type(
-                        type_=ListCustomerGroupsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.groups
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return await self._raw_client.list(cursor=cursor, limit=limit, request_options=request_options)
 
     async def create(
         self,
@@ -494,10 +429,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             group=group, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -537,8 +472,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(group_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(group_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self, group_id: str, *, group: CustomerGroupParams, request_options: typing.Optional[RequestOptions] = None
@@ -582,8 +517,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(group_id, group=group, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.update(group_id, group=group, request_options=request_options)
+        return _response.data
 
     async def delete(
         self, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -623,8 +558,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(group_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(group_id, request_options=request_options)
+        return _response.data
 
     async def add(
         self, customer_id: str, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -671,8 +606,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.add(customer_id, group_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.add(customer_id, group_id, request_options=request_options)
+        return _response.data
 
     async def remove(
         self, customer_id: str, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -719,5 +654,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.remove(customer_id, group_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.remove(customer_id, group_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/customers/groups/raw_client.py b/src/square/customers/groups/raw_client.py
index 8e7ae04f..e3c954ee 100644
--- a/src/square/customers/groups/raw_client.py
+++ b/src/square/customers/groups/raw_client.py
@@ -1,23 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.customer_group import CustomerGroupParams
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_customer_group_response import CreateCustomerGroupResponse
-from ...core.serialization import convert_and_respect_annotation_metadata
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...types.get_customer_group_response import GetCustomerGroupResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
 from ...core.jsonable_encoder import jsonable_encoder
-from ...types.update_customer_group_response import UpdateCustomerGroupResponse
-from ...types.delete_customer_group_response import DeleteCustomerGroupResponse
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.unchecked_base_model import construct_type
+from ...requests.customer_group import CustomerGroupParams
 from ...types.add_group_to_customer_response import AddGroupToCustomerResponse
+from ...types.create_customer_group_response import CreateCustomerGroupResponse
+from ...types.customer_group import CustomerGroup
+from ...types.delete_customer_group_response import DeleteCustomerGroupResponse
+from ...types.get_customer_group_response import GetCustomerGroupResponse
+from ...types.list_customer_groups_response import ListCustomerGroupsResponse
 from ...types.remove_group_from_customer_response import RemoveGroupFromCustomerResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.update_customer_group_response import UpdateCustomerGroupResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -27,6 +29,72 @@ class RawGroupsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomerGroup]:
+        """
+        Retrieves the list of customer groups of a business.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for your original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single page. This limit is advisory. The response might contain more or fewer results.
+            If the limit is less than 1 or greater than 50, Square returns a `400 VALUE_TOO_LOW` or `400 VALUE_TOO_HIGH` error. The default value is 50.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomerGroup]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/customers/groups",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomerGroupsResponse,
+                    construct_type(
+                        type_=ListCustomerGroupsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.groups
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -82,8 +150,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -121,8 +189,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self, group_id: str, *, group: CustomerGroupParams, request_options: typing.Optional[RequestOptions] = None
@@ -172,8 +240,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -211,8 +279,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def add(
         self, customer_id: str, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -256,8 +324,8 @@ def add(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def remove(
         self, customer_id: str, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -301,14 +369,83 @@ def remove(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawGroupsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomerGroup]:
+        """
+        Retrieves the list of customer groups of a business.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for your original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single page. This limit is advisory. The response might contain more or fewer results.
+            If the limit is less than 1 or greater than 50, Square returns a `400 VALUE_TOO_LOW` or `400 VALUE_TOO_HIGH` error. The default value is 50.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomerGroup]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/customers/groups",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomerGroupsResponse,
+                    construct_type(
+                        type_=ListCustomerGroupsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.groups
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -364,8 +501,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -403,8 +540,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self, group_id: str, *, group: CustomerGroupParams, request_options: typing.Optional[RequestOptions] = None
@@ -454,8 +591,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -493,8 +630,8 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def add(
         self, customer_id: str, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -538,8 +675,8 @@ async def add(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def remove(
         self, customer_id: str, group_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -583,5 +720,5 @@ async def remove(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/customers/raw_client.py b/src/square/customers/raw_client.py
index eb903436..c7503ec2 100644
--- a/src/square/customers/raw_client.py
+++ b/src/square/customers/raw_client.py
@@ -1,30 +1,34 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.address import AddressParams
-from ..requests.customer_tax_ids import CustomerTaxIdsParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_customer_response import CreateCustomerResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
+from ..requests.address import AddressParams
 from ..requests.bulk_create_customer_data import BulkCreateCustomerDataParams
+from ..requests.bulk_update_customer_data import BulkUpdateCustomerDataParams
+from ..requests.customer_query import CustomerQueryParams
+from ..requests.customer_tax_ids import CustomerTaxIdsParams
 from ..types.bulk_create_customers_response import BulkCreateCustomersResponse
 from ..types.bulk_delete_customers_response import BulkDeleteCustomersResponse
 from ..types.bulk_retrieve_customers_response import BulkRetrieveCustomersResponse
-from ..requests.bulk_update_customer_data import BulkUpdateCustomerDataParams
 from ..types.bulk_update_customers_response import BulkUpdateCustomersResponse
-from ..requests.customer_query import CustomerQueryParams
-from ..types.search_customers_response import SearchCustomersResponse
+from ..types.create_customer_response import CreateCustomerResponse
+from ..types.customer import Customer
+from ..types.customer_sort_field import CustomerSortField
+from ..types.delete_customer_response import DeleteCustomerResponse
 from ..types.get_customer_response import GetCustomerResponse
-from ..core.jsonable_encoder import jsonable_encoder
+from ..types.list_customers_response import ListCustomersResponse
+from ..types.search_customers_response import SearchCustomersResponse
+from ..types.sort_order import SortOrder
 from ..types.update_customer_response import UpdateCustomerResponse
-from ..types.delete_customer_response import DeleteCustomerResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -34,6 +38,101 @@ class RawCustomersClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        sort_field: typing.Optional[CustomerSortField] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        count: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[Customer]:
+        """
+        Lists customer profiles associated with a Square account.
+
+        Under normal operating conditions, newly created or updated customer profiles become available
+        for the listing operation in well under 30 seconds. Occasionally, propagation of the new or updated
+        profiles can take closer to one minute or longer, especially during network incidents and outages.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for your original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single page. This limit is advisory. The response might contain more or fewer results.
+            If the specified limit is less than 1 or greater than 100, Square returns a `400 VALUE_TOO_LOW` or `400 VALUE_TOO_HIGH` error. The default value is 100.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        sort_field : typing.Optional[CustomerSortField]
+            Indicates how customers should be sorted.
+
+            The default value is `DEFAULT`.
+
+        sort_order : typing.Optional[SortOrder]
+            Indicates whether customers should be sorted in ascending (`ASC`) or
+            descending (`DESC`) order.
+
+            The default value is `ASC`.
+
+        count : typing.Optional[bool]
+            Indicates whether to return the total count of customers in the `count` field of the response.
+
+            The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Customer]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/customers",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+                "sort_field": sort_field,
+                "sort_order": sort_order,
+                "count": count,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomersResponse,
+                    construct_type(
+                        type_=ListCustomersResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.customers
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    limit=limit,
+                    sort_field=sort_field,
+                    sort_order=sort_order,
+                    count=count,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -170,8 +269,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_create(
         self,
@@ -236,8 +335,8 @@ def batch_create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def bulk_delete_customers(
         self, *, customer_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -284,8 +383,8 @@ def bulk_delete_customers(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def bulk_retrieve_customers(
         self, *, customer_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -332,8 +431,8 @@ def bulk_retrieve_customers(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def bulk_update_customers(
         self,
@@ -392,8 +491,8 @@ def bulk_update_customers(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -475,8 +574,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, customer_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -514,8 +613,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -653,8 +752,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self,
@@ -706,14 +805,112 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomersClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        sort_field: typing.Optional[CustomerSortField] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        count: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[Customer]:
+        """
+        Lists customer profiles associated with a Square account.
+
+        Under normal operating conditions, newly created or updated customer profiles become available
+        for the listing operation in well under 30 seconds. Occasionally, propagation of the new or updated
+        profiles can take closer to one minute or longer, especially during network incidents and outages.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for your original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single page. This limit is advisory. The response might contain more or fewer results.
+            If the specified limit is less than 1 or greater than 100, Square returns a `400 VALUE_TOO_LOW` or `400 VALUE_TOO_HIGH` error. The default value is 100.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        sort_field : typing.Optional[CustomerSortField]
+            Indicates how customers should be sorted.
+
+            The default value is `DEFAULT`.
+
+        sort_order : typing.Optional[SortOrder]
+            Indicates whether customers should be sorted in ascending (`ASC`) or
+            descending (`DESC`) order.
+
+            The default value is `ASC`.
+
+        count : typing.Optional[bool]
+            Indicates whether to return the total count of customers in the `count` field of the response.
+
+            The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Customer]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/customers",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+                "sort_field": sort_field,
+                "sort_order": sort_order,
+                "count": count,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomersResponse,
+                    construct_type(
+                        type_=ListCustomersResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.customers
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        limit=limit,
+                        sort_field=sort_field,
+                        sort_order=sort_order,
+                        count=count,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -850,8 +1047,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_create(
         self,
@@ -916,8 +1113,8 @@ async def batch_create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def bulk_delete_customers(
         self, *, customer_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -964,8 +1161,8 @@ async def bulk_delete_customers(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def bulk_retrieve_customers(
         self, *, customer_ids: typing.Sequence[str], request_options: typing.Optional[RequestOptions] = None
@@ -1012,8 +1209,8 @@ async def bulk_retrieve_customers(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def bulk_update_customers(
         self,
@@ -1072,8 +1269,8 @@ async def bulk_update_customers(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -1155,8 +1352,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, customer_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1194,8 +1391,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -1333,8 +1530,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self,
@@ -1386,5 +1583,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/customers/segments/__init__.py b/src/square/customers/segments/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/customers/segments/__init__.py
+++ b/src/square/customers/segments/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/customers/segments/client.py b/src/square/customers/segments/client.py
index a88b0f71..acce7325 100644
--- a/src/square/customers/segments/client.py
+++ b/src/square/customers/segments/client.py
@@ -1,19 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawSegmentsClient
 import typing
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
 from ...types.customer_segment import CustomerSegment
-from ...types.list_customer_segments_response import ListCustomerSegmentsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...types.get_customer_segment_response import GetCustomerSegmentResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawSegmentsClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawSegmentsClient, RawSegmentsClient
 
 
 class SegmentsClient:
@@ -77,37 +71,7 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/customers/segments",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomerSegmentsResponse,
-                    construct_type(
-                        type_=ListCustomerSegmentsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.segments
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return self._raw_client.list(cursor=cursor, limit=limit, request_options=request_options)
 
     def get(
         self, segment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -139,8 +103,8 @@ def get(
             segment_id="segment_id",
         )
         """
-        response = self._raw_client.get(segment_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(segment_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncSegmentsClient:
@@ -205,6 +169,7 @@ async def main() -> None:
             response = await client.customers.segments.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -212,37 +177,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/customers/segments",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListCustomerSegmentsResponse,
-                    construct_type(
-                        type_=ListCustomerSegmentsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.segments
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return await self._raw_client.list(cursor=cursor, limit=limit, request_options=request_options)
 
     async def get(
         self, segment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -282,5 +217,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(segment_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(segment_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/customers/segments/raw_client.py b/src/square/customers/segments/raw_client.py
index 21bf465c..70fb0b0d 100644
--- a/src/square/customers/segments/raw_client.py
+++ b/src/square/customers/segments/raw_client.py
@@ -1,22 +1,90 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
 import typing
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.get_customer_segment_response import GetCustomerSegmentResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.unchecked_base_model import construct_type
+from ...types.customer_segment import CustomerSegment
+from ...types.get_customer_segment_response import GetCustomerSegmentResponse
+from ...types.list_customer_segments_response import ListCustomerSegmentsResponse
 
 
 class RawSegmentsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomerSegment]:
+        """
+        Retrieves the list of customer segments of a business.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by previous calls to `ListCustomerSegments`.
+            This cursor is used to retrieve the next set of query results.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single page. This limit is advisory. The response might contain more or fewer results.
+            If the specified limit is less than 1 or greater than 50, Square returns a `400 VALUE_TOO_LOW` or `400 VALUE_TOO_HIGH` error. The default value is 50.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomerSegment]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/customers/segments",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomerSegmentsResponse,
+                    construct_type(
+                        type_=ListCustomerSegmentsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.segments
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, segment_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetCustomerSegmentResponse]:
@@ -53,14 +121,83 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawSegmentsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomerSegment]:
+        """
+        Retrieves the list of customer segments of a business.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by previous calls to `ListCustomerSegments`.
+            This cursor is used to retrieve the next set of query results.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single page. This limit is advisory. The response might contain more or fewer results.
+            If the specified limit is less than 1 or greater than 50, Square returns a `400 VALUE_TOO_LOW` or `400 VALUE_TOO_HIGH` error. The default value is 50.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomerSegment]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/customers/segments",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListCustomerSegmentsResponse,
+                    construct_type(
+                        type_=ListCustomerSegmentsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.segments
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, segment_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetCustomerSegmentResponse]:
@@ -97,5 +234,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/devices/__init__.py b/src/square/devices/__init__.py
index 56e09d86..36507dfe 100644
--- a/src/square/devices/__init__.py
+++ b/src/square/devices/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import codes
 
 __all__ = ["codes"]
diff --git a/src/square/devices/client.py b/src/square/devices/client.py
index ccc6bbae..f9c8fbbc 100644
--- a/src/square/devices/client.py
+++ b/src/square/devices/client.py
@@ -1,22 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawDevicesClient
-from .codes.client import CodesClient
 import typing
-from ..types.sort_order import SortOrder
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
 from ..types.device import Device
-from ..types.list_devices_response import ListDevicesResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..types.get_device_response import GetDeviceResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawDevicesClient
-from .codes.client import AsyncCodesClient
-from ..core.pagination import AsyncPager
+from ..types.sort_order import SortOrder
+from .codes.client import AsyncCodesClient, CodesClient
+from .raw_client import AsyncRawDevicesClient, RawDevicesClient
 
 
 class DevicesClient:
@@ -88,41 +81,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/devices",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "sort_order": sort_order,
-                "limit": limit,
-                "location_id": location_id,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            cursor=cursor, sort_order=sort_order, limit=limit, location_id=location_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListDevicesResponse,
-                    construct_type(
-                        type_=ListDevicesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    sort_order=sort_order,
-                    limit=limit,
-                    location_id=location_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.devices
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(self, device_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetDeviceResponse:
         """
@@ -152,8 +113,8 @@ def get(self, device_id: str, *, request_options: typing.Optional[RequestOptions
             device_id="device_id",
         )
         """
-        response = self._raw_client.get(device_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(device_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncDevicesClient:
@@ -226,6 +187,7 @@ async def main() -> None:
             response = await client.devices.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -233,41 +195,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/devices",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "sort_order": sort_order,
-                "limit": limit,
-                "location_id": location_id,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            cursor=cursor, sort_order=sort_order, limit=limit, location_id=location_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListDevicesResponse,
-                    construct_type(
-                        type_=ListDevicesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    sort_order=sort_order,
-                    limit=limit,
-                    location_id=location_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.devices
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self, device_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -307,5 +237,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(device_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(device_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/devices/codes/__init__.py b/src/square/devices/codes/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/devices/codes/__init__.py
+++ b/src/square/devices/codes/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/devices/codes/client.py b/src/square/devices/codes/client.py
index 155d9639..5c8330aa 100644
--- a/src/square/devices/codes/client.py
+++ b/src/square/devices/codes/client.py
@@ -1,23 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCodesClient
-from ...types.product_type import ProductType
-from ...types.device_code_status import DeviceCodeStatus
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.device_code import DeviceCode
-from ...types.list_device_codes_response import ListDeviceCodesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.device_code import DeviceCodeParams
 from ...types.create_device_code_response import CreateDeviceCodeResponse
+from ...types.device_code import DeviceCode
+from ...types.device_code_status import DeviceCodeStatus
 from ...types.get_device_code_response import GetDeviceCodeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCodesClient
-from ...core.pagination import AsyncPager
+from ...types.product_type import ProductType
+from .raw_client import AsyncRawCodesClient, RawCodesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -92,41 +86,13 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/devices/codes",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "location_id": location_id,
-                "product_type": product_type,
-                "status": status,
-            },
+        return self._raw_client.list(
+            cursor=cursor,
+            location_id=location_id,
+            product_type=product_type,
+            status=status,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListDeviceCodesResponse,
-                    construct_type(
-                        type_=ListDeviceCodesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    location_id=location_id,
-                    product_type=product_type,
-                    status=status,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.device_codes
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -174,10 +140,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key, device_code=device_code, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetDeviceCodeResponse:
         """
@@ -207,8 +173,8 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             id="id",
         )
         """
-        response = self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
 
 class AsyncCodesClient:
@@ -281,6 +247,7 @@ async def main() -> None:
             response = await client.devices.codes.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -288,41 +255,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/devices/codes",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "location_id": location_id,
-                "product_type": product_type,
-                "status": status,
-            },
+        return await self._raw_client.list(
+            cursor=cursor,
+            location_id=location_id,
+            product_type=product_type,
+            status=status,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListDeviceCodesResponse,
-                    construct_type(
-                        type_=ListDeviceCodesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    location_id=location_id,
-                    product_type=product_type,
-                    status=status,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.device_codes
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -378,10 +317,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key, device_code=device_code, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetDeviceCodeResponse:
         """
@@ -419,5 +358,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(id, request_options=request_options)
+        return _response.data
diff --git a/src/square/devices/codes/raw_client.py b/src/square/devices/codes/raw_client.py
index 4d99ab20..2ed34670 100644
--- a/src/square/devices/codes/raw_client.py
+++ b/src/square/devices/codes/raw_client.py
@@ -1,19 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.device_code import DeviceCodeParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_device_code_response import CreateDeviceCodeResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.device_code import DeviceCodeParams
+from ...types.create_device_code_response import CreateDeviceCodeResponse
+from ...types.device_code import DeviceCode
+from ...types.device_code_status import DeviceCodeStatus
 from ...types.get_device_code_response import GetDeviceCodeResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.list_device_codes_response import ListDeviceCodesResponse
+from ...types.product_type import ProductType
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -23,6 +27,84 @@ class RawCodesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        product_type: typing.Optional[ProductType] = None,
+        status: typing.Optional[DeviceCodeStatus] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[DeviceCode]:
+        """
+        Lists all DeviceCodes associated with the merchant.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for your original query.
+
+            See [Paginating results](https://developer.squareup.com/docs/working-with-apis/pagination) for more information.
+
+        location_id : typing.Optional[str]
+            If specified, only returns DeviceCodes of the specified location.
+            Returns DeviceCodes of all locations if empty.
+
+        product_type : typing.Optional[ProductType]
+            If specified, only returns DeviceCodes targeting the specified product type.
+            Returns DeviceCodes of all product types if empty.
+
+        status : typing.Optional[DeviceCodeStatus]
+            If specified, returns DeviceCodes with the specified statuses.
+            Returns DeviceCodes of status `PAIRED` and `UNPAIRED` if empty.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[DeviceCode]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/devices/codes",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "location_id": location_id,
+                "product_type": product_type,
+                "status": status,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListDeviceCodesResponse,
+                    construct_type(
+                        type_=ListDeviceCodesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.device_codes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    location_id=location_id,
+                    product_type=product_type,
+                    status=status,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -80,8 +162,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -119,14 +201,95 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCodesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        product_type: typing.Optional[ProductType] = None,
+        status: typing.Optional[DeviceCodeStatus] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[DeviceCode]:
+        """
+        Lists all DeviceCodes associated with the merchant.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for your original query.
+
+            See [Paginating results](https://developer.squareup.com/docs/working-with-apis/pagination) for more information.
+
+        location_id : typing.Optional[str]
+            If specified, only returns DeviceCodes of the specified location.
+            Returns DeviceCodes of all locations if empty.
+
+        product_type : typing.Optional[ProductType]
+            If specified, only returns DeviceCodes targeting the specified product type.
+            Returns DeviceCodes of all product types if empty.
+
+        status : typing.Optional[DeviceCodeStatus]
+            If specified, returns DeviceCodes with the specified statuses.
+            Returns DeviceCodes of status `PAIRED` and `UNPAIRED` if empty.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[DeviceCode]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/devices/codes",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "location_id": location_id,
+                "product_type": product_type,
+                "status": status,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListDeviceCodesResponse,
+                    construct_type(
+                        type_=ListDeviceCodesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.device_codes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        location_id=location_id,
+                        product_type=product_type,
+                        status=status,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -184,8 +347,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -223,5 +386,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/devices/raw_client.py b/src/square/devices/raw_client.py
index 83d78c58..0fb3d170 100644
--- a/src/square/devices/raw_client.py
+++ b/src/square/devices/raw_client.py
@@ -1,22 +1,102 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
 import typing
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.get_device_response import GetDeviceResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.device import Device
+from ..types.get_device_response import GetDeviceResponse
+from ..types.list_devices_response import ListDevicesResponse
+from ..types.sort_order import SortOrder
 
 
 class RawDevicesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        limit: typing.Optional[int] = None,
+        location_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[Device]:
+        """
+        List devices associated with the merchant. Currently, only Terminal API
+        devices are supported.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            See [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination) for more information.
+
+        sort_order : typing.Optional[SortOrder]
+            The order in which results are listed.
+            - `ASC` - Oldest to newest.
+            - `DESC` - Newest to oldest (default).
+
+        limit : typing.Optional[int]
+            The number of results to return in a single page.
+
+        location_id : typing.Optional[str]
+            If present, only returns devices at the target location.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Device]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/devices",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "sort_order": sort_order,
+                "limit": limit,
+                "location_id": location_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListDevicesResponse,
+                    construct_type(
+                        type_=ListDevicesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.devices
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    sort_order=sort_order,
+                    limit=limit,
+                    location_id=location_id,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, device_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetDeviceResponse]:
@@ -53,14 +133,94 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawDevicesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        limit: typing.Optional[int] = None,
+        location_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[Device]:
+        """
+        List devices associated with the merchant. Currently, only Terminal API
+        devices are supported.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            See [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination) for more information.
+
+        sort_order : typing.Optional[SortOrder]
+            The order in which results are listed.
+            - `ASC` - Oldest to newest.
+            - `DESC` - Newest to oldest (default).
+
+        limit : typing.Optional[int]
+            The number of results to return in a single page.
+
+        location_id : typing.Optional[str]
+            If present, only returns devices at the target location.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Device]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/devices",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "sort_order": sort_order,
+                "limit": limit,
+                "location_id": location_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListDevicesResponse,
+                    construct_type(
+                        type_=ListDevicesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.devices
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        sort_order=sort_order,
+                        limit=limit,
+                        location_id=location_id,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, device_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetDeviceResponse]:
@@ -97,5 +257,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/disputes/__init__.py b/src/square/disputes/__init__.py
index 899056be..692013d1 100644
--- a/src/square/disputes/__init__.py
+++ b/src/square/disputes/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import evidence
 
 __all__ = ["evidence"]
diff --git a/src/square/disputes/client.py b/src/square/disputes/client.py
index 1bdfeb74..c0c568cc 100644
--- a/src/square/disputes/client.py
+++ b/src/square/disputes/client.py
@@ -1,29 +1,22 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawDisputesClient
-from .evidence.client import EvidenceClient
-from ..types.dispute_state import DisputeState
+
+from .. import core
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.dispute import Dispute
-from ..types.list_disputes_response import ListDisputesResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..types.get_dispute_response import GetDisputeResponse
-from ..types.accept_dispute_response import AcceptDisputeResponse
 from ..requests.create_dispute_evidence_file_request import CreateDisputeEvidenceFileRequestParams
-from .. import core
+from ..types.accept_dispute_response import AcceptDisputeResponse
 from ..types.create_dispute_evidence_file_response import CreateDisputeEvidenceFileResponse
-from ..types.dispute_evidence_type import DisputeEvidenceType
 from ..types.create_dispute_evidence_text_response import CreateDisputeEvidenceTextResponse
+from ..types.dispute import Dispute
+from ..types.dispute_evidence_type import DisputeEvidenceType
+from ..types.dispute_state import DisputeState
+from ..types.get_dispute_response import GetDisputeResponse
 from ..types.submit_evidence_response import SubmitEvidenceResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawDisputesClient
-from .evidence.client import AsyncEvidenceClient
-from ..core.pagination import AsyncPager
+from .evidence.client import AsyncEvidenceClient, EvidenceClient
+from .raw_client import AsyncRawDisputesClient, RawDisputesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -92,39 +85,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/disputes",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "states": states,
-                "location_id": location_id,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            cursor=cursor, states=states, location_id=location_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListDisputesResponse,
-                    construct_type(
-                        type_=ListDisputesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    states=states,
-                    location_id=location_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.disputes
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetDisputeResponse:
         """
@@ -154,8 +117,8 @@ def get(self, dispute_id: str, *, request_options: typing.Optional[RequestOption
             dispute_id="dispute_id",
         )
         """
-        response = self._raw_client.get(dispute_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(dispute_id, request_options=request_options)
+        return _response.data
 
     def accept(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -191,8 +154,8 @@ def accept(
             dispute_id="dispute_id",
         )
         """
-        response = self._raw_client.accept(dispute_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.accept(dispute_id, request_options=request_options)
+        return _response.data
 
     def create_evidence_file(
         self,
@@ -235,10 +198,10 @@ def create_evidence_file(
             dispute_id="dispute_id",
         )
         """
-        response = self._raw_client.create_evidence_file(
+        _response = self._raw_client.create_evidence_file(
             dispute_id, request=request, image_file=image_file, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def create_evidence_text(
         self,
@@ -289,14 +252,14 @@ def create_evidence_text(
             evidence_text="1Z8888888888888888",
         )
         """
-        response = self._raw_client.create_evidence_text(
+        _response = self._raw_client.create_evidence_text(
             dispute_id,
             idempotency_key=idempotency_key,
             evidence_text=evidence_text,
             evidence_type=evidence_type,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def submit_evidence(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -334,8 +297,8 @@ def submit_evidence(
             dispute_id="dispute_id",
         )
         """
-        response = self._raw_client.submit_evidence(dispute_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.submit_evidence(dispute_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncDisputesClient:
@@ -402,6 +365,7 @@ async def main() -> None:
             response = await client.disputes.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -409,39 +373,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/disputes",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "states": states,
-                "location_id": location_id,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            cursor=cursor, states=states, location_id=location_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListDisputesResponse,
-                    construct_type(
-                        type_=ListDisputesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    states=states,
-                    location_id=location_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.disputes
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -481,8 +415,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(dispute_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(dispute_id, request_options=request_options)
+        return _response.data
 
     async def accept(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -526,8 +460,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.accept(dispute_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.accept(dispute_id, request_options=request_options)
+        return _response.data
 
     async def create_evidence_file(
         self,
@@ -578,10 +512,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create_evidence_file(
+        _response = await self._raw_client.create_evidence_file(
             dispute_id, request=request, image_file=image_file, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def create_evidence_text(
         self,
@@ -640,14 +574,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create_evidence_text(
+        _response = await self._raw_client.create_evidence_text(
             dispute_id,
             idempotency_key=idempotency_key,
             evidence_text=evidence_text,
             evidence_type=evidence_type,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def submit_evidence(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -693,5 +627,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.submit_evidence(dispute_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.submit_evidence(dispute_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/disputes/evidence/__init__.py b/src/square/disputes/evidence/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/disputes/evidence/__init__.py
+++ b/src/square/disputes/evidence/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/disputes/evidence/client.py b/src/square/disputes/evidence/client.py
index 5ef81caa..d53d0be8 100644
--- a/src/square/disputes/evidence/client.py
+++ b/src/square/disputes/evidence/client.py
@@ -1,21 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawEvidenceClient
 import typing
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
+from ...types.delete_dispute_evidence_response import DeleteDisputeEvidenceResponse
 from ...types.dispute_evidence import DisputeEvidence
-from ...core.jsonable_encoder import jsonable_encoder
-from ...types.list_dispute_evidence_response import ListDisputeEvidenceResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...types.get_dispute_evidence_response import GetDisputeEvidenceResponse
-from ...types.delete_dispute_evidence_response import DeleteDisputeEvidenceResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawEvidenceClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawEvidenceClient, RawEvidenceClient
 
 
 class EvidenceClient:
@@ -77,36 +70,7 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/disputes/{jsonable_encoder(dispute_id)}/evidence",
-            method="GET",
-            params={
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListDisputeEvidenceResponse,
-                    construct_type(
-                        type_=ListDisputeEvidenceResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    dispute_id,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.evidence
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return self._raw_client.list(dispute_id, cursor=cursor, request_options=request_options)
 
     def get(
         self, dispute_id: str, evidence_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -144,8 +108,8 @@ def get(
             evidence_id="evidence_id",
         )
         """
-        response = self._raw_client.get(dispute_id, evidence_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(dispute_id, evidence_id, request_options=request_options)
+        return _response.data
 
     def delete(
         self, dispute_id: str, evidence_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -182,8 +146,8 @@ def delete(
             evidence_id="evidence_id",
         )
         """
-        response = self._raw_client.delete(dispute_id, evidence_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(dispute_id, evidence_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncEvidenceClient:
@@ -246,6 +210,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -253,36 +218,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/disputes/{jsonable_encoder(dispute_id)}/evidence",
-            method="GET",
-            params={
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListDisputeEvidenceResponse,
-                    construct_type(
-                        type_=ListDisputeEvidenceResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    dispute_id,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.evidence
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return await self._raw_client.list(dispute_id, cursor=cursor, request_options=request_options)
 
     async def get(
         self, dispute_id: str, evidence_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -328,8 +264,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(dispute_id, evidence_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(dispute_id, evidence_id, request_options=request_options)
+        return _response.data
 
     async def delete(
         self, dispute_id: str, evidence_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -374,5 +310,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(dispute_id, evidence_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(dispute_id, evidence_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/disputes/evidence/raw_client.py b/src/square/disputes/evidence/raw_client.py
index 20879e93..c6db9277 100644
--- a/src/square/disputes/evidence/raw_client.py
+++ b/src/square/disputes/evidence/raw_client.py
@@ -1,23 +1,86 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
 import typing
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.get_dispute_evidence_response import GetDisputeEvidenceResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.unchecked_base_model import construct_type
 from ...types.delete_dispute_evidence_response import DeleteDisputeEvidenceResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.dispute_evidence import DisputeEvidence
+from ...types.get_dispute_evidence_response import GetDisputeEvidenceResponse
+from ...types.list_dispute_evidence_response import ListDisputeEvidenceResponse
 
 
 class RawEvidenceClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        dispute_id: str,
+        *,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[DisputeEvidence]:
+        """
+        Returns a list of evidence associated with a dispute.
+
+        Parameters
+        ----------
+        dispute_id : str
+            The ID of the dispute.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[DisputeEvidence]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/disputes/{jsonable_encoder(dispute_id)}/evidence",
+            method="GET",
+            params={
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListDisputeEvidenceResponse,
+                    construct_type(
+                        type_=ListDisputeEvidenceResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.evidence
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    dispute_id,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, dispute_id: str, evidence_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetDisputeEvidenceResponse]:
@@ -59,8 +122,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, dispute_id: str, evidence_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -102,14 +165,78 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawEvidenceClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        dispute_id: str,
+        *,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[DisputeEvidence]:
+        """
+        Returns a list of evidence associated with a dispute.
+
+        Parameters
+        ----------
+        dispute_id : str
+            The ID of the dispute.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[DisputeEvidence]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/disputes/{jsonable_encoder(dispute_id)}/evidence",
+            method="GET",
+            params={
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListDisputeEvidenceResponse,
+                    construct_type(
+                        type_=ListDisputeEvidenceResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.evidence
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        dispute_id,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, dispute_id: str, evidence_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetDisputeEvidenceResponse]:
@@ -151,8 +278,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, dispute_id: str, evidence_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -194,5 +321,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/disputes/raw_client.py b/src/square/disputes/raw_client.py
index 4a3b6013..b2d7a2f4 100644
--- a/src/square/disputes/raw_client.py
+++ b/src/square/disputes/raw_client.py
@@ -1,24 +1,27 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import json
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.get_dispute_response import GetDisputeResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
+from .. import core
 from ..core.api_error import ApiError
-from ..types.accept_dispute_response import AcceptDisputeResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
 from ..requests.create_dispute_evidence_file_request import CreateDisputeEvidenceFileRequestParams
-from .. import core
+from ..types.accept_dispute_response import AcceptDisputeResponse
 from ..types.create_dispute_evidence_file_response import CreateDisputeEvidenceFileResponse
-import json
-from ..types.dispute_evidence_type import DisputeEvidenceType
 from ..types.create_dispute_evidence_text_response import CreateDisputeEvidenceTextResponse
+from ..types.dispute import Dispute
+from ..types.dispute_evidence_type import DisputeEvidenceType
+from ..types.dispute_state import DisputeState
+from ..types.get_dispute_response import GetDisputeResponse
+from ..types.list_disputes_response import ListDisputesResponse
 from ..types.submit_evidence_response import SubmitEvidenceResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -28,6 +31,75 @@ class RawDisputesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        states: typing.Optional[DisputeState] = None,
+        location_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[Dispute]:
+        """
+        Returns a list of disputes associated with a particular account.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        states : typing.Optional[DisputeState]
+            The dispute states used to filter the result. If not specified, the endpoint returns all disputes.
+
+        location_id : typing.Optional[str]
+            The ID of the location for which to return a list of disputes.
+            If not specified, the endpoint returns disputes associated with all locations.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Dispute]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/disputes",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "states": states,
+                "location_id": location_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListDisputesResponse,
+                    construct_type(
+                        type_=ListDisputesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.disputes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    states=states,
+                    location_id=location_id,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetDisputeResponse]:
@@ -64,8 +136,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def accept(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -107,8 +179,8 @@ def accept(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def create_evidence_file(
         self,
@@ -158,6 +230,7 @@ def create_evidence_file(
             },
             request_options=request_options,
             omit=OMIT,
+            force_multipart=True,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -171,8 +244,8 @@ def create_evidence_file(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def create_evidence_text(
         self,
@@ -235,8 +308,8 @@ def create_evidence_text(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def submit_evidence(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -280,14 +353,86 @@ def submit_evidence(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawDisputesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        states: typing.Optional[DisputeState] = None,
+        location_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[Dispute]:
+        """
+        Returns a list of disputes associated with a particular account.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        states : typing.Optional[DisputeState]
+            The dispute states used to filter the result. If not specified, the endpoint returns all disputes.
+
+        location_id : typing.Optional[str]
+            The ID of the location for which to return a list of disputes.
+            If not specified, the endpoint returns disputes associated with all locations.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Dispute]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/disputes",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "states": states,
+                "location_id": location_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListDisputesResponse,
+                    construct_type(
+                        type_=ListDisputesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.disputes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        states=states,
+                        location_id=location_id,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetDisputeResponse]:
@@ -324,8 +469,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def accept(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -367,8 +512,8 @@ async def accept(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def create_evidence_file(
         self,
@@ -418,6 +563,7 @@ async def create_evidence_file(
             },
             request_options=request_options,
             omit=OMIT,
+            force_multipart=True,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -431,8 +577,8 @@ async def create_evidence_file(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def create_evidence_text(
         self,
@@ -495,8 +641,8 @@ async def create_evidence_text(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def submit_evidence(
         self, dispute_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -540,5 +686,5 @@ async def submit_evidence(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/employees/__init__.py b/src/square/employees/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/employees/__init__.py
+++ b/src/square/employees/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/employees/client.py b/src/square/employees/client.py
index 5c602191..240e1f55 100644
--- a/src/square/employees/client.py
+++ b/src/square/employees/client.py
@@ -1,20 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawEmployeesClient
 import typing
-from ..types.employee_status import EmployeeStatus
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
 from ..types.employee import Employee
-from ..types.list_employees_response import ListEmployeesResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
+from ..types.employee_status import EmployeeStatus
 from ..types.get_employee_response import GetEmployeeResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawEmployeesClient
-from ..core.pagination import AsyncPager
+from .raw_client import AsyncRawEmployeesClient, RawEmployeesClient
 
 
 class EmployeesClient:
@@ -80,41 +74,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/employees",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "status": status,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            location_id=location_id, status=status, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListEmployeesResponse,
-                    construct_type(
-                        type_=ListEmployeesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    status=status,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.employees
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetEmployeeResponse:
         """
@@ -144,8 +106,8 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             id="id",
         )
         """
-        response = self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
 
 class AsyncEmployeesClient:
@@ -212,6 +174,7 @@ async def main() -> None:
             response = await client.employees.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -219,41 +182,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/employees",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "status": status,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            location_id=location_id, status=status, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListEmployeesResponse,
-                    construct_type(
-                        type_=ListEmployeesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    status=status,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.employees
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetEmployeeResponse:
         """
@@ -291,5 +222,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(id, request_options=request_options)
+        return _response.data
diff --git a/src/square/employees/raw_client.py b/src/square/employees/raw_client.py
index 0fc41587..62fa76c0 100644
--- a/src/square/employees/raw_client.py
+++ b/src/square/employees/raw_client.py
@@ -1,22 +1,97 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
 import typing
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.get_employee_response import GetEmployeeResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.employee import Employee
+from ..types.employee_status import EmployeeStatus
+from ..types.get_employee_response import GetEmployeeResponse
+from ..types.list_employees_response import ListEmployeesResponse
 
 
 class RawEmployeesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        location_id: typing.Optional[str] = None,
+        status: typing.Optional[EmployeeStatus] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[Employee]:
+        """
+
+
+        Parameters
+        ----------
+        location_id : typing.Optional[str]
+
+
+        status : typing.Optional[EmployeeStatus]
+            Specifies the EmployeeStatus to filter the employee by.
+
+        limit : typing.Optional[int]
+            The number of employees to be returned on each page.
+
+        cursor : typing.Optional[str]
+            The token required to retrieve the specified page of results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Employee]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/employees",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "status": status,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListEmployeesResponse,
+                    construct_type(
+                        type_=ListEmployeesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.employees
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    location_id=location_id,
+                    status=status,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetEmployeeResponse]:
@@ -53,14 +128,89 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawEmployeesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        location_id: typing.Optional[str] = None,
+        status: typing.Optional[EmployeeStatus] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[Employee]:
+        """
+
+
+        Parameters
+        ----------
+        location_id : typing.Optional[str]
+
+
+        status : typing.Optional[EmployeeStatus]
+            Specifies the EmployeeStatus to filter the employee by.
+
+        limit : typing.Optional[int]
+            The number of employees to be returned on each page.
+
+        cursor : typing.Optional[str]
+            The token required to retrieve the specified page of results.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Employee]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/employees",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "status": status,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListEmployeesResponse,
+                    construct_type(
+                        type_=ListEmployeesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.employees
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        location_id=location_id,
+                        status=status,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetEmployeeResponse]:
@@ -97,5 +247,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/events/__init__.py b/src/square/events/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/events/__init__.py
+++ b/src/square/events/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/events/client.py b/src/square/events/client.py
index 493aeb2b..7e62ca68 100644
--- a/src/square/events/client.py
+++ b/src/square/events/client.py
@@ -1,16 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawEventsClient
-from ..requests.search_events_query import SearchEventsQueryParams
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.search_events_response import SearchEventsResponse
+from ..requests.search_events_query import SearchEventsQueryParams
 from ..types.disable_events_response import DisableEventsResponse
 from ..types.enable_events_response import EnableEventsResponse
 from ..types.list_event_types_response import ListEventTypesResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawEventsClient
+from ..types.search_events_response import SearchEventsResponse
+from .raw_client import AsyncRawEventsClient, RawEventsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -76,10 +75,10 @@ def search_events(
         )
         client.events.search_events()
         """
-        response = self._raw_client.search_events(
+        _response = self._raw_client.search_events(
             cursor=cursor, limit=limit, query=query, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def disable_events(self, *, request_options: typing.Optional[RequestOptions] = None) -> DisableEventsResponse:
         """
@@ -106,8 +105,8 @@ def disable_events(self, *, request_options: typing.Optional[RequestOptions] = N
         )
         client.events.disable_events()
         """
-        response = self._raw_client.disable_events(request_options=request_options)
-        return response.data
+        _response = self._raw_client.disable_events(request_options=request_options)
+        return _response.data
 
     def enable_events(self, *, request_options: typing.Optional[RequestOptions] = None) -> EnableEventsResponse:
         """
@@ -132,8 +131,8 @@ def enable_events(self, *, request_options: typing.Optional[RequestOptions] = No
         )
         client.events.enable_events()
         """
-        response = self._raw_client.enable_events(request_options=request_options)
-        return response.data
+        _response = self._raw_client.enable_events(request_options=request_options)
+        return _response.data
 
     def list_event_types(
         self, *, api_version: typing.Optional[str] = None, request_options: typing.Optional[RequestOptions] = None
@@ -163,8 +162,8 @@ def list_event_types(
         )
         client.events.list_event_types()
         """
-        response = self._raw_client.list_event_types(api_version=api_version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.list_event_types(api_version=api_version, request_options=request_options)
+        return _response.data
 
 
 class AsyncEventsClient:
@@ -235,10 +234,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search_events(
+        _response = await self._raw_client.search_events(
             cursor=cursor, limit=limit, query=query, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def disable_events(self, *, request_options: typing.Optional[RequestOptions] = None) -> DisableEventsResponse:
         """
@@ -273,8 +272,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.disable_events(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.disable_events(request_options=request_options)
+        return _response.data
 
     async def enable_events(self, *, request_options: typing.Optional[RequestOptions] = None) -> EnableEventsResponse:
         """
@@ -307,8 +306,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.enable_events(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.enable_events(request_options=request_options)
+        return _response.data
 
     async def list_event_types(
         self, *, api_version: typing.Optional[str] = None, request_options: typing.Optional[RequestOptions] = None
@@ -346,5 +345,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.list_event_types(api_version=api_version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.list_event_types(api_version=api_version, request_options=request_options)
+        return _response.data
diff --git a/src/square/events/raw_client.py b/src/square/events/raw_client.py
index 74408ed8..831b57a5 100644
--- a/src/square/events/raw_client.py
+++ b/src/square/events/raw_client.py
@@ -1,20 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.search_events_query import SearchEventsQueryParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.search_events_response import SearchEventsResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
+from ..requests.search_events_query import SearchEventsQueryParams
 from ..types.disable_events_response import DisableEventsResponse
 from ..types.enable_events_response import EnableEventsResponse
 from ..types.list_event_types_response import ListEventTypesResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.search_events_response import SearchEventsResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -88,8 +87,8 @@ def search_events(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def disable_events(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -126,8 +125,8 @@ def disable_events(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def enable_events(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -162,8 +161,8 @@ def enable_events(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def list_event_types(
         self, *, api_version: typing.Optional[str] = None, request_options: typing.Optional[RequestOptions] = None
@@ -204,8 +203,8 @@ def list_event_types(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawEventsClient:
@@ -276,8 +275,8 @@ async def search_events(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def disable_events(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -314,8 +313,8 @@ async def disable_events(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def enable_events(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -350,8 +349,8 @@ async def enable_events(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def list_event_types(
         self, *, api_version: typing.Optional[str] = None, request_options: typing.Optional[RequestOptions] = None
@@ -392,5 +391,5 @@ async def list_event_types(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/gift_cards/__init__.py b/src/square/gift_cards/__init__.py
index 121cf796..a28b6533 100644
--- a/src/square/gift_cards/__init__.py
+++ b/src/square/gift_cards/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import activities
 
 __all__ = ["activities"]
diff --git a/src/square/gift_cards/activities/__init__.py b/src/square/gift_cards/activities/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/gift_cards/activities/__init__.py
+++ b/src/square/gift_cards/activities/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/gift_cards/activities/client.py b/src/square/gift_cards/activities/client.py
index 10d24366..93c38f9c 100644
--- a/src/square/gift_cards/activities/client.py
+++ b/src/square/gift_cards/activities/client.py
@@ -1,20 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawActivitiesClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.gift_card_activity import GiftCardActivity
-from ...types.list_gift_card_activities_response import ListGiftCardActivitiesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.gift_card_activity import GiftCardActivityParams
 from ...types.create_gift_card_activity_response import CreateGiftCardActivityResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawActivitiesClient
-from ...core.pagination import AsyncPager
+from ...types.gift_card_activity import GiftCardActivity
+from .raw_client import AsyncRawActivitiesClient, RawActivitiesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -115,49 +109,17 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/gift-cards/activities",
-            method="GET",
-            params={
-                "gift_card_id": gift_card_id,
-                "type": type,
-                "location_id": location_id,
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "limit": limit,
-                "cursor": cursor,
-                "sort_order": sort_order,
-            },
+        return self._raw_client.list(
+            gift_card_id=gift_card_id,
+            type=type,
+            location_id=location_id,
+            begin_time=begin_time,
+            end_time=end_time,
+            limit=limit,
+            cursor=cursor,
+            sort_order=sort_order,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListGiftCardActivitiesResponse,
-                    construct_type(
-                        type_=ListGiftCardActivitiesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    gift_card_id=gift_card_id,
-                    type=type,
-                    location_id=location_id,
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    sort_order=sort_order,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.gift_card_activities
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -207,10 +169,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key, gift_card_activity=gift_card_activity, request_options=request_options
         )
-        return response.data
+        return _response.data
 
 
 class AsyncActivitiesClient:
@@ -309,6 +271,7 @@ async def main() -> None:
             response = await client.gift_cards.activities.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -316,49 +279,17 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/gift-cards/activities",
-            method="GET",
-            params={
-                "gift_card_id": gift_card_id,
-                "type": type,
-                "location_id": location_id,
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "limit": limit,
-                "cursor": cursor,
-                "sort_order": sort_order,
-            },
+        return await self._raw_client.list(
+            gift_card_id=gift_card_id,
+            type=type,
+            location_id=location_id,
+            begin_time=begin_time,
+            end_time=end_time,
+            limit=limit,
+            cursor=cursor,
+            sort_order=sort_order,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListGiftCardActivitiesResponse,
-                    construct_type(
-                        type_=ListGiftCardActivitiesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    gift_card_id=gift_card_id,
-                    type=type,
-                    location_id=location_id,
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    sort_order=sort_order,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.gift_card_activities
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -416,7 +347,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key, gift_card_activity=gift_card_activity, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/gift_cards/activities/raw_client.py b/src/square/gift_cards/activities/raw_client.py
index d40c039f..1bdebbcd 100644
--- a/src/square/gift_cards/activities/raw_client.py
+++ b/src/square/gift_cards/activities/raw_client.py
@@ -1,17 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.gift_card_activity import GiftCardActivityParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_gift_card_activity_response import CreateGiftCardActivityResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...requests.gift_card_activity import GiftCardActivityParams
+from ...types.create_gift_card_activity_response import CreateGiftCardActivityResponse
+from ...types.gift_card_activity import GiftCardActivity
+from ...types.list_gift_card_activities_response import ListGiftCardActivitiesResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -21,6 +23,118 @@ class RawActivitiesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        gift_card_id: typing.Optional[str] = None,
+        type: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        sort_order: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[GiftCardActivity]:
+        """
+        Lists gift card activities. By default, you get gift card activities for all
+        gift cards in the seller's account. You can optionally specify query parameters to
+        filter the list. For example, you can get a list of gift card activities for a gift card,
+        for all gift cards in a specific region, or for activities within a time window.
+
+        Parameters
+        ----------
+        gift_card_id : typing.Optional[str]
+            If a gift card ID is provided, the endpoint returns activities related
+            to the specified gift card. Otherwise, the endpoint returns all gift card activities for
+            the seller.
+
+        type : typing.Optional[str]
+            If a [type](entity:GiftCardActivityType) is provided, the endpoint returns gift card activities of the specified type.
+            Otherwise, the endpoint returns all types of gift card activities.
+
+        location_id : typing.Optional[str]
+            If a location ID is provided, the endpoint returns gift card activities for the specified location.
+            Otherwise, the endpoint returns gift card activities for all locations.
+
+        begin_time : typing.Optional[str]
+            The timestamp for the beginning of the reporting period, in RFC 3339 format.
+            This start time is inclusive. The default value is the current time minus one year.
+
+        end_time : typing.Optional[str]
+            The timestamp for the end of the reporting period, in RFC 3339 format.
+            This end time is inclusive. The default value is the current time.
+
+        limit : typing.Optional[int]
+            If a limit is provided, the endpoint returns the specified number
+            of results (or fewer) per page. The maximum value is 100. The default value is 50.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            If a cursor is not provided, the endpoint returns the first page of the results.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        sort_order : typing.Optional[str]
+            The order in which the endpoint returns the activities, based on `created_at`.
+            - `ASC` - Oldest to newest.
+            - `DESC` - Newest to oldest (default).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[GiftCardActivity]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/gift-cards/activities",
+            method="GET",
+            params={
+                "gift_card_id": gift_card_id,
+                "type": type,
+                "location_id": location_id,
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "limit": limit,
+                "cursor": cursor,
+                "sort_order": sort_order,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListGiftCardActivitiesResponse,
+                    construct_type(
+                        type_=ListGiftCardActivitiesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.gift_card_activities
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    gift_card_id=gift_card_id,
+                    type=type,
+                    location_id=location_id,
+                    begin_time=begin_time,
+                    end_time=end_time,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    sort_order=sort_order,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -76,14 +190,129 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawActivitiesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        gift_card_id: typing.Optional[str] = None,
+        type: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        sort_order: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[GiftCardActivity]:
+        """
+        Lists gift card activities. By default, you get gift card activities for all
+        gift cards in the seller's account. You can optionally specify query parameters to
+        filter the list. For example, you can get a list of gift card activities for a gift card,
+        for all gift cards in a specific region, or for activities within a time window.
+
+        Parameters
+        ----------
+        gift_card_id : typing.Optional[str]
+            If a gift card ID is provided, the endpoint returns activities related
+            to the specified gift card. Otherwise, the endpoint returns all gift card activities for
+            the seller.
+
+        type : typing.Optional[str]
+            If a [type](entity:GiftCardActivityType) is provided, the endpoint returns gift card activities of the specified type.
+            Otherwise, the endpoint returns all types of gift card activities.
+
+        location_id : typing.Optional[str]
+            If a location ID is provided, the endpoint returns gift card activities for the specified location.
+            Otherwise, the endpoint returns gift card activities for all locations.
+
+        begin_time : typing.Optional[str]
+            The timestamp for the beginning of the reporting period, in RFC 3339 format.
+            This start time is inclusive. The default value is the current time minus one year.
+
+        end_time : typing.Optional[str]
+            The timestamp for the end of the reporting period, in RFC 3339 format.
+            This end time is inclusive. The default value is the current time.
+
+        limit : typing.Optional[int]
+            If a limit is provided, the endpoint returns the specified number
+            of results (or fewer) per page. The maximum value is 100. The default value is 50.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            If a cursor is not provided, the endpoint returns the first page of the results.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        sort_order : typing.Optional[str]
+            The order in which the endpoint returns the activities, based on `created_at`.
+            - `ASC` - Oldest to newest.
+            - `DESC` - Newest to oldest (default).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[GiftCardActivity]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/gift-cards/activities",
+            method="GET",
+            params={
+                "gift_card_id": gift_card_id,
+                "type": type,
+                "location_id": location_id,
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "limit": limit,
+                "cursor": cursor,
+                "sort_order": sort_order,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListGiftCardActivitiesResponse,
+                    construct_type(
+                        type_=ListGiftCardActivitiesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.gift_card_activities
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        gift_card_id=gift_card_id,
+                        type=type,
+                        location_id=location_id,
+                        begin_time=begin_time,
+                        end_time=end_time,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        sort_order=sort_order,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -139,5 +368,5 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/gift_cards/client.py b/src/square/gift_cards/client.py
index c0ad5b06..938dc642 100644
--- a/src/square/gift_cards/client.py
+++ b/src/square/gift_cards/client.py
@@ -1,27 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawGiftCardsClient
-from .activities.client import ActivitiesClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.gift_card import GiftCard
-from ..types.list_gift_cards_response import ListGiftCardsResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..requests.gift_card import GiftCardParams
 from ..types.create_gift_card_response import CreateGiftCardResponse
 from ..types.get_gift_card_from_gan_response import GetGiftCardFromGanResponse
 from ..types.get_gift_card_from_nonce_response import GetGiftCardFromNonceResponse
+from ..types.get_gift_card_response import GetGiftCardResponse
+from ..types.gift_card import GiftCard
 from ..types.link_customer_to_gift_card_response import LinkCustomerToGiftCardResponse
 from ..types.unlink_customer_from_gift_card_response import UnlinkCustomerFromGiftCardResponse
-from ..types.get_gift_card_response import GetGiftCardResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawGiftCardsClient
-from .activities.client import AsyncActivitiesClient
-from ..core.pagination import AsyncPager
+from .activities.client import ActivitiesClient, AsyncActivitiesClient
+from .raw_client import AsyncRawGiftCardsClient, RawGiftCardsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -103,43 +96,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/gift-cards",
-            method="GET",
-            params={
-                "type": type,
-                "state": state,
-                "limit": limit,
-                "cursor": cursor,
-                "customer_id": customer_id,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            type=type, state=state, limit=limit, cursor=cursor, customer_id=customer_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListGiftCardsResponse,
-                    construct_type(
-                        type_=ListGiftCardsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    type=type,
-                    state=state,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    customer_id=customer_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.gift_cards
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -205,13 +164,13 @@ def create(
             gift_card={"type": "DIGITAL"},
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key,
             location_id=location_id,
             gift_card=gift_card,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get_from_gan(
         self, *, gan: str, request_options: typing.Optional[RequestOptions] = None
@@ -245,8 +204,8 @@ def get_from_gan(
             gan="7783320001001635",
         )
         """
-        response = self._raw_client.get_from_gan(gan=gan, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get_from_gan(gan=gan, request_options=request_options)
+        return _response.data
 
     def get_from_nonce(
         self, *, nonce: str, request_options: typing.Optional[RequestOptions] = None
@@ -279,8 +238,8 @@ def get_from_nonce(
             nonce="cnon:7783322135245171",
         )
         """
-        response = self._raw_client.get_from_nonce(nonce=nonce, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get_from_nonce(nonce=nonce, request_options=request_options)
+        return _response.data
 
     def link_customer(
         self, gift_card_id: str, *, customer_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -316,10 +275,10 @@ def link_customer(
             customer_id="GKY0FZ3V717AH8Q2D821PNT2ZW",
         )
         """
-        response = self._raw_client.link_customer(
+        _response = self._raw_client.link_customer(
             gift_card_id, customer_id=customer_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def unlink_customer(
         self, gift_card_id: str, *, customer_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -355,10 +314,10 @@ def unlink_customer(
             customer_id="GKY0FZ3V717AH8Q2D821PNT2ZW",
         )
         """
-        response = self._raw_client.unlink_customer(
+        _response = self._raw_client.unlink_customer(
             gift_card_id, customer_id=customer_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetGiftCardResponse:
         """
@@ -388,8 +347,8 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             id="id",
         )
         """
-        response = self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
 
 class AsyncGiftCardsClient:
@@ -469,6 +428,7 @@ async def main() -> None:
             response = await client.gift_cards.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -476,43 +436,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/gift-cards",
-            method="GET",
-            params={
-                "type": type,
-                "state": state,
-                "limit": limit,
-                "cursor": cursor,
-                "customer_id": customer_id,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            type=type, state=state, limit=limit, cursor=cursor, customer_id=customer_id, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListGiftCardsResponse,
-                    construct_type(
-                        type_=ListGiftCardsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    type=type,
-                    state=state,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    customer_id=customer_id,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.gift_cards
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -586,13 +512,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key,
             location_id=location_id,
             gift_card=gift_card,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get_from_gan(
         self, *, gan: str, request_options: typing.Optional[RequestOptions] = None
@@ -634,8 +560,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get_from_gan(gan=gan, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get_from_gan(gan=gan, request_options=request_options)
+        return _response.data
 
     async def get_from_nonce(
         self, *, nonce: str, request_options: typing.Optional[RequestOptions] = None
@@ -676,8 +602,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get_from_nonce(nonce=nonce, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get_from_nonce(nonce=nonce, request_options=request_options)
+        return _response.data
 
     async def link_customer(
         self, gift_card_id: str, *, customer_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -721,10 +647,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.link_customer(
+        _response = await self._raw_client.link_customer(
             gift_card_id, customer_id=customer_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def unlink_customer(
         self, gift_card_id: str, *, customer_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -768,10 +694,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.unlink_customer(
+        _response = await self._raw_client.unlink_customer(
             gift_card_id, customer_id=customer_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetGiftCardResponse:
         """
@@ -809,5 +735,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(id, request_options=request_options)
+        return _response.data
diff --git a/src/square/gift_cards/raw_client.py b/src/square/gift_cards/raw_client.py
index 56c60d65..5baf1150 100644
--- a/src/square/gift_cards/raw_client.py
+++ b/src/square/gift_cards/raw_client.py
@@ -1,23 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.gift_card import GiftCardParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_gift_card_response import CreateGiftCardResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
+from ..requests.gift_card import GiftCardParams
+from ..types.create_gift_card_response import CreateGiftCardResponse
 from ..types.get_gift_card_from_gan_response import GetGiftCardFromGanResponse
 from ..types.get_gift_card_from_nonce_response import GetGiftCardFromNonceResponse
+from ..types.get_gift_card_response import GetGiftCardResponse
+from ..types.gift_card import GiftCard
 from ..types.link_customer_to_gift_card_response import LinkCustomerToGiftCardResponse
-from ..core.jsonable_encoder import jsonable_encoder
+from ..types.list_gift_cards_response import ListGiftCardsResponse
 from ..types.unlink_customer_from_gift_card_response import UnlinkCustomerFromGiftCardResponse
-from ..types.get_gift_card_response import GetGiftCardResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -27,6 +29,92 @@ class RawGiftCardsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        type: typing.Optional[str] = None,
+        state: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        customer_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[GiftCard]:
+        """
+        Lists all gift cards. You can specify optional filters to retrieve
+        a subset of the gift cards. Results are sorted by `created_at` in ascending order.
+
+        Parameters
+        ----------
+        type : typing.Optional[str]
+            If a [type](entity:GiftCardType) is provided, the endpoint returns gift cards of the specified type.
+            Otherwise, the endpoint returns gift cards of all types.
+
+        state : typing.Optional[str]
+            If a [state](entity:GiftCardStatus) is provided, the endpoint returns the gift cards in the specified state.
+            Otherwise, the endpoint returns the gift cards of all states.
+
+        limit : typing.Optional[int]
+            If a limit is provided, the endpoint returns only the specified number of results per page.
+            The maximum value is 200. The default value is 30.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            If a cursor is not provided, the endpoint returns the first page of the results.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        customer_id : typing.Optional[str]
+            If a customer ID is provided, the endpoint returns only the gift cards linked to the specified customer.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[GiftCard]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/gift-cards",
+            method="GET",
+            params={
+                "type": type,
+                "state": state,
+                "limit": limit,
+                "cursor": cursor,
+                "customer_id": customer_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListGiftCardsResponse,
+                    construct_type(
+                        type_=ListGiftCardsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.gift_cards
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    type=type,
+                    state=state,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    customer_id=customer_id,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -106,8 +194,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get_from_gan(
         self, *, gan: str, request_options: typing.Optional[RequestOptions] = None
@@ -154,8 +242,8 @@ def get_from_gan(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get_from_nonce(
         self, *, nonce: str, request_options: typing.Optional[RequestOptions] = None
@@ -201,8 +289,8 @@ def get_from_nonce(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def link_customer(
         self, gift_card_id: str, *, customer_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -250,8 +338,8 @@ def link_customer(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def unlink_customer(
         self, gift_card_id: str, *, customer_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -299,8 +387,8 @@ def unlink_customer(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -338,14 +426,103 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawGiftCardsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        type: typing.Optional[str] = None,
+        state: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        customer_id: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[GiftCard]:
+        """
+        Lists all gift cards. You can specify optional filters to retrieve
+        a subset of the gift cards. Results are sorted by `created_at` in ascending order.
+
+        Parameters
+        ----------
+        type : typing.Optional[str]
+            If a [type](entity:GiftCardType) is provided, the endpoint returns gift cards of the specified type.
+            Otherwise, the endpoint returns gift cards of all types.
+
+        state : typing.Optional[str]
+            If a [state](entity:GiftCardStatus) is provided, the endpoint returns the gift cards in the specified state.
+            Otherwise, the endpoint returns the gift cards of all states.
+
+        limit : typing.Optional[int]
+            If a limit is provided, the endpoint returns only the specified number of results per page.
+            The maximum value is 200. The default value is 30.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            If a cursor is not provided, the endpoint returns the first page of the results.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        customer_id : typing.Optional[str]
+            If a customer ID is provided, the endpoint returns only the gift cards linked to the specified customer.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[GiftCard]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/gift-cards",
+            method="GET",
+            params={
+                "type": type,
+                "state": state,
+                "limit": limit,
+                "cursor": cursor,
+                "customer_id": customer_id,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListGiftCardsResponse,
+                    construct_type(
+                        type_=ListGiftCardsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.gift_cards
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        type=type,
+                        state=state,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        customer_id=customer_id,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -425,8 +602,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get_from_gan(
         self, *, gan: str, request_options: typing.Optional[RequestOptions] = None
@@ -473,8 +650,8 @@ async def get_from_gan(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get_from_nonce(
         self, *, nonce: str, request_options: typing.Optional[RequestOptions] = None
@@ -520,8 +697,8 @@ async def get_from_nonce(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def link_customer(
         self, gift_card_id: str, *, customer_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -569,8 +746,8 @@ async def link_customer(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def unlink_customer(
         self, gift_card_id: str, *, customer_id: str, request_options: typing.Optional[RequestOptions] = None
@@ -618,8 +795,8 @@ async def unlink_customer(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -657,5 +834,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/inventory/__init__.py b/src/square/inventory/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/inventory/__init__.py
+++ b/src/square/inventory/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/inventory/client.py b/src/square/inventory/client.py
index a02c104f..cc3c4c23 100644
--- a/src/square/inventory/client.py
+++ b/src/square/inventory/client.py
@@ -1,30 +1,22 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawInventoryClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..types.get_inventory_adjustment_response import GetInventoryAdjustmentResponse
 from ..requests.inventory_change import InventoryChangeParams
 from ..types.batch_change_inventory_response import BatchChangeInventoryResponse
-from ..types.inventory_change_type import InventoryChangeType
-from ..types.inventory_state import InventoryState
 from ..types.batch_get_inventory_changes_response import BatchGetInventoryChangesResponse
 from ..types.batch_get_inventory_counts_response import BatchGetInventoryCountsResponse
-from ..core.pagination import SyncPager
-from ..types.inventory_change import InventoryChange
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..types.inventory_count import InventoryCount
+from ..types.get_inventory_adjustment_response import GetInventoryAdjustmentResponse
 from ..types.get_inventory_physical_count_response import GetInventoryPhysicalCountResponse
 from ..types.get_inventory_transfer_response import GetInventoryTransferResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..types.get_inventory_count_response import GetInventoryCountResponse
-from ..types.get_inventory_changes_response import GetInventoryChangesResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawInventoryClient
-from ..core.pagination import AsyncPager
+from ..types.inventory_change import InventoryChange
+from ..types.inventory_change_type import InventoryChangeType
+from ..types.inventory_count import InventoryCount
+from ..types.inventory_state import InventoryState
+from .raw_client import AsyncRawInventoryClient, RawInventoryClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -76,8 +68,8 @@ def deprecated_get_adjustment(
             adjustment_id="adjustment_id",
         )
         """
-        response = self._raw_client.deprecated_get_adjustment(adjustment_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.deprecated_get_adjustment(adjustment_id, request_options=request_options)
+        return _response.data
 
     def get_adjustment(
         self, adjustment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -110,8 +102,8 @@ def get_adjustment(
             adjustment_id="adjustment_id",
         )
         """
-        response = self._raw_client.get_adjustment(adjustment_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get_adjustment(adjustment_id, request_options=request_options)
+        return _response.data
 
     def deprecated_batch_change(
         self,
@@ -178,13 +170,13 @@ def deprecated_batch_change(
             ignore_unchanged_counts=True,
         )
         """
-        response = self._raw_client.deprecated_batch_change(
+        _response = self._raw_client.deprecated_batch_change(
             idempotency_key=idempotency_key,
             changes=changes,
             ignore_unchanged_counts=ignore_unchanged_counts,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def deprecated_batch_get_changes(
         self,
@@ -265,7 +257,7 @@ def deprecated_batch_get_changes(
             updated_before="2016-12-01T00:00:00.000Z",
         )
         """
-        response = self._raw_client.deprecated_batch_get_changes(
+        _response = self._raw_client.deprecated_batch_get_changes(
             catalog_object_ids=catalog_object_ids,
             location_ids=location_ids,
             types=types,
@@ -276,7 +268,7 @@ def deprecated_batch_get_changes(
             limit=limit,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def deprecated_batch_get_counts(
         self,
@@ -343,7 +335,7 @@ def deprecated_batch_get_counts(
             updated_after="2016-11-16T00:00:00.000Z",
         )
         """
-        response = self._raw_client.deprecated_batch_get_counts(
+        _response = self._raw_client.deprecated_batch_get_counts(
             catalog_object_ids=catalog_object_ids,
             location_ids=location_ids,
             updated_after=updated_after,
@@ -352,7 +344,7 @@ def deprecated_batch_get_counts(
             limit=limit,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def batch_create_changes(
         self,
@@ -422,13 +414,13 @@ def batch_create_changes(
             ignore_unchanged_counts=True,
         )
         """
-        response = self._raw_client.batch_create_changes(
+        _response = self._raw_client.batch_create_changes(
             idempotency_key=idempotency_key,
             changes=changes,
             ignore_unchanged_counts=ignore_unchanged_counts,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def batch_get_changes(
         self,
@@ -520,50 +512,17 @@ def batch_get_changes(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/inventory/changes/batch-retrieve",
-            method="POST",
-            json={
-                "catalog_object_ids": catalog_object_ids,
-                "location_ids": location_ids,
-                "types": types,
-                "states": states,
-                "updated_after": updated_after,
-                "updated_before": updated_before,
-                "cursor": cursor,
-                "limit": limit,
-            },
+        return self._raw_client.batch_get_changes(
+            catalog_object_ids=catalog_object_ids,
+            location_ids=location_ids,
+            types=types,
+            states=states,
+            updated_after=updated_after,
+            updated_before=updated_before,
+            cursor=cursor,
+            limit=limit,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    BatchGetInventoryChangesResponse,
-                    construct_type(
-                        type_=BatchGetInventoryChangesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.batch_get_changes(
-                    catalog_object_ids=catalog_object_ids,
-                    location_ids=location_ids,
-                    types=types,
-                    states=states,
-                    updated_after=updated_after,
-                    updated_before=updated_before,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.changes
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def batch_get_counts(
         self,
@@ -644,46 +603,15 @@ def batch_get_counts(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/inventory/counts/batch-retrieve",
-            method="POST",
-            json={
-                "catalog_object_ids": catalog_object_ids,
-                "location_ids": location_ids,
-                "updated_after": updated_after,
-                "cursor": cursor,
-                "states": states,
-                "limit": limit,
-            },
+        return self._raw_client.batch_get_counts(
+            catalog_object_ids=catalog_object_ids,
+            location_ids=location_ids,
+            updated_after=updated_after,
+            cursor=cursor,
+            states=states,
+            limit=limit,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    BatchGetInventoryCountsResponse,
-                    construct_type(
-                        type_=BatchGetInventoryCountsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.batch_get_counts(
-                    catalog_object_ids=catalog_object_ids,
-                    location_ids=location_ids,
-                    updated_after=updated_after,
-                    cursor=_parsed_next,
-                    states=states,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.counts
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def deprecated_get_physical_count(
         self, physical_count_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -717,8 +645,8 @@ def deprecated_get_physical_count(
             physical_count_id="physical_count_id",
         )
         """
-        response = self._raw_client.deprecated_get_physical_count(physical_count_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.deprecated_get_physical_count(physical_count_id, request_options=request_options)
+        return _response.data
 
     def get_physical_count(
         self, physical_count_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -752,8 +680,8 @@ def get_physical_count(
             physical_count_id="physical_count_id",
         )
         """
-        response = self._raw_client.get_physical_count(physical_count_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get_physical_count(physical_count_id, request_options=request_options)
+        return _response.data
 
     def get_transfer(
         self, transfer_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -786,8 +714,8 @@ def get_transfer(
             transfer_id="transfer_id",
         )
         """
-        response = self._raw_client.get_transfer(transfer_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get_transfer(transfer_id, request_options=request_options)
+        return _response.data
 
     def get(
         self,
@@ -842,38 +770,9 @@ def get(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/inventory/{jsonable_encoder(catalog_object_id)}",
-            method="GET",
-            params={
-                "location_ids": location_ids,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return self._raw_client.get(
+            catalog_object_id, location_ids=location_ids, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    GetInventoryCountResponse,
-                    construct_type(
-                        type_=GetInventoryCountResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.get(
-                    catalog_object_id,
-                    location_ids=location_ids,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.counts
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def changes(
         self,
@@ -937,38 +836,9 @@ def changes(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/inventory/{jsonable_encoder(catalog_object_id)}/changes",
-            method="GET",
-            params={
-                "location_ids": location_ids,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return self._raw_client.changes(
+            catalog_object_id, location_ids=location_ids, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    GetInventoryChangesResponse,
-                    construct_type(
-                        type_=GetInventoryChangesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.changes(
-                    catalog_object_id,
-                    location_ids=location_ids,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.changes
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
 
 class AsyncInventoryClient:
@@ -1025,8 +895,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.deprecated_get_adjustment(adjustment_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.deprecated_get_adjustment(adjustment_id, request_options=request_options)
+        return _response.data
 
     async def get_adjustment(
         self, adjustment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1067,8 +937,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get_adjustment(adjustment_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get_adjustment(adjustment_id, request_options=request_options)
+        return _response.data
 
     async def deprecated_batch_change(
         self,
@@ -1143,13 +1013,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.deprecated_batch_change(
+        _response = await self._raw_client.deprecated_batch_change(
             idempotency_key=idempotency_key,
             changes=changes,
             ignore_unchanged_counts=ignore_unchanged_counts,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def deprecated_batch_get_changes(
         self,
@@ -1238,7 +1108,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.deprecated_batch_get_changes(
+        _response = await self._raw_client.deprecated_batch_get_changes(
             catalog_object_ids=catalog_object_ids,
             location_ids=location_ids,
             types=types,
@@ -1249,7 +1119,7 @@ async def main() -> None:
             limit=limit,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def deprecated_batch_get_counts(
         self,
@@ -1324,7 +1194,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.deprecated_batch_get_counts(
+        _response = await self._raw_client.deprecated_batch_get_counts(
             catalog_object_ids=catalog_object_ids,
             location_ids=location_ids,
             updated_after=updated_after,
@@ -1333,7 +1203,7 @@ async def main() -> None:
             limit=limit,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def batch_create_changes(
         self,
@@ -1411,13 +1281,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_create_changes(
+        _response = await self._raw_client.batch_create_changes(
             idempotency_key=idempotency_key,
             changes=changes,
             ignore_unchanged_counts=ignore_unchanged_counts,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def batch_get_changes(
         self,
@@ -1510,6 +1380,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -1517,50 +1388,17 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/inventory/changes/batch-retrieve",
-            method="POST",
-            json={
-                "catalog_object_ids": catalog_object_ids,
-                "location_ids": location_ids,
-                "types": types,
-                "states": states,
-                "updated_after": updated_after,
-                "updated_before": updated_before,
-                "cursor": cursor,
-                "limit": limit,
-            },
+        return await self._raw_client.batch_get_changes(
+            catalog_object_ids=catalog_object_ids,
+            location_ids=location_ids,
+            types=types,
+            states=states,
+            updated_after=updated_after,
+            updated_before=updated_before,
+            cursor=cursor,
+            limit=limit,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    BatchGetInventoryChangesResponse,
-                    construct_type(
-                        type_=BatchGetInventoryChangesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.batch_get_changes(
-                    catalog_object_ids=catalog_object_ids,
-                    location_ids=location_ids,
-                    types=types,
-                    states=states,
-                    updated_after=updated_after,
-                    updated_before=updated_before,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.changes
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def batch_get_counts(
         self,
@@ -1642,6 +1480,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -1649,46 +1488,15 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/inventory/counts/batch-retrieve",
-            method="POST",
-            json={
-                "catalog_object_ids": catalog_object_ids,
-                "location_ids": location_ids,
-                "updated_after": updated_after,
-                "cursor": cursor,
-                "states": states,
-                "limit": limit,
-            },
+        return await self._raw_client.batch_get_counts(
+            catalog_object_ids=catalog_object_ids,
+            location_ids=location_ids,
+            updated_after=updated_after,
+            cursor=cursor,
+            states=states,
+            limit=limit,
             request_options=request_options,
-            omit=OMIT,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    BatchGetInventoryCountsResponse,
-                    construct_type(
-                        type_=BatchGetInventoryCountsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.batch_get_counts(
-                    catalog_object_ids=catalog_object_ids,
-                    location_ids=location_ids,
-                    updated_after=updated_after,
-                    cursor=_parsed_next,
-                    states=states,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.counts
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def deprecated_get_physical_count(
         self, physical_count_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1730,10 +1538,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.deprecated_get_physical_count(
+        _response = await self._raw_client.deprecated_get_physical_count(
             physical_count_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get_physical_count(
         self, physical_count_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1775,8 +1583,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get_physical_count(physical_count_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get_physical_count(physical_count_id, request_options=request_options)
+        return _response.data
 
     async def get_transfer(
         self, transfer_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1817,8 +1625,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get_transfer(transfer_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get_transfer(transfer_id, request_options=request_options)
+        return _response.data
 
     async def get(
         self,
@@ -1874,6 +1682,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -1881,38 +1690,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/inventory/{jsonable_encoder(catalog_object_id)}",
-            method="GET",
-            params={
-                "location_ids": location_ids,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return await self._raw_client.get(
+            catalog_object_id, location_ids=location_ids, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    GetInventoryCountResponse,
-                    construct_type(
-                        type_=GetInventoryCountResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.get(
-                    catalog_object_id,
-                    location_ids=location_ids,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.counts
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def changes(
         self,
@@ -1977,6 +1757,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -1984,35 +1765,6 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/inventory/{jsonable_encoder(catalog_object_id)}/changes",
-            method="GET",
-            params={
-                "location_ids": location_ids,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return await self._raw_client.changes(
+            catalog_object_id, location_ids=location_ids, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    GetInventoryChangesResponse,
-                    construct_type(
-                        type_=GetInventoryChangesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.changes(
-                    catalog_object_id,
-                    location_ids=location_ids,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.changes
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
diff --git a/src/square/inventory/raw_client.py b/src/square/inventory/raw_client.py
index 2bf46f77..3b66f1db 100644
--- a/src/square/inventory/raw_client.py
+++ b/src/square/inventory/raw_client.py
@@ -1,25 +1,29 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.get_inventory_adjustment_response import GetInventoryAdjustmentResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.serialization import convert_and_respect_annotation_metadata
+from ..core.unchecked_base_model import construct_type
 from ..requests.inventory_change import InventoryChangeParams
 from ..types.batch_change_inventory_response import BatchChangeInventoryResponse
-from ..core.serialization import convert_and_respect_annotation_metadata
-from ..types.inventory_change_type import InventoryChangeType
-from ..types.inventory_state import InventoryState
 from ..types.batch_get_inventory_changes_response import BatchGetInventoryChangesResponse
 from ..types.batch_get_inventory_counts_response import BatchGetInventoryCountsResponse
+from ..types.get_inventory_adjustment_response import GetInventoryAdjustmentResponse
+from ..types.get_inventory_changes_response import GetInventoryChangesResponse
+from ..types.get_inventory_count_response import GetInventoryCountResponse
 from ..types.get_inventory_physical_count_response import GetInventoryPhysicalCountResponse
 from ..types.get_inventory_transfer_response import GetInventoryTransferResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.inventory_change import InventoryChange
+from ..types.inventory_change_type import InventoryChangeType
+from ..types.inventory_count import InventoryCount
+from ..types.inventory_state import InventoryState
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -66,8 +70,8 @@ def deprecated_get_adjustment(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get_adjustment(
         self, adjustment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -106,8 +110,8 @@ def get_adjustment(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def deprecated_batch_change(
         self,
@@ -160,6 +164,9 @@ def deprecated_batch_change(
                 ),
                 "ignore_unchanged_counts": ignore_unchanged_counts,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -175,8 +182,8 @@ def deprecated_batch_change(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def deprecated_batch_get_changes(
         self,
@@ -254,6 +261,9 @@ def deprecated_batch_get_changes(
                 "cursor": cursor,
                 "limit": limit,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -269,8 +279,8 @@ def deprecated_batch_get_changes(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def deprecated_batch_get_counts(
         self,
@@ -335,6 +345,9 @@ def deprecated_batch_get_counts(
                 "states": states,
                 "limit": limit,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -350,8 +363,8 @@ def deprecated_batch_get_counts(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_create_changes(
         self,
@@ -407,6 +420,9 @@ def batch_create_changes(
                 ),
                 "ignore_unchanged_counts": ignore_unchanged_counts,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -422,8 +438,234 @@ def batch_create_changes(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def batch_get_changes(
+        self,
+        *,
+        catalog_object_ids: typing.Optional[typing.Sequence[str]] = OMIT,
+        location_ids: typing.Optional[typing.Sequence[str]] = OMIT,
+        types: typing.Optional[typing.Sequence[InventoryChangeType]] = OMIT,
+        states: typing.Optional[typing.Sequence[InventoryState]] = OMIT,
+        updated_after: typing.Optional[str] = OMIT,
+        updated_before: typing.Optional[str] = OMIT,
+        cursor: typing.Optional[str] = OMIT,
+        limit: typing.Optional[int] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[InventoryChange]:
+        """
+        Returns historical physical counts and adjustments based on the
+        provided filter criteria.
+
+        Results are paginated and sorted in ascending order according their
+        `occurred_at` timestamp (oldest first).
+
+        BatchRetrieveInventoryChanges is a catch-all query endpoint for queries
+        that cannot be handled by other, simpler endpoints.
+
+        Parameters
+        ----------
+        catalog_object_ids : typing.Optional[typing.Sequence[str]]
+            The filter to return results by `CatalogObject` ID.
+            The filter is only applicable when set. The default value is null.
+
+        location_ids : typing.Optional[typing.Sequence[str]]
+            The filter to return results by `Location` ID.
+            The filter is only applicable when set. The default value is null.
+
+        types : typing.Optional[typing.Sequence[InventoryChangeType]]
+            The filter to return results by `InventoryChangeType` values other than `TRANSFER`.
+            The default value is `[PHYSICAL_COUNT, ADJUSTMENT]`.
+
+        states : typing.Optional[typing.Sequence[InventoryState]]
+            The filter to return `ADJUSTMENT` query results by
+            `InventoryState`. This filter is only applied when set.
+            The default value is null.
+
+        updated_after : typing.Optional[str]
+            The filter to return results with their `calculated_at` value
+            after the given time as specified in an RFC 3339 timestamp.
+            The default value is the UNIX epoch of (`1970-01-01T00:00:00Z`).
+
+        updated_before : typing.Optional[str]
+            The filter to return results with their `created_at` or `calculated_at` value
+            strictly before the given time as specified in an RFC 3339 timestamp.
+            The default value is the UNIX epoch of (`1970-01-01T00:00:00Z`).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for the original query.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
+
+        limit : typing.Optional[int]
+            The number of [records](entity:InventoryChange) to return.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[InventoryChange]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/inventory/changes/batch-retrieve",
+            method="POST",
+            json={
+                "catalog_object_ids": catalog_object_ids,
+                "location_ids": location_ids,
+                "types": types,
+                "states": states,
+                "updated_after": updated_after,
+                "updated_before": updated_before,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    BatchGetInventoryChangesResponse,
+                    construct_type(
+                        type_=BatchGetInventoryChangesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.changes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.batch_get_changes(
+                    catalog_object_ids=catalog_object_ids,
+                    location_ids=location_ids,
+                    types=types,
+                    states=states,
+                    updated_after=updated_after,
+                    updated_before=updated_before,
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def batch_get_counts(
+        self,
+        *,
+        catalog_object_ids: typing.Optional[typing.Sequence[str]] = OMIT,
+        location_ids: typing.Optional[typing.Sequence[str]] = OMIT,
+        updated_after: typing.Optional[str] = OMIT,
+        cursor: typing.Optional[str] = OMIT,
+        states: typing.Optional[typing.Sequence[InventoryState]] = OMIT,
+        limit: typing.Optional[int] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[InventoryCount]:
+        """
+        Returns current counts for the provided
+        [CatalogObject](entity:CatalogObject)s at the requested
+        [Location](entity:Location)s.
+
+        Results are paginated and sorted in descending order according to their
+        `calculated_at` timestamp (newest first).
+
+        When `updated_after` is specified, only counts that have changed since that
+        time (based on the server timestamp for the most recent change) are
+        returned. This allows clients to perform a "sync" operation, for example
+        in response to receiving a Webhook notification.
+
+        Parameters
+        ----------
+        catalog_object_ids : typing.Optional[typing.Sequence[str]]
+            The filter to return results by `CatalogObject` ID.
+            The filter is applicable only when set.  The default is null.
+
+        location_ids : typing.Optional[typing.Sequence[str]]
+            The filter to return results by `Location` ID.
+            This filter is applicable only when set. The default is null.
+
+        updated_after : typing.Optional[str]
+            The filter to return results with their `calculated_at` value
+            after the given time as specified in an RFC 3339 timestamp.
+            The default value is the UNIX epoch of (`1970-01-01T00:00:00Z`).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for the original query.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
+
+        states : typing.Optional[typing.Sequence[InventoryState]]
+            The filter to return results by `InventoryState`. The filter is only applicable when set.
+            Ignored are untracked states of `NONE`, `SOLD`, and `UNLINKED_RETURN`.
+            The default is null.
+
+        limit : typing.Optional[int]
+            The number of [records](entity:InventoryCount) to return.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[InventoryCount]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/inventory/counts/batch-retrieve",
+            method="POST",
+            json={
+                "catalog_object_ids": catalog_object_ids,
+                "location_ids": location_ids,
+                "updated_after": updated_after,
+                "cursor": cursor,
+                "states": states,
+                "limit": limit,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    BatchGetInventoryCountsResponse,
+                    construct_type(
+                        type_=BatchGetInventoryCountsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.counts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.batch_get_counts(
+                    catalog_object_ids=catalog_object_ids,
+                    location_ids=location_ids,
+                    updated_after=updated_after,
+                    cursor=_parsed_next,
+                    states=states,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def deprecated_get_physical_count(
         self, physical_count_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -463,8 +705,8 @@ def deprecated_get_physical_count(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get_physical_count(
         self, physical_count_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -504,8 +746,8 @@ def get_physical_count(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get_transfer(
         self, transfer_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -544,98 +786,251 @@ def get_transfer(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
-
-class AsyncRawInventoryClient:
-    def __init__(self, *, client_wrapper: AsyncClientWrapper):
-        self._client_wrapper = client_wrapper
-
-    async def deprecated_get_adjustment(
-        self, adjustment_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> AsyncHttpResponse[GetInventoryAdjustmentResponse]:
+    def get(
+        self,
+        catalog_object_id: str,
+        *,
+        location_ids: typing.Optional[str] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[InventoryCount]:
         """
-        Deprecated version of [RetrieveInventoryAdjustment](api-endpoint:Inventory-RetrieveInventoryAdjustment) after the endpoint URL
-        is updated to conform to the standard convention.
+        Retrieves the current calculated stock count for a given
+        [CatalogObject](entity:CatalogObject) at a given set of
+        [Location](entity:Location)s. Responses are paginated and unsorted.
+        For more sophisticated queries, use a batch endpoint.
 
         Parameters
         ----------
-        adjustment_id : str
-            ID of the [InventoryAdjustment](entity:InventoryAdjustment) to retrieve.
+        catalog_object_id : str
+            ID of the [CatalogObject](entity:CatalogObject) to retrieve.
+
+        location_ids : typing.Optional[str]
+            The [Location](entity:Location) IDs to look up as a comma-separated
+            list. An empty list queries all locations.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for the original query.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        AsyncHttpResponse[GetInventoryAdjustmentResponse]
+        SyncPager[InventoryCount]
             Success
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v2/inventory/adjustment/{jsonable_encoder(adjustment_id)}",
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/inventory/{jsonable_encoder(catalog_object_id)}",
             method="GET",
+            params={
+                "location_ids": location_ids,
+                "cursor": cursor,
+            },
             request_options=request_options,
         )
         try:
             if 200 <= _response.status_code < 300:
-                _data = typing.cast(
-                    GetInventoryAdjustmentResponse,
+                _parsed_response = typing.cast(
+                    GetInventoryCountResponse,
                     construct_type(
-                        type_=GetInventoryAdjustmentResponse,  # type: ignore
+                        type_=GetInventoryCountResponse,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
-                return AsyncHttpResponse(response=_response, data=_data)
+                _items = _parsed_response.counts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.get(
+                    catalog_object_id,
+                    location_ids=location_ids,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
-    async def get_adjustment(
-        self, adjustment_id: str, *, request_options: typing.Optional[RequestOptions] = None
-    ) -> AsyncHttpResponse[GetInventoryAdjustmentResponse]:
+    def changes(
+        self,
+        catalog_object_id: str,
+        *,
+        location_ids: typing.Optional[str] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[InventoryChange]:
         """
-        Returns the [InventoryAdjustment](entity:InventoryAdjustment) object
-        with the provided `adjustment_id`.
+        Returns a set of physical counts and inventory adjustments for the
+        provided [CatalogObject](entity:CatalogObject) at the requested
+        [Location](entity:Location)s.
+
+        You can achieve the same result by calling [BatchRetrieveInventoryChanges](api-endpoint:Inventory-BatchRetrieveInventoryChanges)
+        and having the `catalog_object_ids` list contain a single element of the `CatalogObject` ID.
+
+        Results are paginated and sorted in descending order according to their
+        `occurred_at` timestamp (newest first).
+
+        There are no limits on how far back the caller can page. This endpoint can be
+        used to display recent changes for a specific item. For more
+        sophisticated queries, use a batch endpoint.
 
         Parameters
         ----------
-        adjustment_id : str
-            ID of the [InventoryAdjustment](entity:InventoryAdjustment) to retrieve.
+        catalog_object_id : str
+            ID of the [CatalogObject](entity:CatalogObject) to retrieve.
+
+        location_ids : typing.Optional[str]
+            The [Location](entity:Location) IDs to look up as a comma-separated
+            list. An empty list queries all locations.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for the original query.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
 
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
         Returns
         -------
-        AsyncHttpResponse[GetInventoryAdjustmentResponse]
+        SyncPager[InventoryChange]
             Success
         """
-        _response = await self._client_wrapper.httpx_client.request(
-            f"v2/inventory/adjustments/{jsonable_encoder(adjustment_id)}",
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/inventory/{jsonable_encoder(catalog_object_id)}/changes",
             method="GET",
+            params={
+                "location_ids": location_ids,
+                "cursor": cursor,
+            },
             request_options=request_options,
         )
         try:
             if 200 <= _response.status_code < 300:
-                _data = typing.cast(
-                    GetInventoryAdjustmentResponse,
+                _parsed_response = typing.cast(
+                    GetInventoryChangesResponse,
                     construct_type(
-                        type_=GetInventoryAdjustmentResponse,  # type: ignore
+                        type_=GetInventoryChangesResponse,  # type: ignore
                         object_=_response.json(),
                     ),
                 )
-                return AsyncHttpResponse(response=_response, data=_data)
+                _items = _parsed_response.changes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.changes(
+                    catalog_object_id,
+                    location_ids=location_ids,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
-    async def deprecated_batch_change(
-        self,
-        *,
-        idempotency_key: str,
+
+class AsyncRawInventoryClient:
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
+        self._client_wrapper = client_wrapper
+
+    async def deprecated_get_adjustment(
+        self, adjustment_id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> AsyncHttpResponse[GetInventoryAdjustmentResponse]:
+        """
+        Deprecated version of [RetrieveInventoryAdjustment](api-endpoint:Inventory-RetrieveInventoryAdjustment) after the endpoint URL
+        is updated to conform to the standard convention.
+
+        Parameters
+        ----------
+        adjustment_id : str
+            ID of the [InventoryAdjustment](entity:InventoryAdjustment) to retrieve.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncHttpResponse[GetInventoryAdjustmentResponse]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/inventory/adjustment/{jsonable_encoder(adjustment_id)}",
+            method="GET",
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _data = typing.cast(
+                    GetInventoryAdjustmentResponse,
+                    construct_type(
+                        type_=GetInventoryAdjustmentResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                return AsyncHttpResponse(response=_response, data=_data)
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def get_adjustment(
+        self, adjustment_id: str, *, request_options: typing.Optional[RequestOptions] = None
+    ) -> AsyncHttpResponse[GetInventoryAdjustmentResponse]:
+        """
+        Returns the [InventoryAdjustment](entity:InventoryAdjustment) object
+        with the provided `adjustment_id`.
+
+        Parameters
+        ----------
+        adjustment_id : str
+            ID of the [InventoryAdjustment](entity:InventoryAdjustment) to retrieve.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncHttpResponse[GetInventoryAdjustmentResponse]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/inventory/adjustments/{jsonable_encoder(adjustment_id)}",
+            method="GET",
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _data = typing.cast(
+                    GetInventoryAdjustmentResponse,
+                    construct_type(
+                        type_=GetInventoryAdjustmentResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                return AsyncHttpResponse(response=_response, data=_data)
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def deprecated_batch_change(
+        self,
+        *,
+        idempotency_key: str,
         changes: typing.Optional[typing.Sequence[InventoryChangeParams]] = OMIT,
         ignore_unchanged_counts: typing.Optional[bool] = OMIT,
         request_options: typing.Optional[RequestOptions] = None,
@@ -683,6 +1078,9 @@ async def deprecated_batch_change(
                 ),
                 "ignore_unchanged_counts": ignore_unchanged_counts,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -698,8 +1096,8 @@ async def deprecated_batch_change(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def deprecated_batch_get_changes(
         self,
@@ -777,6 +1175,9 @@ async def deprecated_batch_get_changes(
                 "cursor": cursor,
                 "limit": limit,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -792,8 +1193,8 @@ async def deprecated_batch_get_changes(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def deprecated_batch_get_counts(
         self,
@@ -858,6 +1259,9 @@ async def deprecated_batch_get_counts(
                 "states": states,
                 "limit": limit,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -873,8 +1277,8 @@ async def deprecated_batch_get_counts(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_create_changes(
         self,
@@ -930,6 +1334,9 @@ async def batch_create_changes(
                 ),
                 "ignore_unchanged_counts": ignore_unchanged_counts,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -945,8 +1352,240 @@ async def batch_create_changes(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def batch_get_changes(
+        self,
+        *,
+        catalog_object_ids: typing.Optional[typing.Sequence[str]] = OMIT,
+        location_ids: typing.Optional[typing.Sequence[str]] = OMIT,
+        types: typing.Optional[typing.Sequence[InventoryChangeType]] = OMIT,
+        states: typing.Optional[typing.Sequence[InventoryState]] = OMIT,
+        updated_after: typing.Optional[str] = OMIT,
+        updated_before: typing.Optional[str] = OMIT,
+        cursor: typing.Optional[str] = OMIT,
+        limit: typing.Optional[int] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[InventoryChange]:
+        """
+        Returns historical physical counts and adjustments based on the
+        provided filter criteria.
+
+        Results are paginated and sorted in ascending order according their
+        `occurred_at` timestamp (oldest first).
+
+        BatchRetrieveInventoryChanges is a catch-all query endpoint for queries
+        that cannot be handled by other, simpler endpoints.
+
+        Parameters
+        ----------
+        catalog_object_ids : typing.Optional[typing.Sequence[str]]
+            The filter to return results by `CatalogObject` ID.
+            The filter is only applicable when set. The default value is null.
+
+        location_ids : typing.Optional[typing.Sequence[str]]
+            The filter to return results by `Location` ID.
+            The filter is only applicable when set. The default value is null.
+
+        types : typing.Optional[typing.Sequence[InventoryChangeType]]
+            The filter to return results by `InventoryChangeType` values other than `TRANSFER`.
+            The default value is `[PHYSICAL_COUNT, ADJUSTMENT]`.
+
+        states : typing.Optional[typing.Sequence[InventoryState]]
+            The filter to return `ADJUSTMENT` query results by
+            `InventoryState`. This filter is only applied when set.
+            The default value is null.
+
+        updated_after : typing.Optional[str]
+            The filter to return results with their `calculated_at` value
+            after the given time as specified in an RFC 3339 timestamp.
+            The default value is the UNIX epoch of (`1970-01-01T00:00:00Z`).
+
+        updated_before : typing.Optional[str]
+            The filter to return results with their `created_at` or `calculated_at` value
+            strictly before the given time as specified in an RFC 3339 timestamp.
+            The default value is the UNIX epoch of (`1970-01-01T00:00:00Z`).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for the original query.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
+
+        limit : typing.Optional[int]
+            The number of [records](entity:InventoryChange) to return.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[InventoryChange]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/inventory/changes/batch-retrieve",
+            method="POST",
+            json={
+                "catalog_object_ids": catalog_object_ids,
+                "location_ids": location_ids,
+                "types": types,
+                "states": states,
+                "updated_after": updated_after,
+                "updated_before": updated_before,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    BatchGetInventoryChangesResponse,
+                    construct_type(
+                        type_=BatchGetInventoryChangesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.changes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.batch_get_changes(
+                        catalog_object_ids=catalog_object_ids,
+                        location_ids=location_ids,
+                        types=types,
+                        states=states,
+                        updated_after=updated_after,
+                        updated_before=updated_before,
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def batch_get_counts(
+        self,
+        *,
+        catalog_object_ids: typing.Optional[typing.Sequence[str]] = OMIT,
+        location_ids: typing.Optional[typing.Sequence[str]] = OMIT,
+        updated_after: typing.Optional[str] = OMIT,
+        cursor: typing.Optional[str] = OMIT,
+        states: typing.Optional[typing.Sequence[InventoryState]] = OMIT,
+        limit: typing.Optional[int] = OMIT,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[InventoryCount]:
+        """
+        Returns current counts for the provided
+        [CatalogObject](entity:CatalogObject)s at the requested
+        [Location](entity:Location)s.
+
+        Results are paginated and sorted in descending order according to their
+        `calculated_at` timestamp (newest first).
+
+        When `updated_after` is specified, only counts that have changed since that
+        time (based on the server timestamp for the most recent change) are
+        returned. This allows clients to perform a "sync" operation, for example
+        in response to receiving a Webhook notification.
+
+        Parameters
+        ----------
+        catalog_object_ids : typing.Optional[typing.Sequence[str]]
+            The filter to return results by `CatalogObject` ID.
+            The filter is applicable only when set.  The default is null.
+
+        location_ids : typing.Optional[typing.Sequence[str]]
+            The filter to return results by `Location` ID.
+            This filter is applicable only when set. The default is null.
+
+        updated_after : typing.Optional[str]
+            The filter to return results with their `calculated_at` value
+            after the given time as specified in an RFC 3339 timestamp.
+            The default value is the UNIX epoch of (`1970-01-01T00:00:00Z`).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for the original query.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
+
+        states : typing.Optional[typing.Sequence[InventoryState]]
+            The filter to return results by `InventoryState`. The filter is only applicable when set.
+            Ignored are untracked states of `NONE`, `SOLD`, and `UNLINKED_RETURN`.
+            The default is null.
+
+        limit : typing.Optional[int]
+            The number of [records](entity:InventoryCount) to return.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[InventoryCount]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/inventory/counts/batch-retrieve",
+            method="POST",
+            json={
+                "catalog_object_ids": catalog_object_ids,
+                "location_ids": location_ids,
+                "updated_after": updated_after,
+                "cursor": cursor,
+                "states": states,
+                "limit": limit,
+            },
+            headers={
+                "content-type": "application/json",
+            },
+            request_options=request_options,
+            omit=OMIT,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    BatchGetInventoryCountsResponse,
+                    construct_type(
+                        type_=BatchGetInventoryCountsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.counts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.batch_get_counts(
+                        catalog_object_ids=catalog_object_ids,
+                        location_ids=location_ids,
+                        updated_after=updated_after,
+                        cursor=_parsed_next,
+                        states=states,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def deprecated_get_physical_count(
         self, physical_count_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -986,8 +1625,8 @@ async def deprecated_get_physical_count(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get_physical_count(
         self, physical_count_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1027,8 +1666,8 @@ async def get_physical_count(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get_transfer(
         self, transfer_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1067,5 +1706,164 @@ async def get_transfer(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def get(
+        self,
+        catalog_object_id: str,
+        *,
+        location_ids: typing.Optional[str] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[InventoryCount]:
+        """
+        Retrieves the current calculated stock count for a given
+        [CatalogObject](entity:CatalogObject) at a given set of
+        [Location](entity:Location)s. Responses are paginated and unsorted.
+        For more sophisticated queries, use a batch endpoint.
+
+        Parameters
+        ----------
+        catalog_object_id : str
+            ID of the [CatalogObject](entity:CatalogObject) to retrieve.
+
+        location_ids : typing.Optional[str]
+            The [Location](entity:Location) IDs to look up as a comma-separated
+            list. An empty list queries all locations.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for the original query.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[InventoryCount]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/inventory/{jsonable_encoder(catalog_object_id)}",
+            method="GET",
+            params={
+                "location_ids": location_ids,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    GetInventoryCountResponse,
+                    construct_type(
+                        type_=GetInventoryCountResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.counts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.get(
+                        catalog_object_id,
+                        location_ids=location_ids,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def changes(
+        self,
+        catalog_object_id: str,
+        *,
+        location_ids: typing.Optional[str] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[InventoryChange]:
+        """
+        Returns a set of physical counts and inventory adjustments for the
+        provided [CatalogObject](entity:CatalogObject) at the requested
+        [Location](entity:Location)s.
+
+        You can achieve the same result by calling [BatchRetrieveInventoryChanges](api-endpoint:Inventory-BatchRetrieveInventoryChanges)
+        and having the `catalog_object_ids` list contain a single element of the `CatalogObject` ID.
+
+        Results are paginated and sorted in descending order according to their
+        `occurred_at` timestamp (newest first).
+
+        There are no limits on how far back the caller can page. This endpoint can be
+        used to display recent changes for a specific item. For more
+        sophisticated queries, use a batch endpoint.
+
+        Parameters
+        ----------
+        catalog_object_id : str
+            ID of the [CatalogObject](entity:CatalogObject) to retrieve.
+
+        location_ids : typing.Optional[str]
+            The [Location](entity:Location) IDs to look up as a comma-separated
+            list. An empty list queries all locations.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for the original query.
+
+            See the [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination) guide for more information.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[InventoryChange]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/inventory/{jsonable_encoder(catalog_object_id)}/changes",
+            method="GET",
+            params={
+                "location_ids": location_ids,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    GetInventoryChangesResponse,
+                    construct_type(
+                        type_=GetInventoryChangesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.changes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.changes(
+                        catalog_object_id,
+                        location_ids=location_ids,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/invoices/__init__.py b/src/square/invoices/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/invoices/__init__.py
+++ b/src/square/invoices/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/invoices/client.py b/src/square/invoices/client.py
index 63c64a33..464ff172 100644
--- a/src/square/invoices/client.py
+++ b/src/square/invoices/client.py
@@ -1,31 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawInvoicesClient
+
+from .. import core
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.invoice import Invoice
-from ..types.list_invoices_response import ListInvoicesResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
+from ..requests.create_invoice_attachment_request_data import CreateInvoiceAttachmentRequestDataParams
 from ..requests.invoice import InvoiceParams
-from ..types.create_invoice_response import CreateInvoiceResponse
 from ..requests.invoice_query import InvoiceQueryParams
-from ..types.search_invoices_response import SearchInvoicesResponse
-from ..types.get_invoice_response import GetInvoiceResponse
-from ..types.update_invoice_response import UpdateInvoiceResponse
-from ..types.delete_invoice_response import DeleteInvoiceResponse
-from ..requests.create_invoice_attachment_request_data import CreateInvoiceAttachmentRequestDataParams
-from .. import core
+from ..types.cancel_invoice_response import CancelInvoiceResponse
 from ..types.create_invoice_attachment_response import CreateInvoiceAttachmentResponse
+from ..types.create_invoice_response import CreateInvoiceResponse
 from ..types.delete_invoice_attachment_response import DeleteInvoiceAttachmentResponse
-from ..types.cancel_invoice_response import CancelInvoiceResponse
+from ..types.delete_invoice_response import DeleteInvoiceResponse
+from ..types.get_invoice_response import GetInvoiceResponse
+from ..types.invoice import Invoice
 from ..types.publish_invoice_response import PublishInvoiceResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawInvoicesClient
-from ..core.pagination import AsyncPager
+from ..types.search_invoices_response import SearchInvoicesResponse
+from ..types.update_invoice_response import UpdateInvoiceResponse
+from .raw_client import AsyncRawInvoicesClient, RawInvoicesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -98,39 +92,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/invoices",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            location_id=location_id, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListInvoicesResponse,
-                    construct_type(
-                        type_=ListInvoicesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.invoices
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -222,10 +186,10 @@ def create(
             idempotency_key="ce3748f9-5fc1-4762-aa12-aae5e843f1f4",
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             invoice=invoice, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -285,8 +249,8 @@ def search(
             limit=100,
         )
         """
-        response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
+        return _response.data
 
     def get(self, invoice_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetInvoiceResponse:
         """
@@ -316,8 +280,8 @@ def get(self, invoice_id: str, *, request_options: typing.Optional[RequestOption
             invoice_id="invoice_id",
         )
         """
-        response = self._raw_client.get(invoice_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(invoice_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -386,14 +350,14 @@ def update(
             idempotency_key="4ee82288-0910-499e-ab4c-5d0071dad1be",
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             invoice_id,
             invoice=invoice,
             idempotency_key=idempotency_key,
             fields_to_clear=fields_to_clear,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self,
@@ -436,8 +400,8 @@ def delete(
             invoice_id="invoice_id",
         )
         """
-        response = self._raw_client.delete(invoice_id, version=version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(invoice_id, version=version, request_options=request_options)
+        return _response.data
 
     def create_invoice_attachment(
         self,
@@ -486,10 +450,10 @@ def create_invoice_attachment(
             invoice_id="invoice_id",
         )
         """
-        response = self._raw_client.create_invoice_attachment(
+        _response = self._raw_client.create_invoice_attachment(
             invoice_id, request=request, image_file=image_file, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def delete_invoice_attachment(
         self, invoice_id: str, attachment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -526,10 +490,10 @@ def delete_invoice_attachment(
             attachment_id="attachment_id",
         )
         """
-        response = self._raw_client.delete_invoice_attachment(
+        _response = self._raw_client.delete_invoice_attachment(
             invoice_id, attachment_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def cancel(
         self, invoice_id: str, *, version: int, request_options: typing.Optional[RequestOptions] = None
@@ -570,8 +534,8 @@ def cancel(
             version=0,
         )
         """
-        response = self._raw_client.cancel(invoice_id, version=version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.cancel(invoice_id, version=version, request_options=request_options)
+        return _response.data
 
     def publish(
         self,
@@ -634,10 +598,10 @@ def publish(
             idempotency_key="32da42d0-1997-41b0-826b-f09464fc2c2e",
         )
         """
-        response = self._raw_client.publish(
+        _response = self._raw_client.publish(
             invoice_id, version=version, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
 
 class AsyncInvoicesClient:
@@ -708,6 +672,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -715,39 +680,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/invoices",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            location_id=location_id, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListInvoicesResponse,
-                    construct_type(
-                        type_=ListInvoicesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.invoices
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -847,10 +782,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             invoice=invoice, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -918,10 +853,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, invoice_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -961,8 +896,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(invoice_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(invoice_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -1039,14 +974,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             invoice_id,
             invoice=invoice,
             idempotency_key=idempotency_key,
             fields_to_clear=fields_to_clear,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self,
@@ -1097,8 +1032,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(invoice_id, version=version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(invoice_id, version=version, request_options=request_options)
+        return _response.data
 
     async def create_invoice_attachment(
         self,
@@ -1155,10 +1090,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create_invoice_attachment(
+        _response = await self._raw_client.create_invoice_attachment(
             invoice_id, request=request, image_file=image_file, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def delete_invoice_attachment(
         self, invoice_id: str, attachment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1203,10 +1138,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete_invoice_attachment(
+        _response = await self._raw_client.delete_invoice_attachment(
             invoice_id, attachment_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def cancel(
         self, invoice_id: str, *, version: int, request_options: typing.Optional[RequestOptions] = None
@@ -1255,8 +1190,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.cancel(invoice_id, version=version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.cancel(invoice_id, version=version, request_options=request_options)
+        return _response.data
 
     async def publish(
         self,
@@ -1327,7 +1262,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.publish(
+        _response = await self._raw_client.publish(
             invoice_id, version=version, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/invoices/raw_client.py b/src/square/invoices/raw_client.py
index e1ad5440..c8d95bf8 100644
--- a/src/square/invoices/raw_client.py
+++ b/src/square/invoices/raw_client.py
@@ -1,30 +1,32 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import json
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.invoice import InvoiceParams
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_invoice_response import CreateInvoiceResponse
-from ..core.serialization import convert_and_respect_annotation_metadata
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
+from .. import core
 from ..core.api_error import ApiError
-from ..requests.invoice_query import InvoiceQueryParams
-from ..types.search_invoices_response import SearchInvoicesResponse
-from ..types.get_invoice_response import GetInvoiceResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
 from ..core.jsonable_encoder import jsonable_encoder
-from ..types.update_invoice_response import UpdateInvoiceResponse
-from ..types.delete_invoice_response import DeleteInvoiceResponse
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.serialization import convert_and_respect_annotation_metadata
+from ..core.unchecked_base_model import construct_type
 from ..requests.create_invoice_attachment_request_data import CreateInvoiceAttachmentRequestDataParams
-from .. import core
+from ..requests.invoice import InvoiceParams
+from ..requests.invoice_query import InvoiceQueryParams
+from ..types.cancel_invoice_response import CancelInvoiceResponse
 from ..types.create_invoice_attachment_response import CreateInvoiceAttachmentResponse
-import json
+from ..types.create_invoice_response import CreateInvoiceResponse
 from ..types.delete_invoice_attachment_response import DeleteInvoiceAttachmentResponse
-from ..types.cancel_invoice_response import CancelInvoiceResponse
+from ..types.delete_invoice_response import DeleteInvoiceResponse
+from ..types.get_invoice_response import GetInvoiceResponse
+from ..types.invoice import Invoice
+from ..types.list_invoices_response import ListInvoicesResponse
 from ..types.publish_invoice_response import PublishInvoiceResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.search_invoices_response import SearchInvoicesResponse
+from ..types.update_invoice_response import UpdateInvoiceResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -34,6 +36,78 @@ class RawInvoicesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        location_id: str,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[Invoice]:
+        """
+        Returns a list of invoices for a given location. The response
+        is paginated. If truncated, the response includes a `cursor` that you
+        use in a subsequent request to retrieve the next set of invoices.
+
+        Parameters
+        ----------
+        location_id : str
+            The ID of the location for which to list invoices.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for your original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of invoices to return (200 is the maximum `limit`).
+            If not provided, the server uses a default limit of 100 invoices.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Invoice]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/invoices",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListInvoicesResponse,
+                    construct_type(
+                        type_=ListInvoicesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.invoices
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    location_id=location_id,
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -95,8 +169,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -166,8 +240,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, invoice_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -205,8 +279,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -282,8 +356,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self,
@@ -335,8 +409,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def create_invoice_attachment(
         self,
@@ -392,6 +466,7 @@ def create_invoice_attachment(
             },
             request_options=request_options,
             omit=OMIT,
+            force_multipart=True,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -405,8 +480,8 @@ def create_invoice_attachment(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete_invoice_attachment(
         self, invoice_id: str, attachment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -448,8 +523,8 @@ def delete_invoice_attachment(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def cancel(
         self, invoice_id: str, *, version: int, request_options: typing.Optional[RequestOptions] = None
@@ -502,8 +577,8 @@ def cancel(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def publish(
         self,
@@ -578,14 +653,89 @@ def publish(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawInvoicesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        location_id: str,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[Invoice]:
+        """
+        Returns a list of invoices for a given location. The response
+        is paginated. If truncated, the response includes a `cursor` that you
+        use in a subsequent request to retrieve the next set of invoices.
+
+        Parameters
+        ----------
+        location_id : str
+            The ID of the location for which to list invoices.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for your original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of invoices to return (200 is the maximum `limit`).
+            If not provided, the server uses a default limit of 100 invoices.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Invoice]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/invoices",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListInvoicesResponse,
+                    construct_type(
+                        type_=ListInvoicesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.invoices
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        location_id=location_id,
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -647,8 +797,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -718,8 +868,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, invoice_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -757,8 +907,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -834,8 +984,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self,
@@ -887,8 +1037,8 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def create_invoice_attachment(
         self,
@@ -944,6 +1094,7 @@ async def create_invoice_attachment(
             },
             request_options=request_options,
             omit=OMIT,
+            force_multipart=True,
         )
         try:
             if 200 <= _response.status_code < 300:
@@ -957,8 +1108,8 @@ async def create_invoice_attachment(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete_invoice_attachment(
         self, invoice_id: str, attachment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1000,8 +1151,8 @@ async def delete_invoice_attachment(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def cancel(
         self, invoice_id: str, *, version: int, request_options: typing.Optional[RequestOptions] = None
@@ -1054,8 +1205,8 @@ async def cancel(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def publish(
         self,
@@ -1130,5 +1281,5 @@ async def publish(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/labor/__init__.py b/src/square/labor/__init__.py
index 35d793c5..61ccfc86 100644
--- a/src/square/labor/__init__.py
+++ b/src/square/labor/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import break_types, employee_wages, shifts, team_member_wages, workweek_configs
 
 __all__ = ["break_types", "employee_wages", "shifts", "team_member_wages", "workweek_configs"]
diff --git a/src/square/labor/break_types/__init__.py b/src/square/labor/break_types/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/labor/break_types/__init__.py
+++ b/src/square/labor/break_types/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/labor/break_types/client.py b/src/square/labor/break_types/client.py
index a890205c..a04a8cf3 100644
--- a/src/square/labor/break_types/client.py
+++ b/src/square/labor/break_types/client.py
@@ -1,23 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawBreakTypesClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.break_type import BreakType
-from ...types.list_break_types_response import ListBreakTypesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.break_type import BreakTypeParams
+from ...types.break_type import BreakType
 from ...types.create_break_type_response import CreateBreakTypeResponse
+from ...types.delete_break_type_response import DeleteBreakTypeResponse
 from ...types.get_break_type_response import GetBreakTypeResponse
 from ...types.update_break_type_response import UpdateBreakTypeResponse
-from ...types.delete_break_type_response import DeleteBreakTypeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawBreakTypesClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawBreakTypesClient, RawBreakTypesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -84,39 +78,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/labor/break-types",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            location_id=location_id, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBreakTypesResponse,
-                    construct_type(
-                        type_=ListBreakTypesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.break_types
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -174,10 +138,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             break_type=break_type, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetBreakTypeResponse:
         """
@@ -207,8 +171,8 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             id="id",
         )
         """
-        response = self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
     def update(
         self, id: str, *, break_type: BreakTypeParams, request_options: typing.Optional[RequestOptions] = None
@@ -250,8 +214,8 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(id, break_type=break_type, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update(id, break_type=break_type, request_options=request_options)
+        return _response.data
 
     def delete(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> DeleteBreakTypeResponse:
         """
@@ -283,8 +247,8 @@ def delete(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             id="id",
         )
         """
-        response = self._raw_client.delete(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(id, request_options=request_options)
+        return _response.data
 
 
 class AsyncBreakTypesClient:
@@ -349,6 +313,7 @@ async def main() -> None:
             response = await client.labor.break_types.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -356,39 +321,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/labor/break-types",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            location_id=location_id, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListBreakTypesResponse,
-                    construct_type(
-                        type_=ListBreakTypesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.break_types
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -454,10 +389,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             break_type=break_type, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetBreakTypeResponse:
         """
@@ -495,8 +430,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
     async def update(
         self, id: str, *, break_type: BreakTypeParams, request_options: typing.Optional[RequestOptions] = None
@@ -546,8 +481,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(id, break_type=break_type, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.update(id, break_type=break_type, request_options=request_options)
+        return _response.data
 
     async def delete(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -589,5 +524,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(id, request_options=request_options)
+        return _response.data
diff --git a/src/square/labor/break_types/raw_client.py b/src/square/labor/break_types/raw_client.py
index 3b437ece..3e8aa51d 100644
--- a/src/square/labor/break_types/raw_client.py
+++ b/src/square/labor/break_types/raw_client.py
@@ -1,21 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.break_type import BreakTypeParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_break_type_response import CreateBreakTypeResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.break_type import BreakTypeParams
+from ...types.break_type import BreakType
+from ...types.create_break_type_response import CreateBreakTypeResponse
+from ...types.delete_break_type_response import DeleteBreakTypeResponse
 from ...types.get_break_type_response import GetBreakTypeResponse
-from ...core.jsonable_encoder import jsonable_encoder
+from ...types.list_break_types_response import ListBreakTypesResponse
 from ...types.update_break_type_response import UpdateBreakTypeResponse
-from ...types.delete_break_type_response import DeleteBreakTypeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -25,6 +27,74 @@ class RawBreakTypesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        location_id: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[BreakType]:
+        """
+        Returns a paginated list of `BreakType` instances for a business.
+
+        Parameters
+        ----------
+        location_id : typing.Optional[str]
+            Filter the returned `BreakType` results to only those that are associated with the
+            specified location.
+
+        limit : typing.Optional[int]
+            The maximum number of `BreakType` results to return per page. The number can range between 1
+            and 200. The default is 200.
+
+        cursor : typing.Optional[str]
+            A pointer to the next page of `BreakType` results to fetch.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[BreakType]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/labor/break-types",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBreakTypesResponse,
+                    construct_type(
+                        type_=ListBreakTypesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.break_types
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    location_id=location_id,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -91,8 +161,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -130,8 +200,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self, id: str, *, break_type: BreakTypeParams, request_options: typing.Optional[RequestOptions] = None
@@ -181,8 +251,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -222,14 +292,85 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawBreakTypesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        location_id: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[BreakType]:
+        """
+        Returns a paginated list of `BreakType` instances for a business.
+
+        Parameters
+        ----------
+        location_id : typing.Optional[str]
+            Filter the returned `BreakType` results to only those that are associated with the
+            specified location.
+
+        limit : typing.Optional[int]
+            The maximum number of `BreakType` results to return per page. The number can range between 1
+            and 200. The default is 200.
+
+        cursor : typing.Optional[str]
+            A pointer to the next page of `BreakType` results to fetch.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[BreakType]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/labor/break-types",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListBreakTypesResponse,
+                    construct_type(
+                        type_=ListBreakTypesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.break_types
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        location_id=location_id,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -296,8 +437,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -335,8 +476,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self, id: str, *, break_type: BreakTypeParams, request_options: typing.Optional[RequestOptions] = None
@@ -386,8 +527,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -427,5 +568,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/labor/client.py b/src/square/labor/client.py
index e62db55c..d1e894e6 100644
--- a/src/square/labor/client.py
+++ b/src/square/labor/client.py
@@ -1,38 +1,32 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawLaborClient
-from .break_types.client import BreakTypesClient
-from .employee_wages.client import EmployeeWagesClient
-from .shifts.client import ShiftsClient
-from .team_member_wages.client import TeamMemberWagesClient
-from .workweek_configs.client import WorkweekConfigsClient
-from ..requests.scheduled_shift import ScheduledShiftParams
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.create_scheduled_shift_response import CreateScheduledShiftResponse
 from ..requests.bulk_publish_scheduled_shifts_data import BulkPublishScheduledShiftsDataParams
-from ..types.scheduled_shift_notification_audience import ScheduledShiftNotificationAudience
-from ..types.bulk_publish_scheduled_shifts_response import BulkPublishScheduledShiftsResponse
+from ..requests.scheduled_shift import ScheduledShiftParams
 from ..requests.scheduled_shift_query import ScheduledShiftQueryParams
-from ..types.search_scheduled_shifts_response import SearchScheduledShiftsResponse
-from ..types.retrieve_scheduled_shift_response import RetrieveScheduledShiftResponse
-from ..types.update_scheduled_shift_response import UpdateScheduledShiftResponse
-from ..types.publish_scheduled_shift_response import PublishScheduledShiftResponse
 from ..requests.timecard import TimecardParams
-from ..types.create_timecard_response import CreateTimecardResponse
 from ..requests.timecard_query import TimecardQueryParams
-from ..types.search_timecards_response import SearchTimecardsResponse
+from ..types.bulk_publish_scheduled_shifts_response import BulkPublishScheduledShiftsResponse
+from ..types.create_scheduled_shift_response import CreateScheduledShiftResponse
+from ..types.create_timecard_response import CreateTimecardResponse
+from ..types.delete_timecard_response import DeleteTimecardResponse
+from ..types.publish_scheduled_shift_response import PublishScheduledShiftResponse
+from ..types.retrieve_scheduled_shift_response import RetrieveScheduledShiftResponse
 from ..types.retrieve_timecard_response import RetrieveTimecardResponse
+from ..types.scheduled_shift_notification_audience import ScheduledShiftNotificationAudience
+from ..types.search_scheduled_shifts_response import SearchScheduledShiftsResponse
+from ..types.search_timecards_response import SearchTimecardsResponse
+from ..types.update_scheduled_shift_response import UpdateScheduledShiftResponse
 from ..types.update_timecard_response import UpdateTimecardResponse
-from ..types.delete_timecard_response import DeleteTimecardResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawLaborClient
-from .break_types.client import AsyncBreakTypesClient
-from .employee_wages.client import AsyncEmployeeWagesClient
-from .shifts.client import AsyncShiftsClient
-from .team_member_wages.client import AsyncTeamMemberWagesClient
-from .workweek_configs.client import AsyncWorkweekConfigsClient
+from .break_types.client import AsyncBreakTypesClient, BreakTypesClient
+from .employee_wages.client import AsyncEmployeeWagesClient, EmployeeWagesClient
+from .raw_client import AsyncRawLaborClient, RawLaborClient
+from .shifts.client import AsyncShiftsClient, ShiftsClient
+from .team_member_wages.client import AsyncTeamMemberWagesClient, TeamMemberWagesClient
+from .workweek_configs.client import AsyncWorkweekConfigsClient, WorkweekConfigsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -125,10 +119,10 @@ def create_scheduled_shift(
             },
         )
         """
-        response = self._raw_client.create_scheduled_shift(
+        _response = self._raw_client.create_scheduled_shift(
             scheduled_shift=scheduled_shift, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def bulk_publish_scheduled_shifts(
         self,
@@ -180,12 +174,12 @@ def bulk_publish_scheduled_shifts(
             scheduled_shift_notification_audience="AFFECTED",
         )
         """
-        response = self._raw_client.bulk_publish_scheduled_shifts(
+        _response = self._raw_client.bulk_publish_scheduled_shifts(
             scheduled_shifts=scheduled_shifts,
             scheduled_shift_notification_audience=scheduled_shift_notification_audience,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def search_scheduled_shifts(
         self,
@@ -236,10 +230,10 @@ def search_scheduled_shifts(
             cursor="xoxp-1234-5678-90123",
         )
         """
-        response = self._raw_client.search_scheduled_shifts(
+        _response = self._raw_client.search_scheduled_shifts(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def retrieve_scheduled_shift(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -271,8 +265,8 @@ def retrieve_scheduled_shift(
             id="id",
         )
         """
-        response = self._raw_client.retrieve_scheduled_shift(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.retrieve_scheduled_shift(id, request_options=request_options)
+        return _response.data
 
     def update_scheduled_shift(
         self, id: str, *, scheduled_shift: ScheduledShiftParams, request_options: typing.Optional[RequestOptions] = None
@@ -340,10 +334,10 @@ def update_scheduled_shift(
             },
         )
         """
-        response = self._raw_client.update_scheduled_shift(
+        _response = self._raw_client.update_scheduled_shift(
             id, scheduled_shift=scheduled_shift, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def publish_scheduled_shift(
         self,
@@ -400,14 +394,14 @@ def publish_scheduled_shift(
             scheduled_shift_notification_audience="ALL",
         )
         """
-        response = self._raw_client.publish_scheduled_shift(
+        _response = self._raw_client.publish_scheduled_shift(
             id,
             idempotency_key=idempotency_key,
             version=version,
             scheduled_shift_notification_audience=scheduled_shift_notification_audience,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def create_timecard(
         self,
@@ -485,10 +479,10 @@ def create_timecard(
             },
         )
         """
-        response = self._raw_client.create_timecard(
+        _response = self._raw_client.create_timecard(
             timecard=timecard, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search_timecards(
         self,
@@ -556,10 +550,10 @@ def search_timecards(
             limit=100,
         )
         """
-        response = self._raw_client.search_timecards(
+        _response = self._raw_client.search_timecards(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def retrieve_timecard(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -591,8 +585,8 @@ def retrieve_timecard(
             id="id",
         )
         """
-        response = self._raw_client.retrieve_timecard(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.retrieve_timecard(id, request_options=request_options)
+        return _response.data
 
     def update_timecard(
         self, id: str, *, timecard: TimecardParams, request_options: typing.Optional[RequestOptions] = None
@@ -658,8 +652,8 @@ def update_timecard(
             },
         )
         """
-        response = self._raw_client.update_timecard(id, timecard=timecard, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update_timecard(id, timecard=timecard, request_options=request_options)
+        return _response.data
 
     def delete_timecard(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -691,8 +685,8 @@ def delete_timecard(
             id="id",
         )
         """
-        response = self._raw_client.delete_timecard(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete_timecard(id, request_options=request_options)
+        return _response.data
 
 
 class AsyncLaborClient:
@@ -790,10 +784,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create_scheduled_shift(
+        _response = await self._raw_client.create_scheduled_shift(
             scheduled_shift=scheduled_shift, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def bulk_publish_scheduled_shifts(
         self,
@@ -853,12 +847,12 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.bulk_publish_scheduled_shifts(
+        _response = await self._raw_client.bulk_publish_scheduled_shifts(
             scheduled_shifts=scheduled_shifts,
             scheduled_shift_notification_audience=scheduled_shift_notification_audience,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def search_scheduled_shifts(
         self,
@@ -917,10 +911,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search_scheduled_shifts(
+        _response = await self._raw_client.search_scheduled_shifts(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def retrieve_scheduled_shift(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -960,8 +954,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.retrieve_scheduled_shift(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.retrieve_scheduled_shift(id, request_options=request_options)
+        return _response.data
 
     async def update_scheduled_shift(
         self, id: str, *, scheduled_shift: ScheduledShiftParams, request_options: typing.Optional[RequestOptions] = None
@@ -1037,10 +1031,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update_scheduled_shift(
+        _response = await self._raw_client.update_scheduled_shift(
             id, scheduled_shift=scheduled_shift, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def publish_scheduled_shift(
         self,
@@ -1105,14 +1099,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.publish_scheduled_shift(
+        _response = await self._raw_client.publish_scheduled_shift(
             id,
             idempotency_key=idempotency_key,
             version=version,
             scheduled_shift_notification_audience=scheduled_shift_notification_audience,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def create_timecard(
         self,
@@ -1198,10 +1192,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create_timecard(
+        _response = await self._raw_client.create_timecard(
             timecard=timecard, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search_timecards(
         self,
@@ -1277,10 +1271,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search_timecards(
+        _response = await self._raw_client.search_timecards(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def retrieve_timecard(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1320,8 +1314,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.retrieve_timecard(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.retrieve_timecard(id, request_options=request_options)
+        return _response.data
 
     async def update_timecard(
         self, id: str, *, timecard: TimecardParams, request_options: typing.Optional[RequestOptions] = None
@@ -1395,8 +1389,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update_timecard(id, timecard=timecard, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.update_timecard(id, timecard=timecard, request_options=request_options)
+        return _response.data
 
     async def delete_timecard(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1436,5 +1430,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete_timecard(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete_timecard(id, request_options=request_options)
+        return _response.data
diff --git a/src/square/labor/employee_wages/__init__.py b/src/square/labor/employee_wages/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/labor/employee_wages/__init__.py
+++ b/src/square/labor/employee_wages/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/labor/employee_wages/client.py b/src/square/labor/employee_wages/client.py
index 31147294..861fd738 100644
--- a/src/square/labor/employee_wages/client.py
+++ b/src/square/labor/employee_wages/client.py
@@ -1,19 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawEmployeeWagesClient
 import typing
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
 from ...types.employee_wage import EmployeeWage
-from ...types.list_employee_wages_response import ListEmployeeWagesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...types.get_employee_wage_response import GetEmployeeWageResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawEmployeeWagesClient
-from ...core.pagination import AsyncPager
+from .raw_client import AsyncRawEmployeeWagesClient, RawEmployeeWagesClient
 
 
 class EmployeeWagesClient:
@@ -76,39 +70,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/labor/employee-wages",
-            method="GET",
-            params={
-                "employee_id": employee_id,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            employee_id=employee_id, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListEmployeeWagesResponse,
-                    construct_type(
-                        type_=ListEmployeeWagesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    employee_id=employee_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.employee_wages
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetEmployeeWageResponse:
         """
@@ -138,8 +102,8 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             id="id",
         )
         """
-        response = self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
 
 class AsyncEmployeeWagesClient:
@@ -203,6 +167,7 @@ async def main() -> None:
             response = await client.labor.employee_wages.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -210,39 +175,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/labor/employee-wages",
-            method="GET",
-            params={
-                "employee_id": employee_id,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            employee_id=employee_id, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListEmployeeWagesResponse,
-                    construct_type(
-                        type_=ListEmployeeWagesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    employee_id=employee_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.employee_wages
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetEmployeeWageResponse:
         """
@@ -280,5 +215,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(id, request_options=request_options)
+        return _response.data
diff --git a/src/square/labor/employee_wages/raw_client.py b/src/square/labor/employee_wages/raw_client.py
index 94227b7a..3292919f 100644
--- a/src/square/labor/employee_wages/raw_client.py
+++ b/src/square/labor/employee_wages/raw_client.py
@@ -1,22 +1,91 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
 import typing
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.get_employee_wage_response import GetEmployeeWageResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.unchecked_base_model import construct_type
+from ...types.employee_wage import EmployeeWage
+from ...types.get_employee_wage_response import GetEmployeeWageResponse
+from ...types.list_employee_wages_response import ListEmployeeWagesResponse
 
 
 class RawEmployeeWagesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        employee_id: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[EmployeeWage]:
+        """
+        Returns a paginated list of `EmployeeWage` instances for a business.
+
+        Parameters
+        ----------
+        employee_id : typing.Optional[str]
+            Filter the returned wages to only those that are associated with the specified employee.
+
+        limit : typing.Optional[int]
+            The maximum number of `EmployeeWage` results to return per page. The number can range between
+            1 and 200. The default is 200.
+
+        cursor : typing.Optional[str]
+            A pointer to the next page of `EmployeeWage` results to fetch.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[EmployeeWage]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/labor/employee-wages",
+            method="GET",
+            params={
+                "employee_id": employee_id,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListEmployeeWagesResponse,
+                    construct_type(
+                        type_=ListEmployeeWagesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.employee_wages
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    employee_id=employee_id,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetEmployeeWageResponse]:
@@ -53,14 +122,84 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawEmployeeWagesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        employee_id: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[EmployeeWage]:
+        """
+        Returns a paginated list of `EmployeeWage` instances for a business.
+
+        Parameters
+        ----------
+        employee_id : typing.Optional[str]
+            Filter the returned wages to only those that are associated with the specified employee.
+
+        limit : typing.Optional[int]
+            The maximum number of `EmployeeWage` results to return per page. The number can range between
+            1 and 200. The default is 200.
+
+        cursor : typing.Optional[str]
+            A pointer to the next page of `EmployeeWage` results to fetch.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[EmployeeWage]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/labor/employee-wages",
+            method="GET",
+            params={
+                "employee_id": employee_id,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListEmployeeWagesResponse,
+                    construct_type(
+                        type_=ListEmployeeWagesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.employee_wages
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        employee_id=employee_id,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetEmployeeWageResponse]:
@@ -97,5 +236,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/labor/raw_client.py b/src/square/labor/raw_client.py
index a6fcd97a..e2013f4d 100644
--- a/src/square/labor/raw_client.py
+++ b/src/square/labor/raw_client.py
@@ -1,33 +1,32 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.scheduled_shift import ScheduledShiftParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_scheduled_shift_response import CreateScheduledShiftResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..requests.bulk_publish_scheduled_shifts_data import BulkPublishScheduledShiftsDataParams
-from ..types.scheduled_shift_notification_audience import ScheduledShiftNotificationAudience
-from ..types.bulk_publish_scheduled_shifts_response import BulkPublishScheduledShiftsResponse
+from ..requests.scheduled_shift import ScheduledShiftParams
 from ..requests.scheduled_shift_query import ScheduledShiftQueryParams
-from ..types.search_scheduled_shifts_response import SearchScheduledShiftsResponse
-from ..types.retrieve_scheduled_shift_response import RetrieveScheduledShiftResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..types.update_scheduled_shift_response import UpdateScheduledShiftResponse
-from ..types.publish_scheduled_shift_response import PublishScheduledShiftResponse
 from ..requests.timecard import TimecardParams
-from ..types.create_timecard_response import CreateTimecardResponse
 from ..requests.timecard_query import TimecardQueryParams
-from ..types.search_timecards_response import SearchTimecardsResponse
+from ..types.bulk_publish_scheduled_shifts_response import BulkPublishScheduledShiftsResponse
+from ..types.create_scheduled_shift_response import CreateScheduledShiftResponse
+from ..types.create_timecard_response import CreateTimecardResponse
+from ..types.delete_timecard_response import DeleteTimecardResponse
+from ..types.publish_scheduled_shift_response import PublishScheduledShiftResponse
+from ..types.retrieve_scheduled_shift_response import RetrieveScheduledShiftResponse
 from ..types.retrieve_timecard_response import RetrieveTimecardResponse
+from ..types.scheduled_shift_notification_audience import ScheduledShiftNotificationAudience
+from ..types.search_scheduled_shifts_response import SearchScheduledShiftsResponse
+from ..types.search_timecards_response import SearchTimecardsResponse
+from ..types.update_scheduled_shift_response import UpdateScheduledShiftResponse
 from ..types.update_timecard_response import UpdateTimecardResponse
-from ..types.delete_timecard_response import DeleteTimecardResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -105,8 +104,8 @@ def create_scheduled_shift(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def bulk_publish_scheduled_shifts(
         self,
@@ -175,8 +174,8 @@ def bulk_publish_scheduled_shifts(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search_scheduled_shifts(
         self,
@@ -239,8 +238,8 @@ def search_scheduled_shifts(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def retrieve_scheduled_shift(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -278,8 +277,8 @@ def retrieve_scheduled_shift(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update_scheduled_shift(
         self, id: str, *, scheduled_shift: ScheduledShiftParams, request_options: typing.Optional[RequestOptions] = None
@@ -350,8 +349,8 @@ def update_scheduled_shift(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def publish_scheduled_shift(
         self,
@@ -420,8 +419,8 @@ def publish_scheduled_shift(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def create_timecard(
         self,
@@ -493,8 +492,8 @@ def create_timecard(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search_timecards(
         self,
@@ -567,8 +566,8 @@ def search_timecards(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def retrieve_timecard(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -606,8 +605,8 @@ def retrieve_timecard(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update_timecard(
         self, id: str, *, timecard: TimecardParams, request_options: typing.Optional[RequestOptions] = None
@@ -663,8 +662,8 @@ def update_timecard(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete_timecard(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -702,8 +701,8 @@ def delete_timecard(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawLaborClient:
@@ -778,8 +777,8 @@ async def create_scheduled_shift(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def bulk_publish_scheduled_shifts(
         self,
@@ -848,8 +847,8 @@ async def bulk_publish_scheduled_shifts(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search_scheduled_shifts(
         self,
@@ -912,8 +911,8 @@ async def search_scheduled_shifts(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def retrieve_scheduled_shift(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -951,8 +950,8 @@ async def retrieve_scheduled_shift(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update_scheduled_shift(
         self, id: str, *, scheduled_shift: ScheduledShiftParams, request_options: typing.Optional[RequestOptions] = None
@@ -1023,8 +1022,8 @@ async def update_scheduled_shift(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def publish_scheduled_shift(
         self,
@@ -1093,8 +1092,8 @@ async def publish_scheduled_shift(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def create_timecard(
         self,
@@ -1166,8 +1165,8 @@ async def create_timecard(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search_timecards(
         self,
@@ -1240,8 +1239,8 @@ async def search_timecards(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def retrieve_timecard(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1279,8 +1278,8 @@ async def retrieve_timecard(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update_timecard(
         self, id: str, *, timecard: TimecardParams, request_options: typing.Optional[RequestOptions] = None
@@ -1336,8 +1335,8 @@ async def update_timecard(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete_timecard(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1375,5 +1374,5 @@ async def delete_timecard(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/labor/shifts/__init__.py b/src/square/labor/shifts/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/labor/shifts/__init__.py
+++ b/src/square/labor/shifts/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/labor/shifts/client.py b/src/square/labor/shifts/client.py
index 23fd1d53..6ad4f935 100644
--- a/src/square/labor/shifts/client.py
+++ b/src/square/labor/shifts/client.py
@@ -1,18 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawShiftsClient
-from ...requests.shift import ShiftParams
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.create_shift_response import CreateShiftResponse
+from ...requests.shift import ShiftParams
 from ...requests.shift_query import ShiftQueryParams
-from ...types.search_shifts_response import SearchShiftsResponse
+from ...types.create_shift_response import CreateShiftResponse
+from ...types.delete_shift_response import DeleteShiftResponse
 from ...types.get_shift_response import GetShiftResponse
+from ...types.search_shifts_response import SearchShiftsResponse
 from ...types.update_shift_response import UpdateShiftResponse
-from ...types.delete_shift_response import DeleteShiftResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawShiftsClient
+from .raw_client import AsyncRawShiftsClient, RawShiftsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -109,10 +108,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             shift=shift, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -180,8 +179,8 @@ def search(
             limit=100,
         )
         """
-        response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
+        return _response.data
 
     def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetShiftResponse:
         """
@@ -211,8 +210,8 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             id="id",
         )
         """
-        response = self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
     def update(
         self, id: str, *, shift: ShiftParams, request_options: typing.Optional[RequestOptions] = None
@@ -277,8 +276,8 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(id, shift=shift, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update(id, shift=shift, request_options=request_options)
+        return _response.data
 
     def delete(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> DeleteShiftResponse:
         """
@@ -308,8 +307,8 @@ def delete(self, id: str, *, request_options: typing.Optional[RequestOptions] =
             id="id",
         )
         """
-        response = self._raw_client.delete(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(id, request_options=request_options)
+        return _response.data
 
 
 class AsyncShiftsClient:
@@ -411,10 +410,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             shift=shift, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -490,10 +489,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetShiftResponse:
         """
@@ -531,8 +530,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
     async def update(
         self, id: str, *, shift: ShiftParams, request_options: typing.Optional[RequestOptions] = None
@@ -605,8 +604,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(id, shift=shift, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.update(id, shift=shift, request_options=request_options)
+        return _response.data
 
     async def delete(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> DeleteShiftResponse:
         """
@@ -644,5 +643,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(id, request_options=request_options)
+        return _response.data
diff --git a/src/square/labor/shifts/raw_client.py b/src/square/labor/shifts/raw_client.py
index fff56967..bad5dc91 100644
--- a/src/square/labor/shifts/raw_client.py
+++ b/src/square/labor/shifts/raw_client.py
@@ -1,23 +1,22 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.shift import ShiftParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_shift_response import CreateShiftResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.shift import ShiftParams
 from ...requests.shift_query import ShiftQueryParams
-from ...types.search_shifts_response import SearchShiftsResponse
+from ...types.create_shift_response import CreateShiftResponse
+from ...types.delete_shift_response import DeleteShiftResponse
 from ...types.get_shift_response import GetShiftResponse
-from ...core.jsonable_encoder import jsonable_encoder
+from ...types.search_shifts_response import SearchShiftsResponse
 from ...types.update_shift_response import UpdateShiftResponse
-from ...types.delete_shift_response import DeleteShiftResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -97,8 +96,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -171,8 +170,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -210,8 +209,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self, id: str, *, shift: ShiftParams, request_options: typing.Optional[RequestOptions] = None
@@ -267,8 +266,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -306,8 +305,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawShiftsClient:
@@ -384,8 +383,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -458,8 +457,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -497,8 +496,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self, id: str, *, shift: ShiftParams, request_options: typing.Optional[RequestOptions] = None
@@ -554,8 +553,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -593,5 +592,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/labor/team_member_wages/__init__.py b/src/square/labor/team_member_wages/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/labor/team_member_wages/__init__.py
+++ b/src/square/labor/team_member_wages/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/labor/team_member_wages/client.py b/src/square/labor/team_member_wages/client.py
index ac8334fc..3273add2 100644
--- a/src/square/labor/team_member_wages/client.py
+++ b/src/square/labor/team_member_wages/client.py
@@ -1,19 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawTeamMemberWagesClient
 import typing
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.team_member_wage import TeamMemberWage
-from ...types.list_team_member_wages_response import ListTeamMemberWagesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...types.get_team_member_wage_response import GetTeamMemberWageResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawTeamMemberWagesClient
-from ...core.pagination import AsyncPager
+from ...types.team_member_wage import TeamMemberWage
+from .raw_client import AsyncRawTeamMemberWagesClient, RawTeamMemberWagesClient
 
 
 class TeamMemberWagesClient:
@@ -77,39 +71,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/labor/team-member-wages",
-            method="GET",
-            params={
-                "team_member_id": team_member_id,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            team_member_id=team_member_id, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListTeamMemberWagesResponse,
-                    construct_type(
-                        type_=ListTeamMemberWagesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    team_member_id=team_member_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.team_member_wages
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetTeamMemberWageResponse:
         """
@@ -139,8 +103,8 @@ def get(self, id: str, *, request_options: typing.Optional[RequestOptions] = Non
             id="id",
         )
         """
-        response = self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(id, request_options=request_options)
+        return _response.data
 
 
 class AsyncTeamMemberWagesClient:
@@ -205,6 +169,7 @@ async def main() -> None:
             response = await client.labor.team_member_wages.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -212,39 +177,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/labor/team-member-wages",
-            method="GET",
-            params={
-                "team_member_id": team_member_id,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            team_member_id=team_member_id, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListTeamMemberWagesResponse,
-                    construct_type(
-                        type_=ListTeamMemberWagesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    team_member_id=team_member_id,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.team_member_wages
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -284,5 +219,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(id, request_options=request_options)
+        return _response.data
diff --git a/src/square/labor/team_member_wages/raw_client.py b/src/square/labor/team_member_wages/raw_client.py
index 87400051..f4143b31 100644
--- a/src/square/labor/team_member_wages/raw_client.py
+++ b/src/square/labor/team_member_wages/raw_client.py
@@ -1,22 +1,92 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
 import typing
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.get_team_member_wage_response import GetTeamMemberWageResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
+from ...core.unchecked_base_model import construct_type
+from ...types.get_team_member_wage_response import GetTeamMemberWageResponse
+from ...types.list_team_member_wages_response import ListTeamMemberWagesResponse
+from ...types.team_member_wage import TeamMemberWage
 
 
 class RawTeamMemberWagesClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        team_member_id: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[TeamMemberWage]:
+        """
+        Returns a paginated list of `TeamMemberWage` instances for a business.
+
+        Parameters
+        ----------
+        team_member_id : typing.Optional[str]
+            Filter the returned wages to only those that are associated with the
+            specified team member.
+
+        limit : typing.Optional[int]
+            The maximum number of `TeamMemberWage` results to return per page. The number can range between
+            1 and 200. The default is 200.
+
+        cursor : typing.Optional[str]
+            A pointer to the next page of `EmployeeWage` results to fetch.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[TeamMemberWage]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/labor/team-member-wages",
+            method="GET",
+            params={
+                "team_member_id": team_member_id,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListTeamMemberWagesResponse,
+                    construct_type(
+                        type_=ListTeamMemberWagesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.team_member_wages
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    team_member_id=team_member_id,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetTeamMemberWageResponse]:
@@ -53,14 +123,85 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawTeamMemberWagesClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        team_member_id: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[TeamMemberWage]:
+        """
+        Returns a paginated list of `TeamMemberWage` instances for a business.
+
+        Parameters
+        ----------
+        team_member_id : typing.Optional[str]
+            Filter the returned wages to only those that are associated with the
+            specified team member.
+
+        limit : typing.Optional[int]
+            The maximum number of `TeamMemberWage` results to return per page. The number can range between
+            1 and 200. The default is 200.
+
+        cursor : typing.Optional[str]
+            A pointer to the next page of `EmployeeWage` results to fetch.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[TeamMemberWage]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/labor/team-member-wages",
+            method="GET",
+            params={
+                "team_member_id": team_member_id,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListTeamMemberWagesResponse,
+                    construct_type(
+                        type_=ListTeamMemberWagesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.team_member_wages
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        team_member_id=team_member_id,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetTeamMemberWageResponse]:
@@ -97,5 +238,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/labor/workweek_configs/__init__.py b/src/square/labor/workweek_configs/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/labor/workweek_configs/__init__.py
+++ b/src/square/labor/workweek_configs/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/labor/workweek_configs/client.py b/src/square/labor/workweek_configs/client.py
index 31f50647..98e35abe 100644
--- a/src/square/labor/workweek_configs/client.py
+++ b/src/square/labor/workweek_configs/client.py
@@ -1,20 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawWorkweekConfigsClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.workweek_config import WorkweekConfig
-from ...types.list_workweek_configs_response import ListWorkweekConfigsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.workweek_config import WorkweekConfigParams
 from ...types.update_workweek_config_response import UpdateWorkweekConfigResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawWorkweekConfigsClient
-from ...core.pagination import AsyncPager
+from ...types.workweek_config import WorkweekConfig
+from .raw_client import AsyncRawWorkweekConfigsClient, RawWorkweekConfigsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -75,37 +69,7 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/labor/workweek-configs",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListWorkweekConfigsResponse,
-                    construct_type(
-                        type_=ListWorkweekConfigsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.workweek_configs
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return self._raw_client.list(limit=limit, cursor=cursor, request_options=request_options)
 
     def get(
         self, id: str, *, workweek_config: WorkweekConfigParams, request_options: typing.Optional[RequestOptions] = None
@@ -145,8 +109,8 @@ def get(
             },
         )
         """
-        response = self._raw_client.get(id, workweek_config=workweek_config, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(id, workweek_config=workweek_config, request_options=request_options)
+        return _response.data
 
 
 class AsyncWorkweekConfigsClient:
@@ -205,6 +169,7 @@ async def main() -> None:
             response = await client.labor.workweek_configs.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -212,37 +177,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/labor/workweek-configs",
-            method="GET",
-            params={
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListWorkweekConfigsResponse,
-                    construct_type(
-                        type_=ListWorkweekConfigsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.workweek_configs
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return await self._raw_client.list(limit=limit, cursor=cursor, request_options=request_options)
 
     async def get(
         self, id: str, *, workweek_config: WorkweekConfigParams, request_options: typing.Optional[RequestOptions] = None
@@ -290,5 +225,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(id, workweek_config=workweek_config, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(id, workweek_config=workweek_config, request_options=request_options)
+        return _response.data
diff --git a/src/square/labor/workweek_configs/raw_client.py b/src/square/labor/workweek_configs/raw_client.py
index 2930b711..5c3fa0c2 100644
--- a/src/square/labor/workweek_configs/raw_client.py
+++ b/src/square/labor/workweek_configs/raw_client.py
@@ -1,18 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.workweek_config import WorkweekConfigParams
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.update_workweek_config_response import UpdateWorkweekConfigResponse
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
 from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ...core.request_options import RequestOptions
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...requests.workweek_config import WorkweekConfigParams
+from ...types.list_workweek_configs_response import ListWorkweekConfigsResponse
+from ...types.update_workweek_config_response import UpdateWorkweekConfigResponse
+from ...types.workweek_config import WorkweekConfig
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -22,6 +24,66 @@ class RawWorkweekConfigsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[WorkweekConfig]:
+        """
+        Returns a list of `WorkweekConfig` instances for a business.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of `WorkweekConfigs` results to return per page.
+
+        cursor : typing.Optional[str]
+            A pointer to the next page of `WorkweekConfig` results to fetch.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[WorkweekConfig]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/labor/workweek-configs",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListWorkweekConfigsResponse,
+                    construct_type(
+                        type_=ListWorkweekConfigsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.workweek_configs
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, id: str, *, workweek_config: WorkweekConfigParams, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[UpdateWorkweekConfigResponse]:
@@ -70,14 +132,77 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawWorkweekConfigsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[WorkweekConfig]:
+        """
+        Returns a list of `WorkweekConfig` instances for a business.
+
+        Parameters
+        ----------
+        limit : typing.Optional[int]
+            The maximum number of `WorkweekConfigs` results to return per page.
+
+        cursor : typing.Optional[str]
+            A pointer to the next page of `WorkweekConfig` results to fetch.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[WorkweekConfig]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/labor/workweek-configs",
+            method="GET",
+            params={
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListWorkweekConfigsResponse,
+                    construct_type(
+                        type_=ListWorkweekConfigsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.workweek_configs
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, id: str, *, workweek_config: WorkweekConfigParams, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[UpdateWorkweekConfigResponse]:
@@ -126,5 +251,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/locations/__init__.py b/src/square/locations/__init__.py
index d38cb42e..a012fed8 100644
--- a/src/square/locations/__init__.py
+++ b/src/square/locations/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import custom_attribute_definitions, custom_attributes, transactions
 
 __all__ = ["custom_attribute_definitions", "custom_attributes", "transactions"]
diff --git a/src/square/locations/client.py b/src/square/locations/client.py
index ad76a36b..3833ca97 100644
--- a/src/square/locations/client.py
+++ b/src/square/locations/client.py
@@ -1,26 +1,22 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawLocationsClient
-from .custom_attribute_definitions.client import CustomAttributeDefinitionsClient
-from .custom_attributes.client import CustomAttributesClient
-from .transactions.client import TransactionsClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.list_locations_response import ListLocationsResponse
+from ..requests.address import AddressParams
+from ..requests.charge_request_additional_recipient import ChargeRequestAdditionalRecipientParams
+from ..requests.create_order_request import CreateOrderRequestParams
 from ..requests.location import LocationParams
+from ..types.create_checkout_response import CreateCheckoutResponse
 from ..types.create_location_response import CreateLocationResponse
 from ..types.get_location_response import GetLocationResponse
+from ..types.list_locations_response import ListLocationsResponse
 from ..types.update_location_response import UpdateLocationResponse
-from ..requests.create_order_request import CreateOrderRequestParams
-from ..requests.address import AddressParams
-from ..requests.charge_request_additional_recipient import ChargeRequestAdditionalRecipientParams
-from ..types.create_checkout_response import CreateCheckoutResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawLocationsClient
-from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient
-from .custom_attributes.client import AsyncCustomAttributesClient
-from .transactions.client import AsyncTransactionsClient
+from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient, CustomAttributeDefinitionsClient
+from .custom_attributes.client import AsyncCustomAttributesClient, CustomAttributesClient
+from .raw_client import AsyncRawLocationsClient, RawLocationsClient
+from .transactions.client import AsyncTransactionsClient, TransactionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -70,8 +66,8 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Li
         )
         client.locations.list()
         """
-        response = self._raw_client.list(request_options=request_options)
-        return response.data
+        _response = self._raw_client.list(request_options=request_options)
+        return _response.data
 
     def create(
         self,
@@ -123,8 +119,8 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(location=location, request_options=request_options)
-        return response.data
+        _response = self._raw_client.create(location=location, request_options=request_options)
+        return _response.data
 
     def get(self, location_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetLocationResponse:
         """
@@ -156,8 +152,8 @@ def get(self, location_id: str, *, request_options: typing.Optional[RequestOptio
             location_id="location_id",
         )
         """
-        response = self._raw_client.get(location_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(location_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -218,8 +214,8 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(location_id, location=location, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update(location_id, location=location, request_options=request_options)
+        return _response.data
 
     def checkouts(
         self,
@@ -413,7 +409,7 @@ def checkouts(
             ],
         )
         """
-        response = self._raw_client.checkouts(
+        _response = self._raw_client.checkouts(
             location_id,
             idempotency_key=idempotency_key,
             order=order,
@@ -426,7 +422,7 @@ def checkouts(
             note=note,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
 
 class AsyncLocationsClient:
@@ -481,8 +477,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.list(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.list(request_options=request_options)
+        return _response.data
 
     async def create(
         self,
@@ -542,8 +538,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(location=location, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.create(location=location, request_options=request_options)
+        return _response.data
 
     async def get(
         self, location_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -585,8 +581,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(location_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(location_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -655,8 +651,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(location_id, location=location, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.update(location_id, location=location, request_options=request_options)
+        return _response.data
 
     async def checkouts(
         self,
@@ -860,7 +856,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.checkouts(
+        _response = await self._raw_client.checkouts(
             location_id,
             idempotency_key=idempotency_key,
             order=order,
@@ -873,4 +869,4 @@ async def main() -> None:
             note=note,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
diff --git a/src/square/locations/custom_attribute_definitions/__init__.py b/src/square/locations/custom_attribute_definitions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/locations/custom_attribute_definitions/__init__.py
+++ b/src/square/locations/custom_attribute_definitions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/locations/custom_attribute_definitions/client.py b/src/square/locations/custom_attribute_definitions/client.py
index cba80946..bf13c626 100644
--- a/src/square/locations/custom_attribute_definitions/client.py
+++ b/src/square/locations/custom_attribute_definitions/client.py
@@ -1,32 +1,26 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributeDefinitionsClient
-from ...types.visibility_filter import VisibilityFilter
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.custom_attribute_definition import CustomAttributeDefinition
-from ...types.list_location_custom_attribute_definitions_response import ListLocationCustomAttributeDefinitionsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
 from ...types.create_location_custom_attribute_definition_response import (
     CreateLocationCustomAttributeDefinitionResponse,
 )
+from ...types.custom_attribute_definition import CustomAttributeDefinition
+from ...types.delete_location_custom_attribute_definition_response import (
+    DeleteLocationCustomAttributeDefinitionResponse,
+)
 from ...types.retrieve_location_custom_attribute_definition_response import (
     RetrieveLocationCustomAttributeDefinitionResponse,
 )
 from ...types.update_location_custom_attribute_definition_response import (
     UpdateLocationCustomAttributeDefinitionResponse,
 )
-from ...types.delete_location_custom_attribute_definition_response import (
-    DeleteLocationCustomAttributeDefinitionResponse,
-)
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributeDefinitionsClient
-from ...core.pagination import AsyncPager
+from ...types.visibility_filter import VisibilityFilter
+from .raw_client import AsyncRawCustomAttributeDefinitionsClient, RawCustomAttributeDefinitionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -98,39 +92,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/locations/custom-attribute-definitions",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            visibility_filter=visibility_filter, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListLocationCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListLocationCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    visibility_filter=visibility_filter,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -188,12 +152,12 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -234,8 +198,8 @@ def get(
             key="key",
         )
         """
-        response = self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -299,13 +263,13 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -340,8 +304,8 @@ def delete(
             key="key",
         )
         """
-        response = self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(key, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributeDefinitionsClient:
@@ -411,6 +375,7 @@ async def main() -> None:
             response = await client.locations.custom_attribute_definitions.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -418,39 +383,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/locations/custom-attribute-definitions",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            visibility_filter=visibility_filter, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListLocationCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListLocationCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    visibility_filter=visibility_filter,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -516,12 +451,12 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -570,8 +505,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -643,13 +578,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -692,5 +627,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(key, request_options=request_options)
+        return _response.data
diff --git a/src/square/locations/custom_attribute_definitions/raw_client.py b/src/square/locations/custom_attribute_definitions/raw_client.py
index 82590275..3c013fb1 100644
--- a/src/square/locations/custom_attribute_definitions/raw_client.py
+++ b/src/square/locations/custom_attribute_definitions/raw_client.py
@@ -1,29 +1,32 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
+from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.unchecked_base_model import construct_type
+from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
 from ...types.create_location_custom_attribute_definition_response import (
     CreateLocationCustomAttributeDefinitionResponse,
 )
-from ...core.serialization import convert_and_respect_annotation_metadata
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...types.custom_attribute_definition import CustomAttributeDefinition
+from ...types.delete_location_custom_attribute_definition_response import (
+    DeleteLocationCustomAttributeDefinitionResponse,
+)
+from ...types.list_location_custom_attribute_definitions_response import ListLocationCustomAttributeDefinitionsResponse
 from ...types.retrieve_location_custom_attribute_definition_response import (
     RetrieveLocationCustomAttributeDefinitionResponse,
 )
-from ...core.jsonable_encoder import jsonable_encoder
 from ...types.update_location_custom_attribute_definition_response import (
     UpdateLocationCustomAttributeDefinitionResponse,
 )
-from ...types.delete_location_custom_attribute_definition_response import (
-    DeleteLocationCustomAttributeDefinitionResponse,
-)
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.visibility_filter import VisibilityFilter
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -33,6 +36,79 @@ class RawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttributeDefinition]:
+        """
+        Lists the location-related [custom attribute definitions](entity:CustomAttributeDefinition) that belong to a Square seller account.
+        When all response pages are retrieved, the results include all custom attribute definitions
+        that are visible to the requesting application, including those that are created by other
+        applications and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Filters the `CustomAttributeDefinition` results by their `visibility` values.
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/locations/custom-attribute-definitions",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListLocationCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListLocationCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    visibility_filter=visibility_filter,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -97,8 +173,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -148,8 +224,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -225,8 +301,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -267,14 +343,90 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttributeDefinition]:
+        """
+        Lists the location-related [custom attribute definitions](entity:CustomAttributeDefinition) that belong to a Square seller account.
+        When all response pages are retrieved, the results include all custom attribute definitions
+        that are visible to the requesting application, including those that are created by other
+        applications and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Filters the `CustomAttributeDefinition` results by their `visibility` values.
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/locations/custom-attribute-definitions",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListLocationCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListLocationCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        visibility_filter=visibility_filter,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -339,8 +491,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -390,8 +542,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -467,8 +619,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -509,5 +661,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/locations/custom_attributes/__init__.py b/src/square/locations/custom_attributes/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/locations/custom_attributes/__init__.py
+++ b/src/square/locations/custom_attributes/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/locations/custom_attributes/client.py b/src/square/locations/custom_attributes/client.py
index 3911388c..5b2fd6bc 100644
--- a/src/square/locations/custom_attributes/client.py
+++ b/src/square/locations/custom_attributes/client.py
@@ -1,32 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributesClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
+from ...core.request_options import RequestOptions
 from ...requests.bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request import (
     BulkDeleteLocationCustomAttributesRequestLocationCustomAttributeDeleteRequestParams,
 )
-from ...core.request_options import RequestOptions
-from ...types.bulk_delete_location_custom_attributes_response import BulkDeleteLocationCustomAttributesResponse
 from ...requests.bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request import (
     BulkUpsertLocationCustomAttributesRequestLocationCustomAttributeUpsertRequestParams,
 )
+from ...requests.custom_attribute import CustomAttributeParams
+from ...types.bulk_delete_location_custom_attributes_response import BulkDeleteLocationCustomAttributesResponse
 from ...types.bulk_upsert_location_custom_attributes_response import BulkUpsertLocationCustomAttributesResponse
-from ...types.visibility_filter import VisibilityFilter
-from ...core.pagination import SyncPager
 from ...types.custom_attribute import CustomAttribute
-from ...core.jsonable_encoder import jsonable_encoder
-from ...types.list_location_custom_attributes_response import ListLocationCustomAttributesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...types.delete_location_custom_attribute_response import DeleteLocationCustomAttributeResponse
 from ...types.retrieve_location_custom_attribute_response import RetrieveLocationCustomAttributeResponse
-from ...requests.custom_attribute import CustomAttributeParams
 from ...types.upsert_location_custom_attribute_response import UpsertLocationCustomAttributeResponse
-from ...types.delete_location_custom_attribute_response import DeleteLocationCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributesClient
-from ...core.pagination import AsyncPager
+from ...types.visibility_filter import VisibilityFilter
+from .raw_client import AsyncRawCustomAttributesClient, RawCustomAttributesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -87,8 +80,8 @@ def batch_delete(
             },
         )
         """
-        response = self._raw_client.batch_delete(values=values, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_delete(values=values, request_options=request_options)
+        return _response.data
 
     def batch_upsert(
         self,
@@ -153,8 +146,8 @@ def batch_upsert(
             },
         )
         """
-        response = self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
 
     def list(
         self,
@@ -221,42 +214,14 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/locations/{jsonable_encoder(location_id)}/custom-attributes",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "limit": limit,
-                "cursor": cursor,
-                "with_definitions": with_definitions,
-            },
+        return self._raw_client.list(
+            location_id,
+            visibility_filter=visibility_filter,
+            limit=limit,
+            cursor=cursor,
+            with_definitions=with_definitions,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListLocationCustomAttributesResponse,
-                    construct_type(
-                        type_=ListLocationCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id,
-                    visibility_filter=visibility_filter,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(
         self,
@@ -315,10 +280,10 @@ def get(
             key="key",
         )
         """
-        response = self._raw_client.get(
+        _response = self._raw_client.get(
             location_id, key, with_definition=with_definition, version=version, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def upsert(
         self,
@@ -380,14 +345,14 @@ def upsert(
             custom_attribute={"value": "hot cocoa"},
         )
         """
-        response = self._raw_client.upsert(
+        _response = self._raw_client.upsert(
             location_id,
             key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, location_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -427,8 +392,8 @@ def delete(
             key="key",
         )
         """
-        response = self._raw_client.delete(location_id, key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(location_id, key, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributesClient:
@@ -494,8 +459,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_delete(values=values, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_delete(values=values, request_options=request_options)
+        return _response.data
 
     async def batch_upsert(
         self,
@@ -568,8 +533,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
 
     async def list(
         self,
@@ -637,6 +602,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -644,42 +610,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/locations/{jsonable_encoder(location_id)}/custom-attributes",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "limit": limit,
-                "cursor": cursor,
-                "with_definitions": with_definitions,
-            },
+        return await self._raw_client.list(
+            location_id,
+            visibility_filter=visibility_filter,
+            limit=limit,
+            cursor=cursor,
+            with_definitions=with_definitions,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListLocationCustomAttributesResponse,
-                    construct_type(
-                        type_=ListLocationCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id,
-                    visibility_filter=visibility_filter,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self,
@@ -746,10 +684,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(
+        _response = await self._raw_client.get(
             location_id, key, with_definition=with_definition, version=version, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def upsert(
         self,
@@ -819,14 +757,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.upsert(
+        _response = await self._raw_client.upsert(
             location_id,
             key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, location_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -874,5 +812,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(location_id, key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(location_id, key, request_options=request_options)
+        return _response.data
diff --git a/src/square/locations/custom_attributes/raw_client.py b/src/square/locations/custom_attributes/raw_client.py
index caeb62ee..60d188b8 100644
--- a/src/square/locations/custom_attributes/raw_client.py
+++ b/src/square/locations/custom_attributes/raw_client.py
@@ -1,28 +1,31 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request import (
-    BulkDeleteLocationCustomAttributesRequestLocationCustomAttributeDeleteRequestParams,
-)
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.bulk_delete_location_custom_attributes_response import BulkDeleteLocationCustomAttributesResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request import (
+    BulkDeleteLocationCustomAttributesRequestLocationCustomAttributeDeleteRequestParams,
+)
 from ...requests.bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request import (
     BulkUpsertLocationCustomAttributesRequestLocationCustomAttributeUpsertRequestParams,
 )
+from ...requests.custom_attribute import CustomAttributeParams
+from ...types.bulk_delete_location_custom_attributes_response import BulkDeleteLocationCustomAttributesResponse
 from ...types.bulk_upsert_location_custom_attributes_response import BulkUpsertLocationCustomAttributesResponse
+from ...types.custom_attribute import CustomAttribute
+from ...types.delete_location_custom_attribute_response import DeleteLocationCustomAttributeResponse
+from ...types.list_location_custom_attributes_response import ListLocationCustomAttributesResponse
 from ...types.retrieve_location_custom_attribute_response import RetrieveLocationCustomAttributeResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...requests.custom_attribute import CustomAttributeParams
 from ...types.upsert_location_custom_attribute_response import UpsertLocationCustomAttributeResponse
-from ...types.delete_location_custom_attribute_response import DeleteLocationCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.visibility_filter import VisibilityFilter
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -87,8 +90,8 @@ def batch_delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_upsert(
         self,
@@ -153,8 +156,96 @@ def batch_upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def list(
+        self,
+        location_id: str,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttribute]:
+        """
+        Lists the [custom attributes](entity:CustomAttribute) associated with a location.
+        You can use the `with_definitions` query parameter to also retrieve custom attribute definitions
+        in the same call.
+        When all response pages are retrieved, the results include all custom attributes that are
+        visible to the requesting application, including those that are owned by other applications
+        and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        location_id : str
+            The ID of the target [location](entity:Location).
+
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Filters the `CustomAttributeDefinition` results by their `visibility` values.
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request. For more
+            information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom
+            attribute, information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttribute]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/locations/{jsonable_encoder(location_id)}/custom-attributes",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "limit": limit,
+                "cursor": cursor,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListLocationCustomAttributesResponse,
+                    construct_type(
+                        type_=ListLocationCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    location_id,
+                    visibility_filter=visibility_filter,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    with_definitions=with_definitions,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self,
@@ -222,8 +313,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def upsert(
         self,
@@ -299,8 +390,8 @@ def upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, location_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -345,8 +436,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributesClient:
@@ -408,8 +499,8 @@ async def batch_delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_upsert(
         self,
@@ -474,8 +565,99 @@ async def batch_upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def list(
+        self,
+        location_id: str,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttribute]:
+        """
+        Lists the [custom attributes](entity:CustomAttribute) associated with a location.
+        You can use the `with_definitions` query parameter to also retrieve custom attribute definitions
+        in the same call.
+        When all response pages are retrieved, the results include all custom attributes that are
+        visible to the requesting application, including those that are owned by other applications
+        and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        location_id : str
+            The ID of the target [location](entity:Location).
+
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Filters the `CustomAttributeDefinition` results by their `visibility` values.
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request. For more
+            information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom
+            attribute, information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttribute]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/locations/{jsonable_encoder(location_id)}/custom-attributes",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "limit": limit,
+                "cursor": cursor,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListLocationCustomAttributesResponse,
+                    construct_type(
+                        type_=ListLocationCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        location_id,
+                        visibility_filter=visibility_filter,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        with_definitions=with_definitions,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self,
@@ -543,8 +725,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def upsert(
         self,
@@ -620,8 +802,8 @@ async def upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, location_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -666,5 +848,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/locations/raw_client.py b/src/square/locations/raw_client.py
index 5ea3dc6c..d2488275 100644
--- a/src/square/locations/raw_client.py
+++ b/src/square/locations/raw_client.py
@@ -1,25 +1,24 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.list_locations_response import ListLocationsResponse
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..requests.location import LocationParams
-from ..types.create_location_response import CreateLocationResponse
-from ..core.serialization import convert_and_respect_annotation_metadata
-from ..types.get_location_response import GetLocationResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
 from ..core.jsonable_encoder import jsonable_encoder
-from ..types.update_location_response import UpdateLocationResponse
-from ..requests.create_order_request import CreateOrderRequestParams
+from ..core.request_options import RequestOptions
+from ..core.serialization import convert_and_respect_annotation_metadata
+from ..core.unchecked_base_model import construct_type
 from ..requests.address import AddressParams
 from ..requests.charge_request_additional_recipient import ChargeRequestAdditionalRecipientParams
+from ..requests.create_order_request import CreateOrderRequestParams
+from ..requests.location import LocationParams
 from ..types.create_checkout_response import CreateCheckoutResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.create_location_response import CreateLocationResponse
+from ..types.get_location_response import GetLocationResponse
+from ..types.list_locations_response import ListLocationsResponse
+from ..types.update_location_response import UpdateLocationResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -61,8 +60,8 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Ht
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def create(
         self,
@@ -120,8 +119,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, location_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -161,8 +160,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -216,8 +215,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def checkouts(
         self,
@@ -371,8 +370,8 @@ def checkouts(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawLocationsClient:
@@ -413,8 +412,8 @@ async def list(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def create(
         self,
@@ -472,8 +471,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, location_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -513,8 +512,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -568,8 +567,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def checkouts(
         self,
@@ -723,5 +722,5 @@ async def checkouts(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/locations/transactions/__init__.py b/src/square/locations/transactions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/locations/transactions/__init__.py
+++ b/src/square/locations/transactions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/locations/transactions/client.py b/src/square/locations/transactions/client.py
index 14967b8c..32fd8f55 100644
--- a/src/square/locations/transactions/client.py
+++ b/src/square/locations/transactions/client.py
@@ -1,16 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawTransactionsClient
 import typing
-from ...types.sort_order import SortOrder
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.list_transactions_response import ListTransactionsResponse
-from ...types.get_transaction_response import GetTransactionResponse
 from ...types.capture_transaction_response import CaptureTransactionResponse
+from ...types.get_transaction_response import GetTransactionResponse
+from ...types.list_transactions_response import ListTransactionsResponse
+from ...types.sort_order import SortOrder
 from ...types.void_transaction_response import VoidTransactionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawTransactionsClient
+from .raw_client import AsyncRawTransactionsClient, RawTransactionsClient
 
 
 class TransactionsClient:
@@ -96,7 +95,7 @@ def list(
             location_id="location_id",
         )
         """
-        response = self._raw_client.list(
+        _response = self._raw_client.list(
             location_id,
             begin_time=begin_time,
             end_time=end_time,
@@ -104,7 +103,7 @@ def list(
             cursor=cursor,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -140,8 +139,8 @@ def get(
             transaction_id="transaction_id",
         )
         """
-        response = self._raw_client.get(location_id, transaction_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(location_id, transaction_id, request_options=request_options)
+        return _response.data
 
     def capture(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -182,8 +181,8 @@ def capture(
             transaction_id="transaction_id",
         )
         """
-        response = self._raw_client.capture(location_id, transaction_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.capture(location_id, transaction_id, request_options=request_options)
+        return _response.data
 
     def void(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -224,8 +223,8 @@ def void(
             transaction_id="transaction_id",
         )
         """
-        response = self._raw_client.void(location_id, transaction_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.void(location_id, transaction_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncTransactionsClient:
@@ -319,7 +318,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.list(
+        _response = await self._raw_client.list(
             location_id,
             begin_time=begin_time,
             end_time=end_time,
@@ -327,7 +326,7 @@ async def main() -> None:
             cursor=cursor,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -371,8 +370,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(location_id, transaction_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(location_id, transaction_id, request_options=request_options)
+        return _response.data
 
     async def capture(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -421,8 +420,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.capture(location_id, transaction_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.capture(location_id, transaction_id, request_options=request_options)
+        return _response.data
 
     async def void(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -471,5 +470,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.void(location_id, transaction_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.void(location_id, transaction_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/locations/transactions/raw_client.py b/src/square/locations/transactions/raw_client.py
index 4ca8615a..3a0563b0 100644
--- a/src/square/locations/transactions/raw_client.py
+++ b/src/square/locations/transactions/raw_client.py
@@ -1,20 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
 import typing
-from ...types.sort_order import SortOrder
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.list_transactions_response import ListTransactionsResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...types.get_transaction_response import GetTransactionResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.request_options import RequestOptions
+from ...core.unchecked_base_model import construct_type
 from ...types.capture_transaction_response import CaptureTransactionResponse
+from ...types.get_transaction_response import GetTransactionResponse
+from ...types.list_transactions_response import ListTransactionsResponse
+from ...types.sort_order import SortOrder
 from ...types.void_transaction_response import VoidTransactionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
 
 
 class RawTransactionsClient:
@@ -101,8 +100,8 @@ def list(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -143,8 +142,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def capture(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -190,8 +189,8 @@ def capture(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def void(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -237,8 +236,8 @@ def void(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawTransactionsClient:
@@ -325,8 +324,8 @@ async def list(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -367,8 +366,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def capture(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -414,8 +413,8 @@ async def capture(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def void(
         self, location_id: str, transaction_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -461,5 +460,5 @@ async def void(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/loyalty/__init__.py b/src/square/loyalty/__init__.py
index 81d53d39..077a4340 100644
--- a/src/square/loyalty/__init__.py
+++ b/src/square/loyalty/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import accounts, programs, rewards
 
 __all__ = ["accounts", "programs", "rewards"]
diff --git a/src/square/loyalty/accounts/__init__.py b/src/square/loyalty/accounts/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/loyalty/accounts/__init__.py
+++ b/src/square/loyalty/accounts/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/loyalty/accounts/client.py b/src/square/loyalty/accounts/client.py
index b0952702..e0c6a3fa 100644
--- a/src/square/loyalty/accounts/client.py
+++ b/src/square/loyalty/accounts/client.py
@@ -1,22 +1,21 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawAccountsClient
-from ...requests.loyalty_account import LoyaltyAccountParams
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.create_loyalty_account_response import CreateLoyaltyAccountResponse
+from ...requests.loyalty_account import LoyaltyAccountParams
+from ...requests.loyalty_event_accumulate_points import LoyaltyEventAccumulatePointsParams
+from ...requests.loyalty_event_adjust_points import LoyaltyEventAdjustPointsParams
 from ...requests.search_loyalty_accounts_request_loyalty_account_query import (
     SearchLoyaltyAccountsRequestLoyaltyAccountQueryParams,
 )
-from ...types.search_loyalty_accounts_response import SearchLoyaltyAccountsResponse
-from ...types.get_loyalty_account_response import GetLoyaltyAccountResponse
-from ...requests.loyalty_event_accumulate_points import LoyaltyEventAccumulatePointsParams
 from ...types.accumulate_loyalty_points_response import AccumulateLoyaltyPointsResponse
-from ...requests.loyalty_event_adjust_points import LoyaltyEventAdjustPointsParams
 from ...types.adjust_loyalty_points_response import AdjustLoyaltyPointsResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawAccountsClient
+from ...types.create_loyalty_account_response import CreateLoyaltyAccountResponse
+from ...types.get_loyalty_account_response import GetLoyaltyAccountResponse
+from ...types.search_loyalty_accounts_response import SearchLoyaltyAccountsResponse
+from .raw_client import AsyncRawAccountsClient, RawAccountsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -79,10 +78,10 @@ def create(
             idempotency_key="ec78c477-b1c3-4899-a209-a4e71337c996",
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             loyalty_account=loyalty_account, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -135,8 +134,8 @@ def search(
             limit=10,
         )
         """
-        response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
+        return _response.data
 
     def get(
         self, account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -168,8 +167,8 @@ def get(
             account_id="account_id",
         )
         """
-        response = self._raw_client.get(account_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(account_id, request_options=request_options)
+        return _response.data
 
     def accumulate_points(
         self,
@@ -235,14 +234,14 @@ def accumulate_points(
             location_id="P034NEENMD09F",
         )
         """
-        response = self._raw_client.accumulate_points(
+        _response = self._raw_client.accumulate_points(
             account_id,
             accumulate_points=accumulate_points,
             idempotency_key=idempotency_key,
             location_id=location_id,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def adjust(
         self,
@@ -299,14 +298,14 @@ def adjust(
             adjust_points={"points": 10, "reason": "Complimentary points"},
         )
         """
-        response = self._raw_client.adjust(
+        _response = self._raw_client.adjust(
             account_id,
             idempotency_key=idempotency_key,
             adjust_points=adjust_points,
             allow_negative_balance=allow_negative_balance,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
 
 class AsyncAccountsClient:
@@ -374,10 +373,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             loyalty_account=loyalty_account, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -438,10 +437,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -481,8 +480,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(account_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(account_id, request_options=request_options)
+        return _response.data
 
     async def accumulate_points(
         self,
@@ -556,14 +555,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.accumulate_points(
+        _response = await self._raw_client.accumulate_points(
             account_id,
             accumulate_points=accumulate_points,
             idempotency_key=idempotency_key,
             location_id=location_id,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def adjust(
         self,
@@ -628,11 +627,11 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.adjust(
+        _response = await self._raw_client.adjust(
             account_id,
             idempotency_key=idempotency_key,
             adjust_points=adjust_points,
             allow_negative_balance=allow_negative_balance,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
diff --git a/src/square/loyalty/accounts/raw_client.py b/src/square/loyalty/accounts/raw_client.py
index c1717cd8..5e20b466 100644
--- a/src/square/loyalty/accounts/raw_client.py
+++ b/src/square/loyalty/accounts/raw_client.py
@@ -1,27 +1,26 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.loyalty_account import LoyaltyAccountParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_loyalty_account_response import CreateLoyaltyAccountResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.loyalty_account import LoyaltyAccountParams
+from ...requests.loyalty_event_accumulate_points import LoyaltyEventAccumulatePointsParams
+from ...requests.loyalty_event_adjust_points import LoyaltyEventAdjustPointsParams
 from ...requests.search_loyalty_accounts_request_loyalty_account_query import (
     SearchLoyaltyAccountsRequestLoyaltyAccountQueryParams,
 )
-from ...types.search_loyalty_accounts_response import SearchLoyaltyAccountsResponse
-from ...types.get_loyalty_account_response import GetLoyaltyAccountResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...requests.loyalty_event_accumulate_points import LoyaltyEventAccumulatePointsParams
 from ...types.accumulate_loyalty_points_response import AccumulateLoyaltyPointsResponse
-from ...requests.loyalty_event_adjust_points import LoyaltyEventAdjustPointsParams
 from ...types.adjust_loyalty_points_response import AdjustLoyaltyPointsResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.create_loyalty_account_response import CreateLoyaltyAccountResponse
+from ...types.get_loyalty_account_response import GetLoyaltyAccountResponse
+from ...types.search_loyalty_accounts_response import SearchLoyaltyAccountsResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -85,8 +84,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -155,8 +154,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -194,8 +193,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def accumulate_points(
         self,
@@ -275,8 +274,8 @@ def accumulate_points(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def adjust(
         self,
@@ -348,8 +347,8 @@ def adjust(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawAccountsClient:
@@ -410,8 +409,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -480,8 +479,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, account_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -519,8 +518,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def accumulate_points(
         self,
@@ -600,8 +599,8 @@ async def accumulate_points(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def adjust(
         self,
@@ -673,5 +672,5 @@ async def adjust(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/loyalty/client.py b/src/square/loyalty/client.py
index f811820c..45b174da 100644
--- a/src/square/loyalty/client.py
+++ b/src/square/loyalty/client.py
@@ -1,19 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawLoyaltyClient
-from .accounts.client import AccountsClient
-from .programs.client import ProgramsClient
-from .rewards.client import RewardsClient
-from ..requests.loyalty_event_query import LoyaltyEventQueryParams
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
+from ..requests.loyalty_event_query import LoyaltyEventQueryParams
 from ..types.search_loyalty_events_response import SearchLoyaltyEventsResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawLoyaltyClient
-from .accounts.client import AsyncAccountsClient
-from .programs.client import AsyncProgramsClient
-from .rewards.client import AsyncRewardsClient
+from .accounts.client import AccountsClient, AsyncAccountsClient
+from .programs.client import AsyncProgramsClient, ProgramsClient
+from .raw_client import AsyncRawLoyaltyClient, RawLoyaltyClient
+from .rewards.client import AsyncRewardsClient, RewardsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -99,10 +95,10 @@ def search_events(
             limit=30,
         )
         """
-        response = self._raw_client.search_events(
+        _response = self._raw_client.search_events(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
 
 class AsyncLoyaltyClient:
@@ -193,7 +189,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search_events(
+        _response = await self._raw_client.search_events(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/loyalty/programs/__init__.py b/src/square/loyalty/programs/__init__.py
index 86e70d3e..18f9eb17 100644
--- a/src/square/loyalty/programs/__init__.py
+++ b/src/square/loyalty/programs/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import promotions
 
 __all__ = ["promotions"]
diff --git a/src/square/loyalty/programs/client.py b/src/square/loyalty/programs/client.py
index fc4010d5..d44698ee 100644
--- a/src/square/loyalty/programs/client.py
+++ b/src/square/loyalty/programs/client.py
@@ -1,17 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawProgramsClient
-from .promotions.client import PromotionsClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.list_loyalty_programs_response import ListLoyaltyProgramsResponse
-from ...types.get_loyalty_program_response import GetLoyaltyProgramResponse
 from ...requests.money import MoneyParams
 from ...types.calculate_loyalty_points_response import CalculateLoyaltyPointsResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawProgramsClient
-from .promotions.client import AsyncPromotionsClient
+from ...types.get_loyalty_program_response import GetLoyaltyProgramResponse
+from ...types.list_loyalty_programs_response import ListLoyaltyProgramsResponse
+from .promotions.client import AsyncPromotionsClient, PromotionsClient
+from .raw_client import AsyncRawProgramsClient, RawProgramsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -60,8 +58,8 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Li
         )
         client.loyalty.programs.list()
         """
-        response = self._raw_client.list(request_options=request_options)
-        return response.data
+        _response = self._raw_client.list(request_options=request_options)
+        return _response.data
 
     def get(
         self, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -95,8 +93,8 @@ def get(
             program_id="program_id",
         )
         """
-        response = self._raw_client.get(program_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(program_id, request_options=request_options)
+        return _response.data
 
     def calculate(
         self,
@@ -170,14 +168,14 @@ def calculate(
             loyalty_account_id="79b807d2-d786-46a9-933b-918028d7a8c5",
         )
         """
-        response = self._raw_client.calculate(
+        _response = self._raw_client.calculate(
             program_id,
             order_id=order_id,
             transaction_amount_money=transaction_amount_money,
             loyalty_account_id=loyalty_account_id,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
 
 class AsyncProgramsClient:
@@ -231,8 +229,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.list(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.list(request_options=request_options)
+        return _response.data
 
     async def get(
         self, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -274,8 +272,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(program_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(program_id, request_options=request_options)
+        return _response.data
 
     async def calculate(
         self,
@@ -357,11 +355,11 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.calculate(
+        _response = await self._raw_client.calculate(
             program_id,
             order_id=order_id,
             transaction_amount_money=transaction_amount_money,
             loyalty_account_id=loyalty_account_id,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
diff --git a/src/square/loyalty/programs/promotions/__init__.py b/src/square/loyalty/programs/promotions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/loyalty/programs/promotions/__init__.py
+++ b/src/square/loyalty/programs/promotions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/loyalty/programs/promotions/client.py b/src/square/loyalty/programs/promotions/client.py
index c393ae4d..c6447be7 100644
--- a/src/square/loyalty/programs/promotions/client.py
+++ b/src/square/loyalty/programs/promotions/client.py
@@ -1,24 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ....core.client_wrapper import SyncClientWrapper
-from .raw_client import RawPromotionsClient
-from ....types.loyalty_promotion_status import LoyaltyPromotionStatus
+
+from ....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ....core.pagination import AsyncPager, SyncPager
 from ....core.request_options import RequestOptions
-from ....core.pagination import SyncPager
-from ....types.loyalty_promotion import LoyaltyPromotion
-from ....core.jsonable_encoder import jsonable_encoder
-from ....types.list_loyalty_promotions_response import ListLoyaltyPromotionsResponse
-from ....core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ....core.api_error import ApiError
 from ....requests.loyalty_promotion import LoyaltyPromotionParams
+from ....types.cancel_loyalty_promotion_response import CancelLoyaltyPromotionResponse
 from ....types.create_loyalty_promotion_response import CreateLoyaltyPromotionResponse
 from ....types.get_loyalty_promotion_response import GetLoyaltyPromotionResponse
-from ....types.cancel_loyalty_promotion_response import CancelLoyaltyPromotionResponse
-from ....core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawPromotionsClient
-from ....core.pagination import AsyncPager
+from ....types.loyalty_promotion import LoyaltyPromotion
+from ....types.loyalty_promotion_status import LoyaltyPromotionStatus
+from .raw_client import AsyncRawPromotionsClient, RawPromotionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -97,40 +90,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/loyalty/programs/{jsonable_encoder(program_id)}/promotions",
-            method="GET",
-            params={
-                "status": status,
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            program_id, status=status, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListLoyaltyPromotionsResponse,
-                    construct_type(
-                        type_=ListLoyaltyPromotionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    program_id,
-                    status=status,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.loyalty_promotions
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -197,13 +159,13 @@ def create(
             idempotency_key="ec78c477-b1c3-4899-a209-a4e71337c996",
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             program_id,
             loyalty_promotion=loyalty_promotion,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(
         self, promotion_id: str, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -240,8 +202,8 @@ def get(
             program_id="program_id",
         )
         """
-        response = self._raw_client.get(promotion_id, program_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(promotion_id, program_id, request_options=request_options)
+        return _response.data
 
     def cancel(
         self, promotion_id: str, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -283,8 +245,8 @@ def cancel(
             program_id="program_id",
         )
         """
-        response = self._raw_client.cancel(promotion_id, program_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.cancel(promotion_id, program_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncPromotionsClient:
@@ -361,6 +323,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -368,40 +331,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/loyalty/programs/{jsonable_encoder(program_id)}/promotions",
-            method="GET",
-            params={
-                "status": status,
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            program_id, status=status, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListLoyaltyPromotionsResponse,
-                    construct_type(
-                        type_=ListLoyaltyPromotionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    program_id,
-                    status=status,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.loyalty_promotions
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -476,13 +408,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             program_id,
             loyalty_promotion=loyalty_promotion,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, promotion_id: str, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -527,8 +459,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(promotion_id, program_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(promotion_id, program_id, request_options=request_options)
+        return _response.data
 
     async def cancel(
         self, promotion_id: str, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -578,5 +510,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.cancel(promotion_id, program_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.cancel(promotion_id, program_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/loyalty/programs/promotions/raw_client.py b/src/square/loyalty/programs/promotions/raw_client.py
index 54b4f37e..838e369a 100644
--- a/src/square/loyalty/programs/promotions/raw_client.py
+++ b/src/square/loyalty/programs/promotions/raw_client.py
@@ -1,20 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ....core.client_wrapper import SyncClientWrapper
-from ....requests.loyalty_promotion import LoyaltyPromotionParams
-from ....core.request_options import RequestOptions
-from ....core.http_response import HttpResponse
-from ....types.create_loyalty_promotion_response import CreateLoyaltyPromotionResponse
+from json.decoder import JSONDecodeError
+
+from ....core.api_error import ApiError
+from ....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ....core.http_response import AsyncHttpResponse, HttpResponse
 from ....core.jsonable_encoder import jsonable_encoder
+from ....core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ....core.request_options import RequestOptions
 from ....core.serialization import convert_and_respect_annotation_metadata
 from ....core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ....core.api_error import ApiError
-from ....types.get_loyalty_promotion_response import GetLoyaltyPromotionResponse
+from ....requests.loyalty_promotion import LoyaltyPromotionParams
 from ....types.cancel_loyalty_promotion_response import CancelLoyaltyPromotionResponse
-from ....core.client_wrapper import AsyncClientWrapper
-from ....core.http_response import AsyncHttpResponse
+from ....types.create_loyalty_promotion_response import CreateLoyaltyPromotionResponse
+from ....types.get_loyalty_promotion_response import GetLoyaltyPromotionResponse
+from ....types.list_loyalty_promotions_response import ListLoyaltyPromotionsResponse
+from ....types.loyalty_promotion import LoyaltyPromotion
+from ....types.loyalty_promotion_status import LoyaltyPromotionStatus
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -24,6 +27,85 @@ class RawPromotionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        program_id: str,
+        *,
+        status: typing.Optional[LoyaltyPromotionStatus] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[LoyaltyPromotion]:
+        """
+        Lists the loyalty promotions associated with a [loyalty program](entity:LoyaltyProgram).
+        Results are sorted by the `created_at` date in descending order (newest to oldest).
+
+        Parameters
+        ----------
+        program_id : str
+            The ID of the base [loyalty program](entity:LoyaltyProgram). To get the program ID,
+            call [RetrieveLoyaltyProgram](api-endpoint:Loyalty-RetrieveLoyaltyProgram) using the `main` keyword.
+
+        status : typing.Optional[LoyaltyPromotionStatus]
+            The status to filter the results by. If a status is provided, only loyalty promotions
+            with the specified status are returned. Otherwise, all loyalty promotions associated with
+            the loyalty program are returned.
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response.
+            The minimum value is 1 and the maximum value is 30. The default value is 30.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[LoyaltyPromotion]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/loyalty/programs/{jsonable_encoder(program_id)}/promotions",
+            method="GET",
+            params={
+                "status": status,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListLoyaltyPromotionsResponse,
+                    construct_type(
+                        type_=ListLoyaltyPromotionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.loyalty_promotions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    program_id,
+                    status=status,
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         program_id: str,
@@ -89,8 +171,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, promotion_id: str, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -132,8 +214,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def cancel(
         self, promotion_id: str, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -180,14 +262,96 @@ def cancel(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawPromotionsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        program_id: str,
+        *,
+        status: typing.Optional[LoyaltyPromotionStatus] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[LoyaltyPromotion]:
+        """
+        Lists the loyalty promotions associated with a [loyalty program](entity:LoyaltyProgram).
+        Results are sorted by the `created_at` date in descending order (newest to oldest).
+
+        Parameters
+        ----------
+        program_id : str
+            The ID of the base [loyalty program](entity:LoyaltyProgram). To get the program ID,
+            call [RetrieveLoyaltyProgram](api-endpoint:Loyalty-RetrieveLoyaltyProgram) using the `main` keyword.
+
+        status : typing.Optional[LoyaltyPromotionStatus]
+            The status to filter the results by. If a status is provided, only loyalty promotions
+            with the specified status are returned. Otherwise, all loyalty promotions associated with
+            the loyalty program are returned.
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response.
+            The minimum value is 1 and the maximum value is 30. The default value is 30.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[LoyaltyPromotion]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/loyalty/programs/{jsonable_encoder(program_id)}/promotions",
+            method="GET",
+            params={
+                "status": status,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListLoyaltyPromotionsResponse,
+                    construct_type(
+                        type_=ListLoyaltyPromotionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.loyalty_promotions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        program_id,
+                        status=status,
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         program_id: str,
@@ -253,8 +417,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, promotion_id: str, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -296,8 +460,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def cancel(
         self, promotion_id: str, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -344,5 +508,5 @@ async def cancel(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/loyalty/programs/raw_client.py b/src/square/loyalty/programs/raw_client.py
index e6e99950..eb3d48e5 100644
--- a/src/square/loyalty/programs/raw_client.py
+++ b/src/square/loyalty/programs/raw_client.py
@@ -1,20 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.list_loyalty_programs_response import ListLoyaltyProgramsResponse
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...types.get_loyalty_program_response import GetLoyaltyProgramResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
 from ...core.jsonable_encoder import jsonable_encoder
+from ...core.request_options import RequestOptions
+from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.unchecked_base_model import construct_type
 from ...requests.money import MoneyParams
 from ...types.calculate_loyalty_points_response import CalculateLoyaltyPointsResponse
-from ...core.serialization import convert_and_respect_annotation_metadata
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.get_loyalty_program_response import GetLoyaltyProgramResponse
+from ...types.list_loyalty_programs_response import ListLoyaltyProgramsResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -61,8 +60,8 @@ def list(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -102,8 +101,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def calculate(
         self,
@@ -192,8 +191,8 @@ def calculate(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawProgramsClient:
@@ -237,8 +236,8 @@ async def list(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, program_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -278,8 +277,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def calculate(
         self,
@@ -368,5 +367,5 @@ async def calculate(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/loyalty/raw_client.py b/src/square/loyalty/raw_client.py
index 2fb9fde2..7782050f 100644
--- a/src/square/loyalty/raw_client.py
+++ b/src/square/loyalty/raw_client.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.loyalty_event_query import LoyaltyEventQueryParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.search_loyalty_events_response import SearchLoyaltyEventsResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..requests.loyalty_event_query import LoyaltyEventQueryParams
+from ..types.search_loyalty_events_response import SearchLoyaltyEventsResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -93,8 +92,8 @@ def search_events(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawLoyaltyClient:
@@ -173,5 +172,5 @@ async def search_events(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/loyalty/rewards/__init__.py b/src/square/loyalty/rewards/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/loyalty/rewards/__init__.py
+++ b/src/square/loyalty/rewards/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/loyalty/rewards/client.py b/src/square/loyalty/rewards/client.py
index 5c0449e4..4182121d 100644
--- a/src/square/loyalty/rewards/client.py
+++ b/src/square/loyalty/rewards/client.py
@@ -1,20 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawRewardsClient
-from ...requests.loyalty_reward import LoyaltyRewardParams
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.create_loyalty_reward_response import CreateLoyaltyRewardResponse
+from ...requests.loyalty_reward import LoyaltyRewardParams
 from ...requests.search_loyalty_rewards_request_loyalty_reward_query import (
     SearchLoyaltyRewardsRequestLoyaltyRewardQueryParams,
 )
-from ...types.search_loyalty_rewards_response import SearchLoyaltyRewardsResponse
-from ...types.get_loyalty_reward_response import GetLoyaltyRewardResponse
+from ...types.create_loyalty_reward_response import CreateLoyaltyRewardResponse
 from ...types.delete_loyalty_reward_response import DeleteLoyaltyRewardResponse
+from ...types.get_loyalty_reward_response import GetLoyaltyRewardResponse
 from ...types.redeem_loyalty_reward_response import RedeemLoyaltyRewardResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawRewardsClient
+from ...types.search_loyalty_rewards_response import SearchLoyaltyRewardsResponse
+from .raw_client import AsyncRawRewardsClient, RawRewardsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -85,10 +84,10 @@ def create(
             idempotency_key="18c2e5ea-a620-4b1f-ad60-7b167285e451",
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             reward=reward, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -143,8 +142,8 @@ def search(
             limit=10,
         )
         """
-        response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
+        return _response.data
 
     def get(
         self, reward_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -176,8 +175,8 @@ def get(
             reward_id="reward_id",
         )
         """
-        response = self._raw_client.get(reward_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(reward_id, request_options=request_options)
+        return _response.data
 
     def delete(
         self, reward_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -217,8 +216,8 @@ def delete(
             reward_id="reward_id",
         )
         """
-        response = self._raw_client.delete(reward_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(reward_id, request_options=request_options)
+        return _response.data
 
     def redeem(
         self,
@@ -274,10 +273,10 @@ def redeem(
             location_id="P034NEENMD09F",
         )
         """
-        response = self._raw_client.redeem(
+        _response = self._raw_client.redeem(
             reward_id, idempotency_key=idempotency_key, location_id=location_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
 
 class AsyncRewardsClient:
@@ -353,10 +352,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             reward=reward, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -419,10 +418,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, reward_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -462,8 +461,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(reward_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(reward_id, request_options=request_options)
+        return _response.data
 
     async def delete(
         self, reward_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -511,8 +510,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(reward_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(reward_id, request_options=request_options)
+        return _response.data
 
     async def redeem(
         self,
@@ -576,7 +575,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.redeem(
+        _response = await self._raw_client.redeem(
             reward_id, idempotency_key=idempotency_key, location_id=location_id, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/loyalty/rewards/raw_client.py b/src/square/loyalty/rewards/raw_client.py
index 5d2fbca8..d9d7f343 100644
--- a/src/square/loyalty/rewards/raw_client.py
+++ b/src/square/loyalty/rewards/raw_client.py
@@ -1,25 +1,24 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.loyalty_reward import LoyaltyRewardParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_loyalty_reward_response import CreateLoyaltyRewardResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.loyalty_reward import LoyaltyRewardParams
 from ...requests.search_loyalty_rewards_request_loyalty_reward_query import (
     SearchLoyaltyRewardsRequestLoyaltyRewardQueryParams,
 )
-from ...types.search_loyalty_rewards_response import SearchLoyaltyRewardsResponse
-from ...types.get_loyalty_reward_response import GetLoyaltyRewardResponse
-from ...core.jsonable_encoder import jsonable_encoder
+from ...types.create_loyalty_reward_response import CreateLoyaltyRewardResponse
 from ...types.delete_loyalty_reward_response import DeleteLoyaltyRewardResponse
+from ...types.get_loyalty_reward_response import GetLoyaltyRewardResponse
 from ...types.redeem_loyalty_reward_response import RedeemLoyaltyRewardResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.search_loyalty_rewards_response import SearchLoyaltyRewardsResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -90,8 +89,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -162,8 +161,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, reward_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -201,8 +200,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, reward_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -248,8 +247,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def redeem(
         self,
@@ -317,8 +316,8 @@ def redeem(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawRewardsClient:
@@ -386,8 +385,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -458,8 +457,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, reward_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -497,8 +496,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, reward_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -544,8 +543,8 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def redeem(
         self,
@@ -613,5 +612,5 @@ async def redeem(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/merchants/__init__.py b/src/square/merchants/__init__.py
index cbf84df6..ab727082 100644
--- a/src/square/merchants/__init__.py
+++ b/src/square/merchants/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import custom_attribute_definitions, custom_attributes
 
 __all__ = ["custom_attribute_definitions", "custom_attributes"]
diff --git a/src/square/merchants/client.py b/src/square/merchants/client.py
index 1eae1070..2b368f2c 100644
--- a/src/square/merchants/client.py
+++ b/src/square/merchants/client.py
@@ -1,23 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawMerchantsClient
-from .custom_attribute_definitions.client import CustomAttributeDefinitionsClient
-from .custom_attributes.client import CustomAttributesClient
 import typing
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.merchant import Merchant
-from ..types.list_merchants_response import ListMerchantsResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..types.get_merchant_response import GetMerchantResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawMerchantsClient
-from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient
-from .custom_attributes.client import AsyncCustomAttributesClient
-from ..core.pagination import AsyncPager
+from ..types.merchant import Merchant
+from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient, CustomAttributeDefinitionsClient
+from .custom_attributes.client import AsyncCustomAttributesClient, CustomAttributesClient
+from .raw_client import AsyncRawMerchantsClient, RawMerchantsClient
 
 
 class MerchantsClient:
@@ -80,35 +72,7 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/merchants",
-            method="GET",
-            params={
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListMerchantsResponse,
-                    construct_type(
-                        type_=ListMerchantsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.merchant
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return self._raw_client.list(cursor=cursor, request_options=request_options)
 
     def get(self, merchant_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetMerchantResponse:
         """
@@ -139,8 +103,8 @@ def get(self, merchant_id: str, *, request_options: typing.Optional[RequestOptio
             merchant_id="merchant_id",
         )
         """
-        response = self._raw_client.get(merchant_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(merchant_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncMerchantsClient:
@@ -204,6 +168,7 @@ async def main() -> None:
             response = await client.merchants.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -211,35 +176,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/merchants",
-            method="GET",
-            params={
-                "cursor": cursor,
-            },
-            request_options=request_options,
-        )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListMerchantsResponse,
-                    construct_type(
-                        type_=ListMerchantsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.merchant
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+        return await self._raw_client.list(cursor=cursor, request_options=request_options)
 
     async def get(
         self, merchant_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -280,5 +217,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(merchant_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(merchant_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/merchants/custom_attribute_definitions/__init__.py b/src/square/merchants/custom_attribute_definitions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/merchants/custom_attribute_definitions/__init__.py
+++ b/src/square/merchants/custom_attribute_definitions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/merchants/custom_attribute_definitions/client.py b/src/square/merchants/custom_attribute_definitions/client.py
index f8d0d440..afe807cf 100644
--- a/src/square/merchants/custom_attribute_definitions/client.py
+++ b/src/square/merchants/custom_attribute_definitions/client.py
@@ -1,32 +1,26 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributeDefinitionsClient
-from ...types.visibility_filter import VisibilityFilter
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.custom_attribute_definition import CustomAttributeDefinition
-from ...types.list_merchant_custom_attribute_definitions_response import ListMerchantCustomAttributeDefinitionsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
 from ...types.create_merchant_custom_attribute_definition_response import (
     CreateMerchantCustomAttributeDefinitionResponse,
 )
+from ...types.custom_attribute_definition import CustomAttributeDefinition
+from ...types.delete_merchant_custom_attribute_definition_response import (
+    DeleteMerchantCustomAttributeDefinitionResponse,
+)
 from ...types.retrieve_merchant_custom_attribute_definition_response import (
     RetrieveMerchantCustomAttributeDefinitionResponse,
 )
 from ...types.update_merchant_custom_attribute_definition_response import (
     UpdateMerchantCustomAttributeDefinitionResponse,
 )
-from ...types.delete_merchant_custom_attribute_definition_response import (
-    DeleteMerchantCustomAttributeDefinitionResponse,
-)
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributeDefinitionsClient
-from ...core.pagination import AsyncPager
+from ...types.visibility_filter import VisibilityFilter
+from .raw_client import AsyncRawCustomAttributeDefinitionsClient, RawCustomAttributeDefinitionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -98,39 +92,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/merchants/custom-attribute-definitions",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            visibility_filter=visibility_filter, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListMerchantCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListMerchantCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    visibility_filter=visibility_filter,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -188,12 +152,12 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -234,8 +198,8 @@ def get(
             key="key",
         )
         """
-        response = self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -298,13 +262,13 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -339,8 +303,8 @@ def delete(
             key="key",
         )
         """
-        response = self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(key, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributeDefinitionsClient:
@@ -410,6 +374,7 @@ async def main() -> None:
             response = await client.merchants.custom_attribute_definitions.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -417,39 +382,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/merchants/custom-attribute-definitions",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "limit": limit,
-                "cursor": cursor,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            visibility_filter=visibility_filter, limit=limit, cursor=cursor, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListMerchantCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListMerchantCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    visibility_filter=visibility_filter,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -515,12 +450,12 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -569,8 +504,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -641,13 +576,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -690,5 +625,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(key, request_options=request_options)
+        return _response.data
diff --git a/src/square/merchants/custom_attribute_definitions/raw_client.py b/src/square/merchants/custom_attribute_definitions/raw_client.py
index 6f1e08b3..fe2e7e6e 100644
--- a/src/square/merchants/custom_attribute_definitions/raw_client.py
+++ b/src/square/merchants/custom_attribute_definitions/raw_client.py
@@ -1,29 +1,32 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
+from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.unchecked_base_model import construct_type
+from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
 from ...types.create_merchant_custom_attribute_definition_response import (
     CreateMerchantCustomAttributeDefinitionResponse,
 )
-from ...core.serialization import convert_and_respect_annotation_metadata
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...types.custom_attribute_definition import CustomAttributeDefinition
+from ...types.delete_merchant_custom_attribute_definition_response import (
+    DeleteMerchantCustomAttributeDefinitionResponse,
+)
+from ...types.list_merchant_custom_attribute_definitions_response import ListMerchantCustomAttributeDefinitionsResponse
 from ...types.retrieve_merchant_custom_attribute_definition_response import (
     RetrieveMerchantCustomAttributeDefinitionResponse,
 )
-from ...core.jsonable_encoder import jsonable_encoder
 from ...types.update_merchant_custom_attribute_definition_response import (
     UpdateMerchantCustomAttributeDefinitionResponse,
 )
-from ...types.delete_merchant_custom_attribute_definition_response import (
-    DeleteMerchantCustomAttributeDefinitionResponse,
-)
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.visibility_filter import VisibilityFilter
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -33,6 +36,79 @@ class RawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttributeDefinition]:
+        """
+        Lists the merchant-related [custom attribute definitions](entity:CustomAttributeDefinition) that belong to a Square seller account.
+        When all response pages are retrieved, the results include all custom attribute definitions
+        that are visible to the requesting application, including those that are created by other
+        applications and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Filters the `CustomAttributeDefinition` results by their `visibility` values.
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/merchants/custom-attribute-definitions",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListMerchantCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListMerchantCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    visibility_filter=visibility_filter,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -97,8 +173,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -148,8 +224,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -224,8 +300,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -266,14 +342,90 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttributeDefinition]:
+        """
+        Lists the merchant-related [custom attribute definitions](entity:CustomAttributeDefinition) that belong to a Square seller account.
+        When all response pages are retrieved, the results include all custom attribute definitions
+        that are visible to the requesting application, including those that are created by other
+        applications and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Filters the `CustomAttributeDefinition` results by their `visibility` values.
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/merchants/custom-attribute-definitions",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "limit": limit,
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListMerchantCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListMerchantCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        visibility_filter=visibility_filter,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -338,8 +490,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -389,8 +541,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -465,8 +617,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -507,5 +659,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/merchants/custom_attributes/__init__.py b/src/square/merchants/custom_attributes/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/merchants/custom_attributes/__init__.py
+++ b/src/square/merchants/custom_attributes/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/merchants/custom_attributes/client.py b/src/square/merchants/custom_attributes/client.py
index 2619d72a..b72feb9a 100644
--- a/src/square/merchants/custom_attributes/client.py
+++ b/src/square/merchants/custom_attributes/client.py
@@ -1,32 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributesClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
+from ...core.request_options import RequestOptions
 from ...requests.bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request import (
     BulkDeleteMerchantCustomAttributesRequestMerchantCustomAttributeDeleteRequestParams,
 )
-from ...core.request_options import RequestOptions
-from ...types.bulk_delete_merchant_custom_attributes_response import BulkDeleteMerchantCustomAttributesResponse
 from ...requests.bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request import (
     BulkUpsertMerchantCustomAttributesRequestMerchantCustomAttributeUpsertRequestParams,
 )
+from ...requests.custom_attribute import CustomAttributeParams
+from ...types.bulk_delete_merchant_custom_attributes_response import BulkDeleteMerchantCustomAttributesResponse
 from ...types.bulk_upsert_merchant_custom_attributes_response import BulkUpsertMerchantCustomAttributesResponse
-from ...types.visibility_filter import VisibilityFilter
-from ...core.pagination import SyncPager
 from ...types.custom_attribute import CustomAttribute
-from ...core.jsonable_encoder import jsonable_encoder
-from ...types.list_merchant_custom_attributes_response import ListMerchantCustomAttributesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...types.delete_merchant_custom_attribute_response import DeleteMerchantCustomAttributeResponse
 from ...types.retrieve_merchant_custom_attribute_response import RetrieveMerchantCustomAttributeResponse
-from ...requests.custom_attribute import CustomAttributeParams
 from ...types.upsert_merchant_custom_attribute_response import UpsertMerchantCustomAttributeResponse
-from ...types.delete_merchant_custom_attribute_response import DeleteMerchantCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributesClient
-from ...core.pagination import AsyncPager
+from ...types.visibility_filter import VisibilityFilter
+from .raw_client import AsyncRawCustomAttributesClient, RawCustomAttributesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -86,8 +79,8 @@ def batch_delete(
             },
         )
         """
-        response = self._raw_client.batch_delete(values=values, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_delete(values=values, request_options=request_options)
+        return _response.data
 
     def batch_upsert(
         self,
@@ -145,8 +138,8 @@ def batch_upsert(
             },
         )
         """
-        response = self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
 
     def list(
         self,
@@ -213,42 +206,14 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/merchants/{jsonable_encoder(merchant_id)}/custom-attributes",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "limit": limit,
-                "cursor": cursor,
-                "with_definitions": with_definitions,
-            },
+        return self._raw_client.list(
+            merchant_id,
+            visibility_filter=visibility_filter,
+            limit=limit,
+            cursor=cursor,
+            with_definitions=with_definitions,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListMerchantCustomAttributesResponse,
-                    construct_type(
-                        type_=ListMerchantCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    merchant_id,
-                    visibility_filter=visibility_filter,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(
         self,
@@ -307,10 +272,10 @@ def get(
             key="key",
         )
         """
-        response = self._raw_client.get(
+        _response = self._raw_client.get(
             merchant_id, key, with_definition=with_definition, version=version, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def upsert(
         self,
@@ -372,14 +337,14 @@ def upsert(
             custom_attribute={"value": "Ultimate Sneaker Store"},
         )
         """
-        response = self._raw_client.upsert(
+        _response = self._raw_client.upsert(
             merchant_id,
             key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, merchant_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -419,8 +384,8 @@ def delete(
             key="key",
         )
         """
-        response = self._raw_client.delete(merchant_id, key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(merchant_id, key, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributesClient:
@@ -485,8 +450,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_delete(values=values, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_delete(values=values, request_options=request_options)
+        return _response.data
 
     async def batch_upsert(
         self,
@@ -552,8 +517,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
 
     async def list(
         self,
@@ -621,6 +586,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -628,42 +594,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/merchants/{jsonable_encoder(merchant_id)}/custom-attributes",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "limit": limit,
-                "cursor": cursor,
-                "with_definitions": with_definitions,
-            },
+        return await self._raw_client.list(
+            merchant_id,
+            visibility_filter=visibility_filter,
+            limit=limit,
+            cursor=cursor,
+            with_definitions=with_definitions,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListMerchantCustomAttributesResponse,
-                    construct_type(
-                        type_=ListMerchantCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    merchant_id,
-                    visibility_filter=visibility_filter,
-                    limit=limit,
-                    cursor=_parsed_next,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self,
@@ -730,10 +668,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(
+        _response = await self._raw_client.get(
             merchant_id, key, with_definition=with_definition, version=version, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def upsert(
         self,
@@ -803,14 +741,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.upsert(
+        _response = await self._raw_client.upsert(
             merchant_id,
             key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, merchant_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -858,5 +796,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(merchant_id, key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(merchant_id, key, request_options=request_options)
+        return _response.data
diff --git a/src/square/merchants/custom_attributes/raw_client.py b/src/square/merchants/custom_attributes/raw_client.py
index eb44aad3..3f01f0d0 100644
--- a/src/square/merchants/custom_attributes/raw_client.py
+++ b/src/square/merchants/custom_attributes/raw_client.py
@@ -1,28 +1,31 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request import (
-    BulkDeleteMerchantCustomAttributesRequestMerchantCustomAttributeDeleteRequestParams,
-)
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.bulk_delete_merchant_custom_attributes_response import BulkDeleteMerchantCustomAttributesResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request import (
+    BulkDeleteMerchantCustomAttributesRequestMerchantCustomAttributeDeleteRequestParams,
+)
 from ...requests.bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request import (
     BulkUpsertMerchantCustomAttributesRequestMerchantCustomAttributeUpsertRequestParams,
 )
+from ...requests.custom_attribute import CustomAttributeParams
+from ...types.bulk_delete_merchant_custom_attributes_response import BulkDeleteMerchantCustomAttributesResponse
 from ...types.bulk_upsert_merchant_custom_attributes_response import BulkUpsertMerchantCustomAttributesResponse
+from ...types.custom_attribute import CustomAttribute
+from ...types.delete_merchant_custom_attribute_response import DeleteMerchantCustomAttributeResponse
+from ...types.list_merchant_custom_attributes_response import ListMerchantCustomAttributesResponse
 from ...types.retrieve_merchant_custom_attribute_response import RetrieveMerchantCustomAttributeResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...requests.custom_attribute import CustomAttributeParams
 from ...types.upsert_merchant_custom_attribute_response import UpsertMerchantCustomAttributeResponse
-from ...types.delete_merchant_custom_attribute_response import DeleteMerchantCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.visibility_filter import VisibilityFilter
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -87,8 +90,8 @@ def batch_delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_upsert(
         self,
@@ -153,8 +156,96 @@ def batch_upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def list(
+        self,
+        merchant_id: str,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttribute]:
+        """
+        Lists the [custom attributes](entity:CustomAttribute) associated with a merchant.
+        You can use the `with_definitions` query parameter to also retrieve custom attribute definitions
+        in the same call.
+        When all response pages are retrieved, the results include all custom attributes that are
+        visible to the requesting application, including those that are owned by other applications
+        and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        merchant_id : str
+            The ID of the target [merchant](entity:Merchant).
+
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Filters the `CustomAttributeDefinition` results by their `visibility` values.
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request. For more
+            information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom
+            attribute, information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttribute]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/merchants/{jsonable_encoder(merchant_id)}/custom-attributes",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "limit": limit,
+                "cursor": cursor,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListMerchantCustomAttributesResponse,
+                    construct_type(
+                        type_=ListMerchantCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    merchant_id,
+                    visibility_filter=visibility_filter,
+                    limit=limit,
+                    cursor=_parsed_next,
+                    with_definitions=with_definitions,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self,
@@ -222,8 +313,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def upsert(
         self,
@@ -299,8 +390,8 @@ def upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, merchant_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -345,8 +436,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributesClient:
@@ -408,8 +499,8 @@ async def batch_delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_upsert(
         self,
@@ -474,8 +565,99 @@ async def batch_upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def list(
+        self,
+        merchant_id: str,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        limit: typing.Optional[int] = None,
+        cursor: typing.Optional[str] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttribute]:
+        """
+        Lists the [custom attributes](entity:CustomAttribute) associated with a merchant.
+        You can use the `with_definitions` query parameter to also retrieve custom attribute definitions
+        in the same call.
+        When all response pages are retrieved, the results include all custom attributes that are
+        visible to the requesting application, including those that are owned by other applications
+        and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        merchant_id : str
+            The ID of the target [merchant](entity:Merchant).
+
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Filters the `CustomAttributeDefinition` results by their `visibility` values.
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20. For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request. For more
+            information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom
+            attribute, information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttribute]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/merchants/{jsonable_encoder(merchant_id)}/custom-attributes",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "limit": limit,
+                "cursor": cursor,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListMerchantCustomAttributesResponse,
+                    construct_type(
+                        type_=ListMerchantCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        merchant_id,
+                        visibility_filter=visibility_filter,
+                        limit=limit,
+                        cursor=_parsed_next,
+                        with_definitions=with_definitions,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self,
@@ -543,8 +725,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def upsert(
         self,
@@ -620,8 +802,8 @@ async def upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, merchant_id: str, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -666,5 +848,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/merchants/raw_client.py b/src/square/merchants/raw_client.py
index a41dcfcf..601fb0a0 100644
--- a/src/square/merchants/raw_client.py
+++ b/src/square/merchants/raw_client.py
@@ -1,22 +1,84 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
 import typing
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.get_merchant_response import GetMerchantResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.get_merchant_response import GetMerchantResponse
+from ..types.list_merchants_response import ListMerchantsResponse
+from ..types.merchant import Merchant
 
 
 class RawMerchantsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self, *, cursor: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
+    ) -> SyncPager[Merchant]:
+        """
+        Provides details about the merchant associated with a given access token.
+
+        The access token used to connect your application to a Square seller is associated
+        with a single merchant. That means that `ListMerchants` returns a list
+        with a single `Merchant` object. You can specify your personal access token
+        to get your own merchant information or specify an OAuth token to get the
+        information for the merchant that granted your application access.
+
+        If you know the merchant ID, you can also use the [RetrieveMerchant](api-endpoint:Merchants-RetrieveMerchant)
+        endpoint to retrieve the merchant information.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[int]
+            The cursor generated by the previous response.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Merchant]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/merchants",
+            method="GET",
+            params={
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListMerchantsResponse,
+                    construct_type(
+                        type_=ListMerchantsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.merchant
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, merchant_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetMerchantResponse]:
@@ -54,14 +116,77 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawMerchantsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self, *, cursor: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
+    ) -> AsyncPager[Merchant]:
+        """
+        Provides details about the merchant associated with a given access token.
+
+        The access token used to connect your application to a Square seller is associated
+        with a single merchant. That means that `ListMerchants` returns a list
+        with a single `Merchant` object. You can specify your personal access token
+        to get your own merchant information or specify an OAuth token to get the
+        information for the merchant that granted your application access.
+
+        If you know the merchant ID, you can also use the [RetrieveMerchant](api-endpoint:Merchants-RetrieveMerchant)
+        endpoint to retrieve the merchant information.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[int]
+            The cursor generated by the previous response.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Merchant]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/merchants",
+            method="GET",
+            params={
+                "cursor": cursor,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListMerchantsResponse,
+                    construct_type(
+                        type_=ListMerchantsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.merchant
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, merchant_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetMerchantResponse]:
@@ -99,5 +224,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/mobile/__init__.py b/src/square/mobile/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/mobile/__init__.py
+++ b/src/square/mobile/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/mobile/client.py b/src/square/mobile/client.py
index 024d8292..877eb5fe 100644
--- a/src/square/mobile/client.py
+++ b/src/square/mobile/client.py
@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawMobileClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
 from ..types.create_mobile_authorization_code_response import CreateMobileAuthorizationCodeResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawMobileClient
+from .raw_client import AsyncRawMobileClient, RawMobileClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -71,8 +70,8 @@ def authorization_code(
             location_id="YOUR_LOCATION_ID",
         )
         """
-        response = self._raw_client.authorization_code(location_id=location_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.authorization_code(location_id=location_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncMobileClient:
@@ -142,5 +141,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.authorization_code(location_id=location_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.authorization_code(location_id=location_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/mobile/raw_client.py b/src/square/mobile/raw_client.py
index d7a22d19..cda6a717 100644
--- a/src/square/mobile/raw_client.py
+++ b/src/square/mobile/raw_client.py
@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_mobile_authorization_code_response import CreateMobileAuthorizationCodeResponse
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.create_mobile_authorization_code_response import CreateMobileAuthorizationCodeResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -76,8 +75,8 @@ def authorization_code(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawMobileClient:
@@ -141,5 +140,5 @@ async def authorization_code(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/o_auth/__init__.py b/src/square/o_auth/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/o_auth/__init__.py
+++ b/src/square/o_auth/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/o_auth/client.py b/src/square/o_auth/client.py
index 9a534c8b..ccafdc01 100644
--- a/src/square/o_auth/client.py
+++ b/src/square/o_auth/client.py
@@ -1,14 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawOAuthClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.revoke_token_response import RevokeTokenResponse
 from ..types.obtain_token_response import ObtainTokenResponse
 from ..types.retrieve_token_status_response import RetrieveTokenStatusResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawOAuthClient
+from ..types.revoke_token_response import RevokeTokenResponse
+from .raw_client import AsyncRawOAuthClient, RawOAuthClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -93,14 +92,14 @@ def revoke_token(
             access_token="ACCESS_TOKEN",
         )
         """
-        response = self._raw_client.revoke_token(
+        _response = self._raw_client.revoke_token(
             client_id=client_id,
             access_token=access_token,
             merchant_id=merchant_id,
             revoke_only_access_token=revoke_only_access_token,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def obtain_token(
         self,
@@ -232,7 +231,7 @@ def obtain_token(
             grant_type="authorization_code",
         )
         """
-        response = self._raw_client.obtain_token(
+        _response = self._raw_client.obtain_token(
             client_id=client_id,
             grant_type=grant_type,
             client_secret=client_secret,
@@ -245,7 +244,7 @@ def obtain_token(
             code_verifier=code_verifier,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def retrieve_token_status(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -285,8 +284,8 @@ def retrieve_token_status(
         )
         client.o_auth.retrieve_token_status()
         """
-        response = self._raw_client.retrieve_token_status(request_options=request_options)
-        return response.data
+        _response = self._raw_client.retrieve_token_status(request_options=request_options)
+        return _response.data
 
     def authorize(self, *, request_options: typing.Optional[RequestOptions] = None) -> None:
         """
@@ -308,8 +307,8 @@ def authorize(self, *, request_options: typing.Optional[RequestOptions] = None)
         )
         client.o_auth.authorize()
         """
-        response = self._raw_client.authorize(request_options=request_options)
-        return response.data
+        _response = self._raw_client.authorize(request_options=request_options)
+        return _response.data
 
 
 class AsyncOAuthClient:
@@ -399,14 +398,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.revoke_token(
+        _response = await self._raw_client.revoke_token(
             client_id=client_id,
             access_token=access_token,
             merchant_id=merchant_id,
             revoke_only_access_token=revoke_only_access_token,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def obtain_token(
         self,
@@ -546,7 +545,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.obtain_token(
+        _response = await self._raw_client.obtain_token(
             client_id=client_id,
             grant_type=grant_type,
             client_secret=client_secret,
@@ -559,7 +558,7 @@ async def main() -> None:
             code_verifier=code_verifier,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def retrieve_token_status(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -607,8 +606,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.retrieve_token_status(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.retrieve_token_status(request_options=request_options)
+        return _response.data
 
     async def authorize(self, *, request_options: typing.Optional[RequestOptions] = None) -> None:
         """
@@ -638,5 +637,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.authorize(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.authorize(request_options=request_options)
+        return _response.data
diff --git a/src/square/o_auth/raw_client.py b/src/square/o_auth/raw_client.py
index b7e4a7d1..1433ca30 100644
--- a/src/square/o_auth/raw_client.py
+++ b/src/square/o_auth/raw_client.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.revoke_token_response import RevokeTokenResponse
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
 from ..types.obtain_token_response import ObtainTokenResponse
 from ..types.retrieve_token_status_response import RetrieveTokenStatusResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.revoke_token_response import RevokeTokenResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -100,8 +99,8 @@ def revoke_token(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def obtain_token(
         self,
@@ -252,8 +251,8 @@ def obtain_token(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def retrieve_token_status(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -301,8 +300,8 @@ def retrieve_token_status(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def authorize(self, *, request_options: typing.Optional[RequestOptions] = None) -> HttpResponse[None]:
         """
@@ -325,8 +324,8 @@ def authorize(self, *, request_options: typing.Optional[RequestOptions] = None)
                 return HttpResponse(response=_response, data=None)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawOAuthClient:
@@ -412,8 +411,8 @@ async def revoke_token(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def obtain_token(
         self,
@@ -564,8 +563,8 @@ async def obtain_token(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def retrieve_token_status(
         self, *, request_options: typing.Optional[RequestOptions] = None
@@ -613,8 +612,8 @@ async def retrieve_token_status(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def authorize(self, *, request_options: typing.Optional[RequestOptions] = None) -> AsyncHttpResponse[None]:
         """
@@ -637,5 +636,5 @@ async def authorize(self, *, request_options: typing.Optional[RequestOptions] =
                 return AsyncHttpResponse(response=_response, data=None)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/orders/__init__.py b/src/square/orders/__init__.py
index cbf84df6..ab727082 100644
--- a/src/square/orders/__init__.py
+++ b/src/square/orders/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import custom_attribute_definitions, custom_attributes
 
 __all__ = ["custom_attribute_definitions", "custom_attributes"]
diff --git a/src/square/orders/client.py b/src/square/orders/client.py
index 70f24cc5..cc21dd44 100644
--- a/src/square/orders/client.py
+++ b/src/square/orders/client.py
@@ -1,26 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawOrdersClient
-from .custom_attribute_definitions.client import CustomAttributeDefinitionsClient
-from .custom_attributes.client import CustomAttributesClient
-from ..requests.order import OrderParams
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.create_order_response import CreateOrderResponse
-from ..types.batch_get_orders_response import BatchGetOrdersResponse
+from ..requests.order import OrderParams
 from ..requests.order_reward import OrderRewardParams
+from ..requests.search_orders_query import SearchOrdersQueryParams
+from ..types.batch_get_orders_response import BatchGetOrdersResponse
 from ..types.calculate_order_response import CalculateOrderResponse
 from ..types.clone_order_response import CloneOrderResponse
-from ..requests.search_orders_query import SearchOrdersQueryParams
-from ..types.search_orders_response import SearchOrdersResponse
+from ..types.create_order_response import CreateOrderResponse
 from ..types.get_order_response import GetOrderResponse
-from ..types.update_order_response import UpdateOrderResponse
 from ..types.pay_order_response import PayOrderResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawOrdersClient
-from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient
-from .custom_attributes.client import AsyncCustomAttributesClient
+from ..types.search_orders_response import SearchOrdersResponse
+from ..types.update_order_response import UpdateOrderResponse
+from .custom_attribute_definitions.client import AsyncCustomAttributeDefinitionsClient, CustomAttributeDefinitionsClient
+from .custom_attributes.client import AsyncCustomAttributesClient, CustomAttributesClient
+from .raw_client import AsyncRawOrdersClient, RawOrdersClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -141,10 +138,10 @@ def create(
             idempotency_key="8193148c-9586-11e6-99f9-28cfe92138cf",
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             order=order, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def batch_get(
         self,
@@ -187,10 +184,10 @@ def batch_get(
             order_ids=["CAISEM82RcpmcFBM0TfOyiHV3es", "CAISENgvlJ6jLWAzERDzjyHVybY"],
         )
         """
-        response = self._raw_client.batch_get(
+        _response = self._raw_client.batch_get(
             order_ids=order_ids, location_id=location_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def calculate(
         self,
@@ -250,10 +247,10 @@ def calculate(
             },
         )
         """
-        response = self._raw_client.calculate(
+        _response = self._raw_client.calculate(
             order=order, proposed_rewards=proposed_rewards, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def clone(
         self,
@@ -309,10 +306,10 @@ def clone(
             idempotency_key="UNIQUE_STRING",
         )
         """
-        response = self._raw_client.clone(
+        _response = self._raw_client.clone(
             order_id=order_id, version=version, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -406,7 +403,7 @@ def search(
             return_entries=True,
         )
         """
-        response = self._raw_client.search(
+        _response = self._raw_client.search(
             location_ids=location_ids,
             cursor=cursor,
             query=query,
@@ -414,7 +411,7 @@ def search(
             return_entries=return_entries,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(self, order_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetOrderResponse:
         """
@@ -444,8 +441,8 @@ def get(self, order_id: str, *, request_options: typing.Optional[RequestOptions]
             order_id="order_id",
         )
         """
-        response = self._raw_client.get(order_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(order_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -531,14 +528,14 @@ def update(
             idempotency_key="UNIQUE_STRING",
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             order_id,
             order=order,
             fields_to_clear=fields_to_clear,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def pay(
         self,
@@ -605,14 +602,14 @@ def pay(
             payment_ids=["EnZdNAlWCmfh6Mt5FMNST1o7taB", "0LRiVlbXVwe8ozu4KbZxd12mvaB"],
         )
         """
-        response = self._raw_client.pay(
+        _response = self._raw_client.pay(
             order_id,
             idempotency_key=idempotency_key,
             order_version=order_version,
             payment_ids=payment_ids,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
 
 class AsyncOrdersClient:
@@ -738,10 +735,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             order=order, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def batch_get(
         self,
@@ -795,10 +792,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_get(
+        _response = await self._raw_client.batch_get(
             order_ids=order_ids, location_id=location_id, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def calculate(
         self,
@@ -866,10 +863,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.calculate(
+        _response = await self._raw_client.calculate(
             order=order, proposed_rewards=proposed_rewards, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def clone(
         self,
@@ -933,10 +930,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.clone(
+        _response = await self._raw_client.clone(
             order_id=order_id, version=version, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -1038,7 +1035,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             location_ids=location_ids,
             cursor=cursor,
             query=query,
@@ -1046,7 +1043,7 @@ async def main() -> None:
             return_entries=return_entries,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(self, order_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetOrderResponse:
         """
@@ -1084,8 +1081,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(order_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(order_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -1179,14 +1176,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             order_id,
             order=order,
             fields_to_clear=fields_to_clear,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def pay(
         self,
@@ -1264,11 +1261,11 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.pay(
+        _response = await self._raw_client.pay(
             order_id,
             idempotency_key=idempotency_key,
             order_version=order_version,
             payment_ids=payment_ids,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
diff --git a/src/square/orders/custom_attribute_definitions/__init__.py b/src/square/orders/custom_attribute_definitions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/orders/custom_attribute_definitions/__init__.py
+++ b/src/square/orders/custom_attribute_definitions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/orders/custom_attribute_definitions/client.py b/src/square/orders/custom_attribute_definitions/client.py
index e4deec15..3251c782 100644
--- a/src/square/orders/custom_attribute_definitions/client.py
+++ b/src/square/orders/custom_attribute_definitions/client.py
@@ -1,24 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributeDefinitionsClient
-from ...types.visibility_filter import VisibilityFilter
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.custom_attribute_definition import CustomAttributeDefinition
-from ...types.list_order_custom_attribute_definitions_response import ListOrderCustomAttributeDefinitionsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
 from ...types.create_order_custom_attribute_definition_response import CreateOrderCustomAttributeDefinitionResponse
+from ...types.custom_attribute_definition import CustomAttributeDefinition
+from ...types.delete_order_custom_attribute_definition_response import DeleteOrderCustomAttributeDefinitionResponse
 from ...types.retrieve_order_custom_attribute_definition_response import RetrieveOrderCustomAttributeDefinitionResponse
 from ...types.update_order_custom_attribute_definition_response import UpdateOrderCustomAttributeDefinitionResponse
-from ...types.delete_order_custom_attribute_definition_response import DeleteOrderCustomAttributeDefinitionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributeDefinitionsClient
-from ...core.pagination import AsyncPager
+from ...types.visibility_filter import VisibilityFilter
+from .raw_client import AsyncRawCustomAttributeDefinitionsClient, RawCustomAttributeDefinitionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -93,39 +87,9 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/orders/custom-attribute-definitions",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return self._raw_client.list(
+            visibility_filter=visibility_filter, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListOrderCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListOrderCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    visibility_filter=visibility_filter,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -183,12 +147,12 @@ def create(
             idempotency_key="IDEMPOTENCY_KEY",
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -228,8 +192,8 @@ def get(
             key="key",
         )
         """
-        response = self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -285,13 +249,13 @@ def update(
             idempotency_key="IDEMPOTENCY_KEY",
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -325,8 +289,8 @@ def delete(
             key="key",
         )
         """
-        response = self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(key, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributeDefinitionsClient:
@@ -399,6 +363,7 @@ async def main() -> None:
             response = await client.orders.custom_attribute_definitions.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -406,39 +371,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/orders/custom-attribute-definitions",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return await self._raw_client.list(
+            visibility_filter=visibility_filter, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListOrderCustomAttributeDefinitionsResponse,
-                    construct_type(
-                        type_=ListOrderCustomAttributeDefinitionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    visibility_filter=visibility_filter,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attribute_definitions
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -504,12 +439,12 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -557,8 +492,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(key, version=version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(key, version=version, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -622,13 +557,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             key,
             custom_attribute_definition=custom_attribute_definition,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -670,5 +605,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(key, request_options=request_options)
+        return _response.data
diff --git a/src/square/orders/custom_attribute_definitions/raw_client.py b/src/square/orders/custom_attribute_definitions/raw_client.py
index 4179529c..4a9b8183 100644
--- a/src/square/orders/custom_attribute_definitions/raw_client.py
+++ b/src/square/orders/custom_attribute_definitions/raw_client.py
@@ -1,21 +1,24 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_order_custom_attribute_definition_response import CreateOrderCustomAttributeDefinitionResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.custom_attribute_definition import CustomAttributeDefinitionParams
+from ...types.create_order_custom_attribute_definition_response import CreateOrderCustomAttributeDefinitionResponse
+from ...types.custom_attribute_definition import CustomAttributeDefinition
+from ...types.delete_order_custom_attribute_definition_response import DeleteOrderCustomAttributeDefinitionResponse
+from ...types.list_order_custom_attribute_definitions_response import ListOrderCustomAttributeDefinitionsResponse
 from ...types.retrieve_order_custom_attribute_definition_response import RetrieveOrderCustomAttributeDefinitionResponse
-from ...core.jsonable_encoder import jsonable_encoder
 from ...types.update_order_custom_attribute_definition_response import UpdateOrderCustomAttributeDefinitionResponse
-from ...types.delete_order_custom_attribute_definition_response import DeleteOrderCustomAttributeDefinitionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.visibility_filter import VisibilityFilter
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -25,6 +28,82 @@ class RawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttributeDefinition]:
+        """
+        Lists the order-related [custom attribute definitions](entity:CustomAttributeDefinition) that belong to a Square seller account.
+
+        When all response pages are retrieved, the results include all custom attribute definitions
+        that are visible to the requesting application, including those that are created by other
+        applications and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`. Note that
+        seller-defined custom attributes (also known as custom fields) are always set to `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Requests that all of the custom attributes be returned, or only those that are read-only or read-write.
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/orders/custom-attribute-definitions",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListOrderCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListOrderCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    visibility_filter=visibility_filter,
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -88,8 +167,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -138,8 +217,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -205,8 +284,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -246,14 +325,93 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributeDefinitionsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttributeDefinition]:
+        """
+        Lists the order-related [custom attribute definitions](entity:CustomAttributeDefinition) that belong to a Square seller account.
+
+        When all response pages are retrieved, the results include all custom attribute definitions
+        that are visible to the requesting application, including those that are created by other
+        applications and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`. Note that
+        seller-defined custom attributes (also known as custom fields) are always set to `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Requests that all of the custom attributes be returned, or only those that are read-only or read-write.
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttributeDefinition]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/orders/custom-attribute-definitions",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListOrderCustomAttributeDefinitionsResponse,
+                    construct_type(
+                        type_=ListOrderCustomAttributeDefinitionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attribute_definitions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        visibility_filter=visibility_filter,
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -317,8 +475,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, key: str, *, version: typing.Optional[int] = None, request_options: typing.Optional[RequestOptions] = None
@@ -367,8 +525,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -434,8 +592,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -475,5 +633,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/orders/custom_attributes/__init__.py b/src/square/orders/custom_attributes/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/orders/custom_attributes/__init__.py
+++ b/src/square/orders/custom_attributes/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/orders/custom_attributes/client.py b/src/square/orders/custom_attributes/client.py
index 4db14c24..a4dadb9d 100644
--- a/src/square/orders/custom_attributes/client.py
+++ b/src/square/orders/custom_attributes/client.py
@@ -1,32 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCustomAttributesClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
+from ...core.request_options import RequestOptions
 from ...requests.bulk_delete_order_custom_attributes_request_delete_custom_attribute import (
     BulkDeleteOrderCustomAttributesRequestDeleteCustomAttributeParams,
 )
-from ...core.request_options import RequestOptions
-from ...types.bulk_delete_order_custom_attributes_response import BulkDeleteOrderCustomAttributesResponse
 from ...requests.bulk_upsert_order_custom_attributes_request_upsert_custom_attribute import (
     BulkUpsertOrderCustomAttributesRequestUpsertCustomAttributeParams,
 )
+from ...requests.custom_attribute import CustomAttributeParams
+from ...types.bulk_delete_order_custom_attributes_response import BulkDeleteOrderCustomAttributesResponse
 from ...types.bulk_upsert_order_custom_attributes_response import BulkUpsertOrderCustomAttributesResponse
-from ...types.visibility_filter import VisibilityFilter
-from ...core.pagination import SyncPager
 from ...types.custom_attribute import CustomAttribute
-from ...core.jsonable_encoder import jsonable_encoder
-from ...types.list_order_custom_attributes_response import ListOrderCustomAttributesResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...types.delete_order_custom_attribute_response import DeleteOrderCustomAttributeResponse
 from ...types.retrieve_order_custom_attribute_response import RetrieveOrderCustomAttributeResponse
-from ...requests.custom_attribute import CustomAttributeParams
 from ...types.upsert_order_custom_attribute_response import UpsertOrderCustomAttributeResponse
-from ...types.delete_order_custom_attribute_response import DeleteOrderCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCustomAttributesClient
-from ...core.pagination import AsyncPager
+from ...types.visibility_filter import VisibilityFilter
+from .raw_client import AsyncRawCustomAttributesClient, RawCustomAttributesClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -102,8 +95,8 @@ def batch_delete(
             },
         )
         """
-        response = self._raw_client.batch_delete(values=values, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_delete(values=values, request_options=request_options)
+        return _response.data
 
     def batch_upsert(
         self,
@@ -168,8 +161,8 @@ def batch_upsert(
             },
         )
         """
-        response = self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
 
     def list(
         self,
@@ -239,42 +232,14 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/orders/{jsonable_encoder(order_id)}/custom-attributes",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "cursor": cursor,
-                "limit": limit,
-                "with_definitions": with_definitions,
-            },
+        return self._raw_client.list(
+            order_id,
+            visibility_filter=visibility_filter,
+            cursor=cursor,
+            limit=limit,
+            with_definitions=with_definitions,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListOrderCustomAttributesResponse,
-                    construct_type(
-                        type_=ListOrderCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    order_id,
-                    visibility_filter=visibility_filter,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(
         self,
@@ -333,14 +298,14 @@ def get(
             custom_attribute_key="custom_attribute_key",
         )
         """
-        response = self._raw_client.get(
+        _response = self._raw_client.get(
             order_id,
             custom_attribute_key,
             version=version,
             with_definition=with_definition,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def upsert(
         self,
@@ -405,14 +370,14 @@ def upsert(
             custom_attribute={"key": "table-number", "value": "42", "version": 1},
         )
         """
-        response = self._raw_client.upsert(
+        _response = self._raw_client.upsert(
             order_id,
             custom_attribute_key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def delete(
         self, order_id: str, custom_attribute_key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -453,8 +418,8 @@ def delete(
             custom_attribute_key="custom_attribute_key",
         )
         """
-        response = self._raw_client.delete(order_id, custom_attribute_key, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(order_id, custom_attribute_key, request_options=request_options)
+        return _response.data
 
 
 class AsyncCustomAttributesClient:
@@ -535,8 +500,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_delete(values=values, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_delete(values=values, request_options=request_options)
+        return _response.data
 
     async def batch_upsert(
         self,
@@ -609,8 +574,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_upsert(values=values, request_options=request_options)
+        return _response.data
 
     async def list(
         self,
@@ -681,6 +646,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -688,42 +654,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/orders/{jsonable_encoder(order_id)}/custom-attributes",
-            method="GET",
-            params={
-                "visibility_filter": visibility_filter,
-                "cursor": cursor,
-                "limit": limit,
-                "with_definitions": with_definitions,
-            },
+        return await self._raw_client.list(
+            order_id,
+            visibility_filter=visibility_filter,
+            cursor=cursor,
+            limit=limit,
+            with_definitions=with_definitions,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListOrderCustomAttributesResponse,
-                    construct_type(
-                        type_=ListOrderCustomAttributesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    order_id,
-                    visibility_filter=visibility_filter,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    with_definitions=with_definitions,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.custom_attributes
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self,
@@ -790,14 +728,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(
+        _response = await self._raw_client.get(
             order_id,
             custom_attribute_key,
             version=version,
             with_definition=with_definition,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def upsert(
         self,
@@ -870,14 +808,14 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.upsert(
+        _response = await self._raw_client.upsert(
             order_id,
             custom_attribute_key,
             custom_attribute=custom_attribute,
             idempotency_key=idempotency_key,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, order_id: str, custom_attribute_key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -926,5 +864,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(order_id, custom_attribute_key, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(order_id, custom_attribute_key, request_options=request_options)
+        return _response.data
diff --git a/src/square/orders/custom_attributes/raw_client.py b/src/square/orders/custom_attributes/raw_client.py
index 7bcc5616..7d0f78b8 100644
--- a/src/square/orders/custom_attributes/raw_client.py
+++ b/src/square/orders/custom_attributes/raw_client.py
@@ -1,28 +1,31 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.bulk_delete_order_custom_attributes_request_delete_custom_attribute import (
-    BulkDeleteOrderCustomAttributesRequestDeleteCustomAttributeParams,
-)
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.bulk_delete_order_custom_attributes_response import BulkDeleteOrderCustomAttributesResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.bulk_delete_order_custom_attributes_request_delete_custom_attribute import (
+    BulkDeleteOrderCustomAttributesRequestDeleteCustomAttributeParams,
+)
 from ...requests.bulk_upsert_order_custom_attributes_request_upsert_custom_attribute import (
     BulkUpsertOrderCustomAttributesRequestUpsertCustomAttributeParams,
 )
+from ...requests.custom_attribute import CustomAttributeParams
+from ...types.bulk_delete_order_custom_attributes_response import BulkDeleteOrderCustomAttributesResponse
 from ...types.bulk_upsert_order_custom_attributes_response import BulkUpsertOrderCustomAttributesResponse
+from ...types.custom_attribute import CustomAttribute
+from ...types.delete_order_custom_attribute_response import DeleteOrderCustomAttributeResponse
+from ...types.list_order_custom_attributes_response import ListOrderCustomAttributesResponse
 from ...types.retrieve_order_custom_attribute_response import RetrieveOrderCustomAttributeResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...requests.custom_attribute import CustomAttributeParams
 from ...types.upsert_order_custom_attribute_response import UpsertOrderCustomAttributeResponse
-from ...types.delete_order_custom_attribute_response import DeleteOrderCustomAttributeResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.visibility_filter import VisibilityFilter
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -95,8 +98,8 @@ def batch_delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_upsert(
         self,
@@ -161,8 +164,99 @@ def batch_upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def list(
+        self,
+        order_id: str,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[CustomAttribute]:
+        """
+        Lists the [custom attributes](entity:CustomAttribute) associated with an order.
+
+        You can use the `with_definitions` query parameter to also retrieve custom attribute definitions
+        in the same call.
+
+        When all response pages are retrieved, the results include all custom attributes that are
+        visible to the requesting application, including those that are owned by other applications
+        and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        order_id : str
+            The ID of the target [order](entity:Order).
+
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Requests that all of the custom attributes be returned, or only those that are read-only or read-write.
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom attribute,
+            information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[CustomAttribute]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/orders/{jsonable_encoder(order_id)}/custom-attributes",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "cursor": cursor,
+                "limit": limit,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListOrderCustomAttributesResponse,
+                    construct_type(
+                        type_=ListOrderCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    order_id,
+                    visibility_filter=visibility_filter,
+                    cursor=_parsed_next,
+                    limit=limit,
+                    with_definitions=with_definitions,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self,
@@ -230,8 +324,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def upsert(
         self,
@@ -310,8 +404,8 @@ def upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, order_id: str, custom_attribute_key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -357,8 +451,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCustomAttributesClient:
@@ -428,8 +522,8 @@ async def batch_delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_upsert(
         self,
@@ -494,8 +588,102 @@ async def batch_upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def list(
+        self,
+        order_id: str,
+        *,
+        visibility_filter: typing.Optional[VisibilityFilter] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        with_definitions: typing.Optional[bool] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[CustomAttribute]:
+        """
+        Lists the [custom attributes](entity:CustomAttribute) associated with an order.
+
+        You can use the `with_definitions` query parameter to also retrieve custom attribute definitions
+        in the same call.
+
+        When all response pages are retrieved, the results include all custom attributes that are
+        visible to the requesting application, including those that are owned by other applications
+        and set to `VISIBILITY_READ_ONLY` or `VISIBILITY_READ_WRITE_VALUES`.
+
+        Parameters
+        ----------
+        order_id : str
+            The ID of the target [order](entity:Order).
+
+        visibility_filter : typing.Optional[VisibilityFilter]
+            Requests that all of the custom attributes be returned, or only those that are read-only or read-write.
+
+        cursor : typing.Optional[str]
+            The cursor returned in the paged response from the previous call to this endpoint.
+            Provide this cursor to retrieve the next page of results for your original request.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        limit : typing.Optional[int]
+            The maximum number of results to return in a single paged response. This limit is advisory.
+            The response might contain more or fewer results. The minimum value is 1 and the maximum value is 100.
+            The default value is 20.
+            For more information, see [Pagination](https://developer.squareup.com/docs/working-with-apis/pagination).
+
+        with_definitions : typing.Optional[bool]
+            Indicates whether to return the [custom attribute definition](entity:CustomAttributeDefinition) in the `definition` field of each
+            custom attribute. Set this parameter to `true` to get the name and description of each custom attribute,
+            information about the data type, or other definition details. The default value is `false`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[CustomAttribute]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/orders/{jsonable_encoder(order_id)}/custom-attributes",
+            method="GET",
+            params={
+                "visibility_filter": visibility_filter,
+                "cursor": cursor,
+                "limit": limit,
+                "with_definitions": with_definitions,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListOrderCustomAttributesResponse,
+                    construct_type(
+                        type_=ListOrderCustomAttributesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.custom_attributes
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        order_id,
+                        visibility_filter=visibility_filter,
+                        cursor=_parsed_next,
+                        limit=limit,
+                        with_definitions=with_definitions,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self,
@@ -563,8 +751,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def upsert(
         self,
@@ -643,8 +831,8 @@ async def upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, order_id: str, custom_attribute_key: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -690,5 +878,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/orders/raw_client.py b/src/square/orders/raw_client.py
index 3127e2f5..5fd5067b 100644
--- a/src/square/orders/raw_client.py
+++ b/src/square/orders/raw_client.py
@@ -1,27 +1,26 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.order import OrderParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_order_response import CreateOrderResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..types.batch_get_orders_response import BatchGetOrdersResponse
+from ..requests.order import OrderParams
 from ..requests.order_reward import OrderRewardParams
+from ..requests.search_orders_query import SearchOrdersQueryParams
+from ..types.batch_get_orders_response import BatchGetOrdersResponse
 from ..types.calculate_order_response import CalculateOrderResponse
 from ..types.clone_order_response import CloneOrderResponse
-from ..requests.search_orders_query import SearchOrdersQueryParams
-from ..types.search_orders_response import SearchOrdersResponse
+from ..types.create_order_response import CreateOrderResponse
 from ..types.get_order_response import GetOrderResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..types.update_order_response import UpdateOrderResponse
 from ..types.pay_order_response import PayOrderResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.search_orders_response import SearchOrdersResponse
+from ..types.update_order_response import UpdateOrderResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -80,6 +79,9 @@ def create(
                 ),
                 "idempotency_key": idempotency_key,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -95,8 +97,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_get(
         self,
@@ -152,8 +154,8 @@ def batch_get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def calculate(
         self,
@@ -216,8 +218,8 @@ def calculate(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def clone(
         self,
@@ -286,8 +288,8 @@ def clone(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -386,8 +388,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, order_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -425,8 +427,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -515,8 +517,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def pay(
         self,
@@ -596,8 +598,8 @@ def pay(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawOrdersClient:
@@ -653,6 +655,9 @@ async def create(
                 ),
                 "idempotency_key": idempotency_key,
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -668,8 +673,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_get(
         self,
@@ -725,8 +730,8 @@ async def batch_get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def calculate(
         self,
@@ -789,8 +794,8 @@ async def calculate(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def clone(
         self,
@@ -859,8 +864,8 @@ async def clone(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -959,8 +964,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, order_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -998,8 +1003,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -1088,8 +1093,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def pay(
         self,
@@ -1169,5 +1174,5 @@ async def pay(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/payments/__init__.py b/src/square/payments/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/payments/__init__.py
+++ b/src/square/payments/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/payments/client.py b/src/square/payments/client.py
index bf21b89c..ca6deb6b 100644
--- a/src/square/payments/client.py
+++ b/src/square/payments/client.py
@@ -1,32 +1,26 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawPaymentsClient
-from ..types.list_payments_request_sort_field import ListPaymentsRequestSortField
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.payment import Payment
-from ..types.list_payments_response import ListPaymentsResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..requests.money import MoneyParams
 from ..requests.address import AddressParams
 from ..requests.cash_payment_details import CashPaymentDetailsParams
-from ..requests.external_payment_details import ExternalPaymentDetailsParams
 from ..requests.customer_details import CustomerDetailsParams
+from ..requests.external_payment_details import ExternalPaymentDetailsParams
+from ..requests.money import MoneyParams
 from ..requests.offline_payment_details import OfflinePaymentDetailsParams
-from ..types.create_payment_response import CreatePaymentResponse
-from ..types.cancel_payment_by_idempotency_key_response import CancelPaymentByIdempotencyKeyResponse
-from ..types.get_payment_response import GetPaymentResponse
 from ..requests.payment import PaymentParams
-from ..types.update_payment_response import UpdatePaymentResponse
+from ..types.cancel_payment_by_idempotency_key_response import CancelPaymentByIdempotencyKeyResponse
 from ..types.cancel_payment_response import CancelPaymentResponse
 from ..types.complete_payment_response import CompletePaymentResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawPaymentsClient
-from ..core.pagination import AsyncPager
+from ..types.create_payment_response import CreatePaymentResponse
+from ..types.get_payment_response import GetPaymentResponse
+from ..types.list_payments_request_sort_field import ListPaymentsRequestSortField
+from ..types.payment import Payment
+from ..types.update_payment_response import UpdatePaymentResponse
+from .raw_client import AsyncRawPaymentsClient, RawPaymentsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -173,63 +167,24 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/payments",
-            method="GET",
-            params={
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "sort_order": sort_order,
-                "cursor": cursor,
-                "location_id": location_id,
-                "total": total,
-                "last_4": last4,
-                "card_brand": card_brand,
-                "limit": limit,
-                "is_offline_payment": is_offline_payment,
-                "offline_begin_time": offline_begin_time,
-                "offline_end_time": offline_end_time,
-                "updated_at_begin_time": updated_at_begin_time,
-                "updated_at_end_time": updated_at_end_time,
-                "sort_field": sort_field,
-            },
+        return self._raw_client.list(
+            begin_time=begin_time,
+            end_time=end_time,
+            sort_order=sort_order,
+            cursor=cursor,
+            location_id=location_id,
+            total=total,
+            last4=last4,
+            card_brand=card_brand,
+            limit=limit,
+            is_offline_payment=is_offline_payment,
+            offline_begin_time=offline_begin_time,
+            offline_end_time=offline_end_time,
+            updated_at_begin_time=updated_at_begin_time,
+            updated_at_end_time=updated_at_end_time,
+            sort_field=sort_field,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPaymentsResponse,
-                    construct_type(
-                        type_=ListPaymentsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    sort_order=sort_order,
-                    cursor=_parsed_next,
-                    location_id=location_id,
-                    total=total,
-                    last4=last4,
-                    card_brand=card_brand,
-                    limit=limit,
-                    is_offline_payment=is_offline_payment,
-                    offline_begin_time=offline_begin_time,
-                    offline_end_time=offline_end_time,
-                    updated_at_begin_time=updated_at_begin_time,
-                    updated_at_end_time=updated_at_end_time,
-                    sort_field=sort_field,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.payments
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -472,7 +427,7 @@ def create(
             note="Brief description",
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             source_id=source_id,
             idempotency_key=idempotency_key,
             amount_money=amount_money,
@@ -500,7 +455,7 @@ def create(
             offline_payment_details=offline_payment_details,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def cancel_by_idempotency_key(
         self, *, idempotency_key: str, request_options: typing.Optional[RequestOptions] = None
@@ -542,10 +497,10 @@ def cancel_by_idempotency_key(
             idempotency_key="a7e36d40-d24b-11e8-b568-0800200c9a66",
         )
         """
-        response = self._raw_client.cancel_by_idempotency_key(
+        _response = self._raw_client.cancel_by_idempotency_key(
             idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(self, payment_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetPaymentResponse:
         """
@@ -575,8 +530,8 @@ def get(self, payment_id: str, *, request_options: typing.Optional[RequestOption
             payment_id="payment_id",
         )
         """
-        response = self._raw_client.get(payment_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(payment_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -629,10 +584,10 @@ def update(
             idempotency_key="956f8b13-e4ec-45d6-85e8-d1d95ef0c5de",
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             payment_id, idempotency_key=idempotency_key, payment=payment, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def cancel(
         self, payment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -665,8 +620,8 @@ def cancel(
             payment_id="payment_id",
         )
         """
-        response = self._raw_client.cancel(payment_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.cancel(payment_id, request_options=request_options)
+        return _response.data
 
     def complete(
         self,
@@ -710,8 +665,8 @@ def complete(
             payment_id="payment_id",
         )
         """
-        response = self._raw_client.complete(payment_id, version_token=version_token, request_options=request_options)
-        return response.data
+        _response = self._raw_client.complete(payment_id, version_token=version_token, request_options=request_options)
+        return _response.data
 
 
 class AsyncPaymentsClient:
@@ -856,6 +811,7 @@ async def main() -> None:
             response = await client.payments.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -863,63 +819,24 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/payments",
-            method="GET",
-            params={
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "sort_order": sort_order,
-                "cursor": cursor,
-                "location_id": location_id,
-                "total": total,
-                "last_4": last4,
-                "card_brand": card_brand,
-                "limit": limit,
-                "is_offline_payment": is_offline_payment,
-                "offline_begin_time": offline_begin_time,
-                "offline_end_time": offline_end_time,
-                "updated_at_begin_time": updated_at_begin_time,
-                "updated_at_end_time": updated_at_end_time,
-                "sort_field": sort_field,
-            },
+        return await self._raw_client.list(
+            begin_time=begin_time,
+            end_time=end_time,
+            sort_order=sort_order,
+            cursor=cursor,
+            location_id=location_id,
+            total=total,
+            last4=last4,
+            card_brand=card_brand,
+            limit=limit,
+            is_offline_payment=is_offline_payment,
+            offline_begin_time=offline_begin_time,
+            offline_end_time=offline_end_time,
+            updated_at_begin_time=updated_at_begin_time,
+            updated_at_end_time=updated_at_end_time,
+            sort_field=sort_field,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPaymentsResponse,
-                    construct_type(
-                        type_=ListPaymentsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    sort_order=sort_order,
-                    cursor=_parsed_next,
-                    location_id=location_id,
-                    total=total,
-                    last4=last4,
-                    card_brand=card_brand,
-                    limit=limit,
-                    is_offline_payment=is_offline_payment,
-                    offline_begin_time=offline_begin_time,
-                    offline_end_time=offline_end_time,
-                    updated_at_begin_time=updated_at_begin_time,
-                    updated_at_end_time=updated_at_end_time,
-                    sort_field=sort_field,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.payments
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -1170,7 +1087,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             source_id=source_id,
             idempotency_key=idempotency_key,
             amount_money=amount_money,
@@ -1198,7 +1115,7 @@ async def main() -> None:
             offline_payment_details=offline_payment_details,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def cancel_by_idempotency_key(
         self, *, idempotency_key: str, request_options: typing.Optional[RequestOptions] = None
@@ -1248,10 +1165,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.cancel_by_idempotency_key(
+        _response = await self._raw_client.cancel_by_idempotency_key(
             idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, payment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1291,8 +1208,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(payment_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(payment_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -1353,10 +1270,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             payment_id, idempotency_key=idempotency_key, payment=payment, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def cancel(
         self, payment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1397,8 +1314,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.cancel(payment_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.cancel(payment_id, request_options=request_options)
+        return _response.data
 
     async def complete(
         self,
@@ -1450,7 +1367,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.complete(
+        _response = await self._raw_client.complete(
             payment_id, version_token=version_token, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/payments/raw_client.py b/src/square/payments/raw_client.py
index c9794b0b..d1c700c5 100644
--- a/src/square/payments/raw_client.py
+++ b/src/square/payments/raw_client.py
@@ -1,29 +1,32 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.money import MoneyParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.serialization import convert_and_respect_annotation_metadata
+from ..core.unchecked_base_model import construct_type
 from ..requests.address import AddressParams
 from ..requests.cash_payment_details import CashPaymentDetailsParams
-from ..requests.external_payment_details import ExternalPaymentDetailsParams
 from ..requests.customer_details import CustomerDetailsParams
+from ..requests.external_payment_details import ExternalPaymentDetailsParams
+from ..requests.money import MoneyParams
 from ..requests.offline_payment_details import OfflinePaymentDetailsParams
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_payment_response import CreatePaymentResponse
-from ..core.serialization import convert_and_respect_annotation_metadata
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..types.cancel_payment_by_idempotency_key_response import CancelPaymentByIdempotencyKeyResponse
-from ..types.get_payment_response import GetPaymentResponse
-from ..core.jsonable_encoder import jsonable_encoder
 from ..requests.payment import PaymentParams
-from ..types.update_payment_response import UpdatePaymentResponse
+from ..types.cancel_payment_by_idempotency_key_response import CancelPaymentByIdempotencyKeyResponse
 from ..types.cancel_payment_response import CancelPaymentResponse
 from ..types.complete_payment_response import CompletePaymentResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.create_payment_response import CreatePaymentResponse
+from ..types.get_payment_response import GetPaymentResponse
+from ..types.list_payments_request_sort_field import ListPaymentsRequestSortField
+from ..types.list_payments_response import ListPaymentsResponse
+from ..types.payment import Payment
+from ..types.update_payment_response import UpdatePaymentResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -33,6 +36,178 @@ class RawPaymentsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        sort_order: typing.Optional[str] = None,
+        cursor: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        total: typing.Optional[int] = None,
+        last4: typing.Optional[str] = None,
+        card_brand: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        is_offline_payment: typing.Optional[bool] = None,
+        offline_begin_time: typing.Optional[str] = None,
+        offline_end_time: typing.Optional[str] = None,
+        updated_at_begin_time: typing.Optional[str] = None,
+        updated_at_end_time: typing.Optional[str] = None,
+        sort_field: typing.Optional[ListPaymentsRequestSortField] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[Payment]:
+        """
+        Retrieves a list of payments taken by the account making the request.
+
+        Results are eventually consistent, and new payments or changes to payments might take several
+        seconds to appear.
+
+        The maximum results per page is 100.
+
+        Parameters
+        ----------
+        begin_time : typing.Optional[str]
+            Indicates the start of the time range to retrieve payments for, in RFC 3339 format.
+            The range is determined using the `created_at` field for each Payment.
+            Inclusive. Default: The current time minus one year.
+
+        end_time : typing.Optional[str]
+            Indicates the end of the time range to retrieve payments for, in RFC 3339 format.  The
+            range is determined using the `created_at` field for each Payment.
+
+            Default: The current time.
+
+        sort_order : typing.Optional[str]
+            The order in which results are listed by `ListPaymentsRequest.sort_field`:
+            - `ASC` - Oldest to newest.
+            - `DESC` - Newest to oldest (default).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        location_id : typing.Optional[str]
+            Limit results to the location supplied. By default, results are returned
+            for the default (main) location associated with the seller.
+
+        total : typing.Optional[int]
+            The exact amount in the `total_money` for a payment.
+
+        last4 : typing.Optional[str]
+            The last four digits of a payment card.
+
+        card_brand : typing.Optional[str]
+            The brand of the payment card (for example, VISA).
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+            It is possible to receive fewer results than the specified limit on a given page.
+
+            The default value of 100 is also the maximum allowed value. If the provided value is
+            greater than 100, it is ignored and the default value is used instead.
+
+            Default: `100`
+
+        is_offline_payment : typing.Optional[bool]
+            Whether the payment was taken offline or not.
+
+        offline_begin_time : typing.Optional[str]
+            Indicates the start of the time range for which to retrieve offline payments, in RFC 3339
+            format for timestamps. The range is determined using the
+            `offline_payment_details.client_created_at` field for each Payment. If set, payments without a
+            value set in `offline_payment_details.client_created_at` will not be returned.
+
+            Default: The current time.
+
+        offline_end_time : typing.Optional[str]
+            Indicates the end of the time range for which to retrieve offline payments, in RFC 3339
+            format for timestamps. The range is determined using the
+            `offline_payment_details.client_created_at` field for each Payment. If set, payments without a
+            value set in `offline_payment_details.client_created_at` will not be returned.
+
+            Default: The current time.
+
+        updated_at_begin_time : typing.Optional[str]
+            Indicates the start of the time range to retrieve payments for, in RFC 3339 format.  The
+            range is determined using the `updated_at` field for each Payment.
+
+        updated_at_end_time : typing.Optional[str]
+            Indicates the end of the time range to retrieve payments for, in RFC 3339 format.  The
+            range is determined using the `updated_at` field for each Payment.
+
+        sort_field : typing.Optional[ListPaymentsRequestSortField]
+            The field used to sort results by. The default is `CREATED_AT`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Payment]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/payments",
+            method="GET",
+            params={
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "sort_order": sort_order,
+                "cursor": cursor,
+                "location_id": location_id,
+                "total": total,
+                "last_4": last4,
+                "card_brand": card_brand,
+                "limit": limit,
+                "is_offline_payment": is_offline_payment,
+                "offline_begin_time": offline_begin_time,
+                "offline_end_time": offline_end_time,
+                "updated_at_begin_time": updated_at_begin_time,
+                "updated_at_end_time": updated_at_end_time,
+                "sort_field": sort_field,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPaymentsResponse,
+                    construct_type(
+                        type_=ListPaymentsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.payments
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    begin_time=begin_time,
+                    end_time=end_time,
+                    sort_order=sort_order,
+                    cursor=_parsed_next,
+                    location_id=location_id,
+                    total=total,
+                    last4=last4,
+                    card_brand=card_brand,
+                    limit=limit,
+                    is_offline_payment=is_offline_payment,
+                    offline_begin_time=offline_begin_time,
+                    offline_end_time=offline_end_time,
+                    updated_at_begin_time=updated_at_begin_time,
+                    updated_at_end_time=updated_at_end_time,
+                    sort_field=sort_field,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -321,8 +496,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def cancel_by_idempotency_key(
         self, *, idempotency_key: str, request_options: typing.Optional[RequestOptions] = None
@@ -377,8 +552,8 @@ def cancel_by_idempotency_key(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, payment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -416,8 +591,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -480,8 +655,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def cancel(
         self, payment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -520,8 +695,8 @@ def cancel(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def complete(
         self,
@@ -578,14 +753,189 @@ def complete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawPaymentsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        sort_order: typing.Optional[str] = None,
+        cursor: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        total: typing.Optional[int] = None,
+        last4: typing.Optional[str] = None,
+        card_brand: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        is_offline_payment: typing.Optional[bool] = None,
+        offline_begin_time: typing.Optional[str] = None,
+        offline_end_time: typing.Optional[str] = None,
+        updated_at_begin_time: typing.Optional[str] = None,
+        updated_at_end_time: typing.Optional[str] = None,
+        sort_field: typing.Optional[ListPaymentsRequestSortField] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[Payment]:
+        """
+        Retrieves a list of payments taken by the account making the request.
+
+        Results are eventually consistent, and new payments or changes to payments might take several
+        seconds to appear.
+
+        The maximum results per page is 100.
+
+        Parameters
+        ----------
+        begin_time : typing.Optional[str]
+            Indicates the start of the time range to retrieve payments for, in RFC 3339 format.
+            The range is determined using the `created_at` field for each Payment.
+            Inclusive. Default: The current time minus one year.
+
+        end_time : typing.Optional[str]
+            Indicates the end of the time range to retrieve payments for, in RFC 3339 format.  The
+            range is determined using the `created_at` field for each Payment.
+
+            Default: The current time.
+
+        sort_order : typing.Optional[str]
+            The order in which results are listed by `ListPaymentsRequest.sort_field`:
+            - `ASC` - Oldest to newest.
+            - `DESC` - Newest to oldest (default).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        location_id : typing.Optional[str]
+            Limit results to the location supplied. By default, results are returned
+            for the default (main) location associated with the seller.
+
+        total : typing.Optional[int]
+            The exact amount in the `total_money` for a payment.
+
+        last4 : typing.Optional[str]
+            The last four digits of a payment card.
+
+        card_brand : typing.Optional[str]
+            The brand of the payment card (for example, VISA).
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+            It is possible to receive fewer results than the specified limit on a given page.
+
+            The default value of 100 is also the maximum allowed value. If the provided value is
+            greater than 100, it is ignored and the default value is used instead.
+
+            Default: `100`
+
+        is_offline_payment : typing.Optional[bool]
+            Whether the payment was taken offline or not.
+
+        offline_begin_time : typing.Optional[str]
+            Indicates the start of the time range for which to retrieve offline payments, in RFC 3339
+            format for timestamps. The range is determined using the
+            `offline_payment_details.client_created_at` field for each Payment. If set, payments without a
+            value set in `offline_payment_details.client_created_at` will not be returned.
+
+            Default: The current time.
+
+        offline_end_time : typing.Optional[str]
+            Indicates the end of the time range for which to retrieve offline payments, in RFC 3339
+            format for timestamps. The range is determined using the
+            `offline_payment_details.client_created_at` field for each Payment. If set, payments without a
+            value set in `offline_payment_details.client_created_at` will not be returned.
+
+            Default: The current time.
+
+        updated_at_begin_time : typing.Optional[str]
+            Indicates the start of the time range to retrieve payments for, in RFC 3339 format.  The
+            range is determined using the `updated_at` field for each Payment.
+
+        updated_at_end_time : typing.Optional[str]
+            Indicates the end of the time range to retrieve payments for, in RFC 3339 format.  The
+            range is determined using the `updated_at` field for each Payment.
+
+        sort_field : typing.Optional[ListPaymentsRequestSortField]
+            The field used to sort results by. The default is `CREATED_AT`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Payment]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/payments",
+            method="GET",
+            params={
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "sort_order": sort_order,
+                "cursor": cursor,
+                "location_id": location_id,
+                "total": total,
+                "last_4": last4,
+                "card_brand": card_brand,
+                "limit": limit,
+                "is_offline_payment": is_offline_payment,
+                "offline_begin_time": offline_begin_time,
+                "offline_end_time": offline_end_time,
+                "updated_at_begin_time": updated_at_begin_time,
+                "updated_at_end_time": updated_at_end_time,
+                "sort_field": sort_field,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPaymentsResponse,
+                    construct_type(
+                        type_=ListPaymentsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.payments
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        begin_time=begin_time,
+                        end_time=end_time,
+                        sort_order=sort_order,
+                        cursor=_parsed_next,
+                        location_id=location_id,
+                        total=total,
+                        last4=last4,
+                        card_brand=card_brand,
+                        limit=limit,
+                        is_offline_payment=is_offline_payment,
+                        offline_begin_time=offline_begin_time,
+                        offline_end_time=offline_end_time,
+                        updated_at_begin_time=updated_at_begin_time,
+                        updated_at_end_time=updated_at_end_time,
+                        sort_field=sort_field,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -874,8 +1224,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def cancel_by_idempotency_key(
         self, *, idempotency_key: str, request_options: typing.Optional[RequestOptions] = None
@@ -930,8 +1280,8 @@ async def cancel_by_idempotency_key(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, payment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -969,8 +1319,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -1033,8 +1383,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def cancel(
         self, payment_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1073,8 +1423,8 @@ async def cancel(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def complete(
         self,
@@ -1131,5 +1481,5 @@ async def complete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/payouts/__init__.py b/src/square/payouts/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/payouts/__init__.py
+++ b/src/square/payouts/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/payouts/client.py b/src/square/payouts/client.py
index 3f85b22b..4a66692d 100644
--- a/src/square/payouts/client.py
+++ b/src/square/payouts/client.py
@@ -1,24 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawPayoutsClient
 import typing
-from ..types.payout_status import PayoutStatus
-from ..types.sort_order import SortOrder
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.payout import Payout
-from ..types.list_payouts_response import ListPayoutsResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..types.get_payout_response import GetPayoutResponse
+from ..types.payout import Payout
 from ..types.payout_entry import PayoutEntry
-from ..core.jsonable_encoder import jsonable_encoder
-from ..types.list_payout_entries_response import ListPayoutEntriesResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawPayoutsClient
-from ..core.pagination import AsyncPager
+from ..types.payout_status import PayoutStatus
+from ..types.sort_order import SortOrder
+from .raw_client import AsyncRawPayoutsClient, RawPayoutsClient
 
 
 class PayoutsClient:
@@ -108,47 +100,16 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/payouts",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "status": status,
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "sort_order": sort_order,
-                "cursor": cursor,
-                "limit": limit,
-            },
+        return self._raw_client.list(
+            location_id=location_id,
+            status=status,
+            begin_time=begin_time,
+            end_time=end_time,
+            sort_order=sort_order,
+            cursor=cursor,
+            limit=limit,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPayoutsResponse,
-                    construct_type(
-                        type_=ListPayoutsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    status=status,
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    sort_order=sort_order,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.payouts
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def get(self, payout_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetPayoutResponse:
         """
@@ -179,8 +140,8 @@ def get(self, payout_id: str, *, request_options: typing.Optional[RequestOptions
             payout_id="payout_id",
         )
         """
-        response = self._raw_client.get(payout_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(payout_id, request_options=request_options)
+        return _response.data
 
     def list_entries(
         self,
@@ -240,40 +201,9 @@ def list_entries(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/payouts/{jsonable_encoder(payout_id)}/payout-entries",
-            method="GET",
-            params={
-                "sort_order": sort_order,
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return self._raw_client.list_entries(
+            payout_id, sort_order=sort_order, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPayoutEntriesResponse,
-                    construct_type(
-                        type_=ListPayoutEntriesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list_entries(
-                    payout_id,
-                    sort_order=sort_order,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.payout_entries
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
 
 class AsyncPayoutsClient:
@@ -364,6 +294,7 @@ async def main() -> None:
             response = await client.payouts.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -371,47 +302,16 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/payouts",
-            method="GET",
-            params={
-                "location_id": location_id,
-                "status": status,
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "sort_order": sort_order,
-                "cursor": cursor,
-                "limit": limit,
-            },
+        return await self._raw_client.list(
+            location_id=location_id,
+            status=status,
+            begin_time=begin_time,
+            end_time=end_time,
+            sort_order=sort_order,
+            cursor=cursor,
+            limit=limit,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPayoutsResponse,
-                    construct_type(
-                        type_=ListPayoutsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    location_id=location_id,
-                    status=status,
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    sort_order=sort_order,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.payouts
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def get(
         self, payout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -452,8 +352,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(payout_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(payout_id, request_options=request_options)
+        return _response.data
 
     async def list_entries(
         self,
@@ -514,6 +414,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -521,37 +422,6 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/payouts/{jsonable_encoder(payout_id)}/payout-entries",
-            method="GET",
-            params={
-                "sort_order": sort_order,
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return await self._raw_client.list_entries(
+            payout_id, sort_order=sort_order, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPayoutEntriesResponse,
-                    construct_type(
-                        type_=ListPayoutEntriesResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list_entries(
-                    payout_id,
-                    sort_order=sort_order,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.payout_entries
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
diff --git a/src/square/payouts/raw_client.py b/src/square/payouts/raw_client.py
index 447a4721..b5d161a5 100644
--- a/src/square/payouts/raw_client.py
+++ b/src/square/payouts/raw_client.py
@@ -1,22 +1,130 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
 import typing
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.get_payout_response import GetPayoutResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.get_payout_response import GetPayoutResponse
+from ..types.list_payout_entries_response import ListPayoutEntriesResponse
+from ..types.list_payouts_response import ListPayoutsResponse
+from ..types.payout import Payout
+from ..types.payout_entry import PayoutEntry
+from ..types.payout_status import PayoutStatus
+from ..types.sort_order import SortOrder
 
 
 class RawPayoutsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        location_id: typing.Optional[str] = None,
+        status: typing.Optional[PayoutStatus] = None,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[Payout]:
+        """
+        Retrieves a list of all payouts for the default location.
+        You can filter payouts by location ID, status, time range, and order them in ascending or descending order.
+        To call this endpoint, set `PAYOUTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        location_id : typing.Optional[str]
+            The ID of the location for which to list the payouts.
+            By default, payouts are returned for the default (main) location associated with the seller.
+
+        status : typing.Optional[PayoutStatus]
+            If provided, only payouts with the given status are returned.
+
+        begin_time : typing.Optional[str]
+            The timestamp for the beginning of the payout creation time, in RFC 3339 format.
+            Inclusive. Default: The current time minus one year.
+
+        end_time : typing.Optional[str]
+            The timestamp for the end of the payout creation time, in RFC 3339 format.
+            Default: The current time.
+
+        sort_order : typing.Optional[SortOrder]
+            The order in which payouts are listed.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+            If request parameters change between requests, subsequent results may contain duplicates or missing records.
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+            It is possible to receive fewer results than the specified limit on a given page.
+            The default value of 100 is also the maximum allowed value. If the provided value is
+            greater than 100, it is ignored and the default value is used instead.
+            Default: `100`
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[Payout]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/payouts",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "status": status,
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "sort_order": sort_order,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPayoutsResponse,
+                    construct_type(
+                        type_=ListPayoutsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.payouts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    location_id=location_id,
+                    status=status,
+                    begin_time=begin_time,
+                    end_time=end_time,
+                    sort_order=sort_order,
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def get(
         self, payout_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> HttpResponse[GetPayoutResponse]:
@@ -54,14 +162,198 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def list_entries(
+        self,
+        payout_id: str,
+        *,
+        sort_order: typing.Optional[SortOrder] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[PayoutEntry]:
+        """
+        Retrieves a list of all payout entries for a specific payout.
+        To call this endpoint, set `PAYOUTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        payout_id : str
+            The ID of the payout to retrieve the information for.
+
+        sort_order : typing.Optional[SortOrder]
+            The order in which payout entries are listed.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+            If request parameters change between requests, subsequent results may contain duplicates or missing records.
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+            It is possible to receive fewer results than the specified limit on a given page.
+            The default value of 100 is also the maximum allowed value. If the provided value is
+            greater than 100, it is ignored and the default value is used instead.
+            Default: `100`
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[PayoutEntry]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/payouts/{jsonable_encoder(payout_id)}/payout-entries",
+            method="GET",
+            params={
+                "sort_order": sort_order,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPayoutEntriesResponse,
+                    construct_type(
+                        type_=ListPayoutEntriesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.payout_entries
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list_entries(
+                    payout_id,
+                    sort_order=sort_order,
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawPayoutsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        location_id: typing.Optional[str] = None,
+        status: typing.Optional[PayoutStatus] = None,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[Payout]:
+        """
+        Retrieves a list of all payouts for the default location.
+        You can filter payouts by location ID, status, time range, and order them in ascending or descending order.
+        To call this endpoint, set `PAYOUTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        location_id : typing.Optional[str]
+            The ID of the location for which to list the payouts.
+            By default, payouts are returned for the default (main) location associated with the seller.
+
+        status : typing.Optional[PayoutStatus]
+            If provided, only payouts with the given status are returned.
+
+        begin_time : typing.Optional[str]
+            The timestamp for the beginning of the payout creation time, in RFC 3339 format.
+            Inclusive. Default: The current time minus one year.
+
+        end_time : typing.Optional[str]
+            The timestamp for the end of the payout creation time, in RFC 3339 format.
+            Default: The current time.
+
+        sort_order : typing.Optional[SortOrder]
+            The order in which payouts are listed.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+            If request parameters change between requests, subsequent results may contain duplicates or missing records.
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+            It is possible to receive fewer results than the specified limit on a given page.
+            The default value of 100 is also the maximum allowed value. If the provided value is
+            greater than 100, it is ignored and the default value is used instead.
+            Default: `100`
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[Payout]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/payouts",
+            method="GET",
+            params={
+                "location_id": location_id,
+                "status": status,
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "sort_order": sort_order,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPayoutsResponse,
+                    construct_type(
+                        type_=ListPayoutsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.payouts
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        location_id=location_id,
+                        status=status,
+                        begin_time=begin_time,
+                        end_time=end_time,
+                        sort_order=sort_order,
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def get(
         self, payout_id: str, *, request_options: typing.Optional[RequestOptions] = None
     ) -> AsyncHttpResponse[GetPayoutResponse]:
@@ -99,5 +391,87 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def list_entries(
+        self,
+        payout_id: str,
+        *,
+        sort_order: typing.Optional[SortOrder] = None,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[PayoutEntry]:
+        """
+        Retrieves a list of all payout entries for a specific payout.
+        To call this endpoint, set `PAYOUTS_READ` for the OAuth scope.
+
+        Parameters
+        ----------
+        payout_id : str
+            The ID of the payout to retrieve the information for.
+
+        sort_order : typing.Optional[SortOrder]
+            The order in which payout entries are listed.
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+            If request parameters change between requests, subsequent results may contain duplicates or missing records.
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+            It is possible to receive fewer results than the specified limit on a given page.
+            The default value of 100 is also the maximum allowed value. If the provided value is
+            greater than 100, it is ignored and the default value is used instead.
+            Default: `100`
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[PayoutEntry]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/payouts/{jsonable_encoder(payout_id)}/payout-entries",
+            method="GET",
+            params={
+                "sort_order": sort_order,
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPayoutEntriesResponse,
+                    construct_type(
+                        type_=ListPayoutEntriesResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.payout_entries
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list_entries(
+                        payout_id,
+                        sort_order=sort_order,
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/refunds/__init__.py b/src/square/refunds/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/refunds/__init__.py
+++ b/src/square/refunds/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/refunds/client.py b/src/square/refunds/client.py
index 83e269bf..54904b0b 100644
--- a/src/square/refunds/client.py
+++ b/src/square/refunds/client.py
@@ -1,24 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawRefundsClient
-from ..types.list_payment_refunds_request_sort_field import ListPaymentRefundsRequestSortField
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.pagination import SyncPager
-from ..types.payment_refund import PaymentRefund
-from ..types.list_payment_refunds_response import ListPaymentRefundsResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..requests.money import MoneyParams
 from ..requests.destination_details_cash_refund_details import DestinationDetailsCashRefundDetailsParams
 from ..requests.destination_details_external_refund_details import DestinationDetailsExternalRefundDetailsParams
-from ..types.refund_payment_response import RefundPaymentResponse
+from ..requests.money import MoneyParams
 from ..types.get_payment_refund_response import GetPaymentRefundResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawRefundsClient
-from ..core.pagination import AsyncPager
+from ..types.list_payment_refunds_request_sort_field import ListPaymentRefundsRequestSortField
+from ..types.payment_refund import PaymentRefund
+from ..types.refund_payment_response import RefundPaymentResponse
+from .raw_client import AsyncRawRefundsClient, RawRefundsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -152,55 +146,20 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/refunds",
-            method="GET",
-            params={
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "sort_order": sort_order,
-                "cursor": cursor,
-                "location_id": location_id,
-                "status": status,
-                "source_type": source_type,
-                "limit": limit,
-                "updated_at_begin_time": updated_at_begin_time,
-                "updated_at_end_time": updated_at_end_time,
-                "sort_field": sort_field,
-            },
+        return self._raw_client.list(
+            begin_time=begin_time,
+            end_time=end_time,
+            sort_order=sort_order,
+            cursor=cursor,
+            location_id=location_id,
+            status=status,
+            source_type=source_type,
+            limit=limit,
+            updated_at_begin_time=updated_at_begin_time,
+            updated_at_end_time=updated_at_end_time,
+            sort_field=sort_field,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPaymentRefundsResponse,
-                    construct_type(
-                        type_=ListPaymentRefundsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    sort_order=sort_order,
-                    cursor=_parsed_next,
-                    location_id=location_id,
-                    status=status,
-                    source_type=source_type,
-                    limit=limit,
-                    updated_at_begin_time=updated_at_begin_time,
-                    updated_at_end_time=updated_at_end_time,
-                    sort_field=sort_field,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.refunds
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def refund_payment(
         self,
@@ -334,7 +293,7 @@ def refund_payment(
             reason="Example",
         )
         """
-        response = self._raw_client.refund_payment(
+        _response = self._raw_client.refund_payment(
             idempotency_key=idempotency_key,
             amount_money=amount_money,
             app_fee_money=app_fee_money,
@@ -350,7 +309,7 @@ def refund_payment(
             external_details=external_details,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def get(
         self, refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -382,8 +341,8 @@ def get(
             refund_id="refund_id",
         )
         """
-        response = self._raw_client.get(refund_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(refund_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncRefundsClient:
@@ -515,6 +474,7 @@ async def main() -> None:
             response = await client.refunds.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -522,55 +482,20 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/refunds",
-            method="GET",
-            params={
-                "begin_time": begin_time,
-                "end_time": end_time,
-                "sort_order": sort_order,
-                "cursor": cursor,
-                "location_id": location_id,
-                "status": status,
-                "source_type": source_type,
-                "limit": limit,
-                "updated_at_begin_time": updated_at_begin_time,
-                "updated_at_end_time": updated_at_end_time,
-                "sort_field": sort_field,
-            },
+        return await self._raw_client.list(
+            begin_time=begin_time,
+            end_time=end_time,
+            sort_order=sort_order,
+            cursor=cursor,
+            location_id=location_id,
+            status=status,
+            source_type=source_type,
+            limit=limit,
+            updated_at_begin_time=updated_at_begin_time,
+            updated_at_end_time=updated_at_end_time,
+            sort_field=sort_field,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListPaymentRefundsResponse,
-                    construct_type(
-                        type_=ListPaymentRefundsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    begin_time=begin_time,
-                    end_time=end_time,
-                    sort_order=sort_order,
-                    cursor=_parsed_next,
-                    location_id=location_id,
-                    status=status,
-                    source_type=source_type,
-                    limit=limit,
-                    updated_at_begin_time=updated_at_begin_time,
-                    updated_at_end_time=updated_at_end_time,
-                    sort_field=sort_field,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.refunds
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def refund_payment(
         self,
@@ -712,7 +637,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.refund_payment(
+        _response = await self._raw_client.refund_payment(
             idempotency_key=idempotency_key,
             amount_money=amount_money,
             app_fee_money=app_fee_money,
@@ -728,7 +653,7 @@ async def main() -> None:
             external_details=external_details,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -768,5 +693,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(refund_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(refund_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/refunds/raw_client.py b/src/square/refunds/raw_client.py
index 750ef8f0..7e6c90a6 100644
--- a/src/square/refunds/raw_client.py
+++ b/src/square/refunds/raw_client.py
@@ -1,21 +1,24 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.money import MoneyParams
-from ..requests.destination_details_cash_refund_details import DestinationDetailsCashRefundDetailsParams
-from ..requests.destination_details_external_refund_details import DestinationDetailsExternalRefundDetailsParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.refund_payment_response import RefundPaymentResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
+from ..requests.destination_details_cash_refund_details import DestinationDetailsCashRefundDetailsParams
+from ..requests.destination_details_external_refund_details import DestinationDetailsExternalRefundDetailsParams
+from ..requests.money import MoneyParams
 from ..types.get_payment_refund_response import GetPaymentRefundResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.list_payment_refunds_request_sort_field import ListPaymentRefundsRequestSortField
+from ..types.list_payment_refunds_response import ListPaymentRefundsResponse
+from ..types.payment_refund import PaymentRefund
+from ..types.refund_payment_response import RefundPaymentResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -25,6 +28,157 @@ class RawRefundsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        sort_order: typing.Optional[str] = None,
+        cursor: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        status: typing.Optional[str] = None,
+        source_type: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        updated_at_begin_time: typing.Optional[str] = None,
+        updated_at_end_time: typing.Optional[str] = None,
+        sort_field: typing.Optional[ListPaymentRefundsRequestSortField] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[PaymentRefund]:
+        """
+        Retrieves a list of refunds for the account making the request.
+
+        Results are eventually consistent, and new refunds or changes to refunds might take several
+        seconds to appear.
+
+        The maximum results per page is 100.
+
+        Parameters
+        ----------
+        begin_time : typing.Optional[str]
+            Indicates the start of the time range to retrieve each `PaymentRefund` for, in RFC 3339
+            format.  The range is determined using the `created_at` field for each `PaymentRefund`.
+
+            Default: The current time minus one year.
+
+        end_time : typing.Optional[str]
+            Indicates the end of the time range to retrieve each `PaymentRefund` for, in RFC 3339
+            format.  The range is determined using the `created_at` field for each `PaymentRefund`.
+
+            Default: The current time.
+
+        sort_order : typing.Optional[str]
+            The order in which results are listed by `PaymentRefund.created_at`:
+            - `ASC` - Oldest to newest.
+            - `DESC` - Newest to oldest (default).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        location_id : typing.Optional[str]
+            Limit results to the location supplied. By default, results are returned
+            for all locations associated with the seller.
+
+        status : typing.Optional[str]
+            If provided, only refunds with the given status are returned.
+            For a list of refund status values, see [PaymentRefund](entity:PaymentRefund).
+
+            Default: If omitted, refunds are returned regardless of their status.
+
+        source_type : typing.Optional[str]
+            If provided, only returns refunds whose payments have the indicated source type.
+            Current values include `CARD`, `BANK_ACCOUNT`, `WALLET`, `CASH`, and `EXTERNAL`.
+            For information about these payment source types, see
+            [Take Payments](https://developer.squareup.com/docs/payments-api/take-payments).
+
+            Default: If omitted, refunds are returned regardless of the source type.
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+
+            It is possible to receive fewer results than the specified limit on a given page.
+
+            If the supplied value is greater than 100, no more than 100 results are returned.
+
+            Default: 100
+
+        updated_at_begin_time : typing.Optional[str]
+            Indicates the start of the time range to retrieve each `PaymentRefund` for, in RFC 3339
+            format.  The range is determined using the `updated_at` field for each `PaymentRefund`.
+
+            Default: If omitted, the time range starts at `begin_time`.
+
+        updated_at_end_time : typing.Optional[str]
+            Indicates the end of the time range to retrieve each `PaymentRefund` for, in RFC 3339
+            format.  The range is determined using the `updated_at` field for each `PaymentRefund`.
+
+            Default: The current time.
+
+        sort_field : typing.Optional[ListPaymentRefundsRequestSortField]
+            The field used to sort results by. The default is `CREATED_AT`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[PaymentRefund]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/refunds",
+            method="GET",
+            params={
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "sort_order": sort_order,
+                "cursor": cursor,
+                "location_id": location_id,
+                "status": status,
+                "source_type": source_type,
+                "limit": limit,
+                "updated_at_begin_time": updated_at_begin_time,
+                "updated_at_end_time": updated_at_end_time,
+                "sort_field": sort_field,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPaymentRefundsResponse,
+                    construct_type(
+                        type_=ListPaymentRefundsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.refunds
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    begin_time=begin_time,
+                    end_time=end_time,
+                    sort_order=sort_order,
+                    cursor=_parsed_next,
+                    location_id=location_id,
+                    status=status,
+                    source_type=source_type,
+                    limit=limit,
+                    updated_at_begin_time=updated_at_begin_time,
+                    updated_at_end_time=updated_at_end_time,
+                    sort_field=sort_field,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def refund_payment(
         self,
         *,
@@ -188,8 +342,8 @@ def refund_payment(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -227,14 +381,168 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawRefundsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        begin_time: typing.Optional[str] = None,
+        end_time: typing.Optional[str] = None,
+        sort_order: typing.Optional[str] = None,
+        cursor: typing.Optional[str] = None,
+        location_id: typing.Optional[str] = None,
+        status: typing.Optional[str] = None,
+        source_type: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        updated_at_begin_time: typing.Optional[str] = None,
+        updated_at_end_time: typing.Optional[str] = None,
+        sort_field: typing.Optional[ListPaymentRefundsRequestSortField] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[PaymentRefund]:
+        """
+        Retrieves a list of refunds for the account making the request.
+
+        Results are eventually consistent, and new refunds or changes to refunds might take several
+        seconds to appear.
+
+        The maximum results per page is 100.
+
+        Parameters
+        ----------
+        begin_time : typing.Optional[str]
+            Indicates the start of the time range to retrieve each `PaymentRefund` for, in RFC 3339
+            format.  The range is determined using the `created_at` field for each `PaymentRefund`.
+
+            Default: The current time minus one year.
+
+        end_time : typing.Optional[str]
+            Indicates the end of the time range to retrieve each `PaymentRefund` for, in RFC 3339
+            format.  The range is determined using the `created_at` field for each `PaymentRefund`.
+
+            Default: The current time.
+
+        sort_order : typing.Optional[str]
+            The order in which results are listed by `PaymentRefund.created_at`:
+            - `ASC` - Oldest to newest.
+            - `DESC` - Newest to oldest (default).
+
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this cursor to retrieve the next set of results for the original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        location_id : typing.Optional[str]
+            Limit results to the location supplied. By default, results are returned
+            for all locations associated with the seller.
+
+        status : typing.Optional[str]
+            If provided, only refunds with the given status are returned.
+            For a list of refund status values, see [PaymentRefund](entity:PaymentRefund).
+
+            Default: If omitted, refunds are returned regardless of their status.
+
+        source_type : typing.Optional[str]
+            If provided, only returns refunds whose payments have the indicated source type.
+            Current values include `CARD`, `BANK_ACCOUNT`, `WALLET`, `CASH`, and `EXTERNAL`.
+            For information about these payment source types, see
+            [Take Payments](https://developer.squareup.com/docs/payments-api/take-payments).
+
+            Default: If omitted, refunds are returned regardless of the source type.
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+
+            It is possible to receive fewer results than the specified limit on a given page.
+
+            If the supplied value is greater than 100, no more than 100 results are returned.
+
+            Default: 100
+
+        updated_at_begin_time : typing.Optional[str]
+            Indicates the start of the time range to retrieve each `PaymentRefund` for, in RFC 3339
+            format.  The range is determined using the `updated_at` field for each `PaymentRefund`.
+
+            Default: If omitted, the time range starts at `begin_time`.
+
+        updated_at_end_time : typing.Optional[str]
+            Indicates the end of the time range to retrieve each `PaymentRefund` for, in RFC 3339
+            format.  The range is determined using the `updated_at` field for each `PaymentRefund`.
+
+            Default: The current time.
+
+        sort_field : typing.Optional[ListPaymentRefundsRequestSortField]
+            The field used to sort results by. The default is `CREATED_AT`.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[PaymentRefund]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/refunds",
+            method="GET",
+            params={
+                "begin_time": begin_time,
+                "end_time": end_time,
+                "sort_order": sort_order,
+                "cursor": cursor,
+                "location_id": location_id,
+                "status": status,
+                "source_type": source_type,
+                "limit": limit,
+                "updated_at_begin_time": updated_at_begin_time,
+                "updated_at_end_time": updated_at_end_time,
+                "sort_field": sort_field,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListPaymentRefundsResponse,
+                    construct_type(
+                        type_=ListPaymentRefundsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.refunds
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        begin_time=begin_time,
+                        end_time=end_time,
+                        sort_order=sort_order,
+                        cursor=_parsed_next,
+                        location_id=location_id,
+                        status=status,
+                        source_type=source_type,
+                        limit=limit,
+                        updated_at_begin_time=updated_at_begin_time,
+                        updated_at_end_time=updated_at_end_time,
+                        sort_field=sort_field,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def refund_payment(
         self,
         *,
@@ -398,8 +706,8 @@ async def refund_payment(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -437,5 +745,5 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/requests/__init__.py b/src/square/requests/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/requests/__init__.py
+++ b/src/square/requests/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/requests/accept_dispute_response.py b/src/square/requests/accept_dispute_response.py
index bac64b8e..358b86f6 100644
--- a/src/square/requests/accept_dispute_response.py
+++ b/src/square/requests/accept_dispute_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .dispute import DisputeParams
+from .error import ErrorParams
 
 
 class AcceptDisputeResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/accepted_payment_methods.py b/src/square/requests/accepted_payment_methods.py
index b8193815..0abbacb2 100644
--- a/src/square/requests/accepted_payment_methods.py
+++ b/src/square/requests/accepted_payment_methods.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class AcceptedPaymentMethodsParams(typing_extensions.TypedDict):
     apple_pay: typing_extensions.NotRequired[typing.Optional[bool]]
diff --git a/src/square/requests/accumulate_loyalty_points_response.py b/src/square/requests/accumulate_loyalty_points_response.py
index 6035854e..8d621493 100644
--- a/src/square/requests/accumulate_loyalty_points_response.py
+++ b/src/square/requests/accumulate_loyalty_points_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_event import LoyaltyEventParams
 
diff --git a/src/square/requests/ach_details.py b/src/square/requests/ach_details.py
index 2a5f34dc..dc75d5f0 100644
--- a/src/square/requests/ach_details.py
+++ b/src/square/requests/ach_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class AchDetailsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/add_group_to_customer_response.py b/src/square/requests/add_group_to_customer_response.py
index f35bd007..ecf1452b 100644
--- a/src/square/requests/add_group_to_customer_response.py
+++ b/src/square/requests/add_group_to_customer_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/additional_recipient.py b/src/square/requests/additional_recipient.py
index 140badcb..c86d0777 100644
--- a/src/square/requests/additional_recipient.py
+++ b/src/square/requests/additional_recipient.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/address.py b/src/square/requests/address.py
index 7c5b5621..bd1e5308 100644
--- a/src/square/requests/address.py
+++ b/src/square/requests/address.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..core.serialization import FieldMetadata
 from ..types.country import Country
 
diff --git a/src/square/requests/adjust_loyalty_points_response.py b/src/square/requests/adjust_loyalty_points_response.py
index df752da1..9fd2e62a 100644
--- a/src/square/requests/adjust_loyalty_points_response.py
+++ b/src/square/requests/adjust_loyalty_points_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_event import LoyaltyEventParams
 
diff --git a/src/square/requests/afterpay_details.py b/src/square/requests/afterpay_details.py
index a62946a4..98caa190 100644
--- a/src/square/requests/afterpay_details.py
+++ b/src/square/requests/afterpay_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class AfterpayDetailsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/application_details.py b/src/square/requests/application_details.py
index 900b1554..bab29397 100644
--- a/src/square/requests/application_details.py
+++ b/src/square/requests/application_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.application_details_external_square_product import ApplicationDetailsExternalSquareProduct
-import typing
 
 
 class ApplicationDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/appointment_segment.py b/src/square/requests/appointment_segment.py
index 797f81b9..45dc63a1 100644
--- a/src/square/requests/appointment_segment.py
+++ b/src/square/requests/appointment_segment.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class AppointmentSegmentParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/availability.py b/src/square/requests/availability.py
index 71ed4d52..4d7446c3 100644
--- a/src/square/requests/availability.py
+++ b/src/square/requests/availability.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .appointment_segment import AppointmentSegmentParams
 
 
diff --git a/src/square/requests/bank_account.py b/src/square/requests/bank_account.py
index 86df7455..d5623f0e 100644
--- a/src/square/requests/bank_account.py
+++ b/src/square/requests/bank_account.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
+from ..types.bank_account_status import BankAccountStatus
+from ..types.bank_account_type import BankAccountType
 from ..types.country import Country
 from ..types.currency import Currency
-from ..types.bank_account_type import BankAccountType
-import typing_extensions
-import typing
-from ..types.bank_account_status import BankAccountStatus
 
 
 class BankAccountParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bank_account_created_event.py b/src/square/requests/bank_account_created_event.py
index e7aeb919..ef1a02f6 100644
--- a/src/square/requests/bank_account_created_event.py
+++ b/src/square/requests/bank_account_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bank_account_created_event_data import BankAccountCreatedEventDataParams
 
 
diff --git a/src/square/requests/bank_account_created_event_data.py b/src/square/requests/bank_account_created_event_data.py
index a4904321..b8091ab0 100644
--- a/src/square/requests/bank_account_created_event_data.py
+++ b/src/square/requests/bank_account_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bank_account_created_event_object import BankAccountCreatedEventObjectParams
 
 
diff --git a/src/square/requests/bank_account_created_event_object.py b/src/square/requests/bank_account_created_event_object.py
index 96545ebb..5b5144a0 100644
--- a/src/square/requests/bank_account_created_event_object.py
+++ b/src/square/requests/bank_account_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .bank_account import BankAccountParams
 
diff --git a/src/square/requests/bank_account_disabled_event.py b/src/square/requests/bank_account_disabled_event.py
index f343dd8e..1695ebc5 100644
--- a/src/square/requests/bank_account_disabled_event.py
+++ b/src/square/requests/bank_account_disabled_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bank_account_disabled_event_data import BankAccountDisabledEventDataParams
 
 
diff --git a/src/square/requests/bank_account_disabled_event_data.py b/src/square/requests/bank_account_disabled_event_data.py
index cb3fe57d..432f3ef0 100644
--- a/src/square/requests/bank_account_disabled_event_data.py
+++ b/src/square/requests/bank_account_disabled_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bank_account_disabled_event_object import BankAccountDisabledEventObjectParams
 
 
diff --git a/src/square/requests/bank_account_disabled_event_object.py b/src/square/requests/bank_account_disabled_event_object.py
index 605ddc9b..733e544a 100644
--- a/src/square/requests/bank_account_disabled_event_object.py
+++ b/src/square/requests/bank_account_disabled_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .bank_account import BankAccountParams
 
diff --git a/src/square/requests/bank_account_payment_details.py b/src/square/requests/bank_account_payment_details.py
index e3f18a04..f50e0b3d 100644
--- a/src/square/requests/bank_account_payment_details.py
+++ b/src/square/requests/bank_account_payment_details.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .ach_details import AchDetailsParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/bank_account_verified_event.py b/src/square/requests/bank_account_verified_event.py
index 18870d99..a0a26d87 100644
--- a/src/square/requests/bank_account_verified_event.py
+++ b/src/square/requests/bank_account_verified_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bank_account_verified_event_data import BankAccountVerifiedEventDataParams
 
 
diff --git a/src/square/requests/bank_account_verified_event_data.py b/src/square/requests/bank_account_verified_event_data.py
index 2cf9a96b..bd1d7af5 100644
--- a/src/square/requests/bank_account_verified_event_data.py
+++ b/src/square/requests/bank_account_verified_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bank_account_verified_event_object import BankAccountVerifiedEventObjectParams
 
 
diff --git a/src/square/requests/bank_account_verified_event_object.py b/src/square/requests/bank_account_verified_event_object.py
index 86e18931..960daec5 100644
--- a/src/square/requests/bank_account_verified_event_object.py
+++ b/src/square/requests/bank_account_verified_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .bank_account import BankAccountParams
 
diff --git a/src/square/requests/batch_change_inventory_request.py b/src/square/requests/batch_change_inventory_request.py
index d736b7ef..f0431b4b 100644
--- a/src/square/requests/batch_change_inventory_request.py
+++ b/src/square/requests/batch_change_inventory_request.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .inventory_change import InventoryChangeParams
 
 
diff --git a/src/square/requests/batch_change_inventory_response.py b/src/square/requests/batch_change_inventory_response.py
index f8719ffe..3082632c 100644
--- a/src/square/requests/batch_change_inventory_response.py
+++ b/src/square/requests/batch_change_inventory_response.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
-from .inventory_count import InventoryCountParams
 from .inventory_change import InventoryChangeParams
+from .inventory_count import InventoryCountParams
 
 
 class BatchChangeInventoryResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/batch_create_team_members_response.py b/src/square/requests/batch_create_team_members_response.py
index 6df7f48a..21274d20 100644
--- a/src/square/requests/batch_create_team_members_response.py
+++ b/src/square/requests/batch_create_team_members_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .create_team_member_response import CreateTeamMemberResponseParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/batch_create_vendors_response.py b/src/square/requests/batch_create_vendors_response.py
index 4fd7cf78..459aee16 100644
--- a/src/square/requests/batch_create_vendors_response.py
+++ b/src/square/requests/batch_create_vendors_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .create_vendor_response import CreateVendorResponseParams
+from .error import ErrorParams
 
 
 class BatchCreateVendorsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/batch_delete_catalog_objects_response.py b/src/square/requests/batch_delete_catalog_objects_response.py
index 93a7bfd9..e62f72b4 100644
--- a/src/square/requests/batch_delete_catalog_objects_response.py
+++ b/src/square/requests/batch_delete_catalog_objects_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/batch_get_catalog_objects_response.py b/src/square/requests/batch_get_catalog_objects_response.py
index cbb6c2f2..3365036e 100644
--- a/src/square/requests/batch_get_catalog_objects_response.py
+++ b/src/square/requests/batch_get_catalog_objects_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .catalog_object import CatalogObjectParams
+from .error import ErrorParams
 
 
 class BatchGetCatalogObjectsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/batch_get_inventory_changes_response.py b/src/square/requests/batch_get_inventory_changes_response.py
index d98b9cc4..02572308 100644
--- a/src/square/requests/batch_get_inventory_changes_response.py
+++ b/src/square/requests/batch_get_inventory_changes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .inventory_change import InventoryChangeParams
 
diff --git a/src/square/requests/batch_get_inventory_counts_request.py b/src/square/requests/batch_get_inventory_counts_request.py
index 8e681750..bc4d2231 100644
--- a/src/square/requests/batch_get_inventory_counts_request.py
+++ b/src/square/requests/batch_get_inventory_counts_request.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.inventory_state import InventoryState
 
 
diff --git a/src/square/requests/batch_get_inventory_counts_response.py b/src/square/requests/batch_get_inventory_counts_response.py
index df61152b..3ad8c952 100644
--- a/src/square/requests/batch_get_inventory_counts_response.py
+++ b/src/square/requests/batch_get_inventory_counts_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .inventory_count import InventoryCountParams
 
diff --git a/src/square/requests/batch_get_orders_response.py b/src/square/requests/batch_get_orders_response.py
index dd2377db..0acdaa86 100644
--- a/src/square/requests/batch_get_orders_response.py
+++ b/src/square/requests/batch_get_orders_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .order import OrderParams
+
+import typing_extensions
 from .error import ErrorParams
+from .order import OrderParams
 
 
 class BatchGetOrdersResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/batch_get_vendors_response.py b/src/square/requests/batch_get_vendors_response.py
index 7a32de9b..d4cf11a7 100644
--- a/src/square/requests/batch_get_vendors_response.py
+++ b/src/square/requests/batch_get_vendors_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .get_vendor_response import GetVendorResponseParams
 
diff --git a/src/square/requests/batch_retrieve_inventory_changes_request.py b/src/square/requests/batch_retrieve_inventory_changes_request.py
index d66ed4f1..aff54c23 100644
--- a/src/square/requests/batch_retrieve_inventory_changes_request.py
+++ b/src/square/requests/batch_retrieve_inventory_changes_request.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.inventory_change_type import InventoryChangeType
 from ..types.inventory_state import InventoryState
 
diff --git a/src/square/requests/batch_update_team_members_response.py b/src/square/requests/batch_update_team_members_response.py
index 769388b2..bba659d7 100644
--- a/src/square/requests/batch_update_team_members_response.py
+++ b/src/square/requests/batch_update_team_members_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .update_team_member_response import UpdateTeamMemberResponseParams
+
+import typing_extensions
 from .error import ErrorParams
+from .update_team_member_response import UpdateTeamMemberResponseParams
 
 
 class BatchUpdateTeamMembersResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/batch_update_vendors_response.py b/src/square/requests/batch_update_vendors_response.py
index 305cc20c..fd327cc1 100644
--- a/src/square/requests/batch_update_vendors_response.py
+++ b/src/square/requests/batch_update_vendors_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .update_vendor_response import UpdateVendorResponseParams
 
diff --git a/src/square/requests/batch_upsert_catalog_objects_response.py b/src/square/requests/batch_upsert_catalog_objects_response.py
index f1118b81..4d7c8106 100644
--- a/src/square/requests/batch_upsert_catalog_objects_response.py
+++ b/src/square/requests/batch_upsert_catalog_objects_response.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
-from .catalog_object import CatalogObjectParams
+
+import typing_extensions
 from .catalog_id_mapping import CatalogIdMappingParams
+from .catalog_object import CatalogObjectParams
+from .error import ErrorParams
 
 
 class BatchUpsertCatalogObjectsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request.py b/src/square/requests/batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request.py
index 69a5a615..91807d6f 100644
--- a/src/square/requests/batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request.py
+++ b/src/square/requests/batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing_extensions
-import typing
 
 
 class BatchUpsertCustomerCustomAttributesRequestCustomerCustomAttributeUpsertRequestParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/batch_upsert_customer_custom_attributes_response.py b/src/square/requests/batch_upsert_customer_custom_attributes_response.py
index ed2d79ad..31b0bb5e 100644
--- a/src/square/requests/batch_upsert_customer_custom_attributes_response.py
+++ b/src/square/requests/batch_upsert_customer_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response import (
     BatchUpsertCustomerCustomAttributesResponseCustomerCustomAttributeUpsertResponseParams,
 )
diff --git a/src/square/requests/batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response.py b/src/square/requests/batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response.py
index c6e6375b..ee54f4d5 100644
--- a/src/square/requests/batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response.py
+++ b/src/square/requests/batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/booking.py b/src/square/requests/booking.py
index 8542f9a1..238b18f7 100644
--- a/src/square/requests/booking.py
+++ b/src/square/requests/booking.py
@@ -1,14 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
+from ..types.booking_booking_source import BookingBookingSource
 from ..types.booking_status import BookingStatus
-import typing
-from .appointment_segment import AppointmentSegmentParams
 from ..types.business_appointment_settings_booking_location_type import BusinessAppointmentSettingsBookingLocationType
-from .booking_creator_details import BookingCreatorDetailsParams
-from ..types.booking_booking_source import BookingBookingSource
 from .address import AddressParams
+from .appointment_segment import AppointmentSegmentParams
+from .booking_creator_details import BookingCreatorDetailsParams
 
 
 class BookingParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/booking_created_event.py b/src/square/requests/booking_created_event.py
index 99117b52..d7899af1 100644
--- a/src/square/requests/booking_created_event.py
+++ b/src/square/requests/booking_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .booking_created_event_data import BookingCreatedEventDataParams
 
 
diff --git a/src/square/requests/booking_created_event_data.py b/src/square/requests/booking_created_event_data.py
index cca671ad..c7b82907 100644
--- a/src/square/requests/booking_created_event_data.py
+++ b/src/square/requests/booking_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .booking_created_event_object import BookingCreatedEventObjectParams
 
 
diff --git a/src/square/requests/booking_created_event_object.py b/src/square/requests/booking_created_event_object.py
index 376a2a5b..7455923d 100644
--- a/src/square/requests/booking_created_event_object.py
+++ b/src/square/requests/booking_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .booking import BookingParams
 
diff --git a/src/square/requests/booking_creator_details.py b/src/square/requests/booking_creator_details.py
index 878a8500..fa8f39ec 100644
--- a/src/square/requests/booking_creator_details.py
+++ b/src/square/requests/booking_creator_details.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.booking_creator_details_creator_type import BookingCreatorDetailsCreatorType
 
diff --git a/src/square/requests/booking_custom_attribute_definition_owned_created_event.py b/src/square/requests/booking_custom_attribute_definition_owned_created_event.py
index 2f579450..76423654 100644
--- a/src/square/requests/booking_custom_attribute_definition_owned_created_event.py
+++ b/src/square/requests/booking_custom_attribute_definition_owned_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_definition_owned_deleted_event.py b/src/square/requests/booking_custom_attribute_definition_owned_deleted_event.py
index 52e3ecb6..f3544ec1 100644
--- a/src/square/requests/booking_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/requests/booking_custom_attribute_definition_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_definition_owned_updated_event.py b/src/square/requests/booking_custom_attribute_definition_owned_updated_event.py
index 81025b66..18687fc1 100644
--- a/src/square/requests/booking_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/requests/booking_custom_attribute_definition_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_definition_visible_created_event.py b/src/square/requests/booking_custom_attribute_definition_visible_created_event.py
index a805e525..a7640ae6 100644
--- a/src/square/requests/booking_custom_attribute_definition_visible_created_event.py
+++ b/src/square/requests/booking_custom_attribute_definition_visible_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_definition_visible_deleted_event.py b/src/square/requests/booking_custom_attribute_definition_visible_deleted_event.py
index 0bc1dfbf..5450aa76 100644
--- a/src/square/requests/booking_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/requests/booking_custom_attribute_definition_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_definition_visible_updated_event.py b/src/square/requests/booking_custom_attribute_definition_visible_updated_event.py
index 9d3c40c8..bfb8f94a 100644
--- a/src/square/requests/booking_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/requests/booking_custom_attribute_definition_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_delete_response.py b/src/square/requests/booking_custom_attribute_delete_response.py
index e2f18380..50c1b51f 100644
--- a/src/square/requests/booking_custom_attribute_delete_response.py
+++ b/src/square/requests/booking_custom_attribute_delete_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_owned_deleted_event.py b/src/square/requests/booking_custom_attribute_owned_deleted_event.py
index d182bcd6..a68f6667 100644
--- a/src/square/requests/booking_custom_attribute_owned_deleted_event.py
+++ b/src/square/requests/booking_custom_attribute_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_owned_updated_event.py b/src/square/requests/booking_custom_attribute_owned_updated_event.py
index 4dc0089b..ccc53db9 100644
--- a/src/square/requests/booking_custom_attribute_owned_updated_event.py
+++ b/src/square/requests/booking_custom_attribute_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_upsert_request.py b/src/square/requests/booking_custom_attribute_upsert_request.py
index 5384f71a..7296205f 100644
--- a/src/square/requests/booking_custom_attribute_upsert_request.py
+++ b/src/square/requests/booking_custom_attribute_upsert_request.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing_extensions
-import typing
 
 
 class BookingCustomAttributeUpsertRequestParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/booking_custom_attribute_upsert_response.py b/src/square/requests/booking_custom_attribute_upsert_response.py
index d9f3e8e7..af3d32c6 100644
--- a/src/square/requests/booking_custom_attribute_upsert_response.py
+++ b/src/square/requests/booking_custom_attribute_upsert_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_visible_deleted_event.py b/src/square/requests/booking_custom_attribute_visible_deleted_event.py
index 72eedeb8..5f1ad6f9 100644
--- a/src/square/requests/booking_custom_attribute_visible_deleted_event.py
+++ b/src/square/requests/booking_custom_attribute_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/booking_custom_attribute_visible_updated_event.py b/src/square/requests/booking_custom_attribute_visible_updated_event.py
index 3db837ef..636e5425 100644
--- a/src/square/requests/booking_custom_attribute_visible_updated_event.py
+++ b/src/square/requests/booking_custom_attribute_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/booking_updated_event.py b/src/square/requests/booking_updated_event.py
index 3b7db441..0a677d28 100644
--- a/src/square/requests/booking_updated_event.py
+++ b/src/square/requests/booking_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .booking_updated_event_data import BookingUpdatedEventDataParams
 
 
diff --git a/src/square/requests/booking_updated_event_data.py b/src/square/requests/booking_updated_event_data.py
index f896e68d..5cae0fff 100644
--- a/src/square/requests/booking_updated_event_data.py
+++ b/src/square/requests/booking_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .booking_updated_event_object import BookingUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/booking_updated_event_object.py b/src/square/requests/booking_updated_event_object.py
index af409f66..e2465541 100644
--- a/src/square/requests/booking_updated_event_object.py
+++ b/src/square/requests/booking_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .booking import BookingParams
 
diff --git a/src/square/requests/break_.py b/src/square/requests/break_.py
index 411ddd30..3d92ee8b 100644
--- a/src/square/requests/break_.py
+++ b/src/square/requests/break_.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class BreakParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/break_type.py b/src/square/requests/break_type.py
index 4632bb07..cc158217 100644
--- a/src/square/requests/break_type.py
+++ b/src/square/requests/break_type.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class BreakTypeParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_create_customer_data.py b/src/square/requests/bulk_create_customer_data.py
index 9c132274..a31225d7 100644
--- a/src/square/requests/bulk_create_customer_data.py
+++ b/src/square/requests/bulk_create_customer_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .address import AddressParams
 from .customer_tax_ids import CustomerTaxIdsParams
 
diff --git a/src/square/requests/bulk_create_customers_response.py b/src/square/requests/bulk_create_customers_response.py
index f3addd01..8133955f 100644
--- a/src/square/requests/bulk_create_customers_response.py
+++ b/src/square/requests/bulk_create_customers_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .create_customer_response import CreateCustomerResponseParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/bulk_delete_booking_custom_attributes_response.py b/src/square/requests/bulk_delete_booking_custom_attributes_response.py
index 493f90c1..dc814542 100644
--- a/src/square/requests/bulk_delete_booking_custom_attributes_response.py
+++ b/src/square/requests/bulk_delete_booking_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .booking_custom_attribute_delete_response import BookingCustomAttributeDeleteResponseParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/bulk_delete_customers_response.py b/src/square/requests/bulk_delete_customers_response.py
index 96b4349d..47011ae2 100644
--- a/src/square/requests/bulk_delete_customers_response.py
+++ b/src/square/requests/bulk_delete_customers_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .delete_customer_response import DeleteCustomerResponseParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request.py b/src/square/requests/bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request.py
index 77b38c5c..414415e1 100644
--- a/src/square/requests/bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request.py
+++ b/src/square/requests/bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class BulkDeleteLocationCustomAttributesRequestLocationCustomAttributeDeleteRequestParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_delete_location_custom_attributes_response.py b/src/square/requests/bulk_delete_location_custom_attributes_response.py
index e5fa7b0d..ce23db58 100644
--- a/src/square/requests/bulk_delete_location_custom_attributes_response.py
+++ b/src/square/requests/bulk_delete_location_custom_attributes_response.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response import (
     BulkDeleteLocationCustomAttributesResponseLocationCustomAttributeDeleteResponseParams,
 )
-import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response.py b/src/square/requests/bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response.py
index a46bf4b7..9a45fe72 100644
--- a/src/square/requests/bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response.py
+++ b/src/square/requests/bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request.py b/src/square/requests/bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request.py
index 83c086c8..f2f9dbe1 100644
--- a/src/square/requests/bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request.py
+++ b/src/square/requests/bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class BulkDeleteMerchantCustomAttributesRequestMerchantCustomAttributeDeleteRequestParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_delete_merchant_custom_attributes_response.py b/src/square/requests/bulk_delete_merchant_custom_attributes_response.py
index 686953b4..8291eaf9 100644
--- a/src/square/requests/bulk_delete_merchant_custom_attributes_response.py
+++ b/src/square/requests/bulk_delete_merchant_custom_attributes_response.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response import (
     BulkDeleteMerchantCustomAttributesResponseMerchantCustomAttributeDeleteResponseParams,
 )
-import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response.py b/src/square/requests/bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response.py
index 8d273b7c..809426e6 100644
--- a/src/square/requests/bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response.py
+++ b/src/square/requests/bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/bulk_delete_order_custom_attributes_request_delete_custom_attribute.py b/src/square/requests/bulk_delete_order_custom_attributes_request_delete_custom_attribute.py
index 8007edec..f72c4a90 100644
--- a/src/square/requests/bulk_delete_order_custom_attributes_request_delete_custom_attribute.py
+++ b/src/square/requests/bulk_delete_order_custom_attributes_request_delete_custom_attribute.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class BulkDeleteOrderCustomAttributesRequestDeleteCustomAttributeParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_delete_order_custom_attributes_response.py b/src/square/requests/bulk_delete_order_custom_attributes_response.py
index 4d96949c..353176d5 100644
--- a/src/square/requests/bulk_delete_order_custom_attributes_response.py
+++ b/src/square/requests/bulk_delete_order_custom_attributes_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .delete_order_custom_attribute_response import DeleteOrderCustomAttributeResponseParams
+from .error import ErrorParams
 
 
 class BulkDeleteOrderCustomAttributesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_publish_scheduled_shifts_data.py b/src/square/requests/bulk_publish_scheduled_shifts_data.py
index 9a2cf290..17039f6a 100644
--- a/src/square/requests/bulk_publish_scheduled_shifts_data.py
+++ b/src/square/requests/bulk_publish_scheduled_shifts_data.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class BulkPublishScheduledShiftsDataParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_publish_scheduled_shifts_response.py b/src/square/requests/bulk_publish_scheduled_shifts_response.py
index c3ff4e01..864a1e4e 100644
--- a/src/square/requests/bulk_publish_scheduled_shifts_response.py
+++ b/src/square/requests/bulk_publish_scheduled_shifts_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .publish_scheduled_shift_response import PublishScheduledShiftResponseParams
+
+import typing_extensions
 from .error import ErrorParams
+from .publish_scheduled_shift_response import PublishScheduledShiftResponseParams
 
 
 class BulkPublishScheduledShiftsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_retrieve_bookings_response.py b/src/square/requests/bulk_retrieve_bookings_response.py
index 5fdf6e01..709739f1 100644
--- a/src/square/requests/bulk_retrieve_bookings_response.py
+++ b/src/square/requests/bulk_retrieve_bookings_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .get_booking_response import GetBookingResponseParams
+
+import typing_extensions
 from .error import ErrorParams
+from .get_booking_response import GetBookingResponseParams
 
 
 class BulkRetrieveBookingsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_retrieve_customers_response.py b/src/square/requests/bulk_retrieve_customers_response.py
index 80b03a16..098a36ab 100644
--- a/src/square/requests/bulk_retrieve_customers_response.py
+++ b/src/square/requests/bulk_retrieve_customers_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .get_customer_response import GetCustomerResponseParams
+
+import typing_extensions
 from .error import ErrorParams
+from .get_customer_response import GetCustomerResponseParams
 
 
 class BulkRetrieveCustomersResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_retrieve_team_member_booking_profiles_response.py b/src/square/requests/bulk_retrieve_team_member_booking_profiles_response.py
index dc4163bd..844ff498 100644
--- a/src/square/requests/bulk_retrieve_team_member_booking_profiles_response.py
+++ b/src/square/requests/bulk_retrieve_team_member_booking_profiles_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .get_team_member_booking_profile_response import GetTeamMemberBookingProfileResponseParams
+
+import typing_extensions
 from .error import ErrorParams
+from .get_team_member_booking_profile_response import GetTeamMemberBookingProfileResponseParams
 
 
 class BulkRetrieveTeamMemberBookingProfilesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_swap_plan_response.py b/src/square/requests/bulk_swap_plan_response.py
index a0ec5dbf..0fc63bd6 100644
--- a/src/square/requests/bulk_swap_plan_response.py
+++ b/src/square/requests/bulk_swap_plan_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/bulk_update_customer_data.py b/src/square/requests/bulk_update_customer_data.py
index ecd5260b..33e3dfbf 100644
--- a/src/square/requests/bulk_update_customer_data.py
+++ b/src/square/requests/bulk_update_customer_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .address import AddressParams
 from .customer_tax_ids import CustomerTaxIdsParams
 
diff --git a/src/square/requests/bulk_update_customers_response.py b/src/square/requests/bulk_update_customers_response.py
index 3dd2b049..4fc5b3fc 100644
--- a/src/square/requests/bulk_update_customers_response.py
+++ b/src/square/requests/bulk_update_customers_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .update_customer_response import UpdateCustomerResponseParams
+
+import typing_extensions
 from .error import ErrorParams
+from .update_customer_response import UpdateCustomerResponseParams
 
 
 class BulkUpdateCustomersResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_upsert_booking_custom_attributes_response.py b/src/square/requests/bulk_upsert_booking_custom_attributes_response.py
index 429a7b32..225d7aff 100644
--- a/src/square/requests/bulk_upsert_booking_custom_attributes_response.py
+++ b/src/square/requests/bulk_upsert_booking_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .booking_custom_attribute_upsert_response import BookingCustomAttributeUpsertResponseParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request.py b/src/square/requests/bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request.py
index b4b6d0df..f77d7329 100644
--- a/src/square/requests/bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request.py
+++ b/src/square/requests/bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing_extensions
-import typing
 
 
 class BulkUpsertLocationCustomAttributesRequestLocationCustomAttributeUpsertRequestParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_upsert_location_custom_attributes_response.py b/src/square/requests/bulk_upsert_location_custom_attributes_response.py
index 0d5e6a39..e751d28e 100644
--- a/src/square/requests/bulk_upsert_location_custom_attributes_response.py
+++ b/src/square/requests/bulk_upsert_location_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response import (
     BulkUpsertLocationCustomAttributesResponseLocationCustomAttributeUpsertResponseParams,
 )
diff --git a/src/square/requests/bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response.py b/src/square/requests/bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response.py
index 9ab91818..2059bbb3 100644
--- a/src/square/requests/bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response.py
+++ b/src/square/requests/bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request.py b/src/square/requests/bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request.py
index 87eea5e2..704e933d 100644
--- a/src/square/requests/bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request.py
+++ b/src/square/requests/bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing_extensions
-import typing
 
 
 class BulkUpsertMerchantCustomAttributesRequestMerchantCustomAttributeUpsertRequestParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_upsert_merchant_custom_attributes_response.py b/src/square/requests/bulk_upsert_merchant_custom_attributes_response.py
index ea537063..b65d58a3 100644
--- a/src/square/requests/bulk_upsert_merchant_custom_attributes_response.py
+++ b/src/square/requests/bulk_upsert_merchant_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response import (
     BulkUpsertMerchantCustomAttributesResponseMerchantCustomAttributeUpsertResponseParams,
 )
diff --git a/src/square/requests/bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response.py b/src/square/requests/bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response.py
index 3722aa95..a99bec8f 100644
--- a/src/square/requests/bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response.py
+++ b/src/square/requests/bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/bulk_upsert_order_custom_attributes_request_upsert_custom_attribute.py b/src/square/requests/bulk_upsert_order_custom_attributes_request_upsert_custom_attribute.py
index 03cb9bb7..6ce71b0d 100644
--- a/src/square/requests/bulk_upsert_order_custom_attributes_request_upsert_custom_attribute.py
+++ b/src/square/requests/bulk_upsert_order_custom_attributes_request_upsert_custom_attribute.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing_extensions
-import typing
 
 
 class BulkUpsertOrderCustomAttributesRequestUpsertCustomAttributeParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/bulk_upsert_order_custom_attributes_response.py b/src/square/requests/bulk_upsert_order_custom_attributes_response.py
index 71ab555f..b23f8555 100644
--- a/src/square/requests/bulk_upsert_order_custom_attributes_response.py
+++ b/src/square/requests/bulk_upsert_order_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .upsert_order_custom_attribute_response import UpsertOrderCustomAttributeResponseParams
 
diff --git a/src/square/requests/business_appointment_settings.py b/src/square/requests/business_appointment_settings.py
index 67240b1a..4a7c0ee8 100644
--- a/src/square/requests/business_appointment_settings.py
+++ b/src/square/requests/business_appointment_settings.py
@@ -1,15 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from ..types.business_appointment_settings_booking_location_type import BusinessAppointmentSettingsBookingLocationType
+
+import typing_extensions
 from ..types.business_appointment_settings_alignment_time import BusinessAppointmentSettingsAlignmentTime
+from ..types.business_appointment_settings_booking_location_type import BusinessAppointmentSettingsBookingLocationType
+from ..types.business_appointment_settings_cancellation_policy import BusinessAppointmentSettingsCancellationPolicy
 from ..types.business_appointment_settings_max_appointments_per_day_limit_type import (
     BusinessAppointmentSettingsMaxAppointmentsPerDayLimitType,
 )
 from .money import MoneyParams
-from ..types.business_appointment_settings_cancellation_policy import BusinessAppointmentSettingsCancellationPolicy
 
 
 class BusinessAppointmentSettingsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/business_booking_profile.py b/src/square/requests/business_booking_profile.py
index fb9f7696..bb0f7daa 100644
--- a/src/square/requests/business_booking_profile.py
+++ b/src/square/requests/business_booking_profile.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from ..types.business_booking_profile_customer_timezone_choice import BusinessBookingProfileCustomerTimezoneChoice
+
+import typing_extensions
 from ..types.business_booking_profile_booking_policy import BusinessBookingProfileBookingPolicy
+from ..types.business_booking_profile_customer_timezone_choice import BusinessBookingProfileCustomerTimezoneChoice
 from .business_appointment_settings import BusinessAppointmentSettingsParams
 
 
diff --git a/src/square/requests/business_hours.py b/src/square/requests/business_hours.py
index 758aeade..81ebf97e 100644
--- a/src/square/requests/business_hours.py
+++ b/src/square/requests/business_hours.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .business_hours_period import BusinessHoursPeriodParams
 
 
diff --git a/src/square/requests/business_hours_period.py b/src/square/requests/business_hours_period.py
index 887c08a3..054973ad 100644
--- a/src/square/requests/business_hours_period.py
+++ b/src/square/requests/business_hours_period.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.day_of_week import DayOfWeek
-import typing
 
 
 class BusinessHoursPeriodParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/buy_now_pay_later_details.py b/src/square/requests/buy_now_pay_later_details.py
index be192e33..ebb5c7d0 100644
--- a/src/square/requests/buy_now_pay_later_details.py
+++ b/src/square/requests/buy_now_pay_later_details.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .afterpay_details import AfterpayDetailsParams
 from .clearpay_details import ClearpayDetailsParams
 
diff --git a/src/square/requests/calculate_loyalty_points_response.py b/src/square/requests/calculate_loyalty_points_response.py
index b636b3f9..51e51f9c 100644
--- a/src/square/requests/calculate_loyalty_points_response.py
+++ b/src/square/requests/calculate_loyalty_points_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/calculate_order_response.py b/src/square/requests/calculate_order_response.py
index 4e9c7aba..cf4495d0 100644
--- a/src/square/requests/calculate_order_response.py
+++ b/src/square/requests/calculate_order_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .order import OrderParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .order import OrderParams
 
 
 class CalculateOrderResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/cancel_booking_response.py b/src/square/requests/cancel_booking_response.py
index 21150235..76174beb 100644
--- a/src/square/requests/cancel_booking_response.py
+++ b/src/square/requests/cancel_booking_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .booking import BookingParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/cancel_invoice_response.py b/src/square/requests/cancel_invoice_response.py
index 09263787..2501bc75 100644
--- a/src/square/requests/cancel_invoice_response.py
+++ b/src/square/requests/cancel_invoice_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .invoice import InvoiceParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .invoice import InvoiceParams
 
 
 class CancelInvoiceResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/cancel_loyalty_promotion_response.py b/src/square/requests/cancel_loyalty_promotion_response.py
index 3ce7d076..ce216b4d 100644
--- a/src/square/requests/cancel_loyalty_promotion_response.py
+++ b/src/square/requests/cancel_loyalty_promotion_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_promotion import LoyaltyPromotionParams
 
diff --git a/src/square/requests/cancel_payment_by_idempotency_key_response.py b/src/square/requests/cancel_payment_by_idempotency_key_response.py
index f20cec37..ce763ea2 100644
--- a/src/square/requests/cancel_payment_by_idempotency_key_response.py
+++ b/src/square/requests/cancel_payment_by_idempotency_key_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/cancel_payment_response.py b/src/square/requests/cancel_payment_response.py
index 376577e0..332dfce7 100644
--- a/src/square/requests/cancel_payment_response.py
+++ b/src/square/requests/cancel_payment_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment import PaymentParams
 
diff --git a/src/square/requests/cancel_subscription_response.py b/src/square/requests/cancel_subscription_response.py
index c2420103..5fcd0f98 100644
--- a/src/square/requests/cancel_subscription_response.py
+++ b/src/square/requests/cancel_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 from .subscription_action import SubscriptionActionParams
diff --git a/src/square/requests/cancel_terminal_action_response.py b/src/square/requests/cancel_terminal_action_response.py
index 6595afc6..f52ffeea 100644
--- a/src/square/requests/cancel_terminal_action_response.py
+++ b/src/square/requests/cancel_terminal_action_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_action import TerminalActionParams
 
diff --git a/src/square/requests/cancel_terminal_checkout_response.py b/src/square/requests/cancel_terminal_checkout_response.py
index 703c4d4a..29fc794b 100644
--- a/src/square/requests/cancel_terminal_checkout_response.py
+++ b/src/square/requests/cancel_terminal_checkout_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_checkout import TerminalCheckoutParams
 
diff --git a/src/square/requests/cancel_terminal_refund_response.py b/src/square/requests/cancel_terminal_refund_response.py
index fb81fc57..72fee36c 100644
--- a/src/square/requests/cancel_terminal_refund_response.py
+++ b/src/square/requests/cancel_terminal_refund_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_refund import TerminalRefundParams
 
diff --git a/src/square/requests/capture_transaction_response.py b/src/square/requests/capture_transaction_response.py
index 89a83fc4..841db9d4 100644
--- a/src/square/requests/capture_transaction_response.py
+++ b/src/square/requests/capture_transaction_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/card.py b/src/square/requests/card.py
index cd699fd1..b7168e59 100644
--- a/src/square/requests/card.py
+++ b/src/square/requests/card.py
@@ -1,15 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
-from ..types.card_brand import CardBrand
 from ..core.serialization import FieldMetadata
-import typing
-from .address import AddressParams
-from ..types.card_type import CardType
-from ..types.card_prepaid_type import CardPrepaidType
+from ..types.card_brand import CardBrand
 from ..types.card_co_brand import CardCoBrand
 from ..types.card_issuer_alert import CardIssuerAlert
+from ..types.card_prepaid_type import CardPrepaidType
+from ..types.card_type import CardType
+from .address import AddressParams
 
 
 class CardParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/card_automatically_updated_event.py b/src/square/requests/card_automatically_updated_event.py
index 33b18830..09ca07df 100644
--- a/src/square/requests/card_automatically_updated_event.py
+++ b/src/square/requests/card_automatically_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_automatically_updated_event_data import CardAutomaticallyUpdatedEventDataParams
 
 
diff --git a/src/square/requests/card_automatically_updated_event_data.py b/src/square/requests/card_automatically_updated_event_data.py
index b336fa9d..1788bc8e 100644
--- a/src/square/requests/card_automatically_updated_event_data.py
+++ b/src/square/requests/card_automatically_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_automatically_updated_event_object import CardAutomaticallyUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/card_automatically_updated_event_object.py b/src/square/requests/card_automatically_updated_event_object.py
index f05f3cdc..ca33c822 100644
--- a/src/square/requests/card_automatically_updated_event_object.py
+++ b/src/square/requests/card_automatically_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .card import CardParams
 
diff --git a/src/square/requests/card_created_event.py b/src/square/requests/card_created_event.py
index 0de7144b..9b308dd5 100644
--- a/src/square/requests/card_created_event.py
+++ b/src/square/requests/card_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_created_event_data import CardCreatedEventDataParams
 
 
diff --git a/src/square/requests/card_created_event_data.py b/src/square/requests/card_created_event_data.py
index 5d9b3732..e888fc7c 100644
--- a/src/square/requests/card_created_event_data.py
+++ b/src/square/requests/card_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_created_event_object import CardCreatedEventObjectParams
 
 
diff --git a/src/square/requests/card_created_event_object.py b/src/square/requests/card_created_event_object.py
index fe5e8ff7..aa3f43c7 100644
--- a/src/square/requests/card_created_event_object.py
+++ b/src/square/requests/card_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .card import CardParams
 
diff --git a/src/square/requests/card_disabled_event.py b/src/square/requests/card_disabled_event.py
index 93059b5b..64547c75 100644
--- a/src/square/requests/card_disabled_event.py
+++ b/src/square/requests/card_disabled_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_disabled_event_data import CardDisabledEventDataParams
 
 
diff --git a/src/square/requests/card_disabled_event_data.py b/src/square/requests/card_disabled_event_data.py
index 4ff5a0c0..61f2f606 100644
--- a/src/square/requests/card_disabled_event_data.py
+++ b/src/square/requests/card_disabled_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_disabled_event_object import CardDisabledEventObjectParams
 
 
diff --git a/src/square/requests/card_disabled_event_object.py b/src/square/requests/card_disabled_event_object.py
index f2f94ad3..a19ac583 100644
--- a/src/square/requests/card_disabled_event_object.py
+++ b/src/square/requests/card_disabled_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .card import CardParams
 
diff --git a/src/square/requests/card_forgotten_event.py b/src/square/requests/card_forgotten_event.py
index c1a7e6b4..1d694cd7 100644
--- a/src/square/requests/card_forgotten_event.py
+++ b/src/square/requests/card_forgotten_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_forgotten_event_data import CardForgottenEventDataParams
 
 
diff --git a/src/square/requests/card_forgotten_event_card.py b/src/square/requests/card_forgotten_event_card.py
index 6c836f26..abb68064 100644
--- a/src/square/requests/card_forgotten_event_card.py
+++ b/src/square/requests/card_forgotten_event_card.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CardForgottenEventCardParams(typing_extensions.TypedDict):
     id: typing_extensions.NotRequired[str]
diff --git a/src/square/requests/card_forgotten_event_data.py b/src/square/requests/card_forgotten_event_data.py
index 0a158560..d58d1242 100644
--- a/src/square/requests/card_forgotten_event_data.py
+++ b/src/square/requests/card_forgotten_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_forgotten_event_object import CardForgottenEventObjectParams
 
 
diff --git a/src/square/requests/card_forgotten_event_object.py b/src/square/requests/card_forgotten_event_object.py
index 00fdf84f..83df79d3 100644
--- a/src/square/requests/card_forgotten_event_object.py
+++ b/src/square/requests/card_forgotten_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .card_forgotten_event_card import CardForgottenEventCardParams
 
diff --git a/src/square/requests/card_payment_details.py b/src/square/requests/card_payment_details.py
index d479f4fe..ebce6f44 100644
--- a/src/square/requests/card_payment_details.py
+++ b/src/square/requests/card_payment_details.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card import CardParams
-from .device_details import DeviceDetailsParams
 from .card_payment_timeline import CardPaymentTimelineParams
+from .device_details import DeviceDetailsParams
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/card_payment_timeline.py b/src/square/requests/card_payment_timeline.py
index b75bf94a..b9ac800e 100644
--- a/src/square/requests/card_payment_timeline.py
+++ b/src/square/requests/card_payment_timeline.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CardPaymentTimelineParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/card_updated_event.py b/src/square/requests/card_updated_event.py
index b135f1f9..d3885e3e 100644
--- a/src/square/requests/card_updated_event.py
+++ b/src/square/requests/card_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_updated_event_data import CardUpdatedEventDataParams
 
 
diff --git a/src/square/requests/card_updated_event_data.py b/src/square/requests/card_updated_event_data.py
index 2d191fd0..c85fc732 100644
--- a/src/square/requests/card_updated_event_data.py
+++ b/src/square/requests/card_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .card_updated_event_object import CardUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/card_updated_event_object.py b/src/square/requests/card_updated_event_object.py
index 0359bf6e..b13c86b6 100644
--- a/src/square/requests/card_updated_event_object.py
+++ b/src/square/requests/card_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .card import CardParams
 
diff --git a/src/square/requests/cash_app_details.py b/src/square/requests/cash_app_details.py
index 1c11aa6e..6dd98467 100644
--- a/src/square/requests/cash_app_details.py
+++ b/src/square/requests/cash_app_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CashAppDetailsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/cash_drawer_device.py b/src/square/requests/cash_drawer_device.py
index 44474514..9e8e4736 100644
--- a/src/square/requests/cash_drawer_device.py
+++ b/src/square/requests/cash_drawer_device.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CashDrawerDeviceParams(typing_extensions.TypedDict):
     id: typing_extensions.NotRequired[str]
diff --git a/src/square/requests/cash_drawer_shift.py b/src/square/requests/cash_drawer_shift.py
index b2316697..706715db 100644
--- a/src/square/requests/cash_drawer_shift.py
+++ b/src/square/requests/cash_drawer_shift.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.cash_drawer_shift_state import CashDrawerShiftState
-import typing
-from .money import MoneyParams
 from .cash_drawer_device import CashDrawerDeviceParams
+from .money import MoneyParams
 
 
 class CashDrawerShiftParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/cash_drawer_shift_event.py b/src/square/requests/cash_drawer_shift_event.py
index 924ff154..30fa53bc 100644
--- a/src/square/requests/cash_drawer_shift_event.py
+++ b/src/square/requests/cash_drawer_shift_event.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.cash_drawer_event_type import CashDrawerEventType
 from .money import MoneyParams
-import typing
 
 
 class CashDrawerShiftEventParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/cash_drawer_shift_summary.py b/src/square/requests/cash_drawer_shift_summary.py
index 716b2d75..c8cb0c80 100644
--- a/src/square/requests/cash_drawer_shift_summary.py
+++ b/src/square/requests/cash_drawer_shift_summary.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.cash_drawer_shift_state import CashDrawerShiftState
-import typing
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/cash_payment_details.py b/src/square/requests/cash_payment_details.py
index 9b758cac..e34a3df9 100644
--- a/src/square/requests/cash_payment_details.py
+++ b/src/square/requests/cash_payment_details.py
@@ -2,7 +2,6 @@
 
 import typing_extensions
 from .money import MoneyParams
-import typing_extensions
 
 
 class CashPaymentDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_availability_period.py b/src/square/requests/catalog_availability_period.py
index 449c166a..1aa5bd2a 100644
--- a/src/square/requests/catalog_availability_period.py
+++ b/src/square/requests/catalog_availability_period.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.day_of_week import DayOfWeek
 
 
diff --git a/src/square/requests/catalog_category.py b/src/square/requests/catalog_category.py
index 6bdb97fb..65f5b76b 100644
--- a/src/square/requests/catalog_category.py
+++ b/src/square/requests/catalog_category.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
-import typing_extensions
+
 import typing
+
+import typing_extensions
 from ..types.catalog_category_type import CatalogCategoryType
 from .catalog_ecom_seo_data import CatalogEcomSeoDataParams
 from .category_path_to_root_node import CategoryPathToRootNodeParams
-import typing
 
 if typing.TYPE_CHECKING:
     from .catalog_object_category import CatalogObjectCategoryParams
diff --git a/src/square/requests/catalog_custom_attribute_definition.py b/src/square/requests/catalog_custom_attribute_definition.py
index 7a4d44fc..1e978830 100644
--- a/src/square/requests/catalog_custom_attribute_definition.py
+++ b/src/square/requests/catalog_custom_attribute_definition.py
@@ -1,18 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-from ..types.catalog_custom_attribute_definition_type import CatalogCustomAttributeDefinitionType
-import typing_extensions
 import typing
-from .source_application import SourceApplicationParams
-from ..types.catalog_object_type import CatalogObjectType
+
+import typing_extensions
+from ..types.catalog_custom_attribute_definition_app_visibility import CatalogCustomAttributeDefinitionAppVisibility
 from ..types.catalog_custom_attribute_definition_seller_visibility import (
     CatalogCustomAttributeDefinitionSellerVisibility,
 )
-from ..types.catalog_custom_attribute_definition_app_visibility import CatalogCustomAttributeDefinitionAppVisibility
-from .catalog_custom_attribute_definition_string_config import CatalogCustomAttributeDefinitionStringConfigParams
+from ..types.catalog_custom_attribute_definition_type import CatalogCustomAttributeDefinitionType
+from ..types.catalog_object_type import CatalogObjectType
 from .catalog_custom_attribute_definition_number_config import CatalogCustomAttributeDefinitionNumberConfigParams
 from .catalog_custom_attribute_definition_selection_config import CatalogCustomAttributeDefinitionSelectionConfigParams
+from .catalog_custom_attribute_definition_string_config import CatalogCustomAttributeDefinitionStringConfigParams
+from .source_application import SourceApplicationParams
 
 
 class CatalogCustomAttributeDefinitionParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_custom_attribute_definition_number_config.py b/src/square/requests/catalog_custom_attribute_definition_number_config.py
index 0a35d32d..7710bf10 100644
--- a/src/square/requests/catalog_custom_attribute_definition_number_config.py
+++ b/src/square/requests/catalog_custom_attribute_definition_number_config.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogCustomAttributeDefinitionNumberConfigParams(typing_extensions.TypedDict):
     precision: typing_extensions.NotRequired[typing.Optional[int]]
diff --git a/src/square/requests/catalog_custom_attribute_definition_selection_config.py b/src/square/requests/catalog_custom_attribute_definition_selection_config.py
index 006f636a..ad5b4e65 100644
--- a/src/square/requests/catalog_custom_attribute_definition_selection_config.py
+++ b/src/square/requests/catalog_custom_attribute_definition_selection_config.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .catalog_custom_attribute_definition_selection_config_custom_attribute_selection import (
     CatalogCustomAttributeDefinitionSelectionConfigCustomAttributeSelectionParams,
 )
diff --git a/src/square/requests/catalog_custom_attribute_definition_selection_config_custom_attribute_selection.py b/src/square/requests/catalog_custom_attribute_definition_selection_config_custom_attribute_selection.py
index 92f688b7..abfe6ea9 100644
--- a/src/square/requests/catalog_custom_attribute_definition_selection_config_custom_attribute_selection.py
+++ b/src/square/requests/catalog_custom_attribute_definition_selection_config_custom_attribute_selection.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogCustomAttributeDefinitionSelectionConfigCustomAttributeSelectionParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_custom_attribute_definition_string_config.py b/src/square/requests/catalog_custom_attribute_definition_string_config.py
index 85bd17a4..fb7e6aac 100644
--- a/src/square/requests/catalog_custom_attribute_definition_string_config.py
+++ b/src/square/requests/catalog_custom_attribute_definition_string_config.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogCustomAttributeDefinitionStringConfigParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_custom_attribute_value.py b/src/square/requests/catalog_custom_attribute_value.py
index ccb9cae3..83c7ea61 100644
--- a/src/square/requests/catalog_custom_attribute_value.py
+++ b/src/square/requests/catalog_custom_attribute_value.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.catalog_custom_attribute_definition_type import CatalogCustomAttributeDefinitionType
 
 
diff --git a/src/square/requests/catalog_discount.py b/src/square/requests/catalog_discount.py
index b94ea17c..36666e66 100644
--- a/src/square/requests/catalog_discount.py
+++ b/src/square/requests/catalog_discount.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from ..types.catalog_discount_modify_tax_basis import CatalogDiscountModifyTaxBasis
 from ..types.catalog_discount_type import CatalogDiscountType
 from .money import MoneyParams
-from ..types.catalog_discount_modify_tax_basis import CatalogDiscountModifyTaxBasis
 
 
 class CatalogDiscountParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_ecom_seo_data.py b/src/square/requests/catalog_ecom_seo_data.py
index 856e84a1..62395f76 100644
--- a/src/square/requests/catalog_ecom_seo_data.py
+++ b/src/square/requests/catalog_ecom_seo_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogEcomSeoDataParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_id_mapping.py b/src/square/requests/catalog_id_mapping.py
index c0546499..8cf5abd2 100644
--- a/src/square/requests/catalog_id_mapping.py
+++ b/src/square/requests/catalog_id_mapping.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogIdMappingParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_image.py b/src/square/requests/catalog_image.py
index b9d1a689..2cdeb97d 100644
--- a/src/square/requests/catalog_image.py
+++ b/src/square/requests/catalog_image.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogImageParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_info_response.py b/src/square/requests/catalog_info_response.py
index 496b3aaf..6a71bd5d 100644
--- a/src/square/requests/catalog_info_response.py
+++ b/src/square/requests/catalog_info_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .catalog_info_response_limits import CatalogInfoResponseLimitsParams
+from .error import ErrorParams
 from .standard_unit_description_group import StandardUnitDescriptionGroupParams
 
 
diff --git a/src/square/requests/catalog_info_response_limits.py b/src/square/requests/catalog_info_response_limits.py
index 75bd739c..af1cfca3 100644
--- a/src/square/requests/catalog_info_response_limits.py
+++ b/src/square/requests/catalog_info_response_limits.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogInfoResponseLimitsParams(typing_extensions.TypedDict):
     batch_upsert_max_objects_per_batch: typing_extensions.NotRequired[typing.Optional[int]]
diff --git a/src/square/requests/catalog_item.py b/src/square/requests/catalog_item.py
index e9b7407e..633abbf1 100644
--- a/src/square/requests/catalog_item.py
+++ b/src/square/requests/catalog_item.py
@@ -1,16 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
-import typing_extensions
+
 import typing
-from .catalog_item_modifier_list_info import CatalogItemModifierListInfoParams
+
+import typing_extensions
 from ..types.catalog_item_product_type import CatalogItemProductType
-from .catalog_item_option_for_item import CatalogItemOptionForItemParams
-from .catalog_object_category import CatalogObjectCategoryParams
 from .catalog_ecom_seo_data import CatalogEcomSeoDataParams
 from .catalog_item_food_and_beverage_details import CatalogItemFoodAndBeverageDetailsParams
-import typing
+from .catalog_item_modifier_list_info import CatalogItemModifierListInfoParams
+from .catalog_item_option_for_item import CatalogItemOptionForItemParams
+from .catalog_object_category import CatalogObjectCategoryParams
 
 if typing.TYPE_CHECKING:
     from .catalog_object import CatalogObjectParams
diff --git a/src/square/requests/catalog_item_food_and_beverage_details.py b/src/square/requests/catalog_item_food_and_beverage_details.py
index 2b3c1602..37b74152 100644
--- a/src/square/requests/catalog_item_food_and_beverage_details.py
+++ b/src/square/requests/catalog_item_food_and_beverage_details.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .catalog_item_food_and_beverage_details_dietary_preference import (
     CatalogItemFoodAndBeverageDetailsDietaryPreferenceParams,
 )
diff --git a/src/square/requests/catalog_item_food_and_beverage_details_dietary_preference.py b/src/square/requests/catalog_item_food_and_beverage_details_dietary_preference.py
index 72ba99bb..375db540 100644
--- a/src/square/requests/catalog_item_food_and_beverage_details_dietary_preference.py
+++ b/src/square/requests/catalog_item_food_and_beverage_details_dietary_preference.py
@@ -1,14 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
-from ..types.catalog_item_food_and_beverage_details_dietary_preference_type import (
-    CatalogItemFoodAndBeverageDetailsDietaryPreferenceType,
-)
 from ..types.catalog_item_food_and_beverage_details_dietary_preference_standard_dietary_preference import (
     CatalogItemFoodAndBeverageDetailsDietaryPreferenceStandardDietaryPreference,
 )
-import typing
+from ..types.catalog_item_food_and_beverage_details_dietary_preference_type import (
+    CatalogItemFoodAndBeverageDetailsDietaryPreferenceType,
+)
 
 
 class CatalogItemFoodAndBeverageDetailsDietaryPreferenceParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_item_food_and_beverage_details_ingredient.py b/src/square/requests/catalog_item_food_and_beverage_details_ingredient.py
index b9fe63e2..e8e46d02 100644
--- a/src/square/requests/catalog_item_food_and_beverage_details_ingredient.py
+++ b/src/square/requests/catalog_item_food_and_beverage_details_ingredient.py
@@ -1,6 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.catalog_item_food_and_beverage_details_dietary_preference_type import (
     CatalogItemFoodAndBeverageDetailsDietaryPreferenceType,
@@ -8,7 +9,6 @@
 from ..types.catalog_item_food_and_beverage_details_ingredient_standard_ingredient import (
     CatalogItemFoodAndBeverageDetailsIngredientStandardIngredient,
 )
-import typing
 
 
 class CatalogItemFoodAndBeverageDetailsIngredientParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_item_modifier_list_info.py b/src/square/requests/catalog_item_modifier_list_info.py
index 8adf0b38..e355e691 100644
--- a/src/square/requests/catalog_item_modifier_list_info.py
+++ b/src/square/requests/catalog_item_modifier_list_info.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .catalog_modifier_override import CatalogModifierOverrideParams
 
 
diff --git a/src/square/requests/catalog_item_option.py b/src/square/requests/catalog_item_option.py
index 22745c42..63a3ac9c 100644
--- a/src/square/requests/catalog_item_option.py
+++ b/src/square/requests/catalog_item_option.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
-import typing_extensions
-import typing
+
 import typing
 
+import typing_extensions
+
 if typing.TYPE_CHECKING:
     from .catalog_object import CatalogObjectParams
 
diff --git a/src/square/requests/catalog_item_option_for_item.py b/src/square/requests/catalog_item_option_for_item.py
index a77e9826..51c82186 100644
--- a/src/square/requests/catalog_item_option_for_item.py
+++ b/src/square/requests/catalog_item_option_for_item.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogItemOptionForItemParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_item_option_value.py b/src/square/requests/catalog_item_option_value.py
index 92241f91..0c639274 100644
--- a/src/square/requests/catalog_item_option_value.py
+++ b/src/square/requests/catalog_item_option_value.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogItemOptionValueParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_item_option_value_for_item_variation.py b/src/square/requests/catalog_item_option_value_for_item_variation.py
index ed53a181..62ddd96f 100644
--- a/src/square/requests/catalog_item_option_value_for_item_variation.py
+++ b/src/square/requests/catalog_item_option_value_for_item_variation.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogItemOptionValueForItemVariationParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_item_variation.py b/src/square/requests/catalog_item_variation.py
index d28c59c3..c819bfdf 100644
--- a/src/square/requests/catalog_item_variation.py
+++ b/src/square/requests/catalog_item_variation.py
@@ -1,14 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.catalog_pricing_type import CatalogPricingType
-from .money import MoneyParams
-from .item_variation_location_overrides import ItemVariationLocationOverridesParams
 from ..types.inventory_alert_type import InventoryAlertType
 from .catalog_item_option_value_for_item_variation import CatalogItemOptionValueForItemVariationParams
 from .catalog_stock_conversion import CatalogStockConversionParams
+from .item_variation_location_overrides import ItemVariationLocationOverridesParams
+from .money import MoneyParams
 
 
 class CatalogItemVariationParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_measurement_unit.py b/src/square/requests/catalog_measurement_unit.py
index b2eb24c1..21542934 100644
--- a/src/square/requests/catalog_measurement_unit.py
+++ b/src/square/requests/catalog_measurement_unit.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .measurement_unit import MeasurementUnitParams
-import typing
 
 
 class CatalogMeasurementUnitParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_modifier.py b/src/square/requests/catalog_modifier.py
index e2f85572..e6567414 100644
--- a/src/square/requests/catalog_modifier.py
+++ b/src/square/requests/catalog_modifier.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .money import MoneyParams
+
+import typing_extensions
 from .modifier_location_overrides import ModifierLocationOverridesParams
+from .money import MoneyParams
 
 
 class CatalogModifierParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_modifier_list.py b/src/square/requests/catalog_modifier_list.py
index d7d16801..e0571439 100644
--- a/src/square/requests/catalog_modifier_list.py
+++ b/src/square/requests/catalog_modifier_list.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
-import typing_extensions
+
 import typing
-from ..types.catalog_modifier_list_selection_type import CatalogModifierListSelectionType
+
+import typing_extensions
 from ..types.catalog_modifier_list_modifier_type import CatalogModifierListModifierType
-import typing
+from ..types.catalog_modifier_list_selection_type import CatalogModifierListSelectionType
 
 if typing.TYPE_CHECKING:
     from .catalog_object import CatalogObjectParams
diff --git a/src/square/requests/catalog_modifier_override.py b/src/square/requests/catalog_modifier_override.py
index 70fc8525..7ab8cd0b 100644
--- a/src/square/requests/catalog_modifier_override.py
+++ b/src/square/requests/catalog_modifier_override.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogModifierOverrideParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_object.py b/src/square/requests/catalog_object.py
index 43f63843..2afcbf44 100644
--- a/src/square/requests/catalog_object.py
+++ b/src/square/requests/catalog_object.py
@@ -1,28 +1,29 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
+
 import typing
-from .catalog_object_image import CatalogObjectImageParams
+
+from .catalog_object_availability_period import CatalogObjectAvailabilityPeriodParams
 from .catalog_object_category import CatalogObjectCategoryParams
-from .catalog_object_item_variation import CatalogObjectItemVariationParams
-from .catalog_object_tax import CatalogObjectTaxParams
+from .catalog_object_custom_attribute_definition import CatalogObjectCustomAttributeDefinitionParams
 from .catalog_object_discount import CatalogObjectDiscountParams
+from .catalog_object_image import CatalogObjectImageParams
+from .catalog_object_item_option_value import CatalogObjectItemOptionValueParams
+from .catalog_object_item_variation import CatalogObjectItemVariationParams
+from .catalog_object_measurement_unit import CatalogObjectMeasurementUnitParams
 from .catalog_object_modifier import CatalogObjectModifierParams
 from .catalog_object_pricing_rule import CatalogObjectPricingRuleParams
 from .catalog_object_product_set import CatalogObjectProductSetParams
-from .catalog_object_time_period import CatalogObjectTimePeriodParams
-from .catalog_object_measurement_unit import CatalogObjectMeasurementUnitParams
-from .catalog_object_subscription_plan_variation import CatalogObjectSubscriptionPlanVariationParams
-from .catalog_object_item_option_value import CatalogObjectItemOptionValueParams
-from .catalog_object_custom_attribute_definition import CatalogObjectCustomAttributeDefinitionParams
 from .catalog_object_quick_amounts_settings import CatalogObjectQuickAmountsSettingsParams
-from .catalog_object_availability_period import CatalogObjectAvailabilityPeriodParams
-import typing
+from .catalog_object_subscription_plan_variation import CatalogObjectSubscriptionPlanVariationParams
+from .catalog_object_tax import CatalogObjectTaxParams
+from .catalog_object_time_period import CatalogObjectTimePeriodParams
 
 if typing.TYPE_CHECKING:
     from .catalog_object_item import CatalogObjectItemParams
-    from .catalog_object_modifier_list import CatalogObjectModifierListParams
     from .catalog_object_item_option import CatalogObjectItemOptionParams
+    from .catalog_object_modifier_list import CatalogObjectModifierListParams
     from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlanParams
 CatalogObjectParams = typing.Union[
     "CatalogObjectItemParams",
diff --git a/src/square/requests/catalog_object_availability_period.py b/src/square/requests/catalog_object_availability_period.py
index a4cc7824..0139b550 100644
--- a/src/square/requests/catalog_object_availability_period.py
+++ b/src/square/requests/catalog_object_availability_period.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
+from ..core.serialization import FieldMetadata
 from .catalog_availability_period import CatalogAvailabilityPeriodParams
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectAvailabilityPeriodParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_base.py b/src/square/requests/catalog_object_base.py
index 121cdc09..1f6ec6c0 100644
--- a/src/square/requests/catalog_object_base.py
+++ b/src/square/requests/catalog_object_base.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
+from ..core.serialization import FieldMetadata
 from ..types.catalog_object_type import CatalogObjectType
-import typing_extensions
-import typing
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectBaseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_batch.py b/src/square/requests/catalog_object_batch.py
index 7ed9ff54..0a9c7f8f 100644
--- a/src/square/requests/catalog_object_batch.py
+++ b/src/square/requests/catalog_object_batch.py
@@ -1,7 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
+import typing_extensions
 from .catalog_object import CatalogObjectParams
 
 
diff --git a/src/square/requests/catalog_object_category.py b/src/square/requests/catalog_object_category.py
index 2514aa3b..69d3d820 100644
--- a/src/square/requests/catalog_object_category.py
+++ b/src/square/requests/catalog_object_category.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
-import typing_extensions
+
 import typing
+
+import typing_extensions
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
-import typing
 
 if typing.TYPE_CHECKING:
     from .catalog_category import CatalogCategoryParams
diff --git a/src/square/requests/catalog_object_custom_attribute_definition.py b/src/square/requests/catalog_object_custom_attribute_definition.py
index 17e89b30..81c8be8b 100644
--- a/src/square/requests/catalog_object_custom_attribute_definition.py
+++ b/src/square/requests/catalog_object_custom_attribute_definition.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_definition import CatalogCustomAttributeDefinitionParams
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectCustomAttributeDefinitionParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_discount.py b/src/square/requests/catalog_object_discount.py
index cab74f86..23989e6b 100644
--- a/src/square/requests/catalog_object_discount.py
+++ b/src/square/requests/catalog_object_discount.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_discount import CatalogDiscountParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_discount import CatalogDiscountParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectDiscountParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_image.py b/src/square/requests/catalog_object_image.py
index 54f9d6b9..54aa5c0b 100644
--- a/src/square/requests/catalog_object_image.py
+++ b/src/square/requests/catalog_object_image.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_image import CatalogImageParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_image import CatalogImageParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectImageParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_item.py b/src/square/requests/catalog_object_item.py
index dba33fed..8076b3d3 100644
--- a/src/square/requests/catalog_object_item.py
+++ b/src/square/requests/catalog_object_item.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
+
 import typing
+
 import typing_extensions
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
-import typing
 
 if typing.TYPE_CHECKING:
     from .catalog_item import CatalogItemParams
diff --git a/src/square/requests/catalog_object_item_option.py b/src/square/requests/catalog_object_item_option.py
index b02cb27c..667b6b81 100644
--- a/src/square/requests/catalog_object_item_option.py
+++ b/src/square/requests/catalog_object_item_option.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
+
 import typing
+
 import typing_extensions
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
-import typing
 
 if typing.TYPE_CHECKING:
     from .catalog_item_option import CatalogItemOptionParams
diff --git a/src/square/requests/catalog_object_item_option_value.py b/src/square/requests/catalog_object_item_option_value.py
index e2a3707f..5cea87b2 100644
--- a/src/square/requests/catalog_object_item_option_value.py
+++ b/src/square/requests/catalog_object_item_option_value.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_item_option_value import CatalogItemOptionValueParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_item_option_value import CatalogItemOptionValueParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectItemOptionValueParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_item_variation.py b/src/square/requests/catalog_object_item_variation.py
index 5365db2a..166e6ab6 100644
--- a/src/square/requests/catalog_object_item_variation.py
+++ b/src/square/requests/catalog_object_item_variation.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_item_variation import CatalogItemVariationParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_item_variation import CatalogItemVariationParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectItemVariationParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_measurement_unit.py b/src/square/requests/catalog_object_measurement_unit.py
index eac517ed..d4f682fb 100644
--- a/src/square/requests/catalog_object_measurement_unit.py
+++ b/src/square/requests/catalog_object_measurement_unit.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_measurement_unit import CatalogMeasurementUnitParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_measurement_unit import CatalogMeasurementUnitParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectMeasurementUnitParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_modifier.py b/src/square/requests/catalog_object_modifier.py
index 62bb81ab..0a2f523e 100644
--- a/src/square/requests/catalog_object_modifier.py
+++ b/src/square/requests/catalog_object_modifier.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_modifier import CatalogModifierParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_modifier import CatalogModifierParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectModifierParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_modifier_list.py b/src/square/requests/catalog_object_modifier_list.py
index 8d613b19..80d4f27a 100644
--- a/src/square/requests/catalog_object_modifier_list.py
+++ b/src/square/requests/catalog_object_modifier_list.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
+
 import typing
+
 import typing_extensions
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
-import typing
 
 if typing.TYPE_CHECKING:
     from .catalog_modifier_list import CatalogModifierListParams
diff --git a/src/square/requests/catalog_object_pricing_rule.py b/src/square/requests/catalog_object_pricing_rule.py
index 1374d5a9..05fe7516 100644
--- a/src/square/requests/catalog_object_pricing_rule.py
+++ b/src/square/requests/catalog_object_pricing_rule.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_pricing_rule import CatalogPricingRuleParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_pricing_rule import CatalogPricingRuleParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectPricingRuleParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_product_set.py b/src/square/requests/catalog_object_product_set.py
index 2b02c044..11b19f89 100644
--- a/src/square/requests/catalog_object_product_set.py
+++ b/src/square/requests/catalog_object_product_set.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_product_set import CatalogProductSetParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_product_set import CatalogProductSetParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectProductSetParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_quick_amounts_settings.py b/src/square/requests/catalog_object_quick_amounts_settings.py
index ccc508fb..e8178b86 100644
--- a/src/square/requests/catalog_object_quick_amounts_settings.py
+++ b/src/square/requests/catalog_object_quick_amounts_settings.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_quick_amounts_settings import CatalogQuickAmountsSettingsParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_quick_amounts_settings import CatalogQuickAmountsSettingsParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectQuickAmountsSettingsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_reference.py b/src/square/requests/catalog_object_reference.py
index 0a1d72ae..50b60111 100644
--- a/src/square/requests/catalog_object_reference.py
+++ b/src/square/requests/catalog_object_reference.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogObjectReferenceParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_object_subscription_plan.py b/src/square/requests/catalog_object_subscription_plan.py
index 340b9d27..fa08f44a 100644
--- a/src/square/requests/catalog_object_subscription_plan.py
+++ b/src/square/requests/catalog_object_subscription_plan.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
+
 import typing
+
 import typing_extensions
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
-import typing
 
 if typing.TYPE_CHECKING:
     from .catalog_subscription_plan import CatalogSubscriptionPlanParams
diff --git a/src/square/requests/catalog_object_subscription_plan_variation.py b/src/square/requests/catalog_object_subscription_plan_variation.py
index 21a29d3d..e6df5ab9 100644
--- a/src/square/requests/catalog_object_subscription_plan_variation.py
+++ b/src/square/requests/catalog_object_subscription_plan_variation.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_subscription_plan_variation import CatalogSubscriptionPlanVariationParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_subscription_plan_variation import CatalogSubscriptionPlanVariationParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectSubscriptionPlanVariationParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_tax.py b/src/square/requests/catalog_object_tax.py
index c5eefa1c..4ec491db 100644
--- a/src/square/requests/catalog_object_tax.py
+++ b/src/square/requests/catalog_object_tax.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_tax import CatalogTaxParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_tax import CatalogTaxParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectTaxParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_object_time_period.py b/src/square/requests/catalog_object_time_period.py
index 0200c33e..bc5cd05e 100644
--- a/src/square/requests/catalog_object_time_period.py
+++ b/src/square/requests/catalog_object_time_period.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
-from .catalog_time_period import CatalogTimePeriodParams
+from ..core.serialization import FieldMetadata
 from .catalog_custom_attribute_value import CatalogCustomAttributeValueParams
+from .catalog_time_period import CatalogTimePeriodParams
 from .catalog_v1id import CatalogV1IdParams
-from ..core.serialization import FieldMetadata
 
 
 class CatalogObjectTimePeriodParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_pricing_rule.py b/src/square/requests/catalog_pricing_rule.py
index 2091d508..ccaf45f5 100644
--- a/src/square/requests/catalog_pricing_rule.py
+++ b/src/square/requests/catalog_pricing_rule.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.exclude_strategy import ExcludeStrategy
 from .money import MoneyParams
 
diff --git a/src/square/requests/catalog_product_set.py b/src/square/requests/catalog_product_set.py
index 93b3966e..a023184f 100644
--- a/src/square/requests/catalog_product_set.py
+++ b/src/square/requests/catalog_product_set.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogProductSetParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_query.py b/src/square/requests/catalog_query.py
index dedb774e..feb7bd5b 100644
--- a/src/square/requests/catalog_query.py
+++ b/src/square/requests/catalog_query.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .catalog_query_sorted_attribute import CatalogQuerySortedAttributeParams
 from .catalog_query_exact import CatalogQueryExactParams
-from .catalog_query_set import CatalogQuerySetParams
+from .catalog_query_item_variations_for_item_option_values import CatalogQueryItemVariationsForItemOptionValuesParams
+from .catalog_query_items_for_item_options import CatalogQueryItemsForItemOptionsParams
+from .catalog_query_items_for_modifier_list import CatalogQueryItemsForModifierListParams
+from .catalog_query_items_for_tax import CatalogQueryItemsForTaxParams
 from .catalog_query_prefix import CatalogQueryPrefixParams
 from .catalog_query_range import CatalogQueryRangeParams
+from .catalog_query_set import CatalogQuerySetParams
+from .catalog_query_sorted_attribute import CatalogQuerySortedAttributeParams
 from .catalog_query_text import CatalogQueryTextParams
-from .catalog_query_items_for_tax import CatalogQueryItemsForTaxParams
-from .catalog_query_items_for_modifier_list import CatalogQueryItemsForModifierListParams
-from .catalog_query_items_for_item_options import CatalogQueryItemsForItemOptionsParams
-from .catalog_query_item_variations_for_item_option_values import CatalogQueryItemVariationsForItemOptionValuesParams
 
 
 class CatalogQueryParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_query_item_variations_for_item_option_values.py b/src/square/requests/catalog_query_item_variations_for_item_option_values.py
index 37b5ca1c..f8b3bdda 100644
--- a/src/square/requests/catalog_query_item_variations_for_item_option_values.py
+++ b/src/square/requests/catalog_query_item_variations_for_item_option_values.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogQueryItemVariationsForItemOptionValuesParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_query_items_for_item_options.py b/src/square/requests/catalog_query_items_for_item_options.py
index 9a89c081..f9044c50 100644
--- a/src/square/requests/catalog_query_items_for_item_options.py
+++ b/src/square/requests/catalog_query_items_for_item_options.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogQueryItemsForItemOptionsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_query_items_for_modifier_list.py b/src/square/requests/catalog_query_items_for_modifier_list.py
index f4660dda..e687e450 100644
--- a/src/square/requests/catalog_query_items_for_modifier_list.py
+++ b/src/square/requests/catalog_query_items_for_modifier_list.py
@@ -1,8 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogQueryItemsForModifierListParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_query_items_for_tax.py b/src/square/requests/catalog_query_items_for_tax.py
index 3cacda3d..52b43657 100644
--- a/src/square/requests/catalog_query_items_for_tax.py
+++ b/src/square/requests/catalog_query_items_for_tax.py
@@ -1,8 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogQueryItemsForTaxParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_query_range.py b/src/square/requests/catalog_query_range.py
index 51c68820..49c14e3a 100644
--- a/src/square/requests/catalog_query_range.py
+++ b/src/square/requests/catalog_query_range.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogQueryRangeParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_query_set.py b/src/square/requests/catalog_query_set.py
index 62d39852..f288e1ce 100644
--- a/src/square/requests/catalog_query_set.py
+++ b/src/square/requests/catalog_query_set.py
@@ -1,8 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogQuerySetParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_query_sorted_attribute.py b/src/square/requests/catalog_query_sorted_attribute.py
index ba131111..6d23fd43 100644
--- a/src/square/requests/catalog_query_sorted_attribute.py
+++ b/src/square/requests/catalog_query_sorted_attribute.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.sort_order import SortOrder
 
 
diff --git a/src/square/requests/catalog_query_text.py b/src/square/requests/catalog_query_text.py
index e1ab5e71..071dab0d 100644
--- a/src/square/requests/catalog_query_text.py
+++ b/src/square/requests/catalog_query_text.py
@@ -1,8 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogQueryTextParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_quick_amount.py b/src/square/requests/catalog_quick_amount.py
index 3a71a2d3..ad2a4c9e 100644
--- a/src/square/requests/catalog_quick_amount.py
+++ b/src/square/requests/catalog_quick_amount.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from ..types.catalog_quick_amount_type import CatalogQuickAmountType
 from .money import MoneyParams
-import typing_extensions
-import typing
 
 
 class CatalogQuickAmountParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_quick_amounts_settings.py b/src/square/requests/catalog_quick_amounts_settings.py
index c60f901a..f66735eb 100644
--- a/src/square/requests/catalog_quick_amounts_settings.py
+++ b/src/square/requests/catalog_quick_amounts_settings.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from ..types.catalog_quick_amounts_settings_option import CatalogQuickAmountsSettingsOption
-import typing_extensions
-import typing
 from .catalog_quick_amount import CatalogQuickAmountParams
 
 
diff --git a/src/square/requests/catalog_subscription_plan.py b/src/square/requests/catalog_subscription_plan.py
index 14977a0b..090af2db 100644
--- a/src/square/requests/catalog_subscription_plan.py
+++ b/src/square/requests/catalog_subscription_plan.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
-import typing_extensions
+
 import typing
+
+import typing_extensions
 from .subscription_phase import SubscriptionPhaseParams
-import typing
 
 if typing.TYPE_CHECKING:
     from .catalog_object import CatalogObjectParams
diff --git a/src/square/requests/catalog_subscription_plan_variation.py b/src/square/requests/catalog_subscription_plan_variation.py
index d4539bb3..124cc9aa 100644
--- a/src/square/requests/catalog_subscription_plan_variation.py
+++ b/src/square/requests/catalog_subscription_plan_variation.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
-from .subscription_phase import SubscriptionPhaseParams
+
 import typing_extensions
+from .subscription_phase import SubscriptionPhaseParams
 
 
 class CatalogSubscriptionPlanVariationParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_tax.py b/src/square/requests/catalog_tax.py
index ec388d82..57bbdf81 100644
--- a/src/square/requests/catalog_tax.py
+++ b/src/square/requests/catalog_tax.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.tax_calculation_phase import TaxCalculationPhase
 from ..types.tax_inclusion_type import TaxInclusionType
 
diff --git a/src/square/requests/catalog_time_period.py b/src/square/requests/catalog_time_period.py
index 99b2f94b..0898e791 100644
--- a/src/square/requests/catalog_time_period.py
+++ b/src/square/requests/catalog_time_period.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CatalogTimePeriodParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/catalog_v1id.py b/src/square/requests/catalog_v1id.py
index 419939fa..3459f9ca 100644
--- a/src/square/requests/catalog_v1id.py
+++ b/src/square/requests/catalog_v1id.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..core.serialization import FieldMetadata
 
 
diff --git a/src/square/requests/catalog_version_updated_event.py b/src/square/requests/catalog_version_updated_event.py
index 63a2e029..cec06226 100644
--- a/src/square/requests/catalog_version_updated_event.py
+++ b/src/square/requests/catalog_version_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .catalog_version_updated_event_data import CatalogVersionUpdatedEventDataParams
 
 
diff --git a/src/square/requests/catalog_version_updated_event_catalog_version.py b/src/square/requests/catalog_version_updated_event_catalog_version.py
index e5ec5261..aafd00f5 100644
--- a/src/square/requests/catalog_version_updated_event_catalog_version.py
+++ b/src/square/requests/catalog_version_updated_event_catalog_version.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class CatalogVersionUpdatedEventCatalogVersionParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/catalog_version_updated_event_data.py b/src/square/requests/catalog_version_updated_event_data.py
index 28c73268..35f72bc2 100644
--- a/src/square/requests/catalog_version_updated_event_data.py
+++ b/src/square/requests/catalog_version_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .catalog_version_updated_event_object import CatalogVersionUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/catalog_version_updated_event_object.py b/src/square/requests/catalog_version_updated_event_object.py
index fc6d080f..66c3067e 100644
--- a/src/square/requests/catalog_version_updated_event_object.py
+++ b/src/square/requests/catalog_version_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .catalog_version_updated_event_catalog_version import CatalogVersionUpdatedEventCatalogVersionParams
 
diff --git a/src/square/requests/category_path_to_root_node.py b/src/square/requests/category_path_to_root_node.py
index 2fe269ad..55d05a94 100644
--- a/src/square/requests/category_path_to_root_node.py
+++ b/src/square/requests/category_path_to_root_node.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CategoryPathToRootNodeParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/change_billing_anchor_date_response.py b/src/square/requests/change_billing_anchor_date_response.py
index 7f075adb..fcfc9c8e 100644
--- a/src/square/requests/change_billing_anchor_date_response.py
+++ b/src/square/requests/change_billing_anchor_date_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 from .subscription_action import SubscriptionActionParams
diff --git a/src/square/requests/checkout.py b/src/square/requests/checkout.py
index 9aaa6f4f..3c18bf94 100644
--- a/src/square/requests/checkout.py
+++ b/src/square/requests/checkout.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from .additional_recipient import AdditionalRecipientParams
 from .address import AddressParams
 from .order import OrderParams
-from .additional_recipient import AdditionalRecipientParams
 
 
 class CheckoutParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/checkout_location_settings.py b/src/square/requests/checkout_location_settings.py
index 698da4e5..f109a3c7 100644
--- a/src/square/requests/checkout_location_settings.py
+++ b/src/square/requests/checkout_location_settings.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .checkout_location_settings_policy import CheckoutLocationSettingsPolicyParams
+
+import typing_extensions
 from .checkout_location_settings_branding import CheckoutLocationSettingsBrandingParams
-from .checkout_location_settings_tipping import CheckoutLocationSettingsTippingParams
 from .checkout_location_settings_coupons import CheckoutLocationSettingsCouponsParams
+from .checkout_location_settings_policy import CheckoutLocationSettingsPolicyParams
+from .checkout_location_settings_tipping import CheckoutLocationSettingsTippingParams
 
 
 class CheckoutLocationSettingsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/checkout_location_settings_branding.py b/src/square/requests/checkout_location_settings_branding.py
index 4ede71ae..ea977dde 100644
--- a/src/square/requests/checkout_location_settings_branding.py
+++ b/src/square/requests/checkout_location_settings_branding.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from ..types.checkout_location_settings_branding_header_type import CheckoutLocationSettingsBrandingHeaderType
 import typing
+
+import typing_extensions
 from ..types.checkout_location_settings_branding_button_shape import CheckoutLocationSettingsBrandingButtonShape
+from ..types.checkout_location_settings_branding_header_type import CheckoutLocationSettingsBrandingHeaderType
 
 
 class CheckoutLocationSettingsBrandingParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/checkout_location_settings_coupons.py b/src/square/requests/checkout_location_settings_coupons.py
index 4198cb5b..444fb3ed 100644
--- a/src/square/requests/checkout_location_settings_coupons.py
+++ b/src/square/requests/checkout_location_settings_coupons.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CheckoutLocationSettingsCouponsParams(typing_extensions.TypedDict):
     enabled: typing_extensions.NotRequired[typing.Optional[bool]]
diff --git a/src/square/requests/checkout_location_settings_policy.py b/src/square/requests/checkout_location_settings_policy.py
index e1463504..4e15cdfd 100644
--- a/src/square/requests/checkout_location_settings_policy.py
+++ b/src/square/requests/checkout_location_settings_policy.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CheckoutLocationSettingsPolicyParams(typing_extensions.TypedDict):
     uid: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/checkout_location_settings_tipping.py b/src/square/requests/checkout_location_settings_tipping.py
index 186d2ba0..6edad740 100644
--- a/src/square/requests/checkout_location_settings_tipping.py
+++ b/src/square/requests/checkout_location_settings_tipping.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/checkout_merchant_settings.py b/src/square/requests/checkout_merchant_settings.py
index 0b399083..ae593f18 100644
--- a/src/square/requests/checkout_merchant_settings.py
+++ b/src/square/requests/checkout_merchant_settings.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .checkout_merchant_settings_payment_methods import CheckoutMerchantSettingsPaymentMethodsParams
 
diff --git a/src/square/requests/checkout_merchant_settings_payment_methods.py b/src/square/requests/checkout_merchant_settings_payment_methods.py
index 7fb4ddb0..020559c5 100644
--- a/src/square/requests/checkout_merchant_settings_payment_methods.py
+++ b/src/square/requests/checkout_merchant_settings_payment_methods.py
@@ -1,13 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .checkout_merchant_settings_payment_methods_payment_method import (
-    CheckoutMerchantSettingsPaymentMethodsPaymentMethodParams,
-)
 from .checkout_merchant_settings_payment_methods_afterpay_clearpay import (
     CheckoutMerchantSettingsPaymentMethodsAfterpayClearpayParams,
 )
+from .checkout_merchant_settings_payment_methods_payment_method import (
+    CheckoutMerchantSettingsPaymentMethodsPaymentMethodParams,
+)
 
 
 class CheckoutMerchantSettingsPaymentMethodsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/checkout_merchant_settings_payment_methods_afterpay_clearpay.py b/src/square/requests/checkout_merchant_settings_payment_methods_afterpay_clearpay.py
index bffc8868..bba8c450 100644
--- a/src/square/requests/checkout_merchant_settings_payment_methods_afterpay_clearpay.py
+++ b/src/square/requests/checkout_merchant_settings_payment_methods_afterpay_clearpay.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .checkout_merchant_settings_payment_methods_afterpay_clearpay_eligibility_range import (
     CheckoutMerchantSettingsPaymentMethodsAfterpayClearpayEligibilityRangeParams,
diff --git a/src/square/requests/checkout_merchant_settings_payment_methods_payment_method.py b/src/square/requests/checkout_merchant_settings_payment_methods_payment_method.py
index d36f29ca..4d5452ad 100644
--- a/src/square/requests/checkout_merchant_settings_payment_methods_payment_method.py
+++ b/src/square/requests/checkout_merchant_settings_payment_methods_payment_method.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CheckoutMerchantSettingsPaymentMethodsPaymentMethodParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/checkout_options.py b/src/square/requests/checkout_options.py
index 76ca2325..dfacdba6 100644
--- a/src/square/requests/checkout_options.py
+++ b/src/square/requests/checkout_options.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .custom_field import CustomFieldParams
+
+import typing_extensions
 from .accepted_payment_methods import AcceptedPaymentMethodsParams
+from .custom_field import CustomFieldParams
 from .money import MoneyParams
 from .shipping_fee import ShippingFeeParams
 
diff --git a/src/square/requests/clearpay_details.py b/src/square/requests/clearpay_details.py
index 0395fca0..5a3ce9cc 100644
--- a/src/square/requests/clearpay_details.py
+++ b/src/square/requests/clearpay_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class ClearpayDetailsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/clone_order_response.py b/src/square/requests/clone_order_response.py
index a28752ba..647b1a39 100644
--- a/src/square/requests/clone_order_response.py
+++ b/src/square/requests/clone_order_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .order import OrderParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .order import OrderParams
 
 
 class CloneOrderResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/collected_data.py b/src/square/requests/collected_data.py
index 1d5a9c34..f2c3e03c 100644
--- a/src/square/requests/collected_data.py
+++ b/src/square/requests/collected_data.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class CollectedDataParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/complete_payment_response.py b/src/square/requests/complete_payment_response.py
index be6e3440..9da10b37 100644
--- a/src/square/requests/complete_payment_response.py
+++ b/src/square/requests/complete_payment_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment import PaymentParams
 
diff --git a/src/square/requests/component.py b/src/square/requests/component.py
index f6614d4b..e302f940 100644
--- a/src/square/requests/component.py
+++ b/src/square/requests/component.py
@@ -2,12 +2,11 @@
 
 import typing_extensions
 from ..types.component_component_type import ComponentComponentType
-import typing_extensions
 from .device_component_details_application_details import DeviceComponentDetailsApplicationDetailsParams
-from .device_component_details_card_reader_details import DeviceComponentDetailsCardReaderDetailsParams
 from .device_component_details_battery_details import DeviceComponentDetailsBatteryDetailsParams
-from .device_component_details_wi_fi_details import DeviceComponentDetailsWiFiDetailsParams
+from .device_component_details_card_reader_details import DeviceComponentDetailsCardReaderDetailsParams
 from .device_component_details_ethernet_details import DeviceComponentDetailsEthernetDetailsParams
+from .device_component_details_wi_fi_details import DeviceComponentDetailsWiFiDetailsParams
 
 
 class ComponentParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/confirmation_decision.py b/src/square/requests/confirmation_decision.py
index 227faed6..4bce49dd 100644
--- a/src/square/requests/confirmation_decision.py
+++ b/src/square/requests/confirmation_decision.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class ConfirmationDecisionParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/confirmation_options.py b/src/square/requests/confirmation_options.py
index 313c64b1..df4d74f5 100644
--- a/src/square/requests/confirmation_options.py
+++ b/src/square/requests/confirmation_options.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .confirmation_decision import ConfirmationDecisionParams
 
 
diff --git a/src/square/requests/coordinates.py b/src/square/requests/coordinates.py
index a38514ed..fcd6468f 100644
--- a/src/square/requests/coordinates.py
+++ b/src/square/requests/coordinates.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CoordinatesParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/create_booking_custom_attribute_definition_response.py b/src/square/requests/create_booking_custom_attribute_definition_response.py
index 393aed29..3647b971 100644
--- a/src/square/requests/create_booking_custom_attribute_definition_response.py
+++ b/src/square/requests/create_booking_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/create_booking_response.py b/src/square/requests/create_booking_response.py
index 2701ebb6..d6901d37 100644
--- a/src/square/requests/create_booking_response.py
+++ b/src/square/requests/create_booking_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .booking import BookingParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/create_break_type_response.py b/src/square/requests/create_break_type_response.py
index 980ba009..92c1f4e2 100644
--- a/src/square/requests/create_break_type_response.py
+++ b/src/square/requests/create_break_type_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .break_type import BreakTypeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/create_card_response.py b/src/square/requests/create_card_response.py
index a6c38a95..a793c302 100644
--- a/src/square/requests/create_card_response.py
+++ b/src/square/requests/create_card_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .card import CardParams
+from .error import ErrorParams
 
 
 class CreateCardResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_catalog_image_request.py b/src/square/requests/create_catalog_image_request.py
index ed2c7751..bce1b221 100644
--- a/src/square/requests/create_catalog_image_request.py
+++ b/src/square/requests/create_catalog_image_request.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .catalog_object import CatalogObjectParams
 
diff --git a/src/square/requests/create_catalog_image_response.py b/src/square/requests/create_catalog_image_response.py
index f9bb3e2d..1e4adee5 100644
--- a/src/square/requests/create_catalog_image_response.py
+++ b/src/square/requests/create_catalog_image_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .catalog_object import CatalogObjectParams
+from .error import ErrorParams
 
 
 class CreateCatalogImageResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_checkout_response.py b/src/square/requests/create_checkout_response.py
index a0c20d6d..fdb0a729 100644
--- a/src/square/requests/create_checkout_response.py
+++ b/src/square/requests/create_checkout_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .checkout import CheckoutParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/create_customer_card_response.py b/src/square/requests/create_customer_card_response.py
index 3de25ecc..8b296f24 100644
--- a/src/square/requests/create_customer_card_response.py
+++ b/src/square/requests/create_customer_card_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .card import CardParams
+from .error import ErrorParams
 
 
 class CreateCustomerCardResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_customer_custom_attribute_definition_response.py b/src/square/requests/create_customer_custom_attribute_definition_response.py
index f2720b46..9db205d3 100644
--- a/src/square/requests/create_customer_custom_attribute_definition_response.py
+++ b/src/square/requests/create_customer_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/create_customer_group_response.py b/src/square/requests/create_customer_group_response.py
index b9562c8a..04427382 100644
--- a/src/square/requests/create_customer_group_response.py
+++ b/src/square/requests/create_customer_group_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer_group import CustomerGroupParams
+from .error import ErrorParams
 
 
 class CreateCustomerGroupResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_customer_response.py b/src/square/requests/create_customer_response.py
index 4f344184..050ac978 100644
--- a/src/square/requests/create_customer_response.py
+++ b/src/square/requests/create_customer_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer import CustomerParams
+from .error import ErrorParams
 
 
 class CreateCustomerResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_device_code_response.py b/src/square/requests/create_device_code_response.py
index b5063389..f636eb6d 100644
--- a/src/square/requests/create_device_code_response.py
+++ b/src/square/requests/create_device_code_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .device_code import DeviceCodeParams
+from .error import ErrorParams
 
 
 class CreateDeviceCodeResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_dispute_evidence_file_request.py b/src/square/requests/create_dispute_evidence_file_request.py
index aab11da4..1e3b9bd0 100644
--- a/src/square/requests/create_dispute_evidence_file_request.py
+++ b/src/square/requests/create_dispute_evidence_file_request.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.dispute_evidence_type import DisputeEvidenceType
 
diff --git a/src/square/requests/create_dispute_evidence_file_response.py b/src/square/requests/create_dispute_evidence_file_response.py
index 1517e8ab..64e6f115 100644
--- a/src/square/requests/create_dispute_evidence_file_response.py
+++ b/src/square/requests/create_dispute_evidence_file_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .dispute_evidence import DisputeEvidenceParams
+from .error import ErrorParams
 
 
 class CreateDisputeEvidenceFileResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_dispute_evidence_text_response.py b/src/square/requests/create_dispute_evidence_text_response.py
index 94001032..bcc2364b 100644
--- a/src/square/requests/create_dispute_evidence_text_response.py
+++ b/src/square/requests/create_dispute_evidence_text_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .dispute_evidence import DisputeEvidenceParams
+from .error import ErrorParams
 
 
 class CreateDisputeEvidenceTextResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_gift_card_activity_response.py b/src/square/requests/create_gift_card_activity_response.py
index 675e07b8..89f46ff3 100644
--- a/src/square/requests/create_gift_card_activity_response.py
+++ b/src/square/requests/create_gift_card_activity_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .gift_card_activity import GiftCardActivityParams
 
diff --git a/src/square/requests/create_gift_card_response.py b/src/square/requests/create_gift_card_response.py
index 1c6c94ea..b8349fd4 100644
--- a/src/square/requests/create_gift_card_response.py
+++ b/src/square/requests/create_gift_card_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .gift_card import GiftCardParams
 
diff --git a/src/square/requests/create_invoice_attachment_request_data.py b/src/square/requests/create_invoice_attachment_request_data.py
index 37e08336..11becef2 100644
--- a/src/square/requests/create_invoice_attachment_request_data.py
+++ b/src/square/requests/create_invoice_attachment_request_data.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class CreateInvoiceAttachmentRequestDataParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_invoice_attachment_response.py b/src/square/requests/create_invoice_attachment_response.py
index dbc54026..b1f9f00a 100644
--- a/src/square/requests/create_invoice_attachment_response.py
+++ b/src/square/requests/create_invoice_attachment_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .invoice_attachment import InvoiceAttachmentParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .invoice_attachment import InvoiceAttachmentParams
 
 
 class CreateInvoiceAttachmentResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_invoice_response.py b/src/square/requests/create_invoice_response.py
index 71eeda4c..0185cc7e 100644
--- a/src/square/requests/create_invoice_response.py
+++ b/src/square/requests/create_invoice_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .invoice import InvoiceParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .invoice import InvoiceParams
 
 
 class CreateInvoiceResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_job_response.py b/src/square/requests/create_job_response.py
index 725ccf13..768c98d2 100644
--- a/src/square/requests/create_job_response.py
+++ b/src/square/requests/create_job_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .job import JobParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .job import JobParams
 
 
 class CreateJobResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_location_custom_attribute_definition_response.py b/src/square/requests/create_location_custom_attribute_definition_response.py
index 2fdd7078..967500c1 100644
--- a/src/square/requests/create_location_custom_attribute_definition_response.py
+++ b/src/square/requests/create_location_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/create_location_response.py b/src/square/requests/create_location_response.py
index 5ff1b7ad..6d07b122 100644
--- a/src/square/requests/create_location_response.py
+++ b/src/square/requests/create_location_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .location import LocationParams
 
diff --git a/src/square/requests/create_loyalty_account_response.py b/src/square/requests/create_loyalty_account_response.py
index 2747b258..1a17f224 100644
--- a/src/square/requests/create_loyalty_account_response.py
+++ b/src/square/requests/create_loyalty_account_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_account import LoyaltyAccountParams
 
diff --git a/src/square/requests/create_loyalty_promotion_response.py b/src/square/requests/create_loyalty_promotion_response.py
index e87e983b..1d8ba6f4 100644
--- a/src/square/requests/create_loyalty_promotion_response.py
+++ b/src/square/requests/create_loyalty_promotion_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_promotion import LoyaltyPromotionParams
 
diff --git a/src/square/requests/create_loyalty_reward_response.py b/src/square/requests/create_loyalty_reward_response.py
index 8525f25e..cbbd33b0 100644
--- a/src/square/requests/create_loyalty_reward_response.py
+++ b/src/square/requests/create_loyalty_reward_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_reward import LoyaltyRewardParams
 
diff --git a/src/square/requests/create_merchant_custom_attribute_definition_response.py b/src/square/requests/create_merchant_custom_attribute_definition_response.py
index 45a0597e..3067c1f9 100644
--- a/src/square/requests/create_merchant_custom_attribute_definition_response.py
+++ b/src/square/requests/create_merchant_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/create_mobile_authorization_code_response.py b/src/square/requests/create_mobile_authorization_code_response.py
index e29247d3..d75b37cd 100644
--- a/src/square/requests/create_mobile_authorization_code_response.py
+++ b/src/square/requests/create_mobile_authorization_code_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/create_order_custom_attribute_definition_response.py b/src/square/requests/create_order_custom_attribute_definition_response.py
index 0d6d7e34..9272534c 100644
--- a/src/square/requests/create_order_custom_attribute_definition_response.py
+++ b/src/square/requests/create_order_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/create_order_request.py b/src/square/requests/create_order_request.py
index d9b7cbc6..cd43aef5 100644
--- a/src/square/requests/create_order_request.py
+++ b/src/square/requests/create_order_request.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .order import OrderParams
 
diff --git a/src/square/requests/create_order_response.py b/src/square/requests/create_order_response.py
index 5b29a766..efb02685 100644
--- a/src/square/requests/create_order_response.py
+++ b/src/square/requests/create_order_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .order import OrderParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .order import OrderParams
 
 
 class CreateOrderResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_payment_link_response.py b/src/square/requests/create_payment_link_response.py
index 66a9a03c..6a7a0355 100644
--- a/src/square/requests/create_payment_link_response.py
+++ b/src/square/requests/create_payment_link_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment_link import PaymentLinkParams
 from .payment_link_related_resources import PaymentLinkRelatedResourcesParams
diff --git a/src/square/requests/create_payment_response.py b/src/square/requests/create_payment_response.py
index d252c1d7..d5b3dc15 100644
--- a/src/square/requests/create_payment_response.py
+++ b/src/square/requests/create_payment_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment import PaymentParams
 
diff --git a/src/square/requests/create_scheduled_shift_response.py b/src/square/requests/create_scheduled_shift_response.py
index fc8f1f4f..bb260c55 100644
--- a/src/square/requests/create_scheduled_shift_response.py
+++ b/src/square/requests/create_scheduled_shift_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .scheduled_shift import ScheduledShiftParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .scheduled_shift import ScheduledShiftParams
 
 
 class CreateScheduledShiftResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_shift_response.py b/src/square/requests/create_shift_response.py
index 1b3008d0..95ed60ef 100644
--- a/src/square/requests/create_shift_response.py
+++ b/src/square/requests/create_shift_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .shift import ShiftParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .shift import ShiftParams
 
 
 class CreateShiftResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_subscription_response.py b/src/square/requests/create_subscription_response.py
index 06455c66..959192a3 100644
--- a/src/square/requests/create_subscription_response.py
+++ b/src/square/requests/create_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 
diff --git a/src/square/requests/create_team_member_request.py b/src/square/requests/create_team_member_request.py
index 73fac371..464ecf13 100644
--- a/src/square/requests/create_team_member_request.py
+++ b/src/square/requests/create_team_member_request.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .team_member import TeamMemberParams
 
diff --git a/src/square/requests/create_team_member_response.py b/src/square/requests/create_team_member_response.py
index 7711a9c3..4db2914f 100644
--- a/src/square/requests/create_team_member_response.py
+++ b/src/square/requests/create_team_member_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .team_member import TeamMemberParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .team_member import TeamMemberParams
 
 
 class CreateTeamMemberResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_terminal_action_response.py b/src/square/requests/create_terminal_action_response.py
index bbd69990..8e8ff6ae 100644
--- a/src/square/requests/create_terminal_action_response.py
+++ b/src/square/requests/create_terminal_action_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_action import TerminalActionParams
 
diff --git a/src/square/requests/create_terminal_checkout_response.py b/src/square/requests/create_terminal_checkout_response.py
index 517a509f..524cdca7 100644
--- a/src/square/requests/create_terminal_checkout_response.py
+++ b/src/square/requests/create_terminal_checkout_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_checkout import TerminalCheckoutParams
 
diff --git a/src/square/requests/create_terminal_refund_response.py b/src/square/requests/create_terminal_refund_response.py
index e96b39ac..f4207f37 100644
--- a/src/square/requests/create_terminal_refund_response.py
+++ b/src/square/requests/create_terminal_refund_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_refund import TerminalRefundParams
 
diff --git a/src/square/requests/create_timecard_response.py b/src/square/requests/create_timecard_response.py
index d044a8dd..7a1c6d17 100644
--- a/src/square/requests/create_timecard_response.py
+++ b/src/square/requests/create_timecard_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .timecard import TimecardParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .timecard import TimecardParams
 
 
 class CreateTimecardResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/create_vendor_response.py b/src/square/requests/create_vendor_response.py
index bc2778e2..ee87970d 100644
--- a/src/square/requests/create_vendor_response.py
+++ b/src/square/requests/create_vendor_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .vendor import VendorParams
 
diff --git a/src/square/requests/create_webhook_subscription_response.py b/src/square/requests/create_webhook_subscription_response.py
index de341ccb..e33ee212 100644
--- a/src/square/requests/create_webhook_subscription_response.py
+++ b/src/square/requests/create_webhook_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .webhook_subscription import WebhookSubscriptionParams
 
diff --git a/src/square/requests/custom_attribute.py b/src/square/requests/custom_attribute.py
index 0df6d42c..fc11f71d 100644
--- a/src/square/requests/custom_attribute.py
+++ b/src/square/requests/custom_attribute.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.custom_attribute_definition_visibility import CustomAttributeDefinitionVisibility
 from .custom_attribute_definition import CustomAttributeDefinitionParams
 
diff --git a/src/square/requests/custom_attribute_definition.py b/src/square/requests/custom_attribute_definition.py
index 1ccf0655..bfd768ab 100644
--- a/src/square/requests/custom_attribute_definition.py
+++ b/src/square/requests/custom_attribute_definition.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.custom_attribute_definition_visibility import CustomAttributeDefinitionVisibility
 
 
diff --git a/src/square/requests/custom_attribute_definition_event_data.py b/src/square/requests/custom_attribute_definition_event_data.py
index 973427e4..f49a8471 100644
--- a/src/square/requests/custom_attribute_definition_event_data.py
+++ b/src/square/requests/custom_attribute_definition_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data_object import CustomAttributeDefinitionEventDataObjectParams
 
 
diff --git a/src/square/requests/custom_attribute_definition_event_data_object.py b/src/square/requests/custom_attribute_definition_event_data_object.py
index a4579ff0..ea06b2e5 100644
--- a/src/square/requests/custom_attribute_definition_event_data_object.py
+++ b/src/square/requests/custom_attribute_definition_event_data_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
 
diff --git a/src/square/requests/custom_attribute_event_data.py b/src/square/requests/custom_attribute_event_data.py
index 50fd3570..a36d7e48 100644
--- a/src/square/requests/custom_attribute_event_data.py
+++ b/src/square/requests/custom_attribute_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data_object import CustomAttributeEventDataObjectParams
 
 
diff --git a/src/square/requests/custom_attribute_event_data_object.py b/src/square/requests/custom_attribute_event_data_object.py
index 27ab8c29..d58226bb 100644
--- a/src/square/requests/custom_attribute_event_data_object.py
+++ b/src/square/requests/custom_attribute_event_data_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
 
diff --git a/src/square/requests/custom_attribute_filter.py b/src/square/requests/custom_attribute_filter.py
index c832879e..9e8f5886 100644
--- a/src/square/requests/custom_attribute_filter.py
+++ b/src/square/requests/custom_attribute_filter.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .range import RangeParams
 
 
diff --git a/src/square/requests/customer.py b/src/square/requests/customer.py
index 64544fb7..f26bbb19 100644
--- a/src/square/requests/customer.py
+++ b/src/square/requests/customer.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from ..types.customer_creation_source import CustomerCreationSource
 from .address import AddressParams
 from .customer_preferences import CustomerPreferencesParams
-from ..types.customer_creation_source import CustomerCreationSource
 from .customer_tax_ids import CustomerTaxIdsParams
 
 
diff --git a/src/square/requests/customer_address_filter.py b/src/square/requests/customer_address_filter.py
index 36c16811..3b94867b 100644
--- a/src/square/requests/customer_address_filter.py
+++ b/src/square/requests/customer_address_filter.py
@@ -1,9 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .customer_text_filter import CustomerTextFilterParams
 from ..types.country import Country
+from .customer_text_filter import CustomerTextFilterParams
 
 
 class CustomerAddressFilterParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/customer_created_event.py b/src/square/requests/customer_created_event.py
index ef676f09..9ebf43cc 100644
--- a/src/square/requests/customer_created_event.py
+++ b/src/square/requests/customer_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .customer_created_event_data import CustomerCreatedEventDataParams
 
 
diff --git a/src/square/requests/customer_created_event_data.py b/src/square/requests/customer_created_event_data.py
index 55da3b45..4d18ec3a 100644
--- a/src/square/requests/customer_created_event_data.py
+++ b/src/square/requests/customer_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .customer_created_event_object import CustomerCreatedEventObjectParams
 
 
diff --git a/src/square/requests/customer_created_event_event_context.py b/src/square/requests/customer_created_event_event_context.py
index 9af3e922..1baf7927 100644
--- a/src/square/requests/customer_created_event_event_context.py
+++ b/src/square/requests/customer_created_event_event_context.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .customer_created_event_event_context_merge import CustomerCreatedEventEventContextMergeParams
 
diff --git a/src/square/requests/customer_created_event_event_context_merge.py b/src/square/requests/customer_created_event_event_context_merge.py
index 268169e3..bb8477e7 100644
--- a/src/square/requests/customer_created_event_event_context_merge.py
+++ b/src/square/requests/customer_created_event_event_context_merge.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CustomerCreatedEventEventContextMergeParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/customer_created_event_object.py b/src/square/requests/customer_created_event_object.py
index 36123e27..7789e1b1 100644
--- a/src/square/requests/customer_created_event_object.py
+++ b/src/square/requests/customer_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .customer import CustomerParams
 from .customer_created_event_event_context import CustomerCreatedEventEventContextParams
diff --git a/src/square/requests/customer_creation_source_filter.py b/src/square/requests/customer_creation_source_filter.py
index 155c807e..133a4b73 100644
--- a/src/square/requests/customer_creation_source_filter.py
+++ b/src/square/requests/customer_creation_source_filter.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.customer_creation_source import CustomerCreationSource
 from ..types.customer_inclusion_exclusion import CustomerInclusionExclusion
 
diff --git a/src/square/requests/customer_custom_attribute_definition_created_event.py b/src/square/requests/customer_custom_attribute_definition_created_event.py
index 56382041..45c6dcb3 100644
--- a/src/square/requests/customer_custom_attribute_definition_created_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_created_public_event.py b/src/square/requests/customer_custom_attribute_definition_created_public_event.py
index d5fdac86..dfb21386 100644
--- a/src/square/requests/customer_custom_attribute_definition_created_public_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_created_public_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_deleted_event.py b/src/square/requests/customer_custom_attribute_definition_deleted_event.py
index e8d80091..c171c9ed 100644
--- a/src/square/requests/customer_custom_attribute_definition_deleted_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_deleted_public_event.py b/src/square/requests/customer_custom_attribute_definition_deleted_public_event.py
index 11dc6ca3..0696a9b2 100644
--- a/src/square/requests/customer_custom_attribute_definition_deleted_public_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_deleted_public_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_owned_created_event.py b/src/square/requests/customer_custom_attribute_definition_owned_created_event.py
index e4018059..e16c7700 100644
--- a/src/square/requests/customer_custom_attribute_definition_owned_created_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_owned_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_owned_deleted_event.py b/src/square/requests/customer_custom_attribute_definition_owned_deleted_event.py
index 4937e6c0..982353e7 100644
--- a/src/square/requests/customer_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_owned_updated_event.py b/src/square/requests/customer_custom_attribute_definition_owned_updated_event.py
index 82e3e309..cf76c30b 100644
--- a/src/square/requests/customer_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_updated_event.py b/src/square/requests/customer_custom_attribute_definition_updated_event.py
index 30b417b1..03334bc3 100644
--- a/src/square/requests/customer_custom_attribute_definition_updated_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_updated_public_event.py b/src/square/requests/customer_custom_attribute_definition_updated_public_event.py
index f14f2950..e936c84c 100644
--- a/src/square/requests/customer_custom_attribute_definition_updated_public_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_updated_public_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_visible_created_event.py b/src/square/requests/customer_custom_attribute_definition_visible_created_event.py
index 2cd678e5..9e85c7da 100644
--- a/src/square/requests/customer_custom_attribute_definition_visible_created_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_visible_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_visible_deleted_event.py b/src/square/requests/customer_custom_attribute_definition_visible_deleted_event.py
index 07ffc10f..5abb49e5 100644
--- a/src/square/requests/customer_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_definition_visible_updated_event.py b/src/square/requests/customer_custom_attribute_definition_visible_updated_event.py
index c40ac4d6..50081ddc 100644
--- a/src/square/requests/customer_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/requests/customer_custom_attribute_definition_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_deleted_event.py b/src/square/requests/customer_custom_attribute_deleted_event.py
index 6ebf84ed..3c91e98f 100644
--- a/src/square/requests/customer_custom_attribute_deleted_event.py
+++ b/src/square/requests/customer_custom_attribute_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_deleted_public_event.py b/src/square/requests/customer_custom_attribute_deleted_public_event.py
index b6dfde2a..7ecffdaa 100644
--- a/src/square/requests/customer_custom_attribute_deleted_public_event.py
+++ b/src/square/requests/customer_custom_attribute_deleted_public_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_filter.py b/src/square/requests/customer_custom_attribute_filter.py
index 4c612c10..cddaef85 100644
--- a/src/square/requests/customer_custom_attribute_filter.py
+++ b/src/square/requests/customer_custom_attribute_filter.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .customer_custom_attribute_filter_value import CustomerCustomAttributeFilterValueParams
 from .time_range import TimeRangeParams
diff --git a/src/square/requests/customer_custom_attribute_filter_value.py b/src/square/requests/customer_custom_attribute_filter_value.py
index 1763316b..7c48d1e2 100644
--- a/src/square/requests/customer_custom_attribute_filter_value.py
+++ b/src/square/requests/customer_custom_attribute_filter_value.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
+from .customer_address_filter import CustomerAddressFilterParams
 from .customer_text_filter import CustomerTextFilterParams
 from .filter_value import FilterValueParams
-from .time_range import TimeRangeParams
 from .float_number_range import FloatNumberRangeParams
-import typing
-from .customer_address_filter import CustomerAddressFilterParams
+from .time_range import TimeRangeParams
 
 
 class CustomerCustomAttributeFilterValueParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/customer_custom_attribute_filters.py b/src/square/requests/customer_custom_attribute_filters.py
index b414b422..6a1c13d9 100644
--- a/src/square/requests/customer_custom_attribute_filters.py
+++ b/src/square/requests/customer_custom_attribute_filters.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .customer_custom_attribute_filter import CustomerCustomAttributeFilterParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_owned_deleted_event.py b/src/square/requests/customer_custom_attribute_owned_deleted_event.py
index 142b6439..f6aaaf81 100644
--- a/src/square/requests/customer_custom_attribute_owned_deleted_event.py
+++ b/src/square/requests/customer_custom_attribute_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_owned_updated_event.py b/src/square/requests/customer_custom_attribute_owned_updated_event.py
index 94c5c24c..d35fa2c6 100644
--- a/src/square/requests/customer_custom_attribute_owned_updated_event.py
+++ b/src/square/requests/customer_custom_attribute_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_updated_event.py b/src/square/requests/customer_custom_attribute_updated_event.py
index 0528657a..972a3a89 100644
--- a/src/square/requests/customer_custom_attribute_updated_event.py
+++ b/src/square/requests/customer_custom_attribute_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_updated_public_event.py b/src/square/requests/customer_custom_attribute_updated_public_event.py
index c43fe260..3aa1cbb8 100644
--- a/src/square/requests/customer_custom_attribute_updated_public_event.py
+++ b/src/square/requests/customer_custom_attribute_updated_public_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_visible_deleted_event.py b/src/square/requests/customer_custom_attribute_visible_deleted_event.py
index 13c702ef..da7b562c 100644
--- a/src/square/requests/customer_custom_attribute_visible_deleted_event.py
+++ b/src/square/requests/customer_custom_attribute_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/customer_custom_attribute_visible_updated_event.py b/src/square/requests/customer_custom_attribute_visible_updated_event.py
index 7b15da9a..3cfcf73f 100644
--- a/src/square/requests/customer_custom_attribute_visible_updated_event.py
+++ b/src/square/requests/customer_custom_attribute_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/customer_deleted_event.py b/src/square/requests/customer_deleted_event.py
index f70c0b54..50b7027e 100644
--- a/src/square/requests/customer_deleted_event.py
+++ b/src/square/requests/customer_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .customer_deleted_event_data import CustomerDeletedEventDataParams
 
 
diff --git a/src/square/requests/customer_deleted_event_data.py b/src/square/requests/customer_deleted_event_data.py
index d4b7fa40..9612077a 100644
--- a/src/square/requests/customer_deleted_event_data.py
+++ b/src/square/requests/customer_deleted_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .customer_deleted_event_object import CustomerDeletedEventObjectParams
 
 
diff --git a/src/square/requests/customer_deleted_event_event_context.py b/src/square/requests/customer_deleted_event_event_context.py
index 5b3f1be6..adb7ca57 100644
--- a/src/square/requests/customer_deleted_event_event_context.py
+++ b/src/square/requests/customer_deleted_event_event_context.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .customer_deleted_event_event_context_merge import CustomerDeletedEventEventContextMergeParams
 
diff --git a/src/square/requests/customer_deleted_event_event_context_merge.py b/src/square/requests/customer_deleted_event_event_context_merge.py
index 54104f7c..42797bd6 100644
--- a/src/square/requests/customer_deleted_event_event_context_merge.py
+++ b/src/square/requests/customer_deleted_event_event_context_merge.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CustomerDeletedEventEventContextMergeParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/customer_deleted_event_object.py b/src/square/requests/customer_deleted_event_object.py
index 01dc3b7d..26fc18c3 100644
--- a/src/square/requests/customer_deleted_event_object.py
+++ b/src/square/requests/customer_deleted_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .customer import CustomerParams
 from .customer_deleted_event_event_context import CustomerDeletedEventEventContextParams
diff --git a/src/square/requests/customer_details.py b/src/square/requests/customer_details.py
index f89a2e76..d11b5a62 100644
--- a/src/square/requests/customer_details.py
+++ b/src/square/requests/customer_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CustomerDetailsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/customer_filter.py b/src/square/requests/customer_filter.py
index 46386c38..2a758fa0 100644
--- a/src/square/requests/customer_filter.py
+++ b/src/square/requests/customer_filter.py
@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .customer_creation_source_filter import CustomerCreationSourceFilterParams
-from .time_range import TimeRangeParams
+from .customer_custom_attribute_filters import CustomerCustomAttributeFiltersParams
 from .customer_text_filter import CustomerTextFilterParams
 from .filter_value import FilterValueParams
-from .customer_custom_attribute_filters import CustomerCustomAttributeFiltersParams
+from .time_range import TimeRangeParams
 
 
 class CustomerFilterParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/customer_group.py b/src/square/requests/customer_group.py
index 4c02a2cb..9d0b9f75 100644
--- a/src/square/requests/customer_group.py
+++ b/src/square/requests/customer_group.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class CustomerGroupParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/customer_preferences.py b/src/square/requests/customer_preferences.py
index a60a9ee7..81161028 100644
--- a/src/square/requests/customer_preferences.py
+++ b/src/square/requests/customer_preferences.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CustomerPreferencesParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/customer_query.py b/src/square/requests/customer_query.py
index 60d8237f..1b38853f 100644
--- a/src/square/requests/customer_query.py
+++ b/src/square/requests/customer_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .customer_filter import CustomerFilterParams
 from .customer_sort import CustomerSortParams
diff --git a/src/square/requests/customer_segment.py b/src/square/requests/customer_segment.py
index 8ced3324..1b5cafac 100644
--- a/src/square/requests/customer_segment.py
+++ b/src/square/requests/customer_segment.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class CustomerSegmentParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/customer_sort.py b/src/square/requests/customer_sort.py
index 7757edae..6f2b4008 100644
--- a/src/square/requests/customer_sort.py
+++ b/src/square/requests/customer_sort.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.customer_sort_field import CustomerSortField
 from ..types.sort_order import SortOrder
diff --git a/src/square/requests/customer_tax_ids.py b/src/square/requests/customer_tax_ids.py
index 4aa726ad..fe673b7f 100644
--- a/src/square/requests/customer_tax_ids.py
+++ b/src/square/requests/customer_tax_ids.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CustomerTaxIdsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/customer_text_filter.py b/src/square/requests/customer_text_filter.py
index cf84c05a..191f5595 100644
--- a/src/square/requests/customer_text_filter.py
+++ b/src/square/requests/customer_text_filter.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class CustomerTextFilterParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/customer_updated_event.py b/src/square/requests/customer_updated_event.py
index 5646a0f4..c80bb627 100644
--- a/src/square/requests/customer_updated_event.py
+++ b/src/square/requests/customer_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .customer_updated_event_data import CustomerUpdatedEventDataParams
 
 
diff --git a/src/square/requests/customer_updated_event_data.py b/src/square/requests/customer_updated_event_data.py
index ea959142..e2f35f28 100644
--- a/src/square/requests/customer_updated_event_data.py
+++ b/src/square/requests/customer_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .customer_updated_event_object import CustomerUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/customer_updated_event_object.py b/src/square/requests/customer_updated_event_object.py
index e36799ca..7ec0543e 100644
--- a/src/square/requests/customer_updated_event_object.py
+++ b/src/square/requests/customer_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .customer import CustomerParams
 
diff --git a/src/square/requests/data_collection_options.py b/src/square/requests/data_collection_options.py
index a4d02718..28ea1ba8 100644
--- a/src/square/requests/data_collection_options.py
+++ b/src/square/requests/data_collection_options.py
@@ -2,7 +2,6 @@
 
 import typing_extensions
 from ..types.data_collection_options_input_type import DataCollectionOptionsInputType
-import typing_extensions
 from .collected_data import CollectedDataParams
 
 
diff --git a/src/square/requests/date_range.py b/src/square/requests/date_range.py
index 43fc699e..4ca91c85 100644
--- a/src/square/requests/date_range.py
+++ b/src/square/requests/date_range.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class DateRangeParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/delete_booking_custom_attribute_definition_response.py b/src/square/requests/delete_booking_custom_attribute_definition_response.py
index afe62fa2..0987947c 100644
--- a/src/square/requests/delete_booking_custom_attribute_definition_response.py
+++ b/src/square/requests/delete_booking_custom_attribute_definition_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_booking_custom_attribute_response.py b/src/square/requests/delete_booking_custom_attribute_response.py
index 452bd238..1c6ae976 100644
--- a/src/square/requests/delete_booking_custom_attribute_response.py
+++ b/src/square/requests/delete_booking_custom_attribute_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_break_type_response.py b/src/square/requests/delete_break_type_response.py
index 5d7638f4..ffa46882 100644
--- a/src/square/requests/delete_break_type_response.py
+++ b/src/square/requests/delete_break_type_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_catalog_object_response.py b/src/square/requests/delete_catalog_object_response.py
index f1075b53..0cac152f 100644
--- a/src/square/requests/delete_catalog_object_response.py
+++ b/src/square/requests/delete_catalog_object_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_customer_card_response.py b/src/square/requests/delete_customer_card_response.py
index 070a10e6..26cb66da 100644
--- a/src/square/requests/delete_customer_card_response.py
+++ b/src/square/requests/delete_customer_card_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_customer_custom_attribute_definition_response.py b/src/square/requests/delete_customer_custom_attribute_definition_response.py
index 70d68852..12f4a350 100644
--- a/src/square/requests/delete_customer_custom_attribute_definition_response.py
+++ b/src/square/requests/delete_customer_custom_attribute_definition_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_customer_custom_attribute_response.py b/src/square/requests/delete_customer_custom_attribute_response.py
index e3825a78..d40cb609 100644
--- a/src/square/requests/delete_customer_custom_attribute_response.py
+++ b/src/square/requests/delete_customer_custom_attribute_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_customer_group_response.py b/src/square/requests/delete_customer_group_response.py
index 55640355..bff544e0 100644
--- a/src/square/requests/delete_customer_group_response.py
+++ b/src/square/requests/delete_customer_group_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_customer_response.py b/src/square/requests/delete_customer_response.py
index fc9fc26b..f1a3dd54 100644
--- a/src/square/requests/delete_customer_response.py
+++ b/src/square/requests/delete_customer_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_dispute_evidence_response.py b/src/square/requests/delete_dispute_evidence_response.py
index c480f554..dc20b608 100644
--- a/src/square/requests/delete_dispute_evidence_response.py
+++ b/src/square/requests/delete_dispute_evidence_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_invoice_attachment_response.py b/src/square/requests/delete_invoice_attachment_response.py
index 2131e9b8..b42e0d8e 100644
--- a/src/square/requests/delete_invoice_attachment_response.py
+++ b/src/square/requests/delete_invoice_attachment_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_invoice_response.py b/src/square/requests/delete_invoice_response.py
index 4e12ae19..36eab557 100644
--- a/src/square/requests/delete_invoice_response.py
+++ b/src/square/requests/delete_invoice_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_location_custom_attribute_definition_response.py b/src/square/requests/delete_location_custom_attribute_definition_response.py
index c3b9d441..06e687e2 100644
--- a/src/square/requests/delete_location_custom_attribute_definition_response.py
+++ b/src/square/requests/delete_location_custom_attribute_definition_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_location_custom_attribute_response.py b/src/square/requests/delete_location_custom_attribute_response.py
index f4daa091..57e7b072 100644
--- a/src/square/requests/delete_location_custom_attribute_response.py
+++ b/src/square/requests/delete_location_custom_attribute_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_loyalty_reward_response.py b/src/square/requests/delete_loyalty_reward_response.py
index 541a9d54..a2d666e4 100644
--- a/src/square/requests/delete_loyalty_reward_response.py
+++ b/src/square/requests/delete_loyalty_reward_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_merchant_custom_attribute_definition_response.py b/src/square/requests/delete_merchant_custom_attribute_definition_response.py
index 72283214..0a6ed9db 100644
--- a/src/square/requests/delete_merchant_custom_attribute_definition_response.py
+++ b/src/square/requests/delete_merchant_custom_attribute_definition_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_merchant_custom_attribute_response.py b/src/square/requests/delete_merchant_custom_attribute_response.py
index 5eb7ff8b..306acfd3 100644
--- a/src/square/requests/delete_merchant_custom_attribute_response.py
+++ b/src/square/requests/delete_merchant_custom_attribute_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_order_custom_attribute_definition_response.py b/src/square/requests/delete_order_custom_attribute_definition_response.py
index df172019..44497bf1 100644
--- a/src/square/requests/delete_order_custom_attribute_definition_response.py
+++ b/src/square/requests/delete_order_custom_attribute_definition_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_order_custom_attribute_response.py b/src/square/requests/delete_order_custom_attribute_response.py
index 4d5f6f86..0365f527 100644
--- a/src/square/requests/delete_order_custom_attribute_response.py
+++ b/src/square/requests/delete_order_custom_attribute_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_payment_link_response.py b/src/square/requests/delete_payment_link_response.py
index 2d355787..7699b5da 100644
--- a/src/square/requests/delete_payment_link_response.py
+++ b/src/square/requests/delete_payment_link_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_shift_response.py b/src/square/requests/delete_shift_response.py
index a3a250c2..55959297 100644
--- a/src/square/requests/delete_shift_response.py
+++ b/src/square/requests/delete_shift_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_snippet_response.py b/src/square/requests/delete_snippet_response.py
index da9a4d7b..940b0bd7 100644
--- a/src/square/requests/delete_snippet_response.py
+++ b/src/square/requests/delete_snippet_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_subscription_action_response.py b/src/square/requests/delete_subscription_action_response.py
index 39023a7d..ab00e5b0 100644
--- a/src/square/requests/delete_subscription_action_response.py
+++ b/src/square/requests/delete_subscription_action_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 
diff --git a/src/square/requests/delete_timecard_response.py b/src/square/requests/delete_timecard_response.py
index 70f84b1f..12cff5de 100644
--- a/src/square/requests/delete_timecard_response.py
+++ b/src/square/requests/delete_timecard_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/delete_webhook_subscription_response.py b/src/square/requests/delete_webhook_subscription_response.py
index ed0ae662..5036123e 100644
--- a/src/square/requests/delete_webhook_subscription_response.py
+++ b/src/square/requests/delete_webhook_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/destination.py b/src/square/requests/destination.py
index e00126ec..e50e418e 100644
--- a/src/square/requests/destination.py
+++ b/src/square/requests/destination.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.destination_type import DestinationType
 
diff --git a/src/square/requests/destination_details.py b/src/square/requests/destination_details.py
index fa163c6d..f7bd07e6 100644
--- a/src/square/requests/destination_details.py
+++ b/src/square/requests/destination_details.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .destination_details_card_refund_details import DestinationDetailsCardRefundDetailsParams
 from .destination_details_cash_refund_details import DestinationDetailsCashRefundDetailsParams
diff --git a/src/square/requests/destination_details_card_refund_details.py b/src/square/requests/destination_details_card_refund_details.py
index 165552f0..14e400c8 100644
--- a/src/square/requests/destination_details_card_refund_details.py
+++ b/src/square/requests/destination_details_card_refund_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .card import CardParams
-import typing
 
 
 class DestinationDetailsCardRefundDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/destination_details_cash_refund_details.py b/src/square/requests/destination_details_cash_refund_details.py
index 4387744c..d3658d71 100644
--- a/src/square/requests/destination_details_cash_refund_details.py
+++ b/src/square/requests/destination_details_cash_refund_details.py
@@ -2,7 +2,6 @@
 
 import typing_extensions
 from .money import MoneyParams
-import typing_extensions
 
 
 class DestinationDetailsCashRefundDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/destination_details_external_refund_details.py b/src/square/requests/destination_details_external_refund_details.py
index 06055c6a..43f2bd10 100644
--- a/src/square/requests/destination_details_external_refund_details.py
+++ b/src/square/requests/destination_details_external_refund_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class DestinationDetailsExternalRefundDetailsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/device.py b/src/square/requests/device.py
index 37fbdcba..d1a1e8db 100644
--- a/src/square/requests/device.py
+++ b/src/square/requests/device.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .device_attributes import DeviceAttributesParams
 import typing
+
+import typing_extensions
 from .component import ComponentParams
+from .device_attributes import DeviceAttributesParams
 from .device_status import DeviceStatusParams
 
 
diff --git a/src/square/requests/device_attributes.py b/src/square/requests/device_attributes.py
index 7609eb45..506cbbb6 100644
--- a/src/square/requests/device_attributes.py
+++ b/src/square/requests/device_attributes.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from ..types.device_attributes_device_type import DeviceAttributesDeviceType
-import typing_extensions
-import typing
 
 
 class DeviceAttributesParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/device_checkout_options.py b/src/square/requests/device_checkout_options.py
index 38f7cc04..75b53644 100644
--- a/src/square/requests/device_checkout_options.py
+++ b/src/square/requests/device_checkout_options.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .tip_settings import TipSettingsParams
 
 
diff --git a/src/square/requests/device_code.py b/src/square/requests/device_code.py
index 5a187010..c2f12526 100644
--- a/src/square/requests/device_code.py
+++ b/src/square/requests/device_code.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from ..types.product_type import ProductType
+
+import typing_extensions
 from ..types.device_code_status import DeviceCodeStatus
+from ..types.product_type import ProductType
 
 
 class DeviceCodeParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/device_code_paired_event.py b/src/square/requests/device_code_paired_event.py
index c2cf19a5..83f74513 100644
--- a/src/square/requests/device_code_paired_event.py
+++ b/src/square/requests/device_code_paired_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .device_code_paired_event_data import DeviceCodePairedEventDataParams
 
 
diff --git a/src/square/requests/device_code_paired_event_data.py b/src/square/requests/device_code_paired_event_data.py
index fedff514..aef51a52 100644
--- a/src/square/requests/device_code_paired_event_data.py
+++ b/src/square/requests/device_code_paired_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .device_code_paired_event_object import DeviceCodePairedEventObjectParams
 
 
diff --git a/src/square/requests/device_code_paired_event_object.py b/src/square/requests/device_code_paired_event_object.py
index 09db1a88..4e701845 100644
--- a/src/square/requests/device_code_paired_event_object.py
+++ b/src/square/requests/device_code_paired_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .device_code import DeviceCodeParams
 
diff --git a/src/square/requests/device_component_details_application_details.py b/src/square/requests/device_component_details_application_details.py
index 3942e7ab..c192688c 100644
--- a/src/square/requests/device_component_details_application_details.py
+++ b/src/square/requests/device_component_details_application_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.application_type import ApplicationType
-import typing
 
 
 class DeviceComponentDetailsApplicationDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/device_component_details_battery_details.py b/src/square/requests/device_component_details_battery_details.py
index 6764b47a..bb8d8da9 100644
--- a/src/square/requests/device_component_details_battery_details.py
+++ b/src/square/requests/device_component_details_battery_details.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.device_component_details_external_power import DeviceComponentDetailsExternalPower
 
 
diff --git a/src/square/requests/device_component_details_card_reader_details.py b/src/square/requests/device_component_details_card_reader_details.py
index c4ef09a1..854ec50c 100644
--- a/src/square/requests/device_component_details_card_reader_details.py
+++ b/src/square/requests/device_component_details_card_reader_details.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class DeviceComponentDetailsCardReaderDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/device_component_details_ethernet_details.py b/src/square/requests/device_component_details_ethernet_details.py
index 0b595ede..0fe5cc3f 100644
--- a/src/square/requests/device_component_details_ethernet_details.py
+++ b/src/square/requests/device_component_details_ethernet_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class DeviceComponentDetailsEthernetDetailsParams(typing_extensions.TypedDict):
     active: typing_extensions.NotRequired[typing.Optional[bool]]
diff --git a/src/square/requests/device_component_details_measurement.py b/src/square/requests/device_component_details_measurement.py
index a6a2a6cb..c2065ff2 100644
--- a/src/square/requests/device_component_details_measurement.py
+++ b/src/square/requests/device_component_details_measurement.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class DeviceComponentDetailsMeasurementParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/device_component_details_wi_fi_details.py b/src/square/requests/device_component_details_wi_fi_details.py
index 50dfe5be..af422110 100644
--- a/src/square/requests/device_component_details_wi_fi_details.py
+++ b/src/square/requests/device_component_details_wi_fi_details.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .device_component_details_measurement import DeviceComponentDetailsMeasurementParams
 
 
diff --git a/src/square/requests/device_created_event.py b/src/square/requests/device_created_event.py
index 4d7e2de9..4299d740 100644
--- a/src/square/requests/device_created_event.py
+++ b/src/square/requests/device_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .device_created_event_data import DeviceCreatedEventDataParams
 
 
diff --git a/src/square/requests/device_created_event_data.py b/src/square/requests/device_created_event_data.py
index 49bdd2b6..5c8697a8 100644
--- a/src/square/requests/device_created_event_data.py
+++ b/src/square/requests/device_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .device_created_event_object import DeviceCreatedEventObjectParams
 
 
diff --git a/src/square/requests/device_created_event_object.py b/src/square/requests/device_created_event_object.py
index 298d19cb..f331f032 100644
--- a/src/square/requests/device_created_event_object.py
+++ b/src/square/requests/device_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .device import DeviceParams
 
diff --git a/src/square/requests/device_details.py b/src/square/requests/device_details.py
index 3182f48b..caae2bb5 100644
--- a/src/square/requests/device_details.py
+++ b/src/square/requests/device_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class DeviceDetailsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/device_metadata.py b/src/square/requests/device_metadata.py
index d223e797..a995db21 100644
--- a/src/square/requests/device_metadata.py
+++ b/src/square/requests/device_metadata.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class DeviceMetadataParams(typing_extensions.TypedDict):
     battery_percentage: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/device_status.py b/src/square/requests/device_status.py
index d1cb7da0..cce37bad 100644
--- a/src/square/requests/device_status.py
+++ b/src/square/requests/device_status.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.device_status_category import DeviceStatusCategory
 
diff --git a/src/square/requests/digital_wallet_details.py b/src/square/requests/digital_wallet_details.py
index 24437416..3f1de07b 100644
--- a/src/square/requests/digital_wallet_details.py
+++ b/src/square/requests/digital_wallet_details.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .cash_app_details import CashAppDetailsParams
 
 
diff --git a/src/square/requests/disable_card_response.py b/src/square/requests/disable_card_response.py
index 82d89e7f..af24fb41 100644
--- a/src/square/requests/disable_card_response.py
+++ b/src/square/requests/disable_card_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .card import CardParams
+from .error import ErrorParams
 
 
 class DisableCardResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/disable_events_response.py b/src/square/requests/disable_events_response.py
index 72187950..87bfa929 100644
--- a/src/square/requests/disable_events_response.py
+++ b/src/square/requests/disable_events_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/dismiss_terminal_action_response.py b/src/square/requests/dismiss_terminal_action_response.py
index f9b74711..d3e5d8f6 100644
--- a/src/square/requests/dismiss_terminal_action_response.py
+++ b/src/square/requests/dismiss_terminal_action_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_action import TerminalActionParams
 
diff --git a/src/square/requests/dismiss_terminal_checkout_response.py b/src/square/requests/dismiss_terminal_checkout_response.py
index fefcb3c2..b9517d8f 100644
--- a/src/square/requests/dismiss_terminal_checkout_response.py
+++ b/src/square/requests/dismiss_terminal_checkout_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_checkout import TerminalCheckoutParams
 
diff --git a/src/square/requests/dismiss_terminal_refund_response.py b/src/square/requests/dismiss_terminal_refund_response.py
index b9c558c2..c006b19b 100644
--- a/src/square/requests/dismiss_terminal_refund_response.py
+++ b/src/square/requests/dismiss_terminal_refund_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_refund import TerminalRefundParams
 
diff --git a/src/square/requests/dispute.py b/src/square/requests/dispute.py
index 33d31696..68a6b55c 100644
--- a/src/square/requests/dispute.py
+++ b/src/square/requests/dispute.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .money import MoneyParams
+
+import typing_extensions
+from ..types.card_brand import CardBrand
 from ..types.dispute_reason import DisputeReason
 from ..types.dispute_state import DisputeState
 from .disputed_payment import DisputedPaymentParams
-from ..types.card_brand import CardBrand
+from .money import MoneyParams
 
 
 class DisputeParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/dispute_created_event.py b/src/square/requests/dispute_created_event.py
index 51d2839a..3f10eb86 100644
--- a/src/square/requests/dispute_created_event.py
+++ b/src/square/requests/dispute_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_created_event_data import DisputeCreatedEventDataParams
 
 
diff --git a/src/square/requests/dispute_created_event_data.py b/src/square/requests/dispute_created_event_data.py
index c0b651e6..9b255396 100644
--- a/src/square/requests/dispute_created_event_data.py
+++ b/src/square/requests/dispute_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_created_event_object import DisputeCreatedEventObjectParams
 
 
diff --git a/src/square/requests/dispute_created_event_object.py b/src/square/requests/dispute_created_event_object.py
index 3c969b50..3495e782 100644
--- a/src/square/requests/dispute_created_event_object.py
+++ b/src/square/requests/dispute_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .dispute import DisputeParams
 
diff --git a/src/square/requests/dispute_evidence.py b/src/square/requests/dispute_evidence.py
index c86e8c1c..7d046e99 100644
--- a/src/square/requests/dispute_evidence.py
+++ b/src/square/requests/dispute_evidence.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .dispute_evidence_file import DisputeEvidenceFileParams
+
+import typing_extensions
 from ..types.dispute_evidence_type import DisputeEvidenceType
+from .dispute_evidence_file import DisputeEvidenceFileParams
 
 
 class DisputeEvidenceParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/dispute_evidence_added_event.py b/src/square/requests/dispute_evidence_added_event.py
index 91c1328a..36af4375 100644
--- a/src/square/requests/dispute_evidence_added_event.py
+++ b/src/square/requests/dispute_evidence_added_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_evidence_added_event_data import DisputeEvidenceAddedEventDataParams
 
 
diff --git a/src/square/requests/dispute_evidence_added_event_data.py b/src/square/requests/dispute_evidence_added_event_data.py
index 9c9d136a..687b0630 100644
--- a/src/square/requests/dispute_evidence_added_event_data.py
+++ b/src/square/requests/dispute_evidence_added_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_evidence_added_event_object import DisputeEvidenceAddedEventObjectParams
 
 
diff --git a/src/square/requests/dispute_evidence_added_event_object.py b/src/square/requests/dispute_evidence_added_event_object.py
index 62c24eca..66675a98 100644
--- a/src/square/requests/dispute_evidence_added_event_object.py
+++ b/src/square/requests/dispute_evidence_added_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .dispute import DisputeParams
 
diff --git a/src/square/requests/dispute_evidence_created_event.py b/src/square/requests/dispute_evidence_created_event.py
index f4f91442..d2cca7c9 100644
--- a/src/square/requests/dispute_evidence_created_event.py
+++ b/src/square/requests/dispute_evidence_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_evidence_created_event_data import DisputeEvidenceCreatedEventDataParams
 
 
diff --git a/src/square/requests/dispute_evidence_created_event_data.py b/src/square/requests/dispute_evidence_created_event_data.py
index 2df3f284..ae812dec 100644
--- a/src/square/requests/dispute_evidence_created_event_data.py
+++ b/src/square/requests/dispute_evidence_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_evidence_created_event_object import DisputeEvidenceCreatedEventObjectParams
 
 
diff --git a/src/square/requests/dispute_evidence_created_event_object.py b/src/square/requests/dispute_evidence_created_event_object.py
index cf617c96..5c19da6b 100644
--- a/src/square/requests/dispute_evidence_created_event_object.py
+++ b/src/square/requests/dispute_evidence_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .dispute import DisputeParams
 
diff --git a/src/square/requests/dispute_evidence_deleted_event.py b/src/square/requests/dispute_evidence_deleted_event.py
index 344f4fb9..b8b19ba8 100644
--- a/src/square/requests/dispute_evidence_deleted_event.py
+++ b/src/square/requests/dispute_evidence_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_evidence_deleted_event_data import DisputeEvidenceDeletedEventDataParams
 
 
diff --git a/src/square/requests/dispute_evidence_deleted_event_data.py b/src/square/requests/dispute_evidence_deleted_event_data.py
index dae9f536..5374a3c0 100644
--- a/src/square/requests/dispute_evidence_deleted_event_data.py
+++ b/src/square/requests/dispute_evidence_deleted_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_evidence_deleted_event_object import DisputeEvidenceDeletedEventObjectParams
 
 
diff --git a/src/square/requests/dispute_evidence_deleted_event_object.py b/src/square/requests/dispute_evidence_deleted_event_object.py
index 9aac18bc..599d1c6f 100644
--- a/src/square/requests/dispute_evidence_deleted_event_object.py
+++ b/src/square/requests/dispute_evidence_deleted_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .dispute import DisputeParams
 
diff --git a/src/square/requests/dispute_evidence_file.py b/src/square/requests/dispute_evidence_file.py
index 6a07b069..15c34c82 100644
--- a/src/square/requests/dispute_evidence_file.py
+++ b/src/square/requests/dispute_evidence_file.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class DisputeEvidenceFileParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/dispute_evidence_removed_event.py b/src/square/requests/dispute_evidence_removed_event.py
index 61d1e534..c0b3a0c5 100644
--- a/src/square/requests/dispute_evidence_removed_event.py
+++ b/src/square/requests/dispute_evidence_removed_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_evidence_removed_event_data import DisputeEvidenceRemovedEventDataParams
 
 
diff --git a/src/square/requests/dispute_evidence_removed_event_data.py b/src/square/requests/dispute_evidence_removed_event_data.py
index e4b95150..2761cba0 100644
--- a/src/square/requests/dispute_evidence_removed_event_data.py
+++ b/src/square/requests/dispute_evidence_removed_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_evidence_removed_event_object import DisputeEvidenceRemovedEventObjectParams
 
 
diff --git a/src/square/requests/dispute_evidence_removed_event_object.py b/src/square/requests/dispute_evidence_removed_event_object.py
index d031b015..4dff246c 100644
--- a/src/square/requests/dispute_evidence_removed_event_object.py
+++ b/src/square/requests/dispute_evidence_removed_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .dispute import DisputeParams
 
diff --git a/src/square/requests/dispute_state_changed_event.py b/src/square/requests/dispute_state_changed_event.py
index dc8cc8df..c03f4300 100644
--- a/src/square/requests/dispute_state_changed_event.py
+++ b/src/square/requests/dispute_state_changed_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_state_changed_event_data import DisputeStateChangedEventDataParams
 
 
diff --git a/src/square/requests/dispute_state_changed_event_data.py b/src/square/requests/dispute_state_changed_event_data.py
index df3a0d53..ba3778b0 100644
--- a/src/square/requests/dispute_state_changed_event_data.py
+++ b/src/square/requests/dispute_state_changed_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_state_changed_event_object import DisputeStateChangedEventObjectParams
 
 
diff --git a/src/square/requests/dispute_state_changed_event_object.py b/src/square/requests/dispute_state_changed_event_object.py
index 63bd0a82..4cc12695 100644
--- a/src/square/requests/dispute_state_changed_event_object.py
+++ b/src/square/requests/dispute_state_changed_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .dispute import DisputeParams
 
diff --git a/src/square/requests/dispute_state_updated_event.py b/src/square/requests/dispute_state_updated_event.py
index 9a03c62a..dd45b1b0 100644
--- a/src/square/requests/dispute_state_updated_event.py
+++ b/src/square/requests/dispute_state_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_state_updated_event_data import DisputeStateUpdatedEventDataParams
 
 
diff --git a/src/square/requests/dispute_state_updated_event_data.py b/src/square/requests/dispute_state_updated_event_data.py
index c4e217dc..1b1966ba 100644
--- a/src/square/requests/dispute_state_updated_event_data.py
+++ b/src/square/requests/dispute_state_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_state_updated_event_object import DisputeStateUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/dispute_state_updated_event_object.py b/src/square/requests/dispute_state_updated_event_object.py
index ec0282e7..3a6654cf 100644
--- a/src/square/requests/dispute_state_updated_event_object.py
+++ b/src/square/requests/dispute_state_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .dispute import DisputeParams
 
diff --git a/src/square/requests/disputed_payment.py b/src/square/requests/disputed_payment.py
index 0a3debff..68f455db 100644
--- a/src/square/requests/disputed_payment.py
+++ b/src/square/requests/disputed_payment.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class DisputedPaymentParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/employee.py b/src/square/requests/employee.py
index 3166bcaa..a3d92c1f 100644
--- a/src/square/requests/employee.py
+++ b/src/square/requests/employee.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.employee_status import EmployeeStatus
 
 
diff --git a/src/square/requests/employee_wage.py b/src/square/requests/employee_wage.py
index f5bc26a8..62ba2f92 100644
--- a/src/square/requests/employee_wage.py
+++ b/src/square/requests/employee_wage.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/enable_events_response.py b/src/square/requests/enable_events_response.py
index c78ba8d9..586054c3 100644
--- a/src/square/requests/enable_events_response.py
+++ b/src/square/requests/enable_events_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/error.py b/src/square/requests/error.py
index 5bd17414..f3cbac36 100644
--- a/src/square/requests/error.py
+++ b/src/square/requests/error.py
@@ -3,7 +3,6 @@
 import typing_extensions
 from ..types.error_category import ErrorCategory
 from ..types.error_code import ErrorCode
-import typing_extensions
 
 
 class ErrorParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/event.py b/src/square/requests/event.py
index 8c22db82..5bf97c5a 100644
--- a/src/square/requests/event.py
+++ b/src/square/requests/event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .event_data import EventDataParams
 
 
diff --git a/src/square/requests/event_data.py b/src/square/requests/event_data.py
index 9c0b453c..aa2c4e11 100644
--- a/src/square/requests/event_data.py
+++ b/src/square/requests/event_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class EventDataParams(typing_extensions.TypedDict):
     type: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/event_metadata.py b/src/square/requests/event_metadata.py
index 13555b4c..66c9e0eb 100644
--- a/src/square/requests/event_metadata.py
+++ b/src/square/requests/event_metadata.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class EventMetadataParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/event_type_metadata.py b/src/square/requests/event_type_metadata.py
index a86369e5..75201a66 100644
--- a/src/square/requests/event_type_metadata.py
+++ b/src/square/requests/event_type_metadata.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class EventTypeMetadataParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/external_payment_details.py b/src/square/requests/external_payment_details.py
index 3278cc0f..50ce0451 100644
--- a/src/square/requests/external_payment_details.py
+++ b/src/square/requests/external_payment_details.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/filter_value.py b/src/square/requests/filter_value.py
index 825d367b..8ddba4b9 100644
--- a/src/square/requests/filter_value.py
+++ b/src/square/requests/filter_value.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..core.serialization import FieldMetadata
 
 
diff --git a/src/square/requests/float_number_range.py b/src/square/requests/float_number_range.py
index 3c1787b7..a453b8da 100644
--- a/src/square/requests/float_number_range.py
+++ b/src/square/requests/float_number_range.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class FloatNumberRangeParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/fulfillment.py b/src/square/requests/fulfillment.py
index 3bbcf55b..4873ffb6 100644
--- a/src/square/requests/fulfillment.py
+++ b/src/square/requests/fulfillment.py
@@ -1,15 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from ..types.fulfillment_type import FulfillmentType
-from ..types.fulfillment_state import FulfillmentState
+
+import typing_extensions
 from ..types.fulfillment_fulfillment_line_item_application import FulfillmentFulfillmentLineItemApplication
+from ..types.fulfillment_state import FulfillmentState
+from ..types.fulfillment_type import FulfillmentType
+from .fulfillment_delivery_details import FulfillmentDeliveryDetailsParams
 from .fulfillment_fulfillment_entry import FulfillmentFulfillmentEntryParams
 from .fulfillment_pickup_details import FulfillmentPickupDetailsParams
 from .fulfillment_shipment_details import FulfillmentShipmentDetailsParams
-from .fulfillment_delivery_details import FulfillmentDeliveryDetailsParams
 
 
 class FulfillmentParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/fulfillment_delivery_details.py b/src/square/requests/fulfillment_delivery_details.py
index 7543919a..e014e586 100644
--- a/src/square/requests/fulfillment_delivery_details.py
+++ b/src/square/requests/fulfillment_delivery_details.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
-from .fulfillment_recipient import FulfillmentRecipientParams
 from ..types.fulfillment_delivery_details_order_fulfillment_delivery_details_schedule_type import (
     FulfillmentDeliveryDetailsOrderFulfillmentDeliveryDetailsScheduleType,
 )
-import typing
+from .fulfillment_recipient import FulfillmentRecipientParams
 
 
 class FulfillmentDeliveryDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/fulfillment_fulfillment_entry.py b/src/square/requests/fulfillment_fulfillment_entry.py
index 995a98c6..211b7d4a 100644
--- a/src/square/requests/fulfillment_fulfillment_entry.py
+++ b/src/square/requests/fulfillment_fulfillment_entry.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class FulfillmentFulfillmentEntryParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/fulfillment_pickup_details.py b/src/square/requests/fulfillment_pickup_details.py
index 49e32c40..5c248bef 100644
--- a/src/square/requests/fulfillment_pickup_details.py
+++ b/src/square/requests/fulfillment_pickup_details.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .fulfillment_recipient import FulfillmentRecipientParams
 import typing
+
+import typing_extensions
 from ..types.fulfillment_pickup_details_schedule_type import FulfillmentPickupDetailsScheduleType
 from .fulfillment_pickup_details_curbside_pickup_details import FulfillmentPickupDetailsCurbsidePickupDetailsParams
+from .fulfillment_recipient import FulfillmentRecipientParams
 
 
 class FulfillmentPickupDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/fulfillment_pickup_details_curbside_pickup_details.py b/src/square/requests/fulfillment_pickup_details_curbside_pickup_details.py
index 92cc67ef..f9ffedf3 100644
--- a/src/square/requests/fulfillment_pickup_details_curbside_pickup_details.py
+++ b/src/square/requests/fulfillment_pickup_details_curbside_pickup_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class FulfillmentPickupDetailsCurbsidePickupDetailsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/fulfillment_recipient.py b/src/square/requests/fulfillment_recipient.py
index 974e30db..36134644 100644
--- a/src/square/requests/fulfillment_recipient.py
+++ b/src/square/requests/fulfillment_recipient.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .address import AddressParams
 
 
diff --git a/src/square/requests/fulfillment_shipment_details.py b/src/square/requests/fulfillment_shipment_details.py
index 89353fdc..9404fc82 100644
--- a/src/square/requests/fulfillment_shipment_details.py
+++ b/src/square/requests/fulfillment_shipment_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .fulfillment_recipient import FulfillmentRecipientParams
-import typing
 
 
 class FulfillmentShipmentDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_bank_account_by_v1id_response.py b/src/square/requests/get_bank_account_by_v1id_response.py
index d53f18c6..02d288f2 100644
--- a/src/square/requests/get_bank_account_by_v1id_response.py
+++ b/src/square/requests/get_bank_account_by_v1id_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .bank_account import BankAccountParams
+from .error import ErrorParams
 
 
 class GetBankAccountByV1IdResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_bank_account_response.py b/src/square/requests/get_bank_account_response.py
index 984ce4e0..787673f8 100644
--- a/src/square/requests/get_bank_account_response.py
+++ b/src/square/requests/get_bank_account_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .bank_account import BankAccountParams
+from .error import ErrorParams
 
 
 class GetBankAccountResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_booking_response.py b/src/square/requests/get_booking_response.py
index 2a806bf5..06df7c4c 100644
--- a/src/square/requests/get_booking_response.py
+++ b/src/square/requests/get_booking_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .booking import BookingParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/get_break_type_response.py b/src/square/requests/get_break_type_response.py
index 09ab8647..056c5c7e 100644
--- a/src/square/requests/get_break_type_response.py
+++ b/src/square/requests/get_break_type_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .break_type import BreakTypeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/get_business_booking_profile_response.py b/src/square/requests/get_business_booking_profile_response.py
index e3a9f309..cccb3721 100644
--- a/src/square/requests/get_business_booking_profile_response.py
+++ b/src/square/requests/get_business_booking_profile_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .business_booking_profile import BusinessBookingProfileParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/get_card_response.py b/src/square/requests/get_card_response.py
index b64d34b7..800c47ed 100644
--- a/src/square/requests/get_card_response.py
+++ b/src/square/requests/get_card_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .card import CardParams
+from .error import ErrorParams
 
 
 class GetCardResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_cash_drawer_shift_response.py b/src/square/requests/get_cash_drawer_shift_response.py
index d7a71ce7..ec78d11d 100644
--- a/src/square/requests/get_cash_drawer_shift_response.py
+++ b/src/square/requests/get_cash_drawer_shift_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .cash_drawer_shift import CashDrawerShiftParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/get_catalog_object_response.py b/src/square/requests/get_catalog_object_response.py
index bbaa75f2..53800a11 100644
--- a/src/square/requests/get_catalog_object_response.py
+++ b/src/square/requests/get_catalog_object_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .catalog_object import CatalogObjectParams
+from .error import ErrorParams
 
 
 class GetCatalogObjectResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_customer_custom_attribute_definition_response.py b/src/square/requests/get_customer_custom_attribute_definition_response.py
index 44feb856..8b51289a 100644
--- a/src/square/requests/get_customer_custom_attribute_definition_response.py
+++ b/src/square/requests/get_customer_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/get_customer_custom_attribute_response.py b/src/square/requests/get_customer_custom_attribute_response.py
index 0f1438e4..0ccdee36 100644
--- a/src/square/requests/get_customer_custom_attribute_response.py
+++ b/src/square/requests/get_customer_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/get_customer_group_response.py b/src/square/requests/get_customer_group_response.py
index 615209dc..40a9d1fa 100644
--- a/src/square/requests/get_customer_group_response.py
+++ b/src/square/requests/get_customer_group_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer_group import CustomerGroupParams
+from .error import ErrorParams
 
 
 class GetCustomerGroupResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_customer_response.py b/src/square/requests/get_customer_response.py
index 56a8a33b..38d89c01 100644
--- a/src/square/requests/get_customer_response.py
+++ b/src/square/requests/get_customer_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer import CustomerParams
+from .error import ErrorParams
 
 
 class GetCustomerResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_customer_segment_response.py b/src/square/requests/get_customer_segment_response.py
index d01d8d4f..9aa3e463 100644
--- a/src/square/requests/get_customer_segment_response.py
+++ b/src/square/requests/get_customer_segment_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer_segment import CustomerSegmentParams
+from .error import ErrorParams
 
 
 class GetCustomerSegmentResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_device_code_response.py b/src/square/requests/get_device_code_response.py
index 353793b6..5160a441 100644
--- a/src/square/requests/get_device_code_response.py
+++ b/src/square/requests/get_device_code_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .device_code import DeviceCodeParams
+from .error import ErrorParams
 
 
 class GetDeviceCodeResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_device_response.py b/src/square/requests/get_device_response.py
index d8de606e..a06a06e6 100644
--- a/src/square/requests/get_device_response.py
+++ b/src/square/requests/get_device_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .device import DeviceParams
+from .error import ErrorParams
 
 
 class GetDeviceResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_dispute_evidence_response.py b/src/square/requests/get_dispute_evidence_response.py
index 48a6bc91..4326d987 100644
--- a/src/square/requests/get_dispute_evidence_response.py
+++ b/src/square/requests/get_dispute_evidence_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .dispute_evidence import DisputeEvidenceParams
+from .error import ErrorParams
 
 
 class GetDisputeEvidenceResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_dispute_response.py b/src/square/requests/get_dispute_response.py
index 3952f3ae..d23e4b21 100644
--- a/src/square/requests/get_dispute_response.py
+++ b/src/square/requests/get_dispute_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .dispute import DisputeParams
+from .error import ErrorParams
 
 
 class GetDisputeResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_employee_response.py b/src/square/requests/get_employee_response.py
index 7bf6c3d3..bdd61566 100644
--- a/src/square/requests/get_employee_response.py
+++ b/src/square/requests/get_employee_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .employee import EmployeeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/get_employee_wage_response.py b/src/square/requests/get_employee_wage_response.py
index e4e99196..133baffc 100644
--- a/src/square/requests/get_employee_wage_response.py
+++ b/src/square/requests/get_employee_wage_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .employee_wage import EmployeeWageParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/get_gift_card_from_gan_response.py b/src/square/requests/get_gift_card_from_gan_response.py
index 7f598c9f..32a3cb23 100644
--- a/src/square/requests/get_gift_card_from_gan_response.py
+++ b/src/square/requests/get_gift_card_from_gan_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .gift_card import GiftCardParams
 
diff --git a/src/square/requests/get_gift_card_from_nonce_response.py b/src/square/requests/get_gift_card_from_nonce_response.py
index c4ea7103..2fdcacdd 100644
--- a/src/square/requests/get_gift_card_from_nonce_response.py
+++ b/src/square/requests/get_gift_card_from_nonce_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .gift_card import GiftCardParams
 
diff --git a/src/square/requests/get_gift_card_response.py b/src/square/requests/get_gift_card_response.py
index 93eff8ef..59fe561c 100644
--- a/src/square/requests/get_gift_card_response.py
+++ b/src/square/requests/get_gift_card_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .gift_card import GiftCardParams
 
diff --git a/src/square/requests/get_inventory_adjustment_response.py b/src/square/requests/get_inventory_adjustment_response.py
index 749527d9..f4eab511 100644
--- a/src/square/requests/get_inventory_adjustment_response.py
+++ b/src/square/requests/get_inventory_adjustment_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .inventory_adjustment import InventoryAdjustmentParams
 
diff --git a/src/square/requests/get_inventory_changes_response.py b/src/square/requests/get_inventory_changes_response.py
index d2fea3c0..06ce4306 100644
--- a/src/square/requests/get_inventory_changes_response.py
+++ b/src/square/requests/get_inventory_changes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .inventory_change import InventoryChangeParams
 
diff --git a/src/square/requests/get_inventory_count_response.py b/src/square/requests/get_inventory_count_response.py
index 80fdab5d..dcba3346 100644
--- a/src/square/requests/get_inventory_count_response.py
+++ b/src/square/requests/get_inventory_count_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .inventory_count import InventoryCountParams
 
diff --git a/src/square/requests/get_inventory_physical_count_response.py b/src/square/requests/get_inventory_physical_count_response.py
index 9b828080..d2dc2ea9 100644
--- a/src/square/requests/get_inventory_physical_count_response.py
+++ b/src/square/requests/get_inventory_physical_count_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .inventory_physical_count import InventoryPhysicalCountParams
 
diff --git a/src/square/requests/get_inventory_transfer_response.py b/src/square/requests/get_inventory_transfer_response.py
index a68cab1f..83297433 100644
--- a/src/square/requests/get_inventory_transfer_response.py
+++ b/src/square/requests/get_inventory_transfer_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .inventory_transfer import InventoryTransferParams
 
diff --git a/src/square/requests/get_invoice_response.py b/src/square/requests/get_invoice_response.py
index ff8e43d5..dd6ffd32 100644
--- a/src/square/requests/get_invoice_response.py
+++ b/src/square/requests/get_invoice_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .invoice import InvoiceParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .invoice import InvoiceParams
 
 
 class GetInvoiceResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_location_response.py b/src/square/requests/get_location_response.py
index 35980cba..6e6d0be2 100644
--- a/src/square/requests/get_location_response.py
+++ b/src/square/requests/get_location_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .location import LocationParams
 
diff --git a/src/square/requests/get_loyalty_account_response.py b/src/square/requests/get_loyalty_account_response.py
index f726f45b..d75ae32c 100644
--- a/src/square/requests/get_loyalty_account_response.py
+++ b/src/square/requests/get_loyalty_account_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_account import LoyaltyAccountParams
 
diff --git a/src/square/requests/get_loyalty_program_response.py b/src/square/requests/get_loyalty_program_response.py
index 49e7d8e0..cbc4b47d 100644
--- a/src/square/requests/get_loyalty_program_response.py
+++ b/src/square/requests/get_loyalty_program_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_program import LoyaltyProgramParams
 
diff --git a/src/square/requests/get_loyalty_promotion_response.py b/src/square/requests/get_loyalty_promotion_response.py
index 2fb2eba1..24efb29a 100644
--- a/src/square/requests/get_loyalty_promotion_response.py
+++ b/src/square/requests/get_loyalty_promotion_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_promotion import LoyaltyPromotionParams
 
diff --git a/src/square/requests/get_loyalty_reward_response.py b/src/square/requests/get_loyalty_reward_response.py
index 7ea8680e..246b0cd7 100644
--- a/src/square/requests/get_loyalty_reward_response.py
+++ b/src/square/requests/get_loyalty_reward_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_reward import LoyaltyRewardParams
 
diff --git a/src/square/requests/get_merchant_response.py b/src/square/requests/get_merchant_response.py
index 47feec63..f99f1305 100644
--- a/src/square/requests/get_merchant_response.py
+++ b/src/square/requests/get_merchant_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .merchant import MerchantParams
 
diff --git a/src/square/requests/get_order_response.py b/src/square/requests/get_order_response.py
index ea07e619..abc6a9e7 100644
--- a/src/square/requests/get_order_response.py
+++ b/src/square/requests/get_order_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .order import OrderParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .order import OrderParams
 
 
 class GetOrderResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_payment_link_response.py b/src/square/requests/get_payment_link_response.py
index 7e6fb922..12721cc4 100644
--- a/src/square/requests/get_payment_link_response.py
+++ b/src/square/requests/get_payment_link_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment_link import PaymentLinkParams
 
diff --git a/src/square/requests/get_payment_refund_response.py b/src/square/requests/get_payment_refund_response.py
index 27016ac1..a6e55a83 100644
--- a/src/square/requests/get_payment_refund_response.py
+++ b/src/square/requests/get_payment_refund_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment_refund import PaymentRefundParams
 
diff --git a/src/square/requests/get_payment_response.py b/src/square/requests/get_payment_response.py
index a89a9001..ff33cdc3 100644
--- a/src/square/requests/get_payment_response.py
+++ b/src/square/requests/get_payment_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment import PaymentParams
 
diff --git a/src/square/requests/get_payout_response.py b/src/square/requests/get_payout_response.py
index a2f202fa..04ce2e34 100644
--- a/src/square/requests/get_payout_response.py
+++ b/src/square/requests/get_payout_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .payout import PayoutParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .payout import PayoutParams
 
 
 class GetPayoutResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_shift_response.py b/src/square/requests/get_shift_response.py
index 418b94c4..04166cd9 100644
--- a/src/square/requests/get_shift_response.py
+++ b/src/square/requests/get_shift_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .shift import ShiftParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .shift import ShiftParams
 
 
 class GetShiftResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_snippet_response.py b/src/square/requests/get_snippet_response.py
index efd72d2e..987e49bc 100644
--- a/src/square/requests/get_snippet_response.py
+++ b/src/square/requests/get_snippet_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .snippet import SnippetParams
 
diff --git a/src/square/requests/get_subscription_response.py b/src/square/requests/get_subscription_response.py
index 34df0330..d7166742 100644
--- a/src/square/requests/get_subscription_response.py
+++ b/src/square/requests/get_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 
diff --git a/src/square/requests/get_team_member_booking_profile_response.py b/src/square/requests/get_team_member_booking_profile_response.py
index 754d5999..1743b712 100644
--- a/src/square/requests/get_team_member_booking_profile_response.py
+++ b/src/square/requests/get_team_member_booking_profile_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .team_member_booking_profile import TeamMemberBookingProfileParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .team_member_booking_profile import TeamMemberBookingProfileParams
 
 
 class GetTeamMemberBookingProfileResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_team_member_response.py b/src/square/requests/get_team_member_response.py
index 38f684d4..9d71106d 100644
--- a/src/square/requests/get_team_member_response.py
+++ b/src/square/requests/get_team_member_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .team_member import TeamMemberParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .team_member import TeamMemberParams
 
 
 class GetTeamMemberResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_team_member_wage_response.py b/src/square/requests/get_team_member_wage_response.py
index e9b44031..9fc6b139 100644
--- a/src/square/requests/get_team_member_wage_response.py
+++ b/src/square/requests/get_team_member_wage_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .team_member_wage import TeamMemberWageParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .team_member_wage import TeamMemberWageParams
 
 
 class GetTeamMemberWageResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_terminal_action_response.py b/src/square/requests/get_terminal_action_response.py
index 9ec90205..af56ec6a 100644
--- a/src/square/requests/get_terminal_action_response.py
+++ b/src/square/requests/get_terminal_action_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_action import TerminalActionParams
 
diff --git a/src/square/requests/get_terminal_checkout_response.py b/src/square/requests/get_terminal_checkout_response.py
index d3644296..1c71292d 100644
--- a/src/square/requests/get_terminal_checkout_response.py
+++ b/src/square/requests/get_terminal_checkout_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_checkout import TerminalCheckoutParams
 
diff --git a/src/square/requests/get_terminal_refund_response.py b/src/square/requests/get_terminal_refund_response.py
index e79a9fa7..27828ea6 100644
--- a/src/square/requests/get_terminal_refund_response.py
+++ b/src/square/requests/get_terminal_refund_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_refund import TerminalRefundParams
 
diff --git a/src/square/requests/get_transaction_response.py b/src/square/requests/get_transaction_response.py
index 87522023..10210ad4 100644
--- a/src/square/requests/get_transaction_response.py
+++ b/src/square/requests/get_transaction_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .transaction import TransactionParams
 
diff --git a/src/square/requests/get_vendor_response.py b/src/square/requests/get_vendor_response.py
index 8f461879..c54a2c51 100644
--- a/src/square/requests/get_vendor_response.py
+++ b/src/square/requests/get_vendor_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .vendor import VendorParams
 
diff --git a/src/square/requests/get_wage_setting_response.py b/src/square/requests/get_wage_setting_response.py
index 4e0c6ae8..ba900f20 100644
--- a/src/square/requests/get_wage_setting_response.py
+++ b/src/square/requests/get_wage_setting_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .wage_setting import WageSettingParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .wage_setting import WageSettingParams
 
 
 class GetWageSettingResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/get_webhook_subscription_response.py b/src/square/requests/get_webhook_subscription_response.py
index c0e41df1..c71c6e7d 100644
--- a/src/square/requests/get_webhook_subscription_response.py
+++ b/src/square/requests/get_webhook_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .webhook_subscription import WebhookSubscriptionParams
 
diff --git a/src/square/requests/gift_card.py b/src/square/requests/gift_card.py
index 84a063a1..c4926a92 100644
--- a/src/square/requests/gift_card.py
+++ b/src/square/requests/gift_card.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
-from ..types.gift_card_type import GiftCardType
 from ..types.gift_card_gan_source import GiftCardGanSource
 from ..types.gift_card_status import GiftCardStatus
+from ..types.gift_card_type import GiftCardType
 from .money import MoneyParams
-import typing
 
 
 class GiftCardParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_activity.py b/src/square/requests/gift_card_activity.py
index e20ae638..25a353d7 100644
--- a/src/square/requests/gift_card_activity.py
+++ b/src/square/requests/gift_card_activity.py
@@ -1,25 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.gift_card_activity_type import GiftCardActivityType
-import typing
-from .money import MoneyParams
-from .gift_card_activity_load import GiftCardActivityLoadParams
 from .gift_card_activity_activate import GiftCardActivityActivateParams
-from .gift_card_activity_redeem import GiftCardActivityRedeemParams
+from .gift_card_activity_adjust_decrement import GiftCardActivityAdjustDecrementParams
+from .gift_card_activity_adjust_increment import GiftCardActivityAdjustIncrementParams
+from .gift_card_activity_block import GiftCardActivityBlockParams
 from .gift_card_activity_clear_balance import GiftCardActivityClearBalanceParams
 from .gift_card_activity_deactivate import GiftCardActivityDeactivateParams
-from .gift_card_activity_adjust_increment import GiftCardActivityAdjustIncrementParams
-from .gift_card_activity_adjust_decrement import GiftCardActivityAdjustDecrementParams
-from .gift_card_activity_refund import GiftCardActivityRefundParams
-from .gift_card_activity_unlinked_activity_refund import GiftCardActivityUnlinkedActivityRefundParams
 from .gift_card_activity_import import GiftCardActivityImportParams
-from .gift_card_activity_block import GiftCardActivityBlockParams
-from .gift_card_activity_unblock import GiftCardActivityUnblockParams
 from .gift_card_activity_import_reversal import GiftCardActivityImportReversalParams
-from .gift_card_activity_transfer_balance_to import GiftCardActivityTransferBalanceToParams
+from .gift_card_activity_load import GiftCardActivityLoadParams
+from .gift_card_activity_redeem import GiftCardActivityRedeemParams
+from .gift_card_activity_refund import GiftCardActivityRefundParams
 from .gift_card_activity_transfer_balance_from import GiftCardActivityTransferBalanceFromParams
+from .gift_card_activity_transfer_balance_to import GiftCardActivityTransferBalanceToParams
+from .gift_card_activity_unblock import GiftCardActivityUnblockParams
+from .gift_card_activity_unlinked_activity_refund import GiftCardActivityUnlinkedActivityRefundParams
+from .money import MoneyParams
 
 
 class GiftCardActivityParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_activity_activate.py b/src/square/requests/gift_card_activity_activate.py
index ddfe1e91..1b0990a6 100644
--- a/src/square/requests/gift_card_activity_activate.py
+++ b/src/square/requests/gift_card_activity_activate.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .money import MoneyParams
-import typing
 
 
 class GiftCardActivityActivateParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_activity_adjust_decrement.py b/src/square/requests/gift_card_activity_adjust_decrement.py
index 69c06609..20d74d63 100644
--- a/src/square/requests/gift_card_activity_adjust_decrement.py
+++ b/src/square/requests/gift_card_activity_adjust_decrement.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-from .money import MoneyParams
 from ..types.gift_card_activity_adjust_decrement_reason import GiftCardActivityAdjustDecrementReason
+from .money import MoneyParams
 
 
 class GiftCardActivityAdjustDecrementParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_activity_adjust_increment.py b/src/square/requests/gift_card_activity_adjust_increment.py
index 47ec6b66..2b288d8a 100644
--- a/src/square/requests/gift_card_activity_adjust_increment.py
+++ b/src/square/requests/gift_card_activity_adjust_increment.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-from .money import MoneyParams
 from ..types.gift_card_activity_adjust_increment_reason import GiftCardActivityAdjustIncrementReason
+from .money import MoneyParams
 
 
 class GiftCardActivityAdjustIncrementParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_activity_created_event.py b/src/square/requests/gift_card_activity_created_event.py
index 42a407cb..bd0be1d8 100644
--- a/src/square/requests/gift_card_activity_created_event.py
+++ b/src/square/requests/gift_card_activity_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_activity_created_event_data import GiftCardActivityCreatedEventDataParams
 
 
diff --git a/src/square/requests/gift_card_activity_created_event_data.py b/src/square/requests/gift_card_activity_created_event_data.py
index 6032325a..79f23cea 100644
--- a/src/square/requests/gift_card_activity_created_event_data.py
+++ b/src/square/requests/gift_card_activity_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_activity_created_event_object import GiftCardActivityCreatedEventObjectParams
 
 
diff --git a/src/square/requests/gift_card_activity_created_event_object.py b/src/square/requests/gift_card_activity_created_event_object.py
index 3f9eb4ef..2f8e6b2f 100644
--- a/src/square/requests/gift_card_activity_created_event_object.py
+++ b/src/square/requests/gift_card_activity_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .gift_card_activity import GiftCardActivityParams
 
diff --git a/src/square/requests/gift_card_activity_load.py b/src/square/requests/gift_card_activity_load.py
index 32dcb1df..b7c85427 100644
--- a/src/square/requests/gift_card_activity_load.py
+++ b/src/square/requests/gift_card_activity_load.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .money import MoneyParams
-import typing
 
 
 class GiftCardActivityLoadParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_activity_redeem.py b/src/square/requests/gift_card_activity_redeem.py
index eb1d2fc4..4fd45a5e 100644
--- a/src/square/requests/gift_card_activity_redeem.py
+++ b/src/square/requests/gift_card_activity_redeem.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-from .money import MoneyParams
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.gift_card_activity_redeem_status import GiftCardActivityRedeemStatus
+from .money import MoneyParams
 
 
 class GiftCardActivityRedeemParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_activity_refund.py b/src/square/requests/gift_card_activity_refund.py
index 47bb24fc..30dc52c5 100644
--- a/src/square/requests/gift_card_activity_refund.py
+++ b/src/square/requests/gift_card_activity_refund.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/gift_card_activity_unlinked_activity_refund.py b/src/square/requests/gift_card_activity_unlinked_activity_refund.py
index 8e28e967..43158899 100644
--- a/src/square/requests/gift_card_activity_unlinked_activity_refund.py
+++ b/src/square/requests/gift_card_activity_unlinked_activity_refund.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from .money import MoneyParams
-import typing_extensions
-import typing
 
 
 class GiftCardActivityUnlinkedActivityRefundParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_activity_updated_event.py b/src/square/requests/gift_card_activity_updated_event.py
index 79285d36..42bdd134 100644
--- a/src/square/requests/gift_card_activity_updated_event.py
+++ b/src/square/requests/gift_card_activity_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_activity_updated_event_data import GiftCardActivityUpdatedEventDataParams
 
 
diff --git a/src/square/requests/gift_card_activity_updated_event_data.py b/src/square/requests/gift_card_activity_updated_event_data.py
index 05f2f092..7481491d 100644
--- a/src/square/requests/gift_card_activity_updated_event_data.py
+++ b/src/square/requests/gift_card_activity_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_activity_updated_event_object import GiftCardActivityUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/gift_card_activity_updated_event_object.py b/src/square/requests/gift_card_activity_updated_event_object.py
index aadeee3f..8f35e099 100644
--- a/src/square/requests/gift_card_activity_updated_event_object.py
+++ b/src/square/requests/gift_card_activity_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .gift_card_activity import GiftCardActivityParams
 
diff --git a/src/square/requests/gift_card_created_event.py b/src/square/requests/gift_card_created_event.py
index 82eec7d8..5e27d0fe 100644
--- a/src/square/requests/gift_card_created_event.py
+++ b/src/square/requests/gift_card_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_created_event_data import GiftCardCreatedEventDataParams
 
 
diff --git a/src/square/requests/gift_card_created_event_data.py b/src/square/requests/gift_card_created_event_data.py
index 634fb8cc..b4a08e70 100644
--- a/src/square/requests/gift_card_created_event_data.py
+++ b/src/square/requests/gift_card_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_created_event_object import GiftCardCreatedEventObjectParams
 
 
diff --git a/src/square/requests/gift_card_created_event_object.py b/src/square/requests/gift_card_created_event_object.py
index 32925651..b9df8bf4 100644
--- a/src/square/requests/gift_card_created_event_object.py
+++ b/src/square/requests/gift_card_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .gift_card import GiftCardParams
 
diff --git a/src/square/requests/gift_card_customer_linked_event.py b/src/square/requests/gift_card_customer_linked_event.py
index 72bf0993..b59831ad 100644
--- a/src/square/requests/gift_card_customer_linked_event.py
+++ b/src/square/requests/gift_card_customer_linked_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_customer_linked_event_data import GiftCardCustomerLinkedEventDataParams
 
 
diff --git a/src/square/requests/gift_card_customer_linked_event_data.py b/src/square/requests/gift_card_customer_linked_event_data.py
index 681afa4d..2920674e 100644
--- a/src/square/requests/gift_card_customer_linked_event_data.py
+++ b/src/square/requests/gift_card_customer_linked_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_customer_linked_event_object import GiftCardCustomerLinkedEventObjectParams
 
 
diff --git a/src/square/requests/gift_card_customer_linked_event_object.py b/src/square/requests/gift_card_customer_linked_event_object.py
index 9a82458f..9c45a44a 100644
--- a/src/square/requests/gift_card_customer_linked_event_object.py
+++ b/src/square/requests/gift_card_customer_linked_event_object.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .gift_card import GiftCardParams
-import typing
 
 
 class GiftCardCustomerLinkedEventObjectParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_customer_unlinked_event.py b/src/square/requests/gift_card_customer_unlinked_event.py
index 52c08ed4..8013151c 100644
--- a/src/square/requests/gift_card_customer_unlinked_event.py
+++ b/src/square/requests/gift_card_customer_unlinked_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_customer_unlinked_event_data import GiftCardCustomerUnlinkedEventDataParams
 
 
diff --git a/src/square/requests/gift_card_customer_unlinked_event_data.py b/src/square/requests/gift_card_customer_unlinked_event_data.py
index b61f04d8..c378db15 100644
--- a/src/square/requests/gift_card_customer_unlinked_event_data.py
+++ b/src/square/requests/gift_card_customer_unlinked_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_customer_unlinked_event_object import GiftCardCustomerUnlinkedEventObjectParams
 
 
diff --git a/src/square/requests/gift_card_customer_unlinked_event_object.py b/src/square/requests/gift_card_customer_unlinked_event_object.py
index 8bf59292..fa109b5f 100644
--- a/src/square/requests/gift_card_customer_unlinked_event_object.py
+++ b/src/square/requests/gift_card_customer_unlinked_event_object.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .gift_card import GiftCardParams
-import typing
 
 
 class GiftCardCustomerUnlinkedEventObjectParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/gift_card_updated_event.py b/src/square/requests/gift_card_updated_event.py
index e1da7301..21a10755 100644
--- a/src/square/requests/gift_card_updated_event.py
+++ b/src/square/requests/gift_card_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_updated_event_data import GiftCardUpdatedEventDataParams
 
 
diff --git a/src/square/requests/gift_card_updated_event_data.py b/src/square/requests/gift_card_updated_event_data.py
index fb1a9a3a..75893528 100644
--- a/src/square/requests/gift_card_updated_event_data.py
+++ b/src/square/requests/gift_card_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .gift_card_updated_event_object import GiftCardUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/gift_card_updated_event_object.py b/src/square/requests/gift_card_updated_event_object.py
index 8ad0a8c1..715b18fb 100644
--- a/src/square/requests/gift_card_updated_event_object.py
+++ b/src/square/requests/gift_card_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .gift_card import GiftCardParams
 
diff --git a/src/square/requests/inventory_adjustment.py b/src/square/requests/inventory_adjustment.py
index 97e8a5ff..90a635b1 100644
--- a/src/square/requests/inventory_adjustment.py
+++ b/src/square/requests/inventory_adjustment.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.inventory_state import InventoryState
+from .inventory_adjustment_group import InventoryAdjustmentGroupParams
 from .money import MoneyParams
 from .source_application import SourceApplicationParams
-from .inventory_adjustment_group import InventoryAdjustmentGroupParams
 
 
 class InventoryAdjustmentParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/inventory_adjustment_group.py b/src/square/requests/inventory_adjustment_group.py
index 89a5dd2d..ca76146d 100644
--- a/src/square/requests/inventory_adjustment_group.py
+++ b/src/square/requests/inventory_adjustment_group.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.inventory_state import InventoryState
 
diff --git a/src/square/requests/inventory_change.py b/src/square/requests/inventory_change.py
index ba506b17..bd4baa2a 100644
--- a/src/square/requests/inventory_change.py
+++ b/src/square/requests/inventory_change.py
@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.inventory_change_type import InventoryChangeType
-from .inventory_physical_count import InventoryPhysicalCountParams
+from .catalog_measurement_unit import CatalogMeasurementUnitParams
 from .inventory_adjustment import InventoryAdjustmentParams
+from .inventory_physical_count import InventoryPhysicalCountParams
 from .inventory_transfer import InventoryTransferParams
-from .catalog_measurement_unit import CatalogMeasurementUnitParams
 
 
 class InventoryChangeParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/inventory_count.py b/src/square/requests/inventory_count.py
index 4b24d864..19a10b27 100644
--- a/src/square/requests/inventory_count.py
+++ b/src/square/requests/inventory_count.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.inventory_state import InventoryState
 
 
diff --git a/src/square/requests/inventory_count_updated_event.py b/src/square/requests/inventory_count_updated_event.py
index b15b4096..122b5146 100644
--- a/src/square/requests/inventory_count_updated_event.py
+++ b/src/square/requests/inventory_count_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .inventory_count_updated_event_data import InventoryCountUpdatedEventDataParams
 
 
diff --git a/src/square/requests/inventory_count_updated_event_data.py b/src/square/requests/inventory_count_updated_event_data.py
index 9a1d44b6..3ba390dc 100644
--- a/src/square/requests/inventory_count_updated_event_data.py
+++ b/src/square/requests/inventory_count_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .inventory_count_updated_event_object import InventoryCountUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/inventory_count_updated_event_object.py b/src/square/requests/inventory_count_updated_event_object.py
index bd58002b..c70c6bac 100644
--- a/src/square/requests/inventory_count_updated_event_object.py
+++ b/src/square/requests/inventory_count_updated_event_object.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .inventory_count import InventoryCountParams
 
 
diff --git a/src/square/requests/inventory_physical_count.py b/src/square/requests/inventory_physical_count.py
index 2c0e28bd..d0b1be10 100644
--- a/src/square/requests/inventory_physical_count.py
+++ b/src/square/requests/inventory_physical_count.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.inventory_state import InventoryState
 from .source_application import SourceApplicationParams
 
diff --git a/src/square/requests/inventory_transfer.py b/src/square/requests/inventory_transfer.py
index 722bbd42..b9ffcd88 100644
--- a/src/square/requests/inventory_transfer.py
+++ b/src/square/requests/inventory_transfer.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.inventory_state import InventoryState
 from .source_application import SourceApplicationParams
 
diff --git a/src/square/requests/invoice.py b/src/square/requests/invoice.py
index e8bf725a..6b119ae8 100644
--- a/src/square/requests/invoice.py
+++ b/src/square/requests/invoice.py
@@ -1,16 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .invoice_recipient import InvoiceRecipientParams
-from .invoice_payment_request import InvoicePaymentRequestParams
+
+import typing_extensions
 from ..types.invoice_delivery_method import InvoiceDeliveryMethod
-from .money import MoneyParams
 from ..types.invoice_status import InvoiceStatus
 from .invoice_accepted_payment_methods import InvoiceAcceptedPaymentMethodsParams
-from .invoice_custom_field import InvoiceCustomFieldParams
 from .invoice_attachment import InvoiceAttachmentParams
+from .invoice_custom_field import InvoiceCustomFieldParams
+from .invoice_payment_request import InvoicePaymentRequestParams
+from .invoice_recipient import InvoiceRecipientParams
+from .money import MoneyParams
 
 
 class InvoiceParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/invoice_accepted_payment_methods.py b/src/square/requests/invoice_accepted_payment_methods.py
index 9c0e2b3d..20ccfdf2 100644
--- a/src/square/requests/invoice_accepted_payment_methods.py
+++ b/src/square/requests/invoice_accepted_payment_methods.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class InvoiceAcceptedPaymentMethodsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/invoice_attachment.py b/src/square/requests/invoice_attachment.py
index 16cc3e4b..7f4509da 100644
--- a/src/square/requests/invoice_attachment.py
+++ b/src/square/requests/invoice_attachment.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class InvoiceAttachmentParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/invoice_canceled_event.py b/src/square/requests/invoice_canceled_event.py
index 2fc33c2d..ac9ef375 100644
--- a/src/square/requests/invoice_canceled_event.py
+++ b/src/square/requests/invoice_canceled_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_canceled_event_data import InvoiceCanceledEventDataParams
 
 
diff --git a/src/square/requests/invoice_canceled_event_data.py b/src/square/requests/invoice_canceled_event_data.py
index e8f8b1a3..5855e856 100644
--- a/src/square/requests/invoice_canceled_event_data.py
+++ b/src/square/requests/invoice_canceled_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_canceled_event_object import InvoiceCanceledEventObjectParams
 
 
diff --git a/src/square/requests/invoice_canceled_event_object.py b/src/square/requests/invoice_canceled_event_object.py
index c9a3d1e4..249e05e4 100644
--- a/src/square/requests/invoice_canceled_event_object.py
+++ b/src/square/requests/invoice_canceled_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .invoice import InvoiceParams
 
diff --git a/src/square/requests/invoice_created_event.py b/src/square/requests/invoice_created_event.py
index 05ce1e03..b340020b 100644
--- a/src/square/requests/invoice_created_event.py
+++ b/src/square/requests/invoice_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_created_event_data import InvoiceCreatedEventDataParams
 
 
diff --git a/src/square/requests/invoice_created_event_data.py b/src/square/requests/invoice_created_event_data.py
index 2da8d0ff..7e91cdcb 100644
--- a/src/square/requests/invoice_created_event_data.py
+++ b/src/square/requests/invoice_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_created_event_object import InvoiceCreatedEventObjectParams
 
 
diff --git a/src/square/requests/invoice_created_event_object.py b/src/square/requests/invoice_created_event_object.py
index 3905f5a4..69a52a30 100644
--- a/src/square/requests/invoice_created_event_object.py
+++ b/src/square/requests/invoice_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .invoice import InvoiceParams
 
diff --git a/src/square/requests/invoice_custom_field.py b/src/square/requests/invoice_custom_field.py
index a8143b09..40a610fe 100644
--- a/src/square/requests/invoice_custom_field.py
+++ b/src/square/requests/invoice_custom_field.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.invoice_custom_field_placement import InvoiceCustomFieldPlacement
 
 
diff --git a/src/square/requests/invoice_deleted_event.py b/src/square/requests/invoice_deleted_event.py
index 2312626d..a4c318a3 100644
--- a/src/square/requests/invoice_deleted_event.py
+++ b/src/square/requests/invoice_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_deleted_event_data import InvoiceDeletedEventDataParams
 
 
diff --git a/src/square/requests/invoice_deleted_event_data.py b/src/square/requests/invoice_deleted_event_data.py
index 754666c7..33036f8e 100644
--- a/src/square/requests/invoice_deleted_event_data.py
+++ b/src/square/requests/invoice_deleted_event_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class InvoiceDeletedEventDataParams(typing_extensions.TypedDict):
     type: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/invoice_filter.py b/src/square/requests/invoice_filter.py
index 5146e5d7..45287c98 100644
--- a/src/square/requests/invoice_filter.py
+++ b/src/square/requests/invoice_filter.py
@@ -1,7 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
 import typing_extensions
 
 
diff --git a/src/square/requests/invoice_payment_made_event.py b/src/square/requests/invoice_payment_made_event.py
index b3cae597..2c83f54d 100644
--- a/src/square/requests/invoice_payment_made_event.py
+++ b/src/square/requests/invoice_payment_made_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_payment_made_event_data import InvoicePaymentMadeEventDataParams
 
 
diff --git a/src/square/requests/invoice_payment_made_event_data.py b/src/square/requests/invoice_payment_made_event_data.py
index 46f21697..61251dcb 100644
--- a/src/square/requests/invoice_payment_made_event_data.py
+++ b/src/square/requests/invoice_payment_made_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_payment_made_event_object import InvoicePaymentMadeEventObjectParams
 
 
diff --git a/src/square/requests/invoice_payment_made_event_object.py b/src/square/requests/invoice_payment_made_event_object.py
index 7e66728f..0bbb284f 100644
--- a/src/square/requests/invoice_payment_made_event_object.py
+++ b/src/square/requests/invoice_payment_made_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .invoice import InvoiceParams
 
diff --git a/src/square/requests/invoice_payment_reminder.py b/src/square/requests/invoice_payment_reminder.py
index fa65a564..15dc73c1 100644
--- a/src/square/requests/invoice_payment_reminder.py
+++ b/src/square/requests/invoice_payment_reminder.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.invoice_payment_reminder_status import InvoicePaymentReminderStatus
 
 
diff --git a/src/square/requests/invoice_payment_request.py b/src/square/requests/invoice_payment_request.py
index c8b45c1c..4514d46f 100644
--- a/src/square/requests/invoice_payment_request.py
+++ b/src/square/requests/invoice_payment_request.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from ..types.invoice_automatic_payment_source import InvoiceAutomaticPaymentSource
 from ..types.invoice_request_method import InvoiceRequestMethod
 from ..types.invoice_request_type import InvoiceRequestType
-from .money import MoneyParams
-from ..types.invoice_automatic_payment_source import InvoiceAutomaticPaymentSource
 from .invoice_payment_reminder import InvoicePaymentReminderParams
+from .money import MoneyParams
 
 
 class InvoicePaymentRequestParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/invoice_published_event.py b/src/square/requests/invoice_published_event.py
index 77c5313a..7cc4a3b7 100644
--- a/src/square/requests/invoice_published_event.py
+++ b/src/square/requests/invoice_published_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_published_event_data import InvoicePublishedEventDataParams
 
 
diff --git a/src/square/requests/invoice_published_event_data.py b/src/square/requests/invoice_published_event_data.py
index b7c6092b..4c8b1903 100644
--- a/src/square/requests/invoice_published_event_data.py
+++ b/src/square/requests/invoice_published_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_published_event_object import InvoicePublishedEventObjectParams
 
 
diff --git a/src/square/requests/invoice_published_event_object.py b/src/square/requests/invoice_published_event_object.py
index 2f8305b0..e0b0986f 100644
--- a/src/square/requests/invoice_published_event_object.py
+++ b/src/square/requests/invoice_published_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .invoice import InvoiceParams
 
diff --git a/src/square/requests/invoice_query.py b/src/square/requests/invoice_query.py
index 25106a3a..c40f1caf 100644
--- a/src/square/requests/invoice_query.py
+++ b/src/square/requests/invoice_query.py
@@ -2,7 +2,6 @@
 
 import typing_extensions
 from .invoice_filter import InvoiceFilterParams
-import typing_extensions
 from .invoice_sort import InvoiceSortParams
 
 
diff --git a/src/square/requests/invoice_recipient.py b/src/square/requests/invoice_recipient.py
index 42ae51c7..8af24f08 100644
--- a/src/square/requests/invoice_recipient.py
+++ b/src/square/requests/invoice_recipient.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .address import AddressParams
 from .invoice_recipient_tax_ids import InvoiceRecipientTaxIdsParams
 
diff --git a/src/square/requests/invoice_recipient_tax_ids.py b/src/square/requests/invoice_recipient_tax_ids.py
index 6c7af866..f2f9707e 100644
--- a/src/square/requests/invoice_recipient_tax_ids.py
+++ b/src/square/requests/invoice_recipient_tax_ids.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class InvoiceRecipientTaxIdsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/invoice_refunded_event.py b/src/square/requests/invoice_refunded_event.py
index 3b09a708..a48d101a 100644
--- a/src/square/requests/invoice_refunded_event.py
+++ b/src/square/requests/invoice_refunded_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_refunded_event_data import InvoiceRefundedEventDataParams
 
 
diff --git a/src/square/requests/invoice_refunded_event_data.py b/src/square/requests/invoice_refunded_event_data.py
index a70d7330..aca61fda 100644
--- a/src/square/requests/invoice_refunded_event_data.py
+++ b/src/square/requests/invoice_refunded_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_refunded_event_object import InvoiceRefundedEventObjectParams
 
 
diff --git a/src/square/requests/invoice_refunded_event_object.py b/src/square/requests/invoice_refunded_event_object.py
index 35b5d352..cd611055 100644
--- a/src/square/requests/invoice_refunded_event_object.py
+++ b/src/square/requests/invoice_refunded_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .invoice import InvoiceParams
 
diff --git a/src/square/requests/invoice_scheduled_charge_failed_event.py b/src/square/requests/invoice_scheduled_charge_failed_event.py
index 903b41d3..9854b765 100644
--- a/src/square/requests/invoice_scheduled_charge_failed_event.py
+++ b/src/square/requests/invoice_scheduled_charge_failed_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_scheduled_charge_failed_event_data import InvoiceScheduledChargeFailedEventDataParams
 
 
diff --git a/src/square/requests/invoice_scheduled_charge_failed_event_data.py b/src/square/requests/invoice_scheduled_charge_failed_event_data.py
index 27a45a0b..0fc93c0c 100644
--- a/src/square/requests/invoice_scheduled_charge_failed_event_data.py
+++ b/src/square/requests/invoice_scheduled_charge_failed_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_scheduled_charge_failed_event_object import InvoiceScheduledChargeFailedEventObjectParams
 
 
diff --git a/src/square/requests/invoice_scheduled_charge_failed_event_object.py b/src/square/requests/invoice_scheduled_charge_failed_event_object.py
index 4fe5dfed..76e906d1 100644
--- a/src/square/requests/invoice_scheduled_charge_failed_event_object.py
+++ b/src/square/requests/invoice_scheduled_charge_failed_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .invoice import InvoiceParams
 
diff --git a/src/square/requests/invoice_sort.py b/src/square/requests/invoice_sort.py
index d55e6ecb..7976a74c 100644
--- a/src/square/requests/invoice_sort.py
+++ b/src/square/requests/invoice_sort.py
@@ -2,7 +2,6 @@
 
 import typing_extensions
 from ..types.invoice_sort_field import InvoiceSortField
-import typing_extensions
 from ..types.sort_order import SortOrder
 
 
diff --git a/src/square/requests/invoice_updated_event.py b/src/square/requests/invoice_updated_event.py
index 4807f2f4..b2b7d130 100644
--- a/src/square/requests/invoice_updated_event.py
+++ b/src/square/requests/invoice_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_updated_event_data import InvoiceUpdatedEventDataParams
 
 
diff --git a/src/square/requests/invoice_updated_event_data.py b/src/square/requests/invoice_updated_event_data.py
index a30c42a1..ff7166a5 100644
--- a/src/square/requests/invoice_updated_event_data.py
+++ b/src/square/requests/invoice_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .invoice_updated_event_object import InvoiceUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/invoice_updated_event_object.py b/src/square/requests/invoice_updated_event_object.py
index 3d6dc934..522ad797 100644
--- a/src/square/requests/invoice_updated_event_object.py
+++ b/src/square/requests/invoice_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .invoice import InvoiceParams
 
diff --git a/src/square/requests/item_variation_location_overrides.py b/src/square/requests/item_variation_location_overrides.py
index 8cd26d28..3f57850d 100644
--- a/src/square/requests/item_variation_location_overrides.py
+++ b/src/square/requests/item_variation_location_overrides.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .money import MoneyParams
+
+import typing_extensions
 from ..types.catalog_pricing_type import CatalogPricingType
 from ..types.inventory_alert_type import InventoryAlertType
+from .money import MoneyParams
 
 
 class ItemVariationLocationOverridesParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/job.py b/src/square/requests/job.py
index 8a91559b..6abd5b58 100644
--- a/src/square/requests/job.py
+++ b/src/square/requests/job.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class JobParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/job_assignment.py b/src/square/requests/job_assignment.py
index 751ab86d..be7bae27 100644
--- a/src/square/requests/job_assignment.py
+++ b/src/square/requests/job_assignment.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.job_assignment_pay_type import JobAssignmentPayType
 from .money import MoneyParams
 
diff --git a/src/square/requests/job_created_event.py b/src/square/requests/job_created_event.py
index 8af2c7f3..de43fc6d 100644
--- a/src/square/requests/job_created_event.py
+++ b/src/square/requests/job_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .job_created_event_data import JobCreatedEventDataParams
 
 
diff --git a/src/square/requests/job_created_event_data.py b/src/square/requests/job_created_event_data.py
index a21297ee..29a3d2f1 100644
--- a/src/square/requests/job_created_event_data.py
+++ b/src/square/requests/job_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .job_created_event_object import JobCreatedEventObjectParams
 
 
diff --git a/src/square/requests/job_created_event_object.py b/src/square/requests/job_created_event_object.py
index 700fe956..1f9802ae 100644
--- a/src/square/requests/job_created_event_object.py
+++ b/src/square/requests/job_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .job import JobParams
 
diff --git a/src/square/requests/job_updated_event.py b/src/square/requests/job_updated_event.py
index 6b071b51..e5e32f5f 100644
--- a/src/square/requests/job_updated_event.py
+++ b/src/square/requests/job_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .job_updated_event_data import JobUpdatedEventDataParams
 
 
diff --git a/src/square/requests/job_updated_event_data.py b/src/square/requests/job_updated_event_data.py
index 07c0ca89..1650ae7a 100644
--- a/src/square/requests/job_updated_event_data.py
+++ b/src/square/requests/job_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .job_updated_event_object import JobUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/job_updated_event_object.py b/src/square/requests/job_updated_event_object.py
index a8b7a9e8..095ded6f 100644
--- a/src/square/requests/job_updated_event_object.py
+++ b/src/square/requests/job_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .job import JobParams
 
diff --git a/src/square/requests/labor_scheduled_shift_created_event.py b/src/square/requests/labor_scheduled_shift_created_event.py
index 21aec06e..8088f179 100644
--- a/src/square/requests/labor_scheduled_shift_created_event.py
+++ b/src/square/requests/labor_scheduled_shift_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_scheduled_shift_created_event_data import LaborScheduledShiftCreatedEventDataParams
 
 
diff --git a/src/square/requests/labor_scheduled_shift_created_event_data.py b/src/square/requests/labor_scheduled_shift_created_event_data.py
index e0b1526b..7c7a0412 100644
--- a/src/square/requests/labor_scheduled_shift_created_event_data.py
+++ b/src/square/requests/labor_scheduled_shift_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_scheduled_shift_created_event_object import LaborScheduledShiftCreatedEventObjectParams
 
 
diff --git a/src/square/requests/labor_scheduled_shift_created_event_object.py b/src/square/requests/labor_scheduled_shift_created_event_object.py
index b6fd5d0d..46a4e33f 100644
--- a/src/square/requests/labor_scheduled_shift_created_event_object.py
+++ b/src/square/requests/labor_scheduled_shift_created_event_object.py
@@ -1,9 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .scheduled_shift import ScheduledShiftParams
 from ..core.serialization import FieldMetadata
+from .scheduled_shift import ScheduledShiftParams
 
 
 class LaborScheduledShiftCreatedEventObjectParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/labor_scheduled_shift_deleted_event.py b/src/square/requests/labor_scheduled_shift_deleted_event.py
index 252cef2e..ed134802 100644
--- a/src/square/requests/labor_scheduled_shift_deleted_event.py
+++ b/src/square/requests/labor_scheduled_shift_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_scheduled_shift_deleted_event_data import LaborScheduledShiftDeletedEventDataParams
 
 
diff --git a/src/square/requests/labor_scheduled_shift_deleted_event_data.py b/src/square/requests/labor_scheduled_shift_deleted_event_data.py
index 71caed88..5d051f41 100644
--- a/src/square/requests/labor_scheduled_shift_deleted_event_data.py
+++ b/src/square/requests/labor_scheduled_shift_deleted_event_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LaborScheduledShiftDeletedEventDataParams(typing_extensions.TypedDict):
     type: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/labor_scheduled_shift_published_event.py b/src/square/requests/labor_scheduled_shift_published_event.py
index a359e657..e11b8520 100644
--- a/src/square/requests/labor_scheduled_shift_published_event.py
+++ b/src/square/requests/labor_scheduled_shift_published_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_scheduled_shift_published_event_data import LaborScheduledShiftPublishedEventDataParams
 
 
diff --git a/src/square/requests/labor_scheduled_shift_published_event_data.py b/src/square/requests/labor_scheduled_shift_published_event_data.py
index ca0f238a..14fab0aa 100644
--- a/src/square/requests/labor_scheduled_shift_published_event_data.py
+++ b/src/square/requests/labor_scheduled_shift_published_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_scheduled_shift_published_event_object import LaborScheduledShiftPublishedEventObjectParams
 
 
diff --git a/src/square/requests/labor_scheduled_shift_published_event_object.py b/src/square/requests/labor_scheduled_shift_published_event_object.py
index fcc1aba7..c671db84 100644
--- a/src/square/requests/labor_scheduled_shift_published_event_object.py
+++ b/src/square/requests/labor_scheduled_shift_published_event_object.py
@@ -1,9 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .scheduled_shift import ScheduledShiftParams
 from ..core.serialization import FieldMetadata
+from .scheduled_shift import ScheduledShiftParams
 
 
 class LaborScheduledShiftPublishedEventObjectParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/labor_scheduled_shift_updated_event.py b/src/square/requests/labor_scheduled_shift_updated_event.py
index a32b353d..0c39fd1e 100644
--- a/src/square/requests/labor_scheduled_shift_updated_event.py
+++ b/src/square/requests/labor_scheduled_shift_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_scheduled_shift_updated_event_data import LaborScheduledShiftUpdatedEventDataParams
 
 
diff --git a/src/square/requests/labor_scheduled_shift_updated_event_data.py b/src/square/requests/labor_scheduled_shift_updated_event_data.py
index 246afe9d..dffa1c01 100644
--- a/src/square/requests/labor_scheduled_shift_updated_event_data.py
+++ b/src/square/requests/labor_scheduled_shift_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_scheduled_shift_updated_event_object import LaborScheduledShiftUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/labor_scheduled_shift_updated_event_object.py b/src/square/requests/labor_scheduled_shift_updated_event_object.py
index d165cad9..c14c8938 100644
--- a/src/square/requests/labor_scheduled_shift_updated_event_object.py
+++ b/src/square/requests/labor_scheduled_shift_updated_event_object.py
@@ -1,9 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .scheduled_shift import ScheduledShiftParams
 from ..core.serialization import FieldMetadata
+from .scheduled_shift import ScheduledShiftParams
 
 
 class LaborScheduledShiftUpdatedEventObjectParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/labor_shift_created_event.py b/src/square/requests/labor_shift_created_event.py
index 9ca01d74..909e8edd 100644
--- a/src/square/requests/labor_shift_created_event.py
+++ b/src/square/requests/labor_shift_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_shift_created_event_data import LaborShiftCreatedEventDataParams
 
 
diff --git a/src/square/requests/labor_shift_created_event_data.py b/src/square/requests/labor_shift_created_event_data.py
index fc49eec4..a0a4b9a3 100644
--- a/src/square/requests/labor_shift_created_event_data.py
+++ b/src/square/requests/labor_shift_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_shift_created_event_object import LaborShiftCreatedEventObjectParams
 
 
diff --git a/src/square/requests/labor_shift_created_event_object.py b/src/square/requests/labor_shift_created_event_object.py
index 07450468..29817007 100644
--- a/src/square/requests/labor_shift_created_event_object.py
+++ b/src/square/requests/labor_shift_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .shift import ShiftParams
 
diff --git a/src/square/requests/labor_shift_deleted_event.py b/src/square/requests/labor_shift_deleted_event.py
index c4747fd5..abc6610a 100644
--- a/src/square/requests/labor_shift_deleted_event.py
+++ b/src/square/requests/labor_shift_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_shift_deleted_event_data import LaborShiftDeletedEventDataParams
 
 
diff --git a/src/square/requests/labor_shift_deleted_event_data.py b/src/square/requests/labor_shift_deleted_event_data.py
index ad497962..0cd20fa6 100644
--- a/src/square/requests/labor_shift_deleted_event_data.py
+++ b/src/square/requests/labor_shift_deleted_event_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LaborShiftDeletedEventDataParams(typing_extensions.TypedDict):
     type: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/labor_shift_updated_event.py b/src/square/requests/labor_shift_updated_event.py
index f56c98bb..99647094 100644
--- a/src/square/requests/labor_shift_updated_event.py
+++ b/src/square/requests/labor_shift_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_shift_updated_event_data import LaborShiftUpdatedEventDataParams
 
 
diff --git a/src/square/requests/labor_shift_updated_event_data.py b/src/square/requests/labor_shift_updated_event_data.py
index 9205f7ec..9ca7b17d 100644
--- a/src/square/requests/labor_shift_updated_event_data.py
+++ b/src/square/requests/labor_shift_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_shift_updated_event_object import LaborShiftUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/labor_shift_updated_event_object.py b/src/square/requests/labor_shift_updated_event_object.py
index 6ace74e5..e324d2c1 100644
--- a/src/square/requests/labor_shift_updated_event_object.py
+++ b/src/square/requests/labor_shift_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .shift import ShiftParams
 
diff --git a/src/square/requests/labor_timecard_created_event.py b/src/square/requests/labor_timecard_created_event.py
index c1ac6c2c..9aaf8310 100644
--- a/src/square/requests/labor_timecard_created_event.py
+++ b/src/square/requests/labor_timecard_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_timecard_created_event_data import LaborTimecardCreatedEventDataParams
 
 
diff --git a/src/square/requests/labor_timecard_created_event_data.py b/src/square/requests/labor_timecard_created_event_data.py
index bc6563d5..2704d00e 100644
--- a/src/square/requests/labor_timecard_created_event_data.py
+++ b/src/square/requests/labor_timecard_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_timecard_created_event_object import LaborTimecardCreatedEventObjectParams
 
 
diff --git a/src/square/requests/labor_timecard_created_event_object.py b/src/square/requests/labor_timecard_created_event_object.py
index da3a46c4..b245c355 100644
--- a/src/square/requests/labor_timecard_created_event_object.py
+++ b/src/square/requests/labor_timecard_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .timecard import TimecardParams
 
diff --git a/src/square/requests/labor_timecard_deleted_event.py b/src/square/requests/labor_timecard_deleted_event.py
index 651d9e20..ba5c243a 100644
--- a/src/square/requests/labor_timecard_deleted_event.py
+++ b/src/square/requests/labor_timecard_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_timecard_deleted_event_data import LaborTimecardDeletedEventDataParams
 
 
diff --git a/src/square/requests/labor_timecard_deleted_event_data.py b/src/square/requests/labor_timecard_deleted_event_data.py
index 35942f8b..c821688d 100644
--- a/src/square/requests/labor_timecard_deleted_event_data.py
+++ b/src/square/requests/labor_timecard_deleted_event_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LaborTimecardDeletedEventDataParams(typing_extensions.TypedDict):
     type: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/labor_timecard_updated_event.py b/src/square/requests/labor_timecard_updated_event.py
index 31103492..93a65fa1 100644
--- a/src/square/requests/labor_timecard_updated_event.py
+++ b/src/square/requests/labor_timecard_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_timecard_updated_event_data import LaborTimecardUpdatedEventDataParams
 
 
diff --git a/src/square/requests/labor_timecard_updated_event_data.py b/src/square/requests/labor_timecard_updated_event_data.py
index 52bb86dd..e342bf23 100644
--- a/src/square/requests/labor_timecard_updated_event_data.py
+++ b/src/square/requests/labor_timecard_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .labor_timecard_updated_event_object import LaborTimecardUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/labor_timecard_updated_event_object.py b/src/square/requests/labor_timecard_updated_event_object.py
index 51563549..44d332be 100644
--- a/src/square/requests/labor_timecard_updated_event_object.py
+++ b/src/square/requests/labor_timecard_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .timecard import TimecardParams
 
diff --git a/src/square/requests/link_customer_to_gift_card_response.py b/src/square/requests/link_customer_to_gift_card_response.py
index 32575733..46fc1519 100644
--- a/src/square/requests/link_customer_to_gift_card_response.py
+++ b/src/square/requests/link_customer_to_gift_card_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .gift_card import GiftCardParams
 
diff --git a/src/square/requests/list_bank_accounts_response.py b/src/square/requests/list_bank_accounts_response.py
index e0fb8e04..4ecadd3b 100644
--- a/src/square/requests/list_bank_accounts_response.py
+++ b/src/square/requests/list_bank_accounts_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .bank_account import BankAccountParams
+from .error import ErrorParams
 
 
 class ListBankAccountsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_booking_custom_attribute_definitions_response.py b/src/square/requests/list_booking_custom_attribute_definitions_response.py
index 5883022e..fb8b1c1c 100644
--- a/src/square/requests/list_booking_custom_attribute_definitions_response.py
+++ b/src/square/requests/list_booking_custom_attribute_definitions_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_booking_custom_attributes_response.py b/src/square/requests/list_booking_custom_attributes_response.py
index 85558b7d..1f9fc3b3 100644
--- a/src/square/requests/list_booking_custom_attributes_response.py
+++ b/src/square/requests/list_booking_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute import CustomAttributeParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_bookings_response.py b/src/square/requests/list_bookings_response.py
index 87c639fe..89fd0030 100644
--- a/src/square/requests/list_bookings_response.py
+++ b/src/square/requests/list_bookings_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .booking import BookingParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_break_types_response.py b/src/square/requests/list_break_types_response.py
index fbbd8db1..db67af36 100644
--- a/src/square/requests/list_break_types_response.py
+++ b/src/square/requests/list_break_types_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .break_type import BreakTypeParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_cards_response.py b/src/square/requests/list_cards_response.py
index 36e7a8a3..98eab1cc 100644
--- a/src/square/requests/list_cards_response.py
+++ b/src/square/requests/list_cards_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .card import CardParams
+from .error import ErrorParams
 
 
 class ListCardsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_cash_drawer_shift_events_response.py b/src/square/requests/list_cash_drawer_shift_events_response.py
index 6cb01a67..df551d41 100644
--- a/src/square/requests/list_cash_drawer_shift_events_response.py
+++ b/src/square/requests/list_cash_drawer_shift_events_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .cash_drawer_shift_event import CashDrawerShiftEventParams
+from .error import ErrorParams
 
 
 class ListCashDrawerShiftEventsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_cash_drawer_shifts_response.py b/src/square/requests/list_cash_drawer_shifts_response.py
index c2ce477f..b461bf74 100644
--- a/src/square/requests/list_cash_drawer_shifts_response.py
+++ b/src/square/requests/list_cash_drawer_shifts_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .cash_drawer_shift_summary import CashDrawerShiftSummaryParams
+from .error import ErrorParams
 
 
 class ListCashDrawerShiftsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_catalog_response.py b/src/square/requests/list_catalog_response.py
index baf4328d..41cffb7f 100644
--- a/src/square/requests/list_catalog_response.py
+++ b/src/square/requests/list_catalog_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .catalog_object import CatalogObjectParams
+from .error import ErrorParams
 
 
 class ListCatalogResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_customer_custom_attribute_definitions_response.py b/src/square/requests/list_customer_custom_attribute_definitions_response.py
index 14569e7e..05ad69b2 100644
--- a/src/square/requests/list_customer_custom_attribute_definitions_response.py
+++ b/src/square/requests/list_customer_custom_attribute_definitions_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_customer_custom_attributes_response.py b/src/square/requests/list_customer_custom_attributes_response.py
index 87329e55..9edf2342 100644
--- a/src/square/requests/list_customer_custom_attributes_response.py
+++ b/src/square/requests/list_customer_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute import CustomAttributeParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_customer_groups_response.py b/src/square/requests/list_customer_groups_response.py
index b0d6493f..4c368970 100644
--- a/src/square/requests/list_customer_groups_response.py
+++ b/src/square/requests/list_customer_groups_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer_group import CustomerGroupParams
+from .error import ErrorParams
 
 
 class ListCustomerGroupsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_customer_segments_response.py b/src/square/requests/list_customer_segments_response.py
index d45450ac..0eaf92d1 100644
--- a/src/square/requests/list_customer_segments_response.py
+++ b/src/square/requests/list_customer_segments_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer_segment import CustomerSegmentParams
+from .error import ErrorParams
 
 
 class ListCustomerSegmentsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_customers_response.py b/src/square/requests/list_customers_response.py
index abec80e3..ac3f6201 100644
--- a/src/square/requests/list_customers_response.py
+++ b/src/square/requests/list_customers_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer import CustomerParams
+from .error import ErrorParams
 
 
 class ListCustomersResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_device_codes_response.py b/src/square/requests/list_device_codes_response.py
index b32cb9fb..3c921140 100644
--- a/src/square/requests/list_device_codes_response.py
+++ b/src/square/requests/list_device_codes_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .device_code import DeviceCodeParams
+from .error import ErrorParams
 
 
 class ListDeviceCodesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_devices_response.py b/src/square/requests/list_devices_response.py
index 26a5b8a2..25b84dc3 100644
--- a/src/square/requests/list_devices_response.py
+++ b/src/square/requests/list_devices_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .device import DeviceParams
+from .error import ErrorParams
 
 
 class ListDevicesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_dispute_evidence_response.py b/src/square/requests/list_dispute_evidence_response.py
index 1a324d96..c640cf0b 100644
--- a/src/square/requests/list_dispute_evidence_response.py
+++ b/src/square/requests/list_dispute_evidence_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .dispute_evidence import DisputeEvidenceParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_disputes_response.py b/src/square/requests/list_disputes_response.py
index a4b14505..aa1d681e 100644
--- a/src/square/requests/list_disputes_response.py
+++ b/src/square/requests/list_disputes_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .dispute import DisputeParams
+from .error import ErrorParams
 
 
 class ListDisputesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_employee_wages_response.py b/src/square/requests/list_employee_wages_response.py
index cf69d75a..0ba29709 100644
--- a/src/square/requests/list_employee_wages_response.py
+++ b/src/square/requests/list_employee_wages_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .employee_wage import EmployeeWageParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_employees_response.py b/src/square/requests/list_employees_response.py
index fa99d4fb..0832d468 100644
--- a/src/square/requests/list_employees_response.py
+++ b/src/square/requests/list_employees_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .employee import EmployeeParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_event_types_response.py b/src/square/requests/list_event_types_response.py
index a35185ad..3202b6b7 100644
--- a/src/square/requests/list_event_types_response.py
+++ b/src/square/requests/list_event_types_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .event_type_metadata import EventTypeMetadataParams
 
diff --git a/src/square/requests/list_gift_card_activities_response.py b/src/square/requests/list_gift_card_activities_response.py
index 0f03a1f7..89fa3c21 100644
--- a/src/square/requests/list_gift_card_activities_response.py
+++ b/src/square/requests/list_gift_card_activities_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .gift_card_activity import GiftCardActivityParams
 
diff --git a/src/square/requests/list_gift_cards_response.py b/src/square/requests/list_gift_cards_response.py
index 6ea4e97d..07a790cc 100644
--- a/src/square/requests/list_gift_cards_response.py
+++ b/src/square/requests/list_gift_cards_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .gift_card import GiftCardParams
 
diff --git a/src/square/requests/list_invoices_response.py b/src/square/requests/list_invoices_response.py
index 186ef518..08a356cb 100644
--- a/src/square/requests/list_invoices_response.py
+++ b/src/square/requests/list_invoices_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .invoice import InvoiceParams
+
+import typing_extensions
 from .error import ErrorParams
+from .invoice import InvoiceParams
 
 
 class ListInvoicesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_jobs_response.py b/src/square/requests/list_jobs_response.py
index f85815aa..dc908be0 100644
--- a/src/square/requests/list_jobs_response.py
+++ b/src/square/requests/list_jobs_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .job import JobParams
+
+import typing_extensions
 from .error import ErrorParams
+from .job import JobParams
 
 
 class ListJobsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_location_booking_profiles_response.py b/src/square/requests/list_location_booking_profiles_response.py
index 0f4eee92..b83619a8 100644
--- a/src/square/requests/list_location_booking_profiles_response.py
+++ b/src/square/requests/list_location_booking_profiles_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .location_booking_profile import LocationBookingProfileParams
+
+import typing_extensions
 from .error import ErrorParams
+from .location_booking_profile import LocationBookingProfileParams
 
 
 class ListLocationBookingProfilesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_location_custom_attribute_definitions_response.py b/src/square/requests/list_location_custom_attribute_definitions_response.py
index b977a671..0d2defc1 100644
--- a/src/square/requests/list_location_custom_attribute_definitions_response.py
+++ b/src/square/requests/list_location_custom_attribute_definitions_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_location_custom_attributes_response.py b/src/square/requests/list_location_custom_attributes_response.py
index b0813958..2a59a940 100644
--- a/src/square/requests/list_location_custom_attributes_response.py
+++ b/src/square/requests/list_location_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute import CustomAttributeParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_locations_response.py b/src/square/requests/list_locations_response.py
index d6f6b9e0..e8aa9981 100644
--- a/src/square/requests/list_locations_response.py
+++ b/src/square/requests/list_locations_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .location import LocationParams
 
diff --git a/src/square/requests/list_loyalty_programs_response.py b/src/square/requests/list_loyalty_programs_response.py
index c0c786ba..e9fcdc94 100644
--- a/src/square/requests/list_loyalty_programs_response.py
+++ b/src/square/requests/list_loyalty_programs_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_program import LoyaltyProgramParams
 
diff --git a/src/square/requests/list_loyalty_promotions_response.py b/src/square/requests/list_loyalty_promotions_response.py
index f2ca878d..404a45e0 100644
--- a/src/square/requests/list_loyalty_promotions_response.py
+++ b/src/square/requests/list_loyalty_promotions_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_promotion import LoyaltyPromotionParams
 
diff --git a/src/square/requests/list_merchant_custom_attribute_definitions_response.py b/src/square/requests/list_merchant_custom_attribute_definitions_response.py
index a1fa6fd3..fdbc943d 100644
--- a/src/square/requests/list_merchant_custom_attribute_definitions_response.py
+++ b/src/square/requests/list_merchant_custom_attribute_definitions_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_merchant_custom_attributes_response.py b/src/square/requests/list_merchant_custom_attributes_response.py
index 376d8b9d..5615c36c 100644
--- a/src/square/requests/list_merchant_custom_attributes_response.py
+++ b/src/square/requests/list_merchant_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute import CustomAttributeParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_merchants_response.py b/src/square/requests/list_merchants_response.py
index d715ab2c..3816a1d2 100644
--- a/src/square/requests/list_merchants_response.py
+++ b/src/square/requests/list_merchants_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .merchant import MerchantParams
 
diff --git a/src/square/requests/list_order_custom_attribute_definitions_response.py b/src/square/requests/list_order_custom_attribute_definitions_response.py
index a5ebea0f..075d2cbb 100644
--- a/src/square/requests/list_order_custom_attribute_definitions_response.py
+++ b/src/square/requests/list_order_custom_attribute_definitions_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
-from .custom_attribute_definition import CustomAttributeDefinitionParams
+
 import typing_extensions
+from .custom_attribute_definition import CustomAttributeDefinitionParams
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/list_order_custom_attributes_response.py b/src/square/requests/list_order_custom_attributes_response.py
index 5d6c601a..60988485 100644
--- a/src/square/requests/list_order_custom_attributes_response.py
+++ b/src/square/requests/list_order_custom_attributes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute import CustomAttributeParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/list_payment_links_response.py b/src/square/requests/list_payment_links_response.py
index 475c4fc5..64b67f18 100644
--- a/src/square/requests/list_payment_links_response.py
+++ b/src/square/requests/list_payment_links_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment_link import PaymentLinkParams
 
diff --git a/src/square/requests/list_payment_refunds_response.py b/src/square/requests/list_payment_refunds_response.py
index 168b07f8..22faf9e3 100644
--- a/src/square/requests/list_payment_refunds_response.py
+++ b/src/square/requests/list_payment_refunds_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment_refund import PaymentRefundParams
 
diff --git a/src/square/requests/list_payments_response.py b/src/square/requests/list_payments_response.py
index 7dde3c8e..683e0352 100644
--- a/src/square/requests/list_payments_response.py
+++ b/src/square/requests/list_payments_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment import PaymentParams
 
diff --git a/src/square/requests/list_payout_entries_response.py b/src/square/requests/list_payout_entries_response.py
index 51c9c053..0ad97068 100644
--- a/src/square/requests/list_payout_entries_response.py
+++ b/src/square/requests/list_payout_entries_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .payout_entry import PayoutEntryParams
+
+import typing_extensions
 from .error import ErrorParams
+from .payout_entry import PayoutEntryParams
 
 
 class ListPayoutEntriesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_payouts_response.py b/src/square/requests/list_payouts_response.py
index 05b80b25..35a2f43a 100644
--- a/src/square/requests/list_payouts_response.py
+++ b/src/square/requests/list_payouts_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .payout import PayoutParams
+
+import typing_extensions
 from .error import ErrorParams
+from .payout import PayoutParams
 
 
 class ListPayoutsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_sites_response.py b/src/square/requests/list_sites_response.py
index 7e08ebdb..12900b54 100644
--- a/src/square/requests/list_sites_response.py
+++ b/src/square/requests/list_sites_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .site import SiteParams
 
diff --git a/src/square/requests/list_subscription_events_response.py b/src/square/requests/list_subscription_events_response.py
index 464496ca..df9b344c 100644
--- a/src/square/requests/list_subscription_events_response.py
+++ b/src/square/requests/list_subscription_events_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription_event import SubscriptionEventParams
 
diff --git a/src/square/requests/list_team_member_booking_profiles_response.py b/src/square/requests/list_team_member_booking_profiles_response.py
index b0d5227d..38db3b98 100644
--- a/src/square/requests/list_team_member_booking_profiles_response.py
+++ b/src/square/requests/list_team_member_booking_profiles_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .team_member_booking_profile import TeamMemberBookingProfileParams
+
+import typing_extensions
 from .error import ErrorParams
+from .team_member_booking_profile import TeamMemberBookingProfileParams
 
 
 class ListTeamMemberBookingProfilesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_team_member_wages_response.py b/src/square/requests/list_team_member_wages_response.py
index 1b8738e8..7c20cc4b 100644
--- a/src/square/requests/list_team_member_wages_response.py
+++ b/src/square/requests/list_team_member_wages_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .team_member_wage import TeamMemberWageParams
+
+import typing_extensions
 from .error import ErrorParams
+from .team_member_wage import TeamMemberWageParams
 
 
 class ListTeamMemberWagesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/list_transactions_response.py b/src/square/requests/list_transactions_response.py
index ef54b484..5d4dc825 100644
--- a/src/square/requests/list_transactions_response.py
+++ b/src/square/requests/list_transactions_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .transaction import TransactionParams
 
diff --git a/src/square/requests/list_webhook_event_types_response.py b/src/square/requests/list_webhook_event_types_response.py
index 6daf0201..8f8788ff 100644
--- a/src/square/requests/list_webhook_event_types_response.py
+++ b/src/square/requests/list_webhook_event_types_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .event_type_metadata import EventTypeMetadataParams
 
diff --git a/src/square/requests/list_webhook_subscriptions_response.py b/src/square/requests/list_webhook_subscriptions_response.py
index 6a9e33f1..dd3c296e 100644
--- a/src/square/requests/list_webhook_subscriptions_response.py
+++ b/src/square/requests/list_webhook_subscriptions_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .webhook_subscription import WebhookSubscriptionParams
 
diff --git a/src/square/requests/list_workweek_configs_response.py b/src/square/requests/list_workweek_configs_response.py
index c7f1de6e..b9f8e432 100644
--- a/src/square/requests/list_workweek_configs_response.py
+++ b/src/square/requests/list_workweek_configs_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .workweek_config import WorkweekConfigParams
+
+import typing_extensions
 from .error import ErrorParams
+from .workweek_config import WorkweekConfigParams
 
 
 class ListWorkweekConfigsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/location.py b/src/square/requests/location.py
index 554b90b9..87d42239 100644
--- a/src/square/requests/location.py
+++ b/src/square/requests/location.py
@@ -1,14 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .address import AddressParams
-from ..types.location_capability import LocationCapability
-from ..types.location_status import LocationStatus
+
+import typing_extensions
 from ..types.country import Country
 from ..types.currency import Currency
+from ..types.location_capability import LocationCapability
+from ..types.location_status import LocationStatus
 from ..types.location_type import LocationType
+from .address import AddressParams
 from .business_hours import BusinessHoursParams
 from .coordinates import CoordinatesParams
 from .tax_ids import TaxIdsParams
diff --git a/src/square/requests/location_booking_profile.py b/src/square/requests/location_booking_profile.py
index 27881d17..3827f59d 100644
--- a/src/square/requests/location_booking_profile.py
+++ b/src/square/requests/location_booking_profile.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LocationBookingProfileParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/location_created_event.py b/src/square/requests/location_created_event.py
index e9359a07..9b00b0f0 100644
--- a/src/square/requests/location_created_event.py
+++ b/src/square/requests/location_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .location_created_event_data import LocationCreatedEventDataParams
 
 
diff --git a/src/square/requests/location_created_event_data.py b/src/square/requests/location_created_event_data.py
index 2776e8d7..d0d63857 100644
--- a/src/square/requests/location_created_event_data.py
+++ b/src/square/requests/location_created_event_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LocationCreatedEventDataParams(typing_extensions.TypedDict):
     type: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/location_custom_attribute_definition_owned_created_event.py b/src/square/requests/location_custom_attribute_definition_owned_created_event.py
index e6c39b1f..14b43fff 100644
--- a/src/square/requests/location_custom_attribute_definition_owned_created_event.py
+++ b/src/square/requests/location_custom_attribute_definition_owned_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/location_custom_attribute_definition_owned_deleted_event.py b/src/square/requests/location_custom_attribute_definition_owned_deleted_event.py
index f22827ca..d074c49c 100644
--- a/src/square/requests/location_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/requests/location_custom_attribute_definition_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/location_custom_attribute_definition_owned_updated_event.py b/src/square/requests/location_custom_attribute_definition_owned_updated_event.py
index c77761a7..62d0f72e 100644
--- a/src/square/requests/location_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/requests/location_custom_attribute_definition_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/location_custom_attribute_definition_visible_created_event.py b/src/square/requests/location_custom_attribute_definition_visible_created_event.py
index ffbd5817..7329bb6b 100644
--- a/src/square/requests/location_custom_attribute_definition_visible_created_event.py
+++ b/src/square/requests/location_custom_attribute_definition_visible_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/location_custom_attribute_definition_visible_deleted_event.py b/src/square/requests/location_custom_attribute_definition_visible_deleted_event.py
index 7dfcc586..9cbc3db9 100644
--- a/src/square/requests/location_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/requests/location_custom_attribute_definition_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/location_custom_attribute_definition_visible_updated_event.py b/src/square/requests/location_custom_attribute_definition_visible_updated_event.py
index bfffc604..3b8daac8 100644
--- a/src/square/requests/location_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/requests/location_custom_attribute_definition_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/location_custom_attribute_owned_deleted_event.py b/src/square/requests/location_custom_attribute_owned_deleted_event.py
index 7864fc06..1cbc90d9 100644
--- a/src/square/requests/location_custom_attribute_owned_deleted_event.py
+++ b/src/square/requests/location_custom_attribute_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/location_custom_attribute_owned_updated_event.py b/src/square/requests/location_custom_attribute_owned_updated_event.py
index 01f885d9..4e24bc1a 100644
--- a/src/square/requests/location_custom_attribute_owned_updated_event.py
+++ b/src/square/requests/location_custom_attribute_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/location_custom_attribute_visible_deleted_event.py b/src/square/requests/location_custom_attribute_visible_deleted_event.py
index b979c886..3319789c 100644
--- a/src/square/requests/location_custom_attribute_visible_deleted_event.py
+++ b/src/square/requests/location_custom_attribute_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/location_custom_attribute_visible_updated_event.py b/src/square/requests/location_custom_attribute_visible_updated_event.py
index ac2eb644..ce256338 100644
--- a/src/square/requests/location_custom_attribute_visible_updated_event.py
+++ b/src/square/requests/location_custom_attribute_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/location_settings_updated_event.py b/src/square/requests/location_settings_updated_event.py
index a7202114..693a39f4 100644
--- a/src/square/requests/location_settings_updated_event.py
+++ b/src/square/requests/location_settings_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .location_settings_updated_event_data import LocationSettingsUpdatedEventDataParams
 
 
diff --git a/src/square/requests/location_settings_updated_event_data.py b/src/square/requests/location_settings_updated_event_data.py
index 9c9c1a9d..e282373c 100644
--- a/src/square/requests/location_settings_updated_event_data.py
+++ b/src/square/requests/location_settings_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .location_settings_updated_event_object import LocationSettingsUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/location_settings_updated_event_object.py b/src/square/requests/location_settings_updated_event_object.py
index caf1fa86..4a18c595 100644
--- a/src/square/requests/location_settings_updated_event_object.py
+++ b/src/square/requests/location_settings_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .checkout_location_settings import CheckoutLocationSettingsParams
 
diff --git a/src/square/requests/location_updated_event.py b/src/square/requests/location_updated_event.py
index 9dc0a376..58dd7142 100644
--- a/src/square/requests/location_updated_event.py
+++ b/src/square/requests/location_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .location_updated_event_data import LocationUpdatedEventDataParams
 
 
diff --git a/src/square/requests/location_updated_event_data.py b/src/square/requests/location_updated_event_data.py
index f7bf0129..1f02f996 100644
--- a/src/square/requests/location_updated_event_data.py
+++ b/src/square/requests/location_updated_event_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LocationUpdatedEventDataParams(typing_extensions.TypedDict):
     type: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/loyalty_account.py b/src/square/requests/loyalty_account.py
index 2f8db9d7..a47661ce 100644
--- a/src/square/requests/loyalty_account.py
+++ b/src/square/requests/loyalty_account.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .loyalty_account_mapping import LoyaltyAccountMappingParams
+
+import typing_extensions
 from .loyalty_account_expiring_point_deadline import LoyaltyAccountExpiringPointDeadlineParams
+from .loyalty_account_mapping import LoyaltyAccountMappingParams
 
 
 class LoyaltyAccountParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_account_created_event.py b/src/square/requests/loyalty_account_created_event.py
index 97d3cd7e..f255e571 100644
--- a/src/square/requests/loyalty_account_created_event.py
+++ b/src/square/requests/loyalty_account_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_account_created_event_data import LoyaltyAccountCreatedEventDataParams
 
 
diff --git a/src/square/requests/loyalty_account_created_event_data.py b/src/square/requests/loyalty_account_created_event_data.py
index 755d77ce..95cf5a48 100644
--- a/src/square/requests/loyalty_account_created_event_data.py
+++ b/src/square/requests/loyalty_account_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_account_created_event_object import LoyaltyAccountCreatedEventObjectParams
 
 
diff --git a/src/square/requests/loyalty_account_created_event_object.py b/src/square/requests/loyalty_account_created_event_object.py
index f550abb8..609308cc 100644
--- a/src/square/requests/loyalty_account_created_event_object.py
+++ b/src/square/requests/loyalty_account_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .loyalty_account import LoyaltyAccountParams
 
diff --git a/src/square/requests/loyalty_account_deleted_event.py b/src/square/requests/loyalty_account_deleted_event.py
index 8718811c..f5bc7bca 100644
--- a/src/square/requests/loyalty_account_deleted_event.py
+++ b/src/square/requests/loyalty_account_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_account_deleted_event_data import LoyaltyAccountDeletedEventDataParams
 
 
diff --git a/src/square/requests/loyalty_account_deleted_event_data.py b/src/square/requests/loyalty_account_deleted_event_data.py
index d3032fe5..0cf95c8c 100644
--- a/src/square/requests/loyalty_account_deleted_event_data.py
+++ b/src/square/requests/loyalty_account_deleted_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_account_deleted_event_object import LoyaltyAccountDeletedEventObjectParams
 
 
diff --git a/src/square/requests/loyalty_account_deleted_event_object.py b/src/square/requests/loyalty_account_deleted_event_object.py
index 5b08d734..131439fa 100644
--- a/src/square/requests/loyalty_account_deleted_event_object.py
+++ b/src/square/requests/loyalty_account_deleted_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .loyalty_account import LoyaltyAccountParams
 
diff --git a/src/square/requests/loyalty_account_mapping.py b/src/square/requests/loyalty_account_mapping.py
index d0ff32a6..7278ca76 100644
--- a/src/square/requests/loyalty_account_mapping.py
+++ b/src/square/requests/loyalty_account_mapping.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LoyaltyAccountMappingParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/loyalty_account_updated_event.py b/src/square/requests/loyalty_account_updated_event.py
index 0b3e3f46..8a20658c 100644
--- a/src/square/requests/loyalty_account_updated_event.py
+++ b/src/square/requests/loyalty_account_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_account_updated_event_data import LoyaltyAccountUpdatedEventDataParams
 
 
diff --git a/src/square/requests/loyalty_account_updated_event_data.py b/src/square/requests/loyalty_account_updated_event_data.py
index 17be0dc9..e1060350 100644
--- a/src/square/requests/loyalty_account_updated_event_data.py
+++ b/src/square/requests/loyalty_account_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_account_updated_event_object import LoyaltyAccountUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/loyalty_account_updated_event_object.py b/src/square/requests/loyalty_account_updated_event_object.py
index 3df6cfcb..806a5fff 100644
--- a/src/square/requests/loyalty_account_updated_event_object.py
+++ b/src/square/requests/loyalty_account_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .loyalty_account import LoyaltyAccountParams
 
diff --git a/src/square/requests/loyalty_event.py b/src/square/requests/loyalty_event.py
index c3409264..54f29d02 100644
--- a/src/square/requests/loyalty_event.py
+++ b/src/square/requests/loyalty_event.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
+from ..types.loyalty_event_source import LoyaltyEventSource
 from ..types.loyalty_event_type import LoyaltyEventType
 from .loyalty_event_accumulate_points import LoyaltyEventAccumulatePointsParams
+from .loyalty_event_accumulate_promotion_points import LoyaltyEventAccumulatePromotionPointsParams
+from .loyalty_event_adjust_points import LoyaltyEventAdjustPointsParams
 from .loyalty_event_create_reward import LoyaltyEventCreateRewardParams
-from .loyalty_event_redeem_reward import LoyaltyEventRedeemRewardParams
 from .loyalty_event_delete_reward import LoyaltyEventDeleteRewardParams
-from .loyalty_event_adjust_points import LoyaltyEventAdjustPointsParams
-from ..types.loyalty_event_source import LoyaltyEventSource
 from .loyalty_event_expire_points import LoyaltyEventExpirePointsParams
 from .loyalty_event_other import LoyaltyEventOtherParams
-from .loyalty_event_accumulate_promotion_points import LoyaltyEventAccumulatePromotionPointsParams
+from .loyalty_event_redeem_reward import LoyaltyEventRedeemRewardParams
 
 
 class LoyaltyEventParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_event_accumulate_points.py b/src/square/requests/loyalty_event_accumulate_points.py
index 4426c7ca..c16bb23d 100644
--- a/src/square/requests/loyalty_event_accumulate_points.py
+++ b/src/square/requests/loyalty_event_accumulate_points.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LoyaltyEventAccumulatePointsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/loyalty_event_accumulate_promotion_points.py b/src/square/requests/loyalty_event_accumulate_promotion_points.py
index a291bda8..7fb6c42e 100644
--- a/src/square/requests/loyalty_event_accumulate_promotion_points.py
+++ b/src/square/requests/loyalty_event_accumulate_promotion_points.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class LoyaltyEventAccumulatePromotionPointsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_event_adjust_points.py b/src/square/requests/loyalty_event_adjust_points.py
index 37fb9af5..ab68bb57 100644
--- a/src/square/requests/loyalty_event_adjust_points.py
+++ b/src/square/requests/loyalty_event_adjust_points.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LoyaltyEventAdjustPointsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/loyalty_event_create_reward.py b/src/square/requests/loyalty_event_create_reward.py
index 566c952c..a70cce3a 100644
--- a/src/square/requests/loyalty_event_create_reward.py
+++ b/src/square/requests/loyalty_event_create_reward.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class LoyaltyEventCreateRewardParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_event_created_event.py b/src/square/requests/loyalty_event_created_event.py
index e4bb1618..48456abd 100644
--- a/src/square/requests/loyalty_event_created_event.py
+++ b/src/square/requests/loyalty_event_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_event_created_event_data import LoyaltyEventCreatedEventDataParams
 
 
diff --git a/src/square/requests/loyalty_event_created_event_data.py b/src/square/requests/loyalty_event_created_event_data.py
index f3b65c41..a8ad0200 100644
--- a/src/square/requests/loyalty_event_created_event_data.py
+++ b/src/square/requests/loyalty_event_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_event_created_event_object import LoyaltyEventCreatedEventObjectParams
 
 
diff --git a/src/square/requests/loyalty_event_created_event_object.py b/src/square/requests/loyalty_event_created_event_object.py
index 9ebce773..071cca1c 100644
--- a/src/square/requests/loyalty_event_created_event_object.py
+++ b/src/square/requests/loyalty_event_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .loyalty_event import LoyaltyEventParams
 
diff --git a/src/square/requests/loyalty_event_delete_reward.py b/src/square/requests/loyalty_event_delete_reward.py
index f46b48d1..04f5161b 100644
--- a/src/square/requests/loyalty_event_delete_reward.py
+++ b/src/square/requests/loyalty_event_delete_reward.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class LoyaltyEventDeleteRewardParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_event_expire_points.py b/src/square/requests/loyalty_event_expire_points.py
index 9ca4becd..5b555c59 100644
--- a/src/square/requests/loyalty_event_expire_points.py
+++ b/src/square/requests/loyalty_event_expire_points.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class LoyaltyEventExpirePointsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_event_filter.py b/src/square/requests/loyalty_event_filter.py
index 8f65a2c9..777c0046 100644
--- a/src/square/requests/loyalty_event_filter.py
+++ b/src/square/requests/loyalty_event_filter.py
@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .loyalty_event_loyalty_account_filter import LoyaltyEventLoyaltyAccountFilterParams
-from .loyalty_event_type_filter import LoyaltyEventTypeFilterParams
 from .loyalty_event_date_time_filter import LoyaltyEventDateTimeFilterParams
 from .loyalty_event_location_filter import LoyaltyEventLocationFilterParams
+from .loyalty_event_loyalty_account_filter import LoyaltyEventLoyaltyAccountFilterParams
 from .loyalty_event_order_filter import LoyaltyEventOrderFilterParams
+from .loyalty_event_type_filter import LoyaltyEventTypeFilterParams
 
 
 class LoyaltyEventFilterParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_event_location_filter.py b/src/square/requests/loyalty_event_location_filter.py
index 76fddec9..fd63baa4 100644
--- a/src/square/requests/loyalty_event_location_filter.py
+++ b/src/square/requests/loyalty_event_location_filter.py
@@ -1,8 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LoyaltyEventLocationFilterParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/loyalty_event_other.py b/src/square/requests/loyalty_event_other.py
index 0bc9148c..e4d7d7a4 100644
--- a/src/square/requests/loyalty_event_other.py
+++ b/src/square/requests/loyalty_event_other.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class LoyaltyEventOtherParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_event_query.py b/src/square/requests/loyalty_event_query.py
index 1d370c18..77e16021 100644
--- a/src/square/requests/loyalty_event_query.py
+++ b/src/square/requests/loyalty_event_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .loyalty_event_filter import LoyaltyEventFilterParams
 
diff --git a/src/square/requests/loyalty_event_redeem_reward.py b/src/square/requests/loyalty_event_redeem_reward.py
index f7111f1e..af5c657c 100644
--- a/src/square/requests/loyalty_event_redeem_reward.py
+++ b/src/square/requests/loyalty_event_redeem_reward.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class LoyaltyEventRedeemRewardParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_event_type_filter.py b/src/square/requests/loyalty_event_type_filter.py
index 5de613b5..918b5a8a 100644
--- a/src/square/requests/loyalty_event_type_filter.py
+++ b/src/square/requests/loyalty_event_type_filter.py
@@ -1,7 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.loyalty_event_type import LoyaltyEventType
 
 
diff --git a/src/square/requests/loyalty_program.py b/src/square/requests/loyalty_program.py
index aedbce71..2f1bd7cd 100644
--- a/src/square/requests/loyalty_program.py
+++ b/src/square/requests/loyalty_program.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.loyalty_program_status import LoyaltyProgramStatus
-import typing
-from .loyalty_program_reward_tier import LoyaltyProgramRewardTierParams
+from .loyalty_program_accrual_rule import LoyaltyProgramAccrualRuleParams
 from .loyalty_program_expiration_policy import LoyaltyProgramExpirationPolicyParams
+from .loyalty_program_reward_tier import LoyaltyProgramRewardTierParams
 from .loyalty_program_terminology import LoyaltyProgramTerminologyParams
-from .loyalty_program_accrual_rule import LoyaltyProgramAccrualRuleParams
 
 
 class LoyaltyProgramParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_program_accrual_rule.py b/src/square/requests/loyalty_program_accrual_rule.py
index 1d987987..dbbc5f89 100644
--- a/src/square/requests/loyalty_program_accrual_rule.py
+++ b/src/square/requests/loyalty_program_accrual_rule.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from ..types.loyalty_program_accrual_rule_type import LoyaltyProgramAccrualRuleType
-import typing_extensions
-import typing
-from .loyalty_program_accrual_rule_visit_data import LoyaltyProgramAccrualRuleVisitDataParams
-from .loyalty_program_accrual_rule_spend_data import LoyaltyProgramAccrualRuleSpendDataParams
-from .loyalty_program_accrual_rule_item_variation_data import LoyaltyProgramAccrualRuleItemVariationDataParams
 from .loyalty_program_accrual_rule_category_data import LoyaltyProgramAccrualRuleCategoryDataParams
+from .loyalty_program_accrual_rule_item_variation_data import LoyaltyProgramAccrualRuleItemVariationDataParams
+from .loyalty_program_accrual_rule_spend_data import LoyaltyProgramAccrualRuleSpendDataParams
+from .loyalty_program_accrual_rule_visit_data import LoyaltyProgramAccrualRuleVisitDataParams
 
 
 class LoyaltyProgramAccrualRuleParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_program_accrual_rule_spend_data.py b/src/square/requests/loyalty_program_accrual_rule_spend_data.py
index 53dfd43a..146d1d91 100644
--- a/src/square/requests/loyalty_program_accrual_rule_spend_data.py
+++ b/src/square/requests/loyalty_program_accrual_rule_spend_data.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-from .money import MoneyParams
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.loyalty_program_accrual_rule_tax_mode import LoyaltyProgramAccrualRuleTaxMode
+from .money import MoneyParams
 
 
 class LoyaltyProgramAccrualRuleSpendDataParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_program_accrual_rule_visit_data.py b/src/square/requests/loyalty_program_accrual_rule_visit_data.py
index 3565947b..2d685af3 100644
--- a/src/square/requests/loyalty_program_accrual_rule_visit_data.py
+++ b/src/square/requests/loyalty_program_accrual_rule_visit_data.py
@@ -1,9 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .money import MoneyParams
 from ..types.loyalty_program_accrual_rule_tax_mode import LoyaltyProgramAccrualRuleTaxMode
+from .money import MoneyParams
 
 
 class LoyaltyProgramAccrualRuleVisitDataParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_program_created_event.py b/src/square/requests/loyalty_program_created_event.py
index 62a598e2..f783a77f 100644
--- a/src/square/requests/loyalty_program_created_event.py
+++ b/src/square/requests/loyalty_program_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_program_created_event_data import LoyaltyProgramCreatedEventDataParams
 
 
diff --git a/src/square/requests/loyalty_program_created_event_data.py b/src/square/requests/loyalty_program_created_event_data.py
index eee3c909..132d6a59 100644
--- a/src/square/requests/loyalty_program_created_event_data.py
+++ b/src/square/requests/loyalty_program_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_program_created_event_object import LoyaltyProgramCreatedEventObjectParams
 
 
diff --git a/src/square/requests/loyalty_program_created_event_object.py b/src/square/requests/loyalty_program_created_event_object.py
index b3dc533e..608ae5be 100644
--- a/src/square/requests/loyalty_program_created_event_object.py
+++ b/src/square/requests/loyalty_program_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .loyalty_program import LoyaltyProgramParams
 
diff --git a/src/square/requests/loyalty_program_reward_tier.py b/src/square/requests/loyalty_program_reward_tier.py
index 168d6cff..92304d14 100644
--- a/src/square/requests/loyalty_program_reward_tier.py
+++ b/src/square/requests/loyalty_program_reward_tier.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .catalog_object_reference import CatalogObjectReferenceParams
 
diff --git a/src/square/requests/loyalty_program_updated_event.py b/src/square/requests/loyalty_program_updated_event.py
index c194e3aa..9376645c 100644
--- a/src/square/requests/loyalty_program_updated_event.py
+++ b/src/square/requests/loyalty_program_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_program_updated_event_data import LoyaltyProgramUpdatedEventDataParams
 
 
diff --git a/src/square/requests/loyalty_program_updated_event_data.py b/src/square/requests/loyalty_program_updated_event_data.py
index 191c17cf..d437979f 100644
--- a/src/square/requests/loyalty_program_updated_event_data.py
+++ b/src/square/requests/loyalty_program_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_program_updated_event_object import LoyaltyProgramUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/loyalty_program_updated_event_object.py b/src/square/requests/loyalty_program_updated_event_object.py
index eed266c0..41d5c1cf 100644
--- a/src/square/requests/loyalty_program_updated_event_object.py
+++ b/src/square/requests/loyalty_program_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .loyalty_program import LoyaltyProgramParams
 
diff --git a/src/square/requests/loyalty_promotion.py b/src/square/requests/loyalty_promotion.py
index 0640bc67..870b49ca 100644
--- a/src/square/requests/loyalty_promotion.py
+++ b/src/square/requests/loyalty_promotion.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
-from .loyalty_promotion_incentive import LoyaltyPromotionIncentiveParams
+from ..types.loyalty_promotion_status import LoyaltyPromotionStatus
 from .loyalty_promotion_available_time_data import LoyaltyPromotionAvailableTimeDataParams
+from .loyalty_promotion_incentive import LoyaltyPromotionIncentiveParams
 from .loyalty_promotion_trigger_limit import LoyaltyPromotionTriggerLimitParams
-from ..types.loyalty_promotion_status import LoyaltyPromotionStatus
 from .money import MoneyParams
-import typing
 
 
 class LoyaltyPromotionParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_promotion_available_time_data.py b/src/square/requests/loyalty_promotion_available_time_data.py
index 0baaa907..38cb0194 100644
--- a/src/square/requests/loyalty_promotion_available_time_data.py
+++ b/src/square/requests/loyalty_promotion_available_time_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LoyaltyPromotionAvailableTimeDataParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/loyalty_promotion_created_event.py b/src/square/requests/loyalty_promotion_created_event.py
index bad8c06b..c9b2a639 100644
--- a/src/square/requests/loyalty_promotion_created_event.py
+++ b/src/square/requests/loyalty_promotion_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_promotion_created_event_data import LoyaltyPromotionCreatedEventDataParams
 
 
diff --git a/src/square/requests/loyalty_promotion_created_event_data.py b/src/square/requests/loyalty_promotion_created_event_data.py
index 408bf740..6efd8546 100644
--- a/src/square/requests/loyalty_promotion_created_event_data.py
+++ b/src/square/requests/loyalty_promotion_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_promotion_created_event_object import LoyaltyPromotionCreatedEventObjectParams
 
 
diff --git a/src/square/requests/loyalty_promotion_created_event_object.py b/src/square/requests/loyalty_promotion_created_event_object.py
index e9d373d8..dab483ba 100644
--- a/src/square/requests/loyalty_promotion_created_event_object.py
+++ b/src/square/requests/loyalty_promotion_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .loyalty_promotion import LoyaltyPromotionParams
 
diff --git a/src/square/requests/loyalty_promotion_incentive.py b/src/square/requests/loyalty_promotion_incentive.py
index a47c59ac..8fb74946 100644
--- a/src/square/requests/loyalty_promotion_incentive.py
+++ b/src/square/requests/loyalty_promotion_incentive.py
@@ -2,9 +2,8 @@
 
 import typing_extensions
 from ..types.loyalty_promotion_incentive_type import LoyaltyPromotionIncentiveType
-import typing_extensions
-from .loyalty_promotion_incentive_points_multiplier_data import LoyaltyPromotionIncentivePointsMultiplierDataParams
 from .loyalty_promotion_incentive_points_addition_data import LoyaltyPromotionIncentivePointsAdditionDataParams
+from .loyalty_promotion_incentive_points_multiplier_data import LoyaltyPromotionIncentivePointsMultiplierDataParams
 
 
 class LoyaltyPromotionIncentiveParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/loyalty_promotion_incentive_points_multiplier_data.py b/src/square/requests/loyalty_promotion_incentive_points_multiplier_data.py
index 2f727e28..48323fd7 100644
--- a/src/square/requests/loyalty_promotion_incentive_points_multiplier_data.py
+++ b/src/square/requests/loyalty_promotion_incentive_points_multiplier_data.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class LoyaltyPromotionIncentivePointsMultiplierDataParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/loyalty_promotion_trigger_limit.py b/src/square/requests/loyalty_promotion_trigger_limit.py
index 8742d882..62cff443 100644
--- a/src/square/requests/loyalty_promotion_trigger_limit.py
+++ b/src/square/requests/loyalty_promotion_trigger_limit.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.loyalty_promotion_trigger_limit_interval import LoyaltyPromotionTriggerLimitInterval
 
diff --git a/src/square/requests/loyalty_promotion_updated_event.py b/src/square/requests/loyalty_promotion_updated_event.py
index 000fffed..01103680 100644
--- a/src/square/requests/loyalty_promotion_updated_event.py
+++ b/src/square/requests/loyalty_promotion_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_promotion_updated_event_data import LoyaltyPromotionUpdatedEventDataParams
 
 
diff --git a/src/square/requests/loyalty_promotion_updated_event_data.py b/src/square/requests/loyalty_promotion_updated_event_data.py
index 057e0227..0611d57a 100644
--- a/src/square/requests/loyalty_promotion_updated_event_data.py
+++ b/src/square/requests/loyalty_promotion_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_promotion_updated_event_object import LoyaltyPromotionUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/loyalty_promotion_updated_event_object.py b/src/square/requests/loyalty_promotion_updated_event_object.py
index 1d0d36b0..d64cecd2 100644
--- a/src/square/requests/loyalty_promotion_updated_event_object.py
+++ b/src/square/requests/loyalty_promotion_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .loyalty_promotion import LoyaltyPromotionParams
 
diff --git a/src/square/requests/loyalty_reward.py b/src/square/requests/loyalty_reward.py
index b838475e..6a2f8db8 100644
--- a/src/square/requests/loyalty_reward.py
+++ b/src/square/requests/loyalty_reward.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.loyalty_reward_status import LoyaltyRewardStatus
-import typing
 
 
 class LoyaltyRewardParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/measurement_unit.py b/src/square/requests/measurement_unit.py
index 161506af..3909e47a 100644
--- a/src/square/requests/measurement_unit.py
+++ b/src/square/requests/measurement_unit.py
@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .measurement_unit_custom import MeasurementUnitCustomParams
 from ..types.measurement_unit_area import MeasurementUnitArea
-from ..types.measurement_unit_length import MeasurementUnitLength
-from ..types.measurement_unit_volume import MeasurementUnitVolume
-from ..types.measurement_unit_weight import MeasurementUnitWeight
 from ..types.measurement_unit_generic import MeasurementUnitGeneric
+from ..types.measurement_unit_length import MeasurementUnitLength
 from ..types.measurement_unit_time import MeasurementUnitTime
 from ..types.measurement_unit_unit_type import MeasurementUnitUnitType
+from ..types.measurement_unit_volume import MeasurementUnitVolume
+from ..types.measurement_unit_weight import MeasurementUnitWeight
+from .measurement_unit_custom import MeasurementUnitCustomParams
 
 
 class MeasurementUnitParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/merchant.py b/src/square/requests/merchant.py
index ac2e498d..a48a58e6 100644
--- a/src/square/requests/merchant.py
+++ b/src/square/requests/merchant.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.country import Country
 from ..types.currency import Currency
 from ..types.merchant_status import MerchantStatus
diff --git a/src/square/requests/merchant_custom_attribute_definition_owned_created_event.py b/src/square/requests/merchant_custom_attribute_definition_owned_created_event.py
index b47524a1..4259ff49 100644
--- a/src/square/requests/merchant_custom_attribute_definition_owned_created_event.py
+++ b/src/square/requests/merchant_custom_attribute_definition_owned_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/merchant_custom_attribute_definition_owned_deleted_event.py b/src/square/requests/merchant_custom_attribute_definition_owned_deleted_event.py
index 21183cf3..b8461c9d 100644
--- a/src/square/requests/merchant_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/requests/merchant_custom_attribute_definition_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/merchant_custom_attribute_definition_owned_updated_event.py b/src/square/requests/merchant_custom_attribute_definition_owned_updated_event.py
index 65a0d785..26b2ae60 100644
--- a/src/square/requests/merchant_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/requests/merchant_custom_attribute_definition_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/merchant_custom_attribute_definition_visible_created_event.py b/src/square/requests/merchant_custom_attribute_definition_visible_created_event.py
index e21d7708..08f397fa 100644
--- a/src/square/requests/merchant_custom_attribute_definition_visible_created_event.py
+++ b/src/square/requests/merchant_custom_attribute_definition_visible_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/merchant_custom_attribute_definition_visible_deleted_event.py b/src/square/requests/merchant_custom_attribute_definition_visible_deleted_event.py
index 34849933..7f66e7ab 100644
--- a/src/square/requests/merchant_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/requests/merchant_custom_attribute_definition_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/merchant_custom_attribute_definition_visible_updated_event.py b/src/square/requests/merchant_custom_attribute_definition_visible_updated_event.py
index 7f868651..8b37e1fc 100644
--- a/src/square/requests/merchant_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/requests/merchant_custom_attribute_definition_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/merchant_custom_attribute_owned_deleted_event.py b/src/square/requests/merchant_custom_attribute_owned_deleted_event.py
index 735683c6..9ac3d9ff 100644
--- a/src/square/requests/merchant_custom_attribute_owned_deleted_event.py
+++ b/src/square/requests/merchant_custom_attribute_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/merchant_custom_attribute_owned_updated_event.py b/src/square/requests/merchant_custom_attribute_owned_updated_event.py
index a3165f2d..5d9d8e09 100644
--- a/src/square/requests/merchant_custom_attribute_owned_updated_event.py
+++ b/src/square/requests/merchant_custom_attribute_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/merchant_custom_attribute_visible_deleted_event.py b/src/square/requests/merchant_custom_attribute_visible_deleted_event.py
index 6130d50d..02b815af 100644
--- a/src/square/requests/merchant_custom_attribute_visible_deleted_event.py
+++ b/src/square/requests/merchant_custom_attribute_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/merchant_custom_attribute_visible_updated_event.py b/src/square/requests/merchant_custom_attribute_visible_updated_event.py
index 45f8eb3d..844ddf40 100644
--- a/src/square/requests/merchant_custom_attribute_visible_updated_event.py
+++ b/src/square/requests/merchant_custom_attribute_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/merchant_settings_updated_event.py b/src/square/requests/merchant_settings_updated_event.py
index 26b3d75b..819a3721 100644
--- a/src/square/requests/merchant_settings_updated_event.py
+++ b/src/square/requests/merchant_settings_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .merchant_settings_updated_event_data import MerchantSettingsUpdatedEventDataParams
 
 
diff --git a/src/square/requests/merchant_settings_updated_event_data.py b/src/square/requests/merchant_settings_updated_event_data.py
index 17eadbaa..06843c90 100644
--- a/src/square/requests/merchant_settings_updated_event_data.py
+++ b/src/square/requests/merchant_settings_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .merchant_settings_updated_event_object import MerchantSettingsUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/merchant_settings_updated_event_object.py b/src/square/requests/merchant_settings_updated_event_object.py
index 4605a6cb..65cb18ff 100644
--- a/src/square/requests/merchant_settings_updated_event_object.py
+++ b/src/square/requests/merchant_settings_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .checkout_merchant_settings import CheckoutMerchantSettingsParams
 
diff --git a/src/square/requests/modifier_location_overrides.py b/src/square/requests/modifier_location_overrides.py
index 6b9a397b..e9cb0d51 100644
--- a/src/square/requests/modifier_location_overrides.py
+++ b/src/square/requests/modifier_location_overrides.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/money.py b/src/square/requests/money.py
index 4d034a09..612ce8a4 100644
--- a/src/square/requests/money.py
+++ b/src/square/requests/money.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.currency import Currency
 
 
diff --git a/src/square/requests/oauth_authorization_revoked_event.py b/src/square/requests/oauth_authorization_revoked_event.py
index 8fe44c3b..34431685 100644
--- a/src/square/requests/oauth_authorization_revoked_event.py
+++ b/src/square/requests/oauth_authorization_revoked_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .oauth_authorization_revoked_event_data import OauthAuthorizationRevokedEventDataParams
 
 
diff --git a/src/square/requests/oauth_authorization_revoked_event_data.py b/src/square/requests/oauth_authorization_revoked_event_data.py
index 68e85eea..52cfdf0a 100644
--- a/src/square/requests/oauth_authorization_revoked_event_data.py
+++ b/src/square/requests/oauth_authorization_revoked_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .oauth_authorization_revoked_event_object import OauthAuthorizationRevokedEventObjectParams
 
 
diff --git a/src/square/requests/oauth_authorization_revoked_event_object.py b/src/square/requests/oauth_authorization_revoked_event_object.py
index 7540fd89..57597233 100644
--- a/src/square/requests/oauth_authorization_revoked_event_object.py
+++ b/src/square/requests/oauth_authorization_revoked_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .oauth_authorization_revoked_event_revocation_object import OauthAuthorizationRevokedEventRevocationObjectParams
 
diff --git a/src/square/requests/oauth_authorization_revoked_event_revocation_object.py b/src/square/requests/oauth_authorization_revoked_event_revocation_object.py
index bf4d4952..0d89e289 100644
--- a/src/square/requests/oauth_authorization_revoked_event_revocation_object.py
+++ b/src/square/requests/oauth_authorization_revoked_event_revocation_object.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.oauth_authorization_revoked_event_revoker_type import OauthAuthorizationRevokedEventRevokerType
 
 
diff --git a/src/square/requests/obtain_token_response.py b/src/square/requests/obtain_token_response.py
index debf7560..f53b6bf9 100644
--- a/src/square/requests/obtain_token_response.py
+++ b/src/square/requests/obtain_token_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/offline_payment_details.py b/src/square/requests/offline_payment_details.py
index 9e76b90a..994c3552 100644
--- a/src/square/requests/offline_payment_details.py
+++ b/src/square/requests/offline_payment_details.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class OfflinePaymentDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order.py b/src/square/requests/order.py
index 52658a8f..a6480d03 100644
--- a/src/square/requests/order.py
+++ b/src/square/requests/order.py
@@ -1,23 +1,23 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .order_source import OrderSourceParams
+
+import typing_extensions
+from ..types.order_state import OrderState
+from .fulfillment import FulfillmentParams
+from .money import MoneyParams
 from .order_line_item import OrderLineItemParams
-from .order_line_item_tax import OrderLineItemTaxParams
 from .order_line_item_discount import OrderLineItemDiscountParams
-from .order_service_charge import OrderServiceChargeParams
-from .fulfillment import FulfillmentParams
-from .order_return import OrderReturnParams
+from .order_line_item_tax import OrderLineItemTaxParams
 from .order_money_amounts import OrderMoneyAmountsParams
-from .order_rounding_adjustment import OrderRoundingAdjustmentParams
-from .tender import TenderParams
-from .refund import RefundParams
-from ..types.order_state import OrderState
-from .money import MoneyParams
 from .order_pricing_options import OrderPricingOptionsParams
+from .order_return import OrderReturnParams
 from .order_reward import OrderRewardParams
+from .order_rounding_adjustment import OrderRoundingAdjustmentParams
+from .order_service_charge import OrderServiceChargeParams
+from .order_source import OrderSourceParams
+from .refund import RefundParams
+from .tender import TenderParams
 
 
 class OrderParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_created.py b/src/square/requests/order_created.py
index d9c4caa5..9cb491f2 100644
--- a/src/square/requests/order_created.py
+++ b/src/square/requests/order_created.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.order_state import OrderState
 
 
diff --git a/src/square/requests/order_created_event.py b/src/square/requests/order_created_event.py
index 44119aa7..ebdfcdcb 100644
--- a/src/square/requests/order_created_event.py
+++ b/src/square/requests/order_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .order_created_event_data import OrderCreatedEventDataParams
 
 
diff --git a/src/square/requests/order_created_event_data.py b/src/square/requests/order_created_event_data.py
index 2317c673..5e356c8c 100644
--- a/src/square/requests/order_created_event_data.py
+++ b/src/square/requests/order_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .order_created_object import OrderCreatedObjectParams
 
 
diff --git a/src/square/requests/order_created_object.py b/src/square/requests/order_created_object.py
index cdd1fba3..17dc381e 100644
--- a/src/square/requests/order_created_object.py
+++ b/src/square/requests/order_created_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .order_created import OrderCreatedParams
 
diff --git a/src/square/requests/order_custom_attribute_definition_owned_created_event.py b/src/square/requests/order_custom_attribute_definition_owned_created_event.py
index 95dc5710..f2aac260 100644
--- a/src/square/requests/order_custom_attribute_definition_owned_created_event.py
+++ b/src/square/requests/order_custom_attribute_definition_owned_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/order_custom_attribute_definition_owned_deleted_event.py b/src/square/requests/order_custom_attribute_definition_owned_deleted_event.py
index 4023d974..864b86f5 100644
--- a/src/square/requests/order_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/requests/order_custom_attribute_definition_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/order_custom_attribute_definition_owned_updated_event.py b/src/square/requests/order_custom_attribute_definition_owned_updated_event.py
index 33dbe23c..3ce002b2 100644
--- a/src/square/requests/order_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/requests/order_custom_attribute_definition_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/order_custom_attribute_definition_visible_created_event.py b/src/square/requests/order_custom_attribute_definition_visible_created_event.py
index c36b8018..0b9812db 100644
--- a/src/square/requests/order_custom_attribute_definition_visible_created_event.py
+++ b/src/square/requests/order_custom_attribute_definition_visible_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/order_custom_attribute_definition_visible_deleted_event.py b/src/square/requests/order_custom_attribute_definition_visible_deleted_event.py
index 3b5edfb9..213c34bb 100644
--- a/src/square/requests/order_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/requests/order_custom_attribute_definition_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/order_custom_attribute_definition_visible_updated_event.py b/src/square/requests/order_custom_attribute_definition_visible_updated_event.py
index d7f4bc23..9ba42791 100644
--- a/src/square/requests/order_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/requests/order_custom_attribute_definition_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventDataParams
 
 
diff --git a/src/square/requests/order_custom_attribute_owned_deleted_event.py b/src/square/requests/order_custom_attribute_owned_deleted_event.py
index c8ccf980..7b1388a9 100644
--- a/src/square/requests/order_custom_attribute_owned_deleted_event.py
+++ b/src/square/requests/order_custom_attribute_owned_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/order_custom_attribute_owned_updated_event.py b/src/square/requests/order_custom_attribute_owned_updated_event.py
index a25313c7..8827f3b1 100644
--- a/src/square/requests/order_custom_attribute_owned_updated_event.py
+++ b/src/square/requests/order_custom_attribute_owned_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/order_custom_attribute_visible_deleted_event.py b/src/square/requests/order_custom_attribute_visible_deleted_event.py
index d7c52b8b..ed93a0bf 100644
--- a/src/square/requests/order_custom_attribute_visible_deleted_event.py
+++ b/src/square/requests/order_custom_attribute_visible_deleted_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/order_custom_attribute_visible_updated_event.py b/src/square/requests/order_custom_attribute_visible_updated_event.py
index 06916fa6..42919b5a 100644
--- a/src/square/requests/order_custom_attribute_visible_updated_event.py
+++ b/src/square/requests/order_custom_attribute_visible_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .custom_attribute_event_data import CustomAttributeEventDataParams
 
 
diff --git a/src/square/requests/order_entry.py b/src/square/requests/order_entry.py
index 5982eff4..f98d2f51 100644
--- a/src/square/requests/order_entry.py
+++ b/src/square/requests/order_entry.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class OrderEntryParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/order_fulfillment_updated.py b/src/square/requests/order_fulfillment_updated.py
index 47272d19..002b2315 100644
--- a/src/square/requests/order_fulfillment_updated.py
+++ b/src/square/requests/order_fulfillment_updated.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.order_state import OrderState
 from .order_fulfillment_updated_update import OrderFulfillmentUpdatedUpdateParams
 
diff --git a/src/square/requests/order_fulfillment_updated_event.py b/src/square/requests/order_fulfillment_updated_event.py
index ea67f17a..5acbb141 100644
--- a/src/square/requests/order_fulfillment_updated_event.py
+++ b/src/square/requests/order_fulfillment_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .order_fulfillment_updated_event_data import OrderFulfillmentUpdatedEventDataParams
 
 
diff --git a/src/square/requests/order_fulfillment_updated_event_data.py b/src/square/requests/order_fulfillment_updated_event_data.py
index 8b741cb7..887e886c 100644
--- a/src/square/requests/order_fulfillment_updated_event_data.py
+++ b/src/square/requests/order_fulfillment_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .order_fulfillment_updated_object import OrderFulfillmentUpdatedObjectParams
 
 
diff --git a/src/square/requests/order_fulfillment_updated_object.py b/src/square/requests/order_fulfillment_updated_object.py
index 16d2f554..94b5a27a 100644
--- a/src/square/requests/order_fulfillment_updated_object.py
+++ b/src/square/requests/order_fulfillment_updated_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .order_fulfillment_updated import OrderFulfillmentUpdatedParams
 
diff --git a/src/square/requests/order_fulfillment_updated_update.py b/src/square/requests/order_fulfillment_updated_update.py
index f0698b1a..808104f3 100644
--- a/src/square/requests/order_fulfillment_updated_update.py
+++ b/src/square/requests/order_fulfillment_updated_update.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.fulfillment_state import FulfillmentState
 
 
diff --git a/src/square/requests/order_line_item.py b/src/square/requests/order_line_item.py
index b73d0b0e..8a19c25c 100644
--- a/src/square/requests/order_line_item.py
+++ b/src/square/requests/order_line_item.py
@@ -1,16 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .order_quantity_unit import OrderQuantityUnitParams
+
+import typing_extensions
 from ..types.order_line_item_item_type import OrderLineItemItemType
-from .order_line_item_modifier import OrderLineItemModifierParams
-from .order_line_item_applied_tax import OrderLineItemAppliedTaxParams
+from .money import MoneyParams
 from .order_line_item_applied_discount import OrderLineItemAppliedDiscountParams
 from .order_line_item_applied_service_charge import OrderLineItemAppliedServiceChargeParams
-from .money import MoneyParams
+from .order_line_item_applied_tax import OrderLineItemAppliedTaxParams
+from .order_line_item_modifier import OrderLineItemModifierParams
 from .order_line_item_pricing_blocklists import OrderLineItemPricingBlocklistsParams
+from .order_quantity_unit import OrderQuantityUnitParams
 
 
 class OrderLineItemParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_line_item_applied_discount.py b/src/square/requests/order_line_item_applied_discount.py
index 65846c1c..01f68225 100644
--- a/src/square/requests/order_line_item_applied_discount.py
+++ b/src/square/requests/order_line_item_applied_discount.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/order_line_item_applied_service_charge.py b/src/square/requests/order_line_item_applied_service_charge.py
index 831fd65f..110c2e15 100644
--- a/src/square/requests/order_line_item_applied_service_charge.py
+++ b/src/square/requests/order_line_item_applied_service_charge.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/order_line_item_applied_tax.py b/src/square/requests/order_line_item_applied_tax.py
index 9ad533be..ede2bf53 100644
--- a/src/square/requests/order_line_item_applied_tax.py
+++ b/src/square/requests/order_line_item_applied_tax.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/order_line_item_discount.py b/src/square/requests/order_line_item_discount.py
index 2e16566d..efdd4291 100644
--- a/src/square/requests/order_line_item_discount.py
+++ b/src/square/requests/order_line_item_discount.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from ..types.order_line_item_discount_scope import OrderLineItemDiscountScope
 from ..types.order_line_item_discount_type import OrderLineItemDiscountType
 from .money import MoneyParams
-from ..types.order_line_item_discount_scope import OrderLineItemDiscountScope
 
 
 class OrderLineItemDiscountParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_line_item_modifier.py b/src/square/requests/order_line_item_modifier.py
index 01e024b2..6b7f922c 100644
--- a/src/square/requests/order_line_item_modifier.py
+++ b/src/square/requests/order_line_item_modifier.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/order_line_item_pricing_blocklists.py b/src/square/requests/order_line_item_pricing_blocklists.py
index fb3b6373..4dcd7cbf 100644
--- a/src/square/requests/order_line_item_pricing_blocklists.py
+++ b/src/square/requests/order_line_item_pricing_blocklists.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .order_line_item_pricing_blocklists_blocked_discount import OrderLineItemPricingBlocklistsBlockedDiscountParams
 from .order_line_item_pricing_blocklists_blocked_tax import OrderLineItemPricingBlocklistsBlockedTaxParams
 
diff --git a/src/square/requests/order_line_item_pricing_blocklists_blocked_discount.py b/src/square/requests/order_line_item_pricing_blocklists_blocked_discount.py
index b957c317..b3cac7d6 100644
--- a/src/square/requests/order_line_item_pricing_blocklists_blocked_discount.py
+++ b/src/square/requests/order_line_item_pricing_blocklists_blocked_discount.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class OrderLineItemPricingBlocklistsBlockedDiscountParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/order_line_item_pricing_blocklists_blocked_tax.py b/src/square/requests/order_line_item_pricing_blocklists_blocked_tax.py
index 8b18190a..c5124e67 100644
--- a/src/square/requests/order_line_item_pricing_blocklists_blocked_tax.py
+++ b/src/square/requests/order_line_item_pricing_blocklists_blocked_tax.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class OrderLineItemPricingBlocklistsBlockedTaxParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/order_line_item_tax.py b/src/square/requests/order_line_item_tax.py
index 025eefc1..0fe1fba8 100644
--- a/src/square/requests/order_line_item_tax.py
+++ b/src/square/requests/order_line_item_tax.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from ..types.order_line_item_tax_scope import OrderLineItemTaxScope
 from ..types.order_line_item_tax_type import OrderLineItemTaxType
 from .money import MoneyParams
-from ..types.order_line_item_tax_scope import OrderLineItemTaxScope
 
 
 class OrderLineItemTaxParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_money_amounts.py b/src/square/requests/order_money_amounts.py
index 33c1ac38..1861406f 100644
--- a/src/square/requests/order_money_amounts.py
+++ b/src/square/requests/order_money_amounts.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .money import MoneyParams
 
diff --git a/src/square/requests/order_pricing_options.py b/src/square/requests/order_pricing_options.py
index e8e539fd..9b0a67d1 100644
--- a/src/square/requests/order_pricing_options.py
+++ b/src/square/requests/order_pricing_options.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class OrderPricingOptionsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/order_quantity_unit.py b/src/square/requests/order_quantity_unit.py
index cbc71bc6..e64f2c30 100644
--- a/src/square/requests/order_quantity_unit.py
+++ b/src/square/requests/order_quantity_unit.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .measurement_unit import MeasurementUnitParams
-import typing
 
 
 class OrderQuantityUnitParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_return.py b/src/square/requests/order_return.py
index 7b08d29d..add4328c 100644
--- a/src/square/requests/order_return.py
+++ b/src/square/requests/order_return.py
@@ -1,15 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from .order_money_amounts import OrderMoneyAmountsParams
+from .order_return_discount import OrderReturnDiscountParams
 from .order_return_line_item import OrderReturnLineItemParams
 from .order_return_service_charge import OrderReturnServiceChargeParams
 from .order_return_tax import OrderReturnTaxParams
-from .order_return_discount import OrderReturnDiscountParams
 from .order_return_tip import OrderReturnTipParams
 from .order_rounding_adjustment import OrderRoundingAdjustmentParams
-from .order_money_amounts import OrderMoneyAmountsParams
 
 
 class OrderReturnParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_return_discount.py b/src/square/requests/order_return_discount.py
index 341223fc..f9687933 100644
--- a/src/square/requests/order_return_discount.py
+++ b/src/square/requests/order_return_discount.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from ..types.order_line_item_discount_scope import OrderLineItemDiscountScope
 from ..types.order_line_item_discount_type import OrderLineItemDiscountType
 from .money import MoneyParams
-from ..types.order_line_item_discount_scope import OrderLineItemDiscountScope
 
 
 class OrderReturnDiscountParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_return_line_item.py b/src/square/requests/order_return_line_item.py
index 18505b2e..3159ae67 100644
--- a/src/square/requests/order_return_line_item.py
+++ b/src/square/requests/order_return_line_item.py
@@ -1,15 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .order_quantity_unit import OrderQuantityUnitParams
+
+import typing_extensions
 from ..types.order_line_item_item_type import OrderLineItemItemType
-from .order_return_line_item_modifier import OrderReturnLineItemModifierParams
-from .order_line_item_applied_tax import OrderLineItemAppliedTaxParams
-from .order_line_item_applied_discount import OrderLineItemAppliedDiscountParams
 from .money import MoneyParams
+from .order_line_item_applied_discount import OrderLineItemAppliedDiscountParams
 from .order_line_item_applied_service_charge import OrderLineItemAppliedServiceChargeParams
+from .order_line_item_applied_tax import OrderLineItemAppliedTaxParams
+from .order_quantity_unit import OrderQuantityUnitParams
+from .order_return_line_item_modifier import OrderReturnLineItemModifierParams
 
 
 class OrderReturnLineItemParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_return_line_item_modifier.py b/src/square/requests/order_return_line_item_modifier.py
index 2efce772..663a207e 100644
--- a/src/square/requests/order_return_line_item_modifier.py
+++ b/src/square/requests/order_return_line_item_modifier.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/order_return_service_charge.py b/src/square/requests/order_return_service_charge.py
index 2e8e538c..c3b72a5e 100644
--- a/src/square/requests/order_return_service_charge.py
+++ b/src/square/requests/order_return_service_charge.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .money import MoneyParams
+
+import typing_extensions
 from ..types.order_service_charge_calculation_phase import OrderServiceChargeCalculationPhase
-from .order_line_item_applied_tax import OrderLineItemAppliedTaxParams
-from ..types.order_service_charge_treatment_type import OrderServiceChargeTreatmentType
 from ..types.order_service_charge_scope import OrderServiceChargeScope
+from ..types.order_service_charge_treatment_type import OrderServiceChargeTreatmentType
+from .money import MoneyParams
+from .order_line_item_applied_tax import OrderLineItemAppliedTaxParams
 
 
 class OrderReturnServiceChargeParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_return_tax.py b/src/square/requests/order_return_tax.py
index 1b5e059a..563f4567 100644
--- a/src/square/requests/order_return_tax.py
+++ b/src/square/requests/order_return_tax.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from ..types.order_line_item_tax_scope import OrderLineItemTaxScope
 from ..types.order_line_item_tax_type import OrderLineItemTaxType
 from .money import MoneyParams
-from ..types.order_line_item_tax_scope import OrderLineItemTaxScope
 
 
 class OrderReturnTaxParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_return_tip.py b/src/square/requests/order_return_tip.py
index d567b10c..66332d23 100644
--- a/src/square/requests/order_return_tip.py
+++ b/src/square/requests/order_return_tip.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/order_rounding_adjustment.py b/src/square/requests/order_rounding_adjustment.py
index 8cff0218..e1ef6558 100644
--- a/src/square/requests/order_rounding_adjustment.py
+++ b/src/square/requests/order_rounding_adjustment.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/order_service_charge.py b/src/square/requests/order_service_charge.py
index 28042c33..9355890f 100644
--- a/src/square/requests/order_service_charge.py
+++ b/src/square/requests/order_service_charge.py
@@ -1,14 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .money import MoneyParams
+
+import typing_extensions
 from ..types.order_service_charge_calculation_phase import OrderServiceChargeCalculationPhase
-from .order_line_item_applied_tax import OrderLineItemAppliedTaxParams
-from ..types.order_service_charge_type import OrderServiceChargeType
-from ..types.order_service_charge_treatment_type import OrderServiceChargeTreatmentType
 from ..types.order_service_charge_scope import OrderServiceChargeScope
+from ..types.order_service_charge_treatment_type import OrderServiceChargeTreatmentType
+from ..types.order_service_charge_type import OrderServiceChargeType
+from .money import MoneyParams
+from .order_line_item_applied_tax import OrderLineItemAppliedTaxParams
 
 
 class OrderServiceChargeParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/order_source.py b/src/square/requests/order_source.py
index 74f6e7e3..85509e53 100644
--- a/src/square/requests/order_source.py
+++ b/src/square/requests/order_source.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class OrderSourceParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/order_updated.py b/src/square/requests/order_updated.py
index b165a746..d999a84c 100644
--- a/src/square/requests/order_updated.py
+++ b/src/square/requests/order_updated.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.order_state import OrderState
 
 
diff --git a/src/square/requests/order_updated_event.py b/src/square/requests/order_updated_event.py
index 745780d7..50e3f125 100644
--- a/src/square/requests/order_updated_event.py
+++ b/src/square/requests/order_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .order_updated_event_data import OrderUpdatedEventDataParams
 
 
diff --git a/src/square/requests/order_updated_event_data.py b/src/square/requests/order_updated_event_data.py
index ec24da9d..0a55ffc9 100644
--- a/src/square/requests/order_updated_event_data.py
+++ b/src/square/requests/order_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .order_updated_object import OrderUpdatedObjectParams
 
 
diff --git a/src/square/requests/order_updated_object.py b/src/square/requests/order_updated_object.py
index d4461d24..91d3be8c 100644
--- a/src/square/requests/order_updated_object.py
+++ b/src/square/requests/order_updated_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .order_updated import OrderUpdatedParams
 
diff --git a/src/square/requests/pause_subscription_response.py b/src/square/requests/pause_subscription_response.py
index acc74d82..5a0ed6ad 100644
--- a/src/square/requests/pause_subscription_response.py
+++ b/src/square/requests/pause_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 from .subscription_action import SubscriptionActionParams
diff --git a/src/square/requests/pay_order_response.py b/src/square/requests/pay_order_response.py
index aed21b54..a02cbe52 100644
--- a/src/square/requests/pay_order_response.py
+++ b/src/square/requests/pay_order_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .order import OrderParams
 
diff --git a/src/square/requests/payment.py b/src/square/requests/payment.py
index a274d9f4..ad5907b8 100644
--- a/src/square/requests/payment.py
+++ b/src/square/requests/payment.py
@@ -1,22 +1,22 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .money import MoneyParams
 import typing
-from .processing_fee import ProcessingFeeParams
-from .card_payment_details import CardPaymentDetailsParams
-from .cash_payment_details import CashPaymentDetailsParams
+
+import typing_extensions
+from .address import AddressParams
+from .application_details import ApplicationDetailsParams
 from .bank_account_payment_details import BankAccountPaymentDetailsParams
-from .external_payment_details import ExternalPaymentDetailsParams
-from .digital_wallet_details import DigitalWalletDetailsParams
 from .buy_now_pay_later_details import BuyNowPayLaterDetailsParams
-from .square_account_details import SquareAccountDetailsParams
-from .risk_evaluation import RiskEvaluationParams
-from .address import AddressParams
+from .card_payment_details import CardPaymentDetailsParams
+from .cash_payment_details import CashPaymentDetailsParams
 from .device_details import DeviceDetailsParams
-from .application_details import ApplicationDetailsParams
+from .digital_wallet_details import DigitalWalletDetailsParams
+from .external_payment_details import ExternalPaymentDetailsParams
+from .money import MoneyParams
 from .offline_payment_details import OfflinePaymentDetailsParams
+from .processing_fee import ProcessingFeeParams
+from .risk_evaluation import RiskEvaluationParams
+from .square_account_details import SquareAccountDetailsParams
 
 
 class PaymentParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/payment_balance_activity_app_fee_refund_detail.py b/src/square/requests/payment_balance_activity_app_fee_refund_detail.py
index 22905824..c67b8f9c 100644
--- a/src/square/requests/payment_balance_activity_app_fee_refund_detail.py
+++ b/src/square/requests/payment_balance_activity_app_fee_refund_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityAppFeeRefundDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_app_fee_revenue_detail.py b/src/square/requests/payment_balance_activity_app_fee_revenue_detail.py
index 45c421b3..8e38d6d4 100644
--- a/src/square/requests/payment_balance_activity_app_fee_revenue_detail.py
+++ b/src/square/requests/payment_balance_activity_app_fee_revenue_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityAppFeeRevenueDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_automatic_savings_detail.py b/src/square/requests/payment_balance_activity_automatic_savings_detail.py
index 77a35b4b..270d71de 100644
--- a/src/square/requests/payment_balance_activity_automatic_savings_detail.py
+++ b/src/square/requests/payment_balance_activity_automatic_savings_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityAutomaticSavingsDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_automatic_savings_reversed_detail.py b/src/square/requests/payment_balance_activity_automatic_savings_reversed_detail.py
index 43f422a3..e4b6e479 100644
--- a/src/square/requests/payment_balance_activity_automatic_savings_reversed_detail.py
+++ b/src/square/requests/payment_balance_activity_automatic_savings_reversed_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityAutomaticSavingsReversedDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_charge_detail.py b/src/square/requests/payment_balance_activity_charge_detail.py
index 1104fe0f..b25f3a33 100644
--- a/src/square/requests/payment_balance_activity_charge_detail.py
+++ b/src/square/requests/payment_balance_activity_charge_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityChargeDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_deposit_fee_detail.py b/src/square/requests/payment_balance_activity_deposit_fee_detail.py
index 5b06cdc1..e432bedc 100644
--- a/src/square/requests/payment_balance_activity_deposit_fee_detail.py
+++ b/src/square/requests/payment_balance_activity_deposit_fee_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityDepositFeeDetailParams(typing_extensions.TypedDict):
     payout_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_deposit_fee_reversed_detail.py b/src/square/requests/payment_balance_activity_deposit_fee_reversed_detail.py
index e33eca45..9d7aec6d 100644
--- a/src/square/requests/payment_balance_activity_deposit_fee_reversed_detail.py
+++ b/src/square/requests/payment_balance_activity_deposit_fee_reversed_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityDepositFeeReversedDetailParams(typing_extensions.TypedDict):
     payout_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_dispute_detail.py b/src/square/requests/payment_balance_activity_dispute_detail.py
index 4cb66a20..2c3cee7a 100644
--- a/src/square/requests/payment_balance_activity_dispute_detail.py
+++ b/src/square/requests/payment_balance_activity_dispute_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityDisputeDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_fee_detail.py b/src/square/requests/payment_balance_activity_fee_detail.py
index 51b97e58..bc480d9f 100644
--- a/src/square/requests/payment_balance_activity_fee_detail.py
+++ b/src/square/requests/payment_balance_activity_fee_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityFeeDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_free_processing_detail.py b/src/square/requests/payment_balance_activity_free_processing_detail.py
index 59908278..f2e0fef4 100644
--- a/src/square/requests/payment_balance_activity_free_processing_detail.py
+++ b/src/square/requests/payment_balance_activity_free_processing_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityFreeProcessingDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_hold_adjustment_detail.py b/src/square/requests/payment_balance_activity_hold_adjustment_detail.py
index 8b4d729c..876e69a0 100644
--- a/src/square/requests/payment_balance_activity_hold_adjustment_detail.py
+++ b/src/square/requests/payment_balance_activity_hold_adjustment_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityHoldAdjustmentDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_open_dispute_detail.py b/src/square/requests/payment_balance_activity_open_dispute_detail.py
index 2be98265..b33929f3 100644
--- a/src/square/requests/payment_balance_activity_open_dispute_detail.py
+++ b/src/square/requests/payment_balance_activity_open_dispute_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityOpenDisputeDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_other_adjustment_detail.py b/src/square/requests/payment_balance_activity_other_adjustment_detail.py
index ce35d891..9ab0e5cb 100644
--- a/src/square/requests/payment_balance_activity_other_adjustment_detail.py
+++ b/src/square/requests/payment_balance_activity_other_adjustment_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityOtherAdjustmentDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_other_detail.py b/src/square/requests/payment_balance_activity_other_detail.py
index 630e23da..acefe170 100644
--- a/src/square/requests/payment_balance_activity_other_detail.py
+++ b/src/square/requests/payment_balance_activity_other_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityOtherDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_refund_detail.py b/src/square/requests/payment_balance_activity_refund_detail.py
index 0f8b1f90..e19ad8c0 100644
--- a/src/square/requests/payment_balance_activity_refund_detail.py
+++ b/src/square/requests/payment_balance_activity_refund_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityRefundDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_release_adjustment_detail.py b/src/square/requests/payment_balance_activity_release_adjustment_detail.py
index 6b92f80f..ed4539d7 100644
--- a/src/square/requests/payment_balance_activity_release_adjustment_detail.py
+++ b/src/square/requests/payment_balance_activity_release_adjustment_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityReleaseAdjustmentDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_reserve_hold_detail.py b/src/square/requests/payment_balance_activity_reserve_hold_detail.py
index 9a95d2f2..06090799 100644
--- a/src/square/requests/payment_balance_activity_reserve_hold_detail.py
+++ b/src/square/requests/payment_balance_activity_reserve_hold_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityReserveHoldDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_reserve_release_detail.py b/src/square/requests/payment_balance_activity_reserve_release_detail.py
index da039f70..b856a48e 100644
--- a/src/square/requests/payment_balance_activity_reserve_release_detail.py
+++ b/src/square/requests/payment_balance_activity_reserve_release_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityReserveReleaseDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_square_capital_payment_detail.py b/src/square/requests/payment_balance_activity_square_capital_payment_detail.py
index 0d96f731..56e0c8b4 100644
--- a/src/square/requests/payment_balance_activity_square_capital_payment_detail.py
+++ b/src/square/requests/payment_balance_activity_square_capital_payment_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivitySquareCapitalPaymentDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_square_capital_reversed_payment_detail.py b/src/square/requests/payment_balance_activity_square_capital_reversed_payment_detail.py
index 37953dfe..c5a39613 100644
--- a/src/square/requests/payment_balance_activity_square_capital_reversed_payment_detail.py
+++ b/src/square/requests/payment_balance_activity_square_capital_reversed_payment_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivitySquareCapitalReversedPaymentDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_square_payroll_transfer_detail.py b/src/square/requests/payment_balance_activity_square_payroll_transfer_detail.py
index 968ecf17..3c23689d 100644
--- a/src/square/requests/payment_balance_activity_square_payroll_transfer_detail.py
+++ b/src/square/requests/payment_balance_activity_square_payroll_transfer_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivitySquarePayrollTransferDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_square_payroll_transfer_reversed_detail.py b/src/square/requests/payment_balance_activity_square_payroll_transfer_reversed_detail.py
index 43a75176..3c06a6d7 100644
--- a/src/square/requests/payment_balance_activity_square_payroll_transfer_reversed_detail.py
+++ b/src/square/requests/payment_balance_activity_square_payroll_transfer_reversed_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivitySquarePayrollTransferReversedDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_tax_on_fee_detail.py b/src/square/requests/payment_balance_activity_tax_on_fee_detail.py
index 3556955d..2736da5b 100644
--- a/src/square/requests/payment_balance_activity_tax_on_fee_detail.py
+++ b/src/square/requests/payment_balance_activity_tax_on_fee_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityTaxOnFeeDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_third_party_fee_detail.py b/src/square/requests/payment_balance_activity_third_party_fee_detail.py
index b0fd275b..521fe12b 100644
--- a/src/square/requests/payment_balance_activity_third_party_fee_detail.py
+++ b/src/square/requests/payment_balance_activity_third_party_fee_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityThirdPartyFeeDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_balance_activity_third_party_fee_refund_detail.py b/src/square/requests/payment_balance_activity_third_party_fee_refund_detail.py
index 2a725fb3..a2ff74f1 100644
--- a/src/square/requests/payment_balance_activity_third_party_fee_refund_detail.py
+++ b/src/square/requests/payment_balance_activity_third_party_fee_refund_detail.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PaymentBalanceActivityThirdPartyFeeRefundDetailParams(typing_extensions.TypedDict):
     payment_id: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/payment_created_event.py b/src/square/requests/payment_created_event.py
index 5945cfb6..86af90ba 100644
--- a/src/square/requests/payment_created_event.py
+++ b/src/square/requests/payment_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payment_created_event_data import PaymentCreatedEventDataParams
 
 
diff --git a/src/square/requests/payment_created_event_data.py b/src/square/requests/payment_created_event_data.py
index 0d2ed4a2..d3ca19ad 100644
--- a/src/square/requests/payment_created_event_data.py
+++ b/src/square/requests/payment_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payment_created_event_object import PaymentCreatedEventObjectParams
 
 
diff --git a/src/square/requests/payment_created_event_object.py b/src/square/requests/payment_created_event_object.py
index 19fa5ca3..9bfa8c55 100644
--- a/src/square/requests/payment_created_event_object.py
+++ b/src/square/requests/payment_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .payment import PaymentParams
 
diff --git a/src/square/requests/payment_link.py b/src/square/requests/payment_link.py
index 6397f6b7..c01de1f1 100644
--- a/src/square/requests/payment_link.py
+++ b/src/square/requests/payment_link.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .checkout_options import CheckoutOptionsParams
 from .pre_populated_data import PrePopulatedDataParams
 
diff --git a/src/square/requests/payment_link_related_resources.py b/src/square/requests/payment_link_related_resources.py
index f30988b9..c56ef728 100644
--- a/src/square/requests/payment_link_related_resources.py
+++ b/src/square/requests/payment_link_related_resources.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .order import OrderParams
+
+import typing_extensions
 from .catalog_object import CatalogObjectParams
+from .order import OrderParams
 
 
 class PaymentLinkRelatedResourcesParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/payment_options.py b/src/square/requests/payment_options.py
index 67a5eec5..cb119bd7 100644
--- a/src/square/requests/payment_options.py
+++ b/src/square/requests/payment_options.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.payment_options_delay_action import PaymentOptionsDelayAction
 
 
diff --git a/src/square/requests/payment_refund.py b/src/square/requests/payment_refund.py
index bb865ffe..6eb94635 100644
--- a/src/square/requests/payment_refund.py
+++ b/src/square/requests/payment_refund.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .destination_details import DestinationDetailsParams
 from .money import MoneyParams
 from .processing_fee import ProcessingFeeParams
diff --git a/src/square/requests/payment_updated_event.py b/src/square/requests/payment_updated_event.py
index b2f90225..4ab820fb 100644
--- a/src/square/requests/payment_updated_event.py
+++ b/src/square/requests/payment_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payment_updated_event_data import PaymentUpdatedEventDataParams
 
 
diff --git a/src/square/requests/payment_updated_event_data.py b/src/square/requests/payment_updated_event_data.py
index 1ebeb8c7..c43d5136 100644
--- a/src/square/requests/payment_updated_event_data.py
+++ b/src/square/requests/payment_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payment_updated_event_object import PaymentUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/payment_updated_event_object.py b/src/square/requests/payment_updated_event_object.py
index 451ef729..8351e9bd 100644
--- a/src/square/requests/payment_updated_event_object.py
+++ b/src/square/requests/payment_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .payment import PaymentParams
 
diff --git a/src/square/requests/payout.py b/src/square/requests/payout.py
index 36bff55c..901d1504 100644
--- a/src/square/requests/payout.py
+++ b/src/square/requests/payout.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.payout_status import PayoutStatus
-from .money import MoneyParams
-from .destination import DestinationParams
 from ..types.payout_type import PayoutType
-import typing
+from .destination import DestinationParams
+from .money import MoneyParams
 from .payout_fee import PayoutFeeParams
 
 
diff --git a/src/square/requests/payout_entry.py b/src/square/requests/payout_entry.py
index 58d33b09..1acb9fa9 100644
--- a/src/square/requests/payout_entry.py
+++ b/src/square/requests/payout_entry.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.activity_type import ActivityType
 from .money import MoneyParams
-from .payment_balance_activity_app_fee_revenue_detail import PaymentBalanceActivityAppFeeRevenueDetailParams
 from .payment_balance_activity_app_fee_refund_detail import PaymentBalanceActivityAppFeeRefundDetailParams
+from .payment_balance_activity_app_fee_revenue_detail import PaymentBalanceActivityAppFeeRevenueDetailParams
 from .payment_balance_activity_automatic_savings_detail import PaymentBalanceActivityAutomaticSavingsDetailParams
 from .payment_balance_activity_automatic_savings_reversed_detail import (
     PaymentBalanceActivityAutomaticSavingsReversedDetailParams,
@@ -19,8 +19,8 @@
 from .payment_balance_activity_free_processing_detail import PaymentBalanceActivityFreeProcessingDetailParams
 from .payment_balance_activity_hold_adjustment_detail import PaymentBalanceActivityHoldAdjustmentDetailParams
 from .payment_balance_activity_open_dispute_detail import PaymentBalanceActivityOpenDisputeDetailParams
-from .payment_balance_activity_other_detail import PaymentBalanceActivityOtherDetailParams
 from .payment_balance_activity_other_adjustment_detail import PaymentBalanceActivityOtherAdjustmentDetailParams
+from .payment_balance_activity_other_detail import PaymentBalanceActivityOtherDetailParams
 from .payment_balance_activity_refund_detail import PaymentBalanceActivityRefundDetailParams
 from .payment_balance_activity_release_adjustment_detail import PaymentBalanceActivityReleaseAdjustmentDetailParams
 from .payment_balance_activity_reserve_hold_detail import PaymentBalanceActivityReserveHoldDetailParams
@@ -31,17 +31,17 @@
 from .payment_balance_activity_square_capital_reversed_payment_detail import (
     PaymentBalanceActivitySquareCapitalReversedPaymentDetailParams,
 )
-from .payment_balance_activity_tax_on_fee_detail import PaymentBalanceActivityTaxOnFeeDetailParams
-from .payment_balance_activity_third_party_fee_detail import PaymentBalanceActivityThirdPartyFeeDetailParams
-from .payment_balance_activity_third_party_fee_refund_detail import (
-    PaymentBalanceActivityThirdPartyFeeRefundDetailParams,
-)
 from .payment_balance_activity_square_payroll_transfer_detail import (
     PaymentBalanceActivitySquarePayrollTransferDetailParams,
 )
 from .payment_balance_activity_square_payroll_transfer_reversed_detail import (
     PaymentBalanceActivitySquarePayrollTransferReversedDetailParams,
 )
+from .payment_balance_activity_tax_on_fee_detail import PaymentBalanceActivityTaxOnFeeDetailParams
+from .payment_balance_activity_third_party_fee_detail import PaymentBalanceActivityThirdPartyFeeDetailParams
+from .payment_balance_activity_third_party_fee_refund_detail import (
+    PaymentBalanceActivityThirdPartyFeeRefundDetailParams,
+)
 
 
 class PayoutEntryParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/payout_failed_event.py b/src/square/requests/payout_failed_event.py
index eb397fd7..115e590e 100644
--- a/src/square/requests/payout_failed_event.py
+++ b/src/square/requests/payout_failed_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payout_failed_event_data import PayoutFailedEventDataParams
 
 
diff --git a/src/square/requests/payout_failed_event_data.py b/src/square/requests/payout_failed_event_data.py
index a83065af..23c47547 100644
--- a/src/square/requests/payout_failed_event_data.py
+++ b/src/square/requests/payout_failed_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payout_failed_event_object import PayoutFailedEventObjectParams
 
 
diff --git a/src/square/requests/payout_failed_event_object.py b/src/square/requests/payout_failed_event_object.py
index 0cc55f75..3d792a28 100644
--- a/src/square/requests/payout_failed_event_object.py
+++ b/src/square/requests/payout_failed_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .payout import PayoutParams
 
diff --git a/src/square/requests/payout_fee.py b/src/square/requests/payout_fee.py
index ae5d9682..3c7acc4e 100644
--- a/src/square/requests/payout_fee.py
+++ b/src/square/requests/payout_fee.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .money import MoneyParams
 import typing
+
+import typing_extensions
 from ..types.payout_fee_type import PayoutFeeType
+from .money import MoneyParams
 
 
 class PayoutFeeParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/payout_paid_event.py b/src/square/requests/payout_paid_event.py
index 99100176..9ab52c4e 100644
--- a/src/square/requests/payout_paid_event.py
+++ b/src/square/requests/payout_paid_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payout_paid_event_data import PayoutPaidEventDataParams
 
 
diff --git a/src/square/requests/payout_paid_event_data.py b/src/square/requests/payout_paid_event_data.py
index ecf1bb71..d459d6c5 100644
--- a/src/square/requests/payout_paid_event_data.py
+++ b/src/square/requests/payout_paid_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payout_paid_event_object import PayoutPaidEventObjectParams
 
 
diff --git a/src/square/requests/payout_paid_event_object.py b/src/square/requests/payout_paid_event_object.py
index 3445d94d..92e4d2d9 100644
--- a/src/square/requests/payout_paid_event_object.py
+++ b/src/square/requests/payout_paid_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .payout import PayoutParams
 
diff --git a/src/square/requests/payout_sent_event.py b/src/square/requests/payout_sent_event.py
index 51fbfc57..fe2e96c1 100644
--- a/src/square/requests/payout_sent_event.py
+++ b/src/square/requests/payout_sent_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payout_sent_event_data import PayoutSentEventDataParams
 
 
diff --git a/src/square/requests/payout_sent_event_data.py b/src/square/requests/payout_sent_event_data.py
index 7d7ce1ab..0a5cd8a1 100644
--- a/src/square/requests/payout_sent_event_data.py
+++ b/src/square/requests/payout_sent_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .payout_sent_event_object import PayoutSentEventObjectParams
 
 
diff --git a/src/square/requests/payout_sent_event_object.py b/src/square/requests/payout_sent_event_object.py
index 3b1897ab..a711be55 100644
--- a/src/square/requests/payout_sent_event_object.py
+++ b/src/square/requests/payout_sent_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .payout import PayoutParams
 
diff --git a/src/square/requests/phase.py b/src/square/requests/phase.py
index 80d3ffb6..72d15cb9 100644
--- a/src/square/requests/phase.py
+++ b/src/square/requests/phase.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PhaseParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/phase_input.py b/src/square/requests/phase_input.py
index 4c36efb1..6ee11a09 100644
--- a/src/square/requests/phase_input.py
+++ b/src/square/requests/phase_input.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class PhaseInputParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/pre_populated_data.py b/src/square/requests/pre_populated_data.py
index 379e57b4..74ae95ae 100644
--- a/src/square/requests/pre_populated_data.py
+++ b/src/square/requests/pre_populated_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .address import AddressParams
 
 
diff --git a/src/square/requests/processing_fee.py b/src/square/requests/processing_fee.py
index 34c7c7e0..6e6a0be5 100644
--- a/src/square/requests/processing_fee.py
+++ b/src/square/requests/processing_fee.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/publish_invoice_response.py b/src/square/requests/publish_invoice_response.py
index e2fe3b3b..61ba6fae 100644
--- a/src/square/requests/publish_invoice_response.py
+++ b/src/square/requests/publish_invoice_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .invoice import InvoiceParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .invoice import InvoiceParams
 
 
 class PublishInvoiceResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/publish_scheduled_shift_response.py b/src/square/requests/publish_scheduled_shift_response.py
index f0c40497..d8e6fd77 100644
--- a/src/square/requests/publish_scheduled_shift_response.py
+++ b/src/square/requests/publish_scheduled_shift_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .scheduled_shift import ScheduledShiftParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .scheduled_shift import ScheduledShiftParams
 
 
 class PublishScheduledShiftResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/range.py b/src/square/requests/range.py
index c4515928..b84e5a01 100644
--- a/src/square/requests/range.py
+++ b/src/square/requests/range.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class RangeParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/receipt_options.py b/src/square/requests/receipt_options.py
index 4db5f4ed..7392b861 100644
--- a/src/square/requests/receipt_options.py
+++ b/src/square/requests/receipt_options.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class ReceiptOptionsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/redeem_loyalty_reward_response.py b/src/square/requests/redeem_loyalty_reward_response.py
index 1047a1c1..8ec9b795 100644
--- a/src/square/requests/redeem_loyalty_reward_response.py
+++ b/src/square/requests/redeem_loyalty_reward_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_event import LoyaltyEventParams
 
diff --git a/src/square/requests/refund.py b/src/square/requests/refund.py
index c89921b3..8a87f027 100644
--- a/src/square/requests/refund.py
+++ b/src/square/requests/refund.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .money import MoneyParams
+
+import typing_extensions
 from ..types.refund_status import RefundStatus
 from .additional_recipient import AdditionalRecipientParams
+from .money import MoneyParams
 
 
 class RefundParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/refund_created_event.py b/src/square/requests/refund_created_event.py
index f38ade3c..a0314a21 100644
--- a/src/square/requests/refund_created_event.py
+++ b/src/square/requests/refund_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .refund_created_event_data import RefundCreatedEventDataParams
 
 
diff --git a/src/square/requests/refund_created_event_data.py b/src/square/requests/refund_created_event_data.py
index a2539d61..d3e457bc 100644
--- a/src/square/requests/refund_created_event_data.py
+++ b/src/square/requests/refund_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .refund_created_event_object import RefundCreatedEventObjectParams
 
 
diff --git a/src/square/requests/refund_created_event_object.py b/src/square/requests/refund_created_event_object.py
index 70dfd0ee..4c322bbf 100644
--- a/src/square/requests/refund_created_event_object.py
+++ b/src/square/requests/refund_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .payment_refund import PaymentRefundParams
 
diff --git a/src/square/requests/refund_payment_response.py b/src/square/requests/refund_payment_response.py
index bc6aa8cd..ad7c43d8 100644
--- a/src/square/requests/refund_payment_response.py
+++ b/src/square/requests/refund_payment_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment_refund import PaymentRefundParams
 
diff --git a/src/square/requests/refund_updated_event.py b/src/square/requests/refund_updated_event.py
index d8a9b1f8..6710266b 100644
--- a/src/square/requests/refund_updated_event.py
+++ b/src/square/requests/refund_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .refund_updated_event_data import RefundUpdatedEventDataParams
 
 
diff --git a/src/square/requests/refund_updated_event_data.py b/src/square/requests/refund_updated_event_data.py
index cff7f6c8..895cd4ac 100644
--- a/src/square/requests/refund_updated_event_data.py
+++ b/src/square/requests/refund_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .refund_updated_event_object import RefundUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/refund_updated_event_object.py b/src/square/requests/refund_updated_event_object.py
index 09bc7260..3e613f77 100644
--- a/src/square/requests/refund_updated_event_object.py
+++ b/src/square/requests/refund_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .payment_refund import PaymentRefundParams
 
diff --git a/src/square/requests/register_domain_response.py b/src/square/requests/register_domain_response.py
index 7663b138..44dd2885 100644
--- a/src/square/requests/register_domain_response.py
+++ b/src/square/requests/register_domain_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from ..types.register_domain_response_status import RegisterDomainResponseStatus
+from .error import ErrorParams
 
 
 class RegisterDomainResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/remove_group_from_customer_response.py b/src/square/requests/remove_group_from_customer_response.py
index dbe2f8cb..9f0a7b82 100644
--- a/src/square/requests/remove_group_from_customer_response.py
+++ b/src/square/requests/remove_group_from_customer_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/resume_subscription_response.py b/src/square/requests/resume_subscription_response.py
index c71dadb1..fb8b9ee7 100644
--- a/src/square/requests/resume_subscription_response.py
+++ b/src/square/requests/resume_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 from .subscription_action import SubscriptionActionParams
diff --git a/src/square/requests/retrieve_booking_custom_attribute_definition_response.py b/src/square/requests/retrieve_booking_custom_attribute_definition_response.py
index c53196cb..04a77de9 100644
--- a/src/square/requests/retrieve_booking_custom_attribute_definition_response.py
+++ b/src/square/requests/retrieve_booking_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/retrieve_booking_custom_attribute_response.py b/src/square/requests/retrieve_booking_custom_attribute_response.py
index 8a5b0d41..c15fd4b6 100644
--- a/src/square/requests/retrieve_booking_custom_attribute_response.py
+++ b/src/square/requests/retrieve_booking_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/retrieve_job_response.py b/src/square/requests/retrieve_job_response.py
index b3f63846..284cf04c 100644
--- a/src/square/requests/retrieve_job_response.py
+++ b/src/square/requests/retrieve_job_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .job import JobParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .job import JobParams
 
 
 class RetrieveJobResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/retrieve_location_booking_profile_response.py b/src/square/requests/retrieve_location_booking_profile_response.py
index 9f388db3..40341b18 100644
--- a/src/square/requests/retrieve_location_booking_profile_response.py
+++ b/src/square/requests/retrieve_location_booking_profile_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .location_booking_profile import LocationBookingProfileParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .location_booking_profile import LocationBookingProfileParams
 
 
 class RetrieveLocationBookingProfileResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/retrieve_location_custom_attribute_definition_response.py b/src/square/requests/retrieve_location_custom_attribute_definition_response.py
index e1baac74..24768a4c 100644
--- a/src/square/requests/retrieve_location_custom_attribute_definition_response.py
+++ b/src/square/requests/retrieve_location_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/retrieve_location_custom_attribute_response.py b/src/square/requests/retrieve_location_custom_attribute_response.py
index 3b9027d4..ed221409 100644
--- a/src/square/requests/retrieve_location_custom_attribute_response.py
+++ b/src/square/requests/retrieve_location_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/retrieve_location_settings_response.py b/src/square/requests/retrieve_location_settings_response.py
index b9963397..0761eb98 100644
--- a/src/square/requests/retrieve_location_settings_response.py
+++ b/src/square/requests/retrieve_location_settings_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .checkout_location_settings import CheckoutLocationSettingsParams
+from .error import ErrorParams
 
 
 class RetrieveLocationSettingsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/retrieve_merchant_custom_attribute_definition_response.py b/src/square/requests/retrieve_merchant_custom_attribute_definition_response.py
index d3716e5c..9ce65497 100644
--- a/src/square/requests/retrieve_merchant_custom_attribute_definition_response.py
+++ b/src/square/requests/retrieve_merchant_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/retrieve_merchant_custom_attribute_response.py b/src/square/requests/retrieve_merchant_custom_attribute_response.py
index 51e2276f..c908acd9 100644
--- a/src/square/requests/retrieve_merchant_custom_attribute_response.py
+++ b/src/square/requests/retrieve_merchant_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/retrieve_merchant_settings_response.py b/src/square/requests/retrieve_merchant_settings_response.py
index 59e93198..28d9f52f 100644
--- a/src/square/requests/retrieve_merchant_settings_response.py
+++ b/src/square/requests/retrieve_merchant_settings_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .checkout_merchant_settings import CheckoutMerchantSettingsParams
+from .error import ErrorParams
 
 
 class RetrieveMerchantSettingsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/retrieve_order_custom_attribute_definition_response.py b/src/square/requests/retrieve_order_custom_attribute_definition_response.py
index 43dd63f9..5f40e98f 100644
--- a/src/square/requests/retrieve_order_custom_attribute_definition_response.py
+++ b/src/square/requests/retrieve_order_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/retrieve_order_custom_attribute_response.py b/src/square/requests/retrieve_order_custom_attribute_response.py
index 5ec697b1..c9c5f48c 100644
--- a/src/square/requests/retrieve_order_custom_attribute_response.py
+++ b/src/square/requests/retrieve_order_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/retrieve_scheduled_shift_response.py b/src/square/requests/retrieve_scheduled_shift_response.py
index 55802966..680fb0ac 100644
--- a/src/square/requests/retrieve_scheduled_shift_response.py
+++ b/src/square/requests/retrieve_scheduled_shift_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .scheduled_shift import ScheduledShiftParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .scheduled_shift import ScheduledShiftParams
 
 
 class RetrieveScheduledShiftResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/retrieve_timecard_response.py b/src/square/requests/retrieve_timecard_response.py
index c67d22fc..4386b02d 100644
--- a/src/square/requests/retrieve_timecard_response.py
+++ b/src/square/requests/retrieve_timecard_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .timecard import TimecardParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .timecard import TimecardParams
 
 
 class RetrieveTimecardResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/retrieve_token_status_response.py b/src/square/requests/retrieve_token_status_response.py
index 4c0dc37d..65beb01f 100644
--- a/src/square/requests/retrieve_token_status_response.py
+++ b/src/square/requests/retrieve_token_status_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/revoke_token_response.py b/src/square/requests/revoke_token_response.py
index f6caf213..35238e40 100644
--- a/src/square/requests/revoke_token_response.py
+++ b/src/square/requests/revoke_token_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/risk_evaluation.py b/src/square/requests/risk_evaluation.py
index c46b8409..b6a4dcc5 100644
--- a/src/square/requests/risk_evaluation.py
+++ b/src/square/requests/risk_evaluation.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.risk_evaluation_risk_level import RiskEvaluationRiskLevel
 
diff --git a/src/square/requests/save_card_options.py b/src/square/requests/save_card_options.py
index 21669437..8d538494 100644
--- a/src/square/requests/save_card_options.py
+++ b/src/square/requests/save_card_options.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class SaveCardOptionsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/scheduled_shift.py b/src/square/requests/scheduled_shift.py
index 3760247c..f8d8f3a4 100644
--- a/src/square/requests/scheduled_shift.py
+++ b/src/square/requests/scheduled_shift.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .scheduled_shift_details import ScheduledShiftDetailsParams
 
diff --git a/src/square/requests/scheduled_shift_details.py b/src/square/requests/scheduled_shift_details.py
index 7ad70b97..d57bcf4b 100644
--- a/src/square/requests/scheduled_shift_details.py
+++ b/src/square/requests/scheduled_shift_details.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class ScheduledShiftDetailsParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/scheduled_shift_filter.py b/src/square/requests/scheduled_shift_filter.py
index a3d89445..0e86e606 100644
--- a/src/square/requests/scheduled_shift_filter.py
+++ b/src/square/requests/scheduled_shift_filter.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .time_range import TimeRangeParams
-from .scheduled_shift_workday import ScheduledShiftWorkdayParams
+
+import typing_extensions
 from ..types.scheduled_shift_filter_assignment_status import ScheduledShiftFilterAssignmentStatus
 from ..types.scheduled_shift_filter_scheduled_shift_status import ScheduledShiftFilterScheduledShiftStatus
+from .scheduled_shift_workday import ScheduledShiftWorkdayParams
+from .time_range import TimeRangeParams
 
 
 class ScheduledShiftFilterParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/scheduled_shift_query.py b/src/square/requests/scheduled_shift_query.py
index 45a79375..3ee16b27 100644
--- a/src/square/requests/scheduled_shift_query.py
+++ b/src/square/requests/scheduled_shift_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .scheduled_shift_filter import ScheduledShiftFilterParams
 from .scheduled_shift_sort import ScheduledShiftSortParams
diff --git a/src/square/requests/scheduled_shift_sort.py b/src/square/requests/scheduled_shift_sort.py
index 0f8df45b..ba67fc8b 100644
--- a/src/square/requests/scheduled_shift_sort.py
+++ b/src/square/requests/scheduled_shift_sort.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.scheduled_shift_sort_field import ScheduledShiftSortField
 from ..types.sort_order import SortOrder
diff --git a/src/square/requests/scheduled_shift_workday.py b/src/square/requests/scheduled_shift_workday.py
index 720473f2..30b0abce 100644
--- a/src/square/requests/scheduled_shift_workday.py
+++ b/src/square/requests/scheduled_shift_workday.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
-from .date_range import DateRangeParams
 from ..types.scheduled_shift_workday_matcher import ScheduledShiftWorkdayMatcher
-import typing
+from .date_range import DateRangeParams
 
 
 class ScheduledShiftWorkdayParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_availability_filter.py b/src/square/requests/search_availability_filter.py
index 9b5f4891..cedaa176 100644
--- a/src/square/requests/search_availability_filter.py
+++ b/src/square/requests/search_availability_filter.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-from .time_range import TimeRangeParams
-import typing_extensions
 import typing
+
+import typing_extensions
 from .segment_filter import SegmentFilterParams
+from .time_range import TimeRangeParams
 
 
 class SearchAvailabilityFilterParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_availability_response.py b/src/square/requests/search_availability_response.py
index f9bae6a2..f33663dd 100644
--- a/src/square/requests/search_availability_response.py
+++ b/src/square/requests/search_availability_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .availability import AvailabilityParams
 from .error import ErrorParams
 
diff --git a/src/square/requests/search_catalog_items_response.py b/src/square/requests/search_catalog_items_response.py
index e6fd0e23..3134597b 100644
--- a/src/square/requests/search_catalog_items_response.py
+++ b/src/square/requests/search_catalog_items_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .catalog_object import CatalogObjectParams
+from .error import ErrorParams
 
 
 class SearchCatalogItemsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_catalog_objects_response.py b/src/square/requests/search_catalog_objects_response.py
index 53c915a8..d63b322a 100644
--- a/src/square/requests/search_catalog_objects_response.py
+++ b/src/square/requests/search_catalog_objects_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .catalog_object import CatalogObjectParams
+from .error import ErrorParams
 
 
 class SearchCatalogObjectsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_customers_response.py b/src/square/requests/search_customers_response.py
index c63303c5..57bca295 100644
--- a/src/square/requests/search_customers_response.py
+++ b/src/square/requests/search_customers_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer import CustomerParams
+from .error import ErrorParams
 
 
 class SearchCustomersResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_events_filter.py b/src/square/requests/search_events_filter.py
index ac74dd08..7e84967e 100644
--- a/src/square/requests/search_events_filter.py
+++ b/src/square/requests/search_events_filter.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .time_range import TimeRangeParams
 
 
diff --git a/src/square/requests/search_events_query.py b/src/square/requests/search_events_query.py
index 331af398..0fb0d526 100644
--- a/src/square/requests/search_events_query.py
+++ b/src/square/requests/search_events_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .search_events_filter import SearchEventsFilterParams
 from .search_events_sort import SearchEventsSortParams
diff --git a/src/square/requests/search_events_response.py b/src/square/requests/search_events_response.py
index ebfbc4a3..e2842fde 100644
--- a/src/square/requests/search_events_response.py
+++ b/src/square/requests/search_events_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .event import EventParams
 from .event_metadata import EventMetadataParams
diff --git a/src/square/requests/search_events_sort.py b/src/square/requests/search_events_sort.py
index 967fe5a0..54702851 100644
--- a/src/square/requests/search_events_sort.py
+++ b/src/square/requests/search_events_sort.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.search_events_sort_field import SearchEventsSortField
 from ..types.sort_order import SortOrder
diff --git a/src/square/requests/search_invoices_response.py b/src/square/requests/search_invoices_response.py
index 79dba59a..58f3da2f 100644
--- a/src/square/requests/search_invoices_response.py
+++ b/src/square/requests/search_invoices_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .invoice import InvoiceParams
+
+import typing_extensions
 from .error import ErrorParams
+from .invoice import InvoiceParams
 
 
 class SearchInvoicesResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_loyalty_accounts_request_loyalty_account_query.py b/src/square/requests/search_loyalty_accounts_request_loyalty_account_query.py
index 439ea77c..519ac8f4 100644
--- a/src/square/requests/search_loyalty_accounts_request_loyalty_account_query.py
+++ b/src/square/requests/search_loyalty_accounts_request_loyalty_account_query.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .loyalty_account_mapping import LoyaltyAccountMappingParams
 
 
diff --git a/src/square/requests/search_loyalty_accounts_response.py b/src/square/requests/search_loyalty_accounts_response.py
index 17893705..f1ce95b8 100644
--- a/src/square/requests/search_loyalty_accounts_response.py
+++ b/src/square/requests/search_loyalty_accounts_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_account import LoyaltyAccountParams
 
diff --git a/src/square/requests/search_loyalty_events_response.py b/src/square/requests/search_loyalty_events_response.py
index f4467bcc..c9b0d376 100644
--- a/src/square/requests/search_loyalty_events_response.py
+++ b/src/square/requests/search_loyalty_events_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_event import LoyaltyEventParams
 
diff --git a/src/square/requests/search_loyalty_rewards_request_loyalty_reward_query.py b/src/square/requests/search_loyalty_rewards_request_loyalty_reward_query.py
index 13ab21fd..7a9600ff 100644
--- a/src/square/requests/search_loyalty_rewards_request_loyalty_reward_query.py
+++ b/src/square/requests/search_loyalty_rewards_request_loyalty_reward_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.loyalty_reward_status import LoyaltyRewardStatus
 
diff --git a/src/square/requests/search_loyalty_rewards_response.py b/src/square/requests/search_loyalty_rewards_response.py
index 421260f0..ae5654f9 100644
--- a/src/square/requests/search_loyalty_rewards_response.py
+++ b/src/square/requests/search_loyalty_rewards_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .loyalty_reward import LoyaltyRewardParams
 
diff --git a/src/square/requests/search_orders_customer_filter.py b/src/square/requests/search_orders_customer_filter.py
index 0cabb7a8..fa8c17e9 100644
--- a/src/square/requests/search_orders_customer_filter.py
+++ b/src/square/requests/search_orders_customer_filter.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class SearchOrdersCustomerFilterParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/search_orders_date_time_filter.py b/src/square/requests/search_orders_date_time_filter.py
index c2a66eba..1d05dd0d 100644
--- a/src/square/requests/search_orders_date_time_filter.py
+++ b/src/square/requests/search_orders_date_time_filter.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .time_range import TimeRangeParams
 
diff --git a/src/square/requests/search_orders_filter.py b/src/square/requests/search_orders_filter.py
index 793a2ae6..cfecf6bb 100644
--- a/src/square/requests/search_orders_filter.py
+++ b/src/square/requests/search_orders_filter.py
@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from .search_orders_state_filter import SearchOrdersStateFilterParams
+from .search_orders_customer_filter import SearchOrdersCustomerFilterParams
 from .search_orders_date_time_filter import SearchOrdersDateTimeFilterParams
 from .search_orders_fulfillment_filter import SearchOrdersFulfillmentFilterParams
 from .search_orders_source_filter import SearchOrdersSourceFilterParams
-from .search_orders_customer_filter import SearchOrdersCustomerFilterParams
+from .search_orders_state_filter import SearchOrdersStateFilterParams
 
 
 class SearchOrdersFilterParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_orders_fulfillment_filter.py b/src/square/requests/search_orders_fulfillment_filter.py
index 72449b18..9507c5ed 100644
--- a/src/square/requests/search_orders_fulfillment_filter.py
+++ b/src/square/requests/search_orders_fulfillment_filter.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from ..types.fulfillment_type import FulfillmentType
+
+import typing_extensions
 from ..types.fulfillment_state import FulfillmentState
+from ..types.fulfillment_type import FulfillmentType
 
 
 class SearchOrdersFulfillmentFilterParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_orders_query.py b/src/square/requests/search_orders_query.py
index 41f1f5f7..0c494a44 100644
--- a/src/square/requests/search_orders_query.py
+++ b/src/square/requests/search_orders_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .search_orders_filter import SearchOrdersFilterParams
 from .search_orders_sort import SearchOrdersSortParams
diff --git a/src/square/requests/search_orders_response.py b/src/square/requests/search_orders_response.py
index 3ed5bb65..f015c711 100644
--- a/src/square/requests/search_orders_response.py
+++ b/src/square/requests/search_orders_response.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .order_entry import OrderEntryParams
-from .order import OrderParams
+
+import typing_extensions
 from .error import ErrorParams
+from .order import OrderParams
+from .order_entry import OrderEntryParams
 
 
 class SearchOrdersResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_orders_sort.py b/src/square/requests/search_orders_sort.py
index 2efc3d85..91ac512e 100644
--- a/src/square/requests/search_orders_sort.py
+++ b/src/square/requests/search_orders_sort.py
@@ -2,7 +2,6 @@
 
 import typing_extensions
 from ..types.search_orders_sort_field import SearchOrdersSortField
-import typing_extensions
 from ..types.sort_order import SortOrder
 
 
diff --git a/src/square/requests/search_orders_source_filter.py b/src/square/requests/search_orders_source_filter.py
index 05a8a92c..673d6535 100644
--- a/src/square/requests/search_orders_source_filter.py
+++ b/src/square/requests/search_orders_source_filter.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class SearchOrdersSourceFilterParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/search_orders_state_filter.py b/src/square/requests/search_orders_state_filter.py
index e43825dc..914fd36f 100644
--- a/src/square/requests/search_orders_state_filter.py
+++ b/src/square/requests/search_orders_state_filter.py
@@ -1,7 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.order_state import OrderState
 
 
diff --git a/src/square/requests/search_scheduled_shifts_response.py b/src/square/requests/search_scheduled_shifts_response.py
index 9e39b534..ff375f33 100644
--- a/src/square/requests/search_scheduled_shifts_response.py
+++ b/src/square/requests/search_scheduled_shifts_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .scheduled_shift import ScheduledShiftParams
+
+import typing_extensions
 from .error import ErrorParams
+from .scheduled_shift import ScheduledShiftParams
 
 
 class SearchScheduledShiftsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_shifts_response.py b/src/square/requests/search_shifts_response.py
index 8ce6a38b..846709cc 100644
--- a/src/square/requests/search_shifts_response.py
+++ b/src/square/requests/search_shifts_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .shift import ShiftParams
+
+import typing_extensions
 from .error import ErrorParams
+from .shift import ShiftParams
 
 
 class SearchShiftsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_subscriptions_filter.py b/src/square/requests/search_subscriptions_filter.py
index 32f4ec74..03019c96 100644
--- a/src/square/requests/search_subscriptions_filter.py
+++ b/src/square/requests/search_subscriptions_filter.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class SearchSubscriptionsFilterParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/search_subscriptions_query.py b/src/square/requests/search_subscriptions_query.py
index b5c3e435..67fd6978 100644
--- a/src/square/requests/search_subscriptions_query.py
+++ b/src/square/requests/search_subscriptions_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .search_subscriptions_filter import SearchSubscriptionsFilterParams
 
diff --git a/src/square/requests/search_subscriptions_response.py b/src/square/requests/search_subscriptions_response.py
index e2489cc7..1ec4ca52 100644
--- a/src/square/requests/search_subscriptions_response.py
+++ b/src/square/requests/search_subscriptions_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 
diff --git a/src/square/requests/search_team_members_filter.py b/src/square/requests/search_team_members_filter.py
index ce7427f9..8b3303f0 100644
--- a/src/square/requests/search_team_members_filter.py
+++ b/src/square/requests/search_team_members_filter.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.team_member_status import TeamMemberStatus
 
 
diff --git a/src/square/requests/search_team_members_query.py b/src/square/requests/search_team_members_query.py
index 95965e03..04c65f8b 100644
--- a/src/square/requests/search_team_members_query.py
+++ b/src/square/requests/search_team_members_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .search_team_members_filter import SearchTeamMembersFilterParams
 
diff --git a/src/square/requests/search_team_members_response.py b/src/square/requests/search_team_members_response.py
index 1db13d28..fba98de6 100644
--- a/src/square/requests/search_team_members_response.py
+++ b/src/square/requests/search_team_members_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .team_member import TeamMemberParams
+
+import typing_extensions
 from .error import ErrorParams
+from .team_member import TeamMemberParams
 
 
 class SearchTeamMembersResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_terminal_actions_response.py b/src/square/requests/search_terminal_actions_response.py
index 66d3ceae..fab186d7 100644
--- a/src/square/requests/search_terminal_actions_response.py
+++ b/src/square/requests/search_terminal_actions_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_action import TerminalActionParams
 
diff --git a/src/square/requests/search_terminal_checkouts_response.py b/src/square/requests/search_terminal_checkouts_response.py
index 85eb1317..b256c4f0 100644
--- a/src/square/requests/search_terminal_checkouts_response.py
+++ b/src/square/requests/search_terminal_checkouts_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_checkout import TerminalCheckoutParams
 
diff --git a/src/square/requests/search_terminal_refunds_response.py b/src/square/requests/search_terminal_refunds_response.py
index c578c273..294976fa 100644
--- a/src/square/requests/search_terminal_refunds_response.py
+++ b/src/square/requests/search_terminal_refunds_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .terminal_refund import TerminalRefundParams
 
diff --git a/src/square/requests/search_timecards_response.py b/src/square/requests/search_timecards_response.py
index aaba9b36..d5905093 100644
--- a/src/square/requests/search_timecards_response.py
+++ b/src/square/requests/search_timecards_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .timecard import TimecardParams
+
+import typing_extensions
 from .error import ErrorParams
+from .timecard import TimecardParams
 
 
 class SearchTimecardsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/search_vendors_request_filter.py b/src/square/requests/search_vendors_request_filter.py
index 9179f6d8..18bb6c48 100644
--- a/src/square/requests/search_vendors_request_filter.py
+++ b/src/square/requests/search_vendors_request_filter.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.vendor_status import VendorStatus
 
 
diff --git a/src/square/requests/search_vendors_request_sort.py b/src/square/requests/search_vendors_request_sort.py
index 666ec42b..fdbc5ab9 100644
--- a/src/square/requests/search_vendors_request_sort.py
+++ b/src/square/requests/search_vendors_request_sort.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.search_vendors_request_sort_field import SearchVendorsRequestSortField
 from ..types.sort_order import SortOrder
diff --git a/src/square/requests/search_vendors_response.py b/src/square/requests/search_vendors_response.py
index 1db5871d..1869dec9 100644
--- a/src/square/requests/search_vendors_response.py
+++ b/src/square/requests/search_vendors_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .vendor import VendorParams
 
diff --git a/src/square/requests/segment_filter.py b/src/square/requests/segment_filter.py
index d1637315..8cc08b52 100644
--- a/src/square/requests/segment_filter.py
+++ b/src/square/requests/segment_filter.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .filter_value import FilterValueParams
 
diff --git a/src/square/requests/select_options.py b/src/square/requests/select_options.py
index 529f527c..facb038b 100644
--- a/src/square/requests/select_options.py
+++ b/src/square/requests/select_options.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing
-from .select_option import SelectOptionParams
+
 import typing_extensions
+from .select_option import SelectOptionParams
 
 
 class SelectOptionsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/shift.py b/src/square/requests/shift.py
index 5001354c..fbcb1412 100644
--- a/src/square/requests/shift.py
+++ b/src/square/requests/shift.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .shift_wage import ShiftWageParams
-from .break_ import BreakParams
+
+import typing_extensions
 from ..types.shift_status import ShiftStatus
+from .break_ import BreakParams
 from .money import MoneyParams
+from .shift_wage import ShiftWageParams
 
 
 class ShiftParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/shift_filter.py b/src/square/requests/shift_filter.py
index d6839b8d..3d7c3f32 100644
--- a/src/square/requests/shift_filter.py
+++ b/src/square/requests/shift_filter.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.shift_filter_status import ShiftFilterStatus
-from .time_range import TimeRangeParams
 from .shift_workday import ShiftWorkdayParams
+from .time_range import TimeRangeParams
 
 
 class ShiftFilterParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/shift_query.py b/src/square/requests/shift_query.py
index b008241d..40437bbb 100644
--- a/src/square/requests/shift_query.py
+++ b/src/square/requests/shift_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .shift_filter import ShiftFilterParams
 from .shift_sort import ShiftSortParams
diff --git a/src/square/requests/shift_sort.py b/src/square/requests/shift_sort.py
index aaba9888..c2d5554f 100644
--- a/src/square/requests/shift_sort.py
+++ b/src/square/requests/shift_sort.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.shift_sort_field import ShiftSortField
 from ..types.sort_order import SortOrder
diff --git a/src/square/requests/shift_wage.py b/src/square/requests/shift_wage.py
index 90949121..b73c05c3 100644
--- a/src/square/requests/shift_wage.py
+++ b/src/square/requests/shift_wage.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/shift_workday.py b/src/square/requests/shift_workday.py
index e52fae32..88b06829 100644
--- a/src/square/requests/shift_workday.py
+++ b/src/square/requests/shift_workday.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
-from .date_range import DateRangeParams
 from ..types.shift_workday_matcher import ShiftWorkdayMatcher
-import typing
+from .date_range import DateRangeParams
 
 
 class ShiftWorkdayParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/shipping_fee.py b/src/square/requests/shipping_fee.py
index 8eab3f4e..7a4c86c3 100644
--- a/src/square/requests/shipping_fee.py
+++ b/src/square/requests/shipping_fee.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/signature_image.py b/src/square/requests/signature_image.py
index ceaa8beb..9d4e6b28 100644
--- a/src/square/requests/signature_image.py
+++ b/src/square/requests/signature_image.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class SignatureImageParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/signature_options.py b/src/square/requests/signature_options.py
index f7dcedfa..3db0f39c 100644
--- a/src/square/requests/signature_options.py
+++ b/src/square/requests/signature_options.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .signature_image import SignatureImageParams
 
 
diff --git a/src/square/requests/site.py b/src/square/requests/site.py
index 07448c1e..4ac251f5 100644
--- a/src/square/requests/site.py
+++ b/src/square/requests/site.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class SiteParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/snippet.py b/src/square/requests/snippet.py
index b8c82ad6..343d4539 100644
--- a/src/square/requests/snippet.py
+++ b/src/square/requests/snippet.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class SnippetParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/source_application.py b/src/square/requests/source_application.py
index 581e159e..2c9daeb6 100644
--- a/src/square/requests/source_application.py
+++ b/src/square/requests/source_application.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.product import Product
-import typing
 
 
 class SourceApplicationParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/square_account_details.py b/src/square/requests/square_account_details.py
index 1e00023e..6df3dd4e 100644
--- a/src/square/requests/square_account_details.py
+++ b/src/square/requests/square_account_details.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/standard_unit_description.py b/src/square/requests/standard_unit_description.py
index 88550059..30f253e0 100644
--- a/src/square/requests/standard_unit_description.py
+++ b/src/square/requests/standard_unit_description.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .measurement_unit import MeasurementUnitParams
-import typing
 
 
 class StandardUnitDescriptionParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/standard_unit_description_group.py b/src/square/requests/standard_unit_description_group.py
index 1d149127..fd807948 100644
--- a/src/square/requests/standard_unit_description_group.py
+++ b/src/square/requests/standard_unit_description_group.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .standard_unit_description import StandardUnitDescriptionParams
 
 
diff --git a/src/square/requests/submit_evidence_response.py b/src/square/requests/submit_evidence_response.py
index 49c25291..6e90c99a 100644
--- a/src/square/requests/submit_evidence_response.py
+++ b/src/square/requests/submit_evidence_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .dispute import DisputeParams
+from .error import ErrorParams
 
 
 class SubmitEvidenceResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/subscription.py b/src/square/requests/subscription.py
index 7df62b03..274eb7c1 100644
--- a/src/square/requests/subscription.py
+++ b/src/square/requests/subscription.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.subscription_status import SubscriptionStatus
 from .money import MoneyParams
-from .subscription_source import SubscriptionSourceParams
-from .subscription_action import SubscriptionActionParams
 from .phase import PhaseParams
+from .subscription_action import SubscriptionActionParams
+from .subscription_source import SubscriptionSourceParams
 
 
 class SubscriptionParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/subscription_action.py b/src/square/requests/subscription_action.py
index 9c6be863..e438a19f 100644
--- a/src/square/requests/subscription_action.py
+++ b/src/square/requests/subscription_action.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.subscription_action_type import SubscriptionActionType
-import typing
 from .phase import PhaseParams
 
 
diff --git a/src/square/requests/subscription_created_event.py b/src/square/requests/subscription_created_event.py
index 042d78a4..9e9d1cda 100644
--- a/src/square/requests/subscription_created_event.py
+++ b/src/square/requests/subscription_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .subscription_created_event_data import SubscriptionCreatedEventDataParams
 
 
diff --git a/src/square/requests/subscription_created_event_data.py b/src/square/requests/subscription_created_event_data.py
index 6f2c999f..5b871c25 100644
--- a/src/square/requests/subscription_created_event_data.py
+++ b/src/square/requests/subscription_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .subscription_created_event_object import SubscriptionCreatedEventObjectParams
 
 
diff --git a/src/square/requests/subscription_created_event_object.py b/src/square/requests/subscription_created_event_object.py
index ac0f44b8..99137a37 100644
--- a/src/square/requests/subscription_created_event_object.py
+++ b/src/square/requests/subscription_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .subscription import SubscriptionParams
 
diff --git a/src/square/requests/subscription_event.py b/src/square/requests/subscription_event.py
index 71effc95..b0965c53 100644
--- a/src/square/requests/subscription_event.py
+++ b/src/square/requests/subscription_event.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
 from ..types.subscription_event_subscription_event_type import SubscriptionEventSubscriptionEventType
-import typing_extensions
-from .subscription_event_info import SubscriptionEventInfoParams
-import typing
 from .phase import PhaseParams
+from .subscription_event_info import SubscriptionEventInfoParams
 
 
 class SubscriptionEventParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/subscription_event_info.py b/src/square/requests/subscription_event_info.py
index ab0267a3..dd17061f 100644
--- a/src/square/requests/subscription_event_info.py
+++ b/src/square/requests/subscription_event_info.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.subscription_event_info_code import SubscriptionEventInfoCode
 
 
diff --git a/src/square/requests/subscription_phase.py b/src/square/requests/subscription_phase.py
index 7819cf86..398746d0 100644
--- a/src/square/requests/subscription_phase.py
+++ b/src/square/requests/subscription_phase.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.subscription_cadence import SubscriptionCadence
 from .money import MoneyParams
 from .subscription_pricing import SubscriptionPricingParams
diff --git a/src/square/requests/subscription_pricing.py b/src/square/requests/subscription_pricing.py
index fe18bd2b..746474a1 100644
--- a/src/square/requests/subscription_pricing.py
+++ b/src/square/requests/subscription_pricing.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.subscription_pricing_type import SubscriptionPricingType
-import typing
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/subscription_source.py b/src/square/requests/subscription_source.py
index d47cde83..affd05ee 100644
--- a/src/square/requests/subscription_source.py
+++ b/src/square/requests/subscription_source.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class SubscriptionSourceParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/subscription_test_result.py b/src/square/requests/subscription_test_result.py
index b4f852c3..055c636b 100644
--- a/src/square/requests/subscription_test_result.py
+++ b/src/square/requests/subscription_test_result.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class SubscriptionTestResultParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/subscription_updated_event.py b/src/square/requests/subscription_updated_event.py
index 0e4221f9..f26b4bb2 100644
--- a/src/square/requests/subscription_updated_event.py
+++ b/src/square/requests/subscription_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .subscription_updated_event_data import SubscriptionUpdatedEventDataParams
 
 
diff --git a/src/square/requests/subscription_updated_event_data.py b/src/square/requests/subscription_updated_event_data.py
index c52e8cd8..c13941dc 100644
--- a/src/square/requests/subscription_updated_event_data.py
+++ b/src/square/requests/subscription_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .subscription_updated_event_object import SubscriptionUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/subscription_updated_event_object.py b/src/square/requests/subscription_updated_event_object.py
index 27d2f9b4..5553893a 100644
--- a/src/square/requests/subscription_updated_event_object.py
+++ b/src/square/requests/subscription_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .subscription import SubscriptionParams
 
diff --git a/src/square/requests/swap_plan_response.py b/src/square/requests/swap_plan_response.py
index 5270c11b..4d37006b 100644
--- a/src/square/requests/swap_plan_response.py
+++ b/src/square/requests/swap_plan_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 from .subscription_action import SubscriptionActionParams
diff --git a/src/square/requests/tax_ids.py b/src/square/requests/tax_ids.py
index d50377c4..14d02b6b 100644
--- a/src/square/requests/tax_ids.py
+++ b/src/square/requests/tax_ids.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class TaxIdsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/team_member.py b/src/square/requests/team_member.py
index 98036314..e4578990 100644
--- a/src/square/requests/team_member.py
+++ b/src/square/requests/team_member.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.team_member_status import TeamMemberStatus
 from .team_member_assigned_locations import TeamMemberAssignedLocationsParams
 from .wage_setting import WageSettingParams
diff --git a/src/square/requests/team_member_assigned_locations.py b/src/square/requests/team_member_assigned_locations.py
index 5e9748d8..77aeb850 100644
--- a/src/square/requests/team_member_assigned_locations.py
+++ b/src/square/requests/team_member_assigned_locations.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from ..types.team_member_assigned_locations_assignment_type import TeamMemberAssignedLocationsAssignmentType
-import typing
 
 
 class TeamMemberAssignedLocationsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/team_member_booking_profile.py b/src/square/requests/team_member_booking_profile.py
index 93e11c7e..55ef8dad 100644
--- a/src/square/requests/team_member_booking_profile.py
+++ b/src/square/requests/team_member_booking_profile.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class TeamMemberBookingProfileParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/team_member_created_event.py b/src/square/requests/team_member_created_event.py
index 90b5a596..dddbbb8e 100644
--- a/src/square/requests/team_member_created_event.py
+++ b/src/square/requests/team_member_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .team_member_created_event_data import TeamMemberCreatedEventDataParams
 
 
diff --git a/src/square/requests/team_member_created_event_data.py b/src/square/requests/team_member_created_event_data.py
index 6edd1f1f..0e251405 100644
--- a/src/square/requests/team_member_created_event_data.py
+++ b/src/square/requests/team_member_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .team_member_created_event_object import TeamMemberCreatedEventObjectParams
 
 
diff --git a/src/square/requests/team_member_created_event_object.py b/src/square/requests/team_member_created_event_object.py
index 980f4f9b..d1edb904 100644
--- a/src/square/requests/team_member_created_event_object.py
+++ b/src/square/requests/team_member_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .team_member import TeamMemberParams
 
diff --git a/src/square/requests/team_member_updated_event.py b/src/square/requests/team_member_updated_event.py
index 98bc0f02..f63392ed 100644
--- a/src/square/requests/team_member_updated_event.py
+++ b/src/square/requests/team_member_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .team_member_updated_event_data import TeamMemberUpdatedEventDataParams
 
 
diff --git a/src/square/requests/team_member_updated_event_data.py b/src/square/requests/team_member_updated_event_data.py
index cc5ba98a..08398360 100644
--- a/src/square/requests/team_member_updated_event_data.py
+++ b/src/square/requests/team_member_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .team_member_updated_event_object import TeamMemberUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/team_member_updated_event_object.py b/src/square/requests/team_member_updated_event_object.py
index 1668fbe8..d95b587c 100644
--- a/src/square/requests/team_member_updated_event_object.py
+++ b/src/square/requests/team_member_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .team_member import TeamMemberParams
 
diff --git a/src/square/requests/team_member_wage.py b/src/square/requests/team_member_wage.py
index 72a1a796..2d2a947d 100644
--- a/src/square/requests/team_member_wage.py
+++ b/src/square/requests/team_member_wage.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/team_member_wage_setting_updated_event.py b/src/square/requests/team_member_wage_setting_updated_event.py
index 5a035870..f43b6719 100644
--- a/src/square/requests/team_member_wage_setting_updated_event.py
+++ b/src/square/requests/team_member_wage_setting_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .team_member_wage_setting_updated_event_data import TeamMemberWageSettingUpdatedEventDataParams
 
 
diff --git a/src/square/requests/team_member_wage_setting_updated_event_data.py b/src/square/requests/team_member_wage_setting_updated_event_data.py
index 6e7e7f66..aeb5e64d 100644
--- a/src/square/requests/team_member_wage_setting_updated_event_data.py
+++ b/src/square/requests/team_member_wage_setting_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .team_member_wage_setting_updated_event_object import TeamMemberWageSettingUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/team_member_wage_setting_updated_event_object.py b/src/square/requests/team_member_wage_setting_updated_event_object.py
index f2bcc33f..4470c4bc 100644
--- a/src/square/requests/team_member_wage_setting_updated_event_object.py
+++ b/src/square/requests/team_member_wage_setting_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .wage_setting import WageSettingParams
 
diff --git a/src/square/requests/tender.py b/src/square/requests/tender.py
index 0fc703fd..c85d0d50 100644
--- a/src/square/requests/tender.py
+++ b/src/square/requests/tender.py
@@ -1,16 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .money import MoneyParams
+
+import typing_extensions
 from ..types.tender_type import TenderType
-from .tender_card_details import TenderCardDetailsParams
-from .tender_cash_details import TenderCashDetailsParams
+from .additional_recipient import AdditionalRecipientParams
+from .money import MoneyParams
 from .tender_bank_account_details import TenderBankAccountDetailsParams
 from .tender_buy_now_pay_later_details import TenderBuyNowPayLaterDetailsParams
+from .tender_card_details import TenderCardDetailsParams
+from .tender_cash_details import TenderCashDetailsParams
 from .tender_square_account_details import TenderSquareAccountDetailsParams
-from .additional_recipient import AdditionalRecipientParams
 
 
 class TenderParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/tender_bank_account_details.py b/src/square/requests/tender_bank_account_details.py
index bbef9618..3e5124f7 100644
--- a/src/square/requests/tender_bank_account_details.py
+++ b/src/square/requests/tender_bank_account_details.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.tender_bank_account_details_status import TenderBankAccountDetailsStatus
 
diff --git a/src/square/requests/tender_buy_now_pay_later_details.py b/src/square/requests/tender_buy_now_pay_later_details.py
index 51c90413..c68f9615 100644
--- a/src/square/requests/tender_buy_now_pay_later_details.py
+++ b/src/square/requests/tender_buy_now_pay_later_details.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.tender_buy_now_pay_later_details_brand import TenderBuyNowPayLaterDetailsBrand
 from ..types.tender_buy_now_pay_later_details_status import TenderBuyNowPayLaterDetailsStatus
diff --git a/src/square/requests/tender_card_details.py b/src/square/requests/tender_card_details.py
index fa3b0720..5ad38675 100644
--- a/src/square/requests/tender_card_details.py
+++ b/src/square/requests/tender_card_details.py
@@ -1,10 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
+from ..types.tender_card_details_entry_method import TenderCardDetailsEntryMethod
 from ..types.tender_card_details_status import TenderCardDetailsStatus
 from .card import CardParams
-from ..types.tender_card_details_entry_method import TenderCardDetailsEntryMethod
 
 
 class TenderCardDetailsParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/tender_cash_details.py b/src/square/requests/tender_cash_details.py
index e0a56d35..a1ef03b1 100644
--- a/src/square/requests/tender_cash_details.py
+++ b/src/square/requests/tender_cash_details.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .money import MoneyParams
 
diff --git a/src/square/requests/tender_square_account_details.py b/src/square/requests/tender_square_account_details.py
index f40227b3..16110945 100644
--- a/src/square/requests/tender_square_account_details.py
+++ b/src/square/requests/tender_square_account_details.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.tender_square_account_details_status import TenderSquareAccountDetailsStatus
 
diff --git a/src/square/requests/terminal_action.py b/src/square/requests/terminal_action.py
index 54b54627..139ba41b 100644
--- a/src/square/requests/terminal_action.py
+++ b/src/square/requests/terminal_action.py
@@ -1,18 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.action_cancel_reason import ActionCancelReason
 from ..types.terminal_action_action_type import TerminalActionActionType
-from .qr_code_options import QrCodeOptionsParams
-from .save_card_options import SaveCardOptionsParams
-from .signature_options import SignatureOptionsParams
 from .confirmation_options import ConfirmationOptionsParams
-from .receipt_options import ReceiptOptionsParams
 from .data_collection_options import DataCollectionOptionsParams
-from .select_options import SelectOptionsParams
 from .device_metadata import DeviceMetadataParams
+from .qr_code_options import QrCodeOptionsParams
+from .receipt_options import ReceiptOptionsParams
+from .save_card_options import SaveCardOptionsParams
+from .select_options import SelectOptionsParams
+from .signature_options import SignatureOptionsParams
 
 
 class TerminalActionParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/terminal_action_created_event.py b/src/square/requests/terminal_action_created_event.py
index 4ff6bd35..02e35f0c 100644
--- a/src/square/requests/terminal_action_created_event.py
+++ b/src/square/requests/terminal_action_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_action_created_event_data import TerminalActionCreatedEventDataParams
 
 
diff --git a/src/square/requests/terminal_action_created_event_data.py b/src/square/requests/terminal_action_created_event_data.py
index dc6c9e32..aca2ffca 100644
--- a/src/square/requests/terminal_action_created_event_data.py
+++ b/src/square/requests/terminal_action_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_action_created_event_object import TerminalActionCreatedEventObjectParams
 
 
diff --git a/src/square/requests/terminal_action_created_event_object.py b/src/square/requests/terminal_action_created_event_object.py
index 08ab497a..b73c0f7b 100644
--- a/src/square/requests/terminal_action_created_event_object.py
+++ b/src/square/requests/terminal_action_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .terminal_action import TerminalActionParams
 
diff --git a/src/square/requests/terminal_action_query.py b/src/square/requests/terminal_action_query.py
index 7b8a2f5b..400853ec 100644
--- a/src/square/requests/terminal_action_query.py
+++ b/src/square/requests/terminal_action_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .terminal_action_query_filter import TerminalActionQueryFilterParams
 from .terminal_action_query_sort import TerminalActionQuerySortParams
diff --git a/src/square/requests/terminal_action_query_filter.py b/src/square/requests/terminal_action_query_filter.py
index 36a76a4f..bcc1f38a 100644
--- a/src/square/requests/terminal_action_query_filter.py
+++ b/src/square/requests/terminal_action_query_filter.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .time_range import TimeRangeParams
+
+import typing_extensions
 from ..types.terminal_action_action_type import TerminalActionActionType
+from .time_range import TimeRangeParams
 
 
 class TerminalActionQueryFilterParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/terminal_action_query_sort.py b/src/square/requests/terminal_action_query_sort.py
index bc732dc8..b507783b 100644
--- a/src/square/requests/terminal_action_query_sort.py
+++ b/src/square/requests/terminal_action_query_sort.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.sort_order import SortOrder
 
diff --git a/src/square/requests/terminal_action_updated_event.py b/src/square/requests/terminal_action_updated_event.py
index b6f1492f..b581ca15 100644
--- a/src/square/requests/terminal_action_updated_event.py
+++ b/src/square/requests/terminal_action_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_action_updated_event_data import TerminalActionUpdatedEventDataParams
 
 
diff --git a/src/square/requests/terminal_action_updated_event_data.py b/src/square/requests/terminal_action_updated_event_data.py
index c976ee8b..71e90dea 100644
--- a/src/square/requests/terminal_action_updated_event_data.py
+++ b/src/square/requests/terminal_action_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_action_updated_event_object import TerminalActionUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/terminal_action_updated_event_object.py b/src/square/requests/terminal_action_updated_event_object.py
index 753171d1..12e8cc0b 100644
--- a/src/square/requests/terminal_action_updated_event_object.py
+++ b/src/square/requests/terminal_action_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .terminal_action import TerminalActionParams
 
diff --git a/src/square/requests/terminal_checkout.py b/src/square/requests/terminal_checkout.py
index 8655cabf..95a5ad93 100644
--- a/src/square/requests/terminal_checkout.py
+++ b/src/square/requests/terminal_checkout.py
@@ -1,13 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .money import MoneyParams
 import typing
-from .payment_options import PaymentOptionsParams
-from .device_checkout_options import DeviceCheckoutOptionsParams
+
+import typing_extensions
 from ..types.action_cancel_reason import ActionCancelReason
 from ..types.checkout_options_payment_type import CheckoutOptionsPaymentType
+from .device_checkout_options import DeviceCheckoutOptionsParams
+from .money import MoneyParams
+from .payment_options import PaymentOptionsParams
 
 
 class TerminalCheckoutParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/terminal_checkout_created_event.py b/src/square/requests/terminal_checkout_created_event.py
index 99e58b60..7d81a356 100644
--- a/src/square/requests/terminal_checkout_created_event.py
+++ b/src/square/requests/terminal_checkout_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_checkout_created_event_data import TerminalCheckoutCreatedEventDataParams
 
 
diff --git a/src/square/requests/terminal_checkout_created_event_data.py b/src/square/requests/terminal_checkout_created_event_data.py
index 53d3ea6e..643728ff 100644
--- a/src/square/requests/terminal_checkout_created_event_data.py
+++ b/src/square/requests/terminal_checkout_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_checkout_created_event_object import TerminalCheckoutCreatedEventObjectParams
 
 
diff --git a/src/square/requests/terminal_checkout_created_event_object.py b/src/square/requests/terminal_checkout_created_event_object.py
index 223147f7..e013ab03 100644
--- a/src/square/requests/terminal_checkout_created_event_object.py
+++ b/src/square/requests/terminal_checkout_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .terminal_checkout import TerminalCheckoutParams
 
diff --git a/src/square/requests/terminal_checkout_query.py b/src/square/requests/terminal_checkout_query.py
index eb53834a..a6cfdeca 100644
--- a/src/square/requests/terminal_checkout_query.py
+++ b/src/square/requests/terminal_checkout_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .terminal_checkout_query_filter import TerminalCheckoutQueryFilterParams
 from .terminal_checkout_query_sort import TerminalCheckoutQuerySortParams
diff --git a/src/square/requests/terminal_checkout_query_filter.py b/src/square/requests/terminal_checkout_query_filter.py
index d9f22a97..5261f298 100644
--- a/src/square/requests/terminal_checkout_query_filter.py
+++ b/src/square/requests/terminal_checkout_query_filter.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .time_range import TimeRangeParams
 
 
diff --git a/src/square/requests/terminal_checkout_query_sort.py b/src/square/requests/terminal_checkout_query_sort.py
index 48108b5d..cc80f534 100644
--- a/src/square/requests/terminal_checkout_query_sort.py
+++ b/src/square/requests/terminal_checkout_query_sort.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.sort_order import SortOrder
 
diff --git a/src/square/requests/terminal_checkout_updated_event.py b/src/square/requests/terminal_checkout_updated_event.py
index 0c30f535..f8835ca8 100644
--- a/src/square/requests/terminal_checkout_updated_event.py
+++ b/src/square/requests/terminal_checkout_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_checkout_updated_event_data import TerminalCheckoutUpdatedEventDataParams
 
 
diff --git a/src/square/requests/terminal_checkout_updated_event_data.py b/src/square/requests/terminal_checkout_updated_event_data.py
index e6b62184..71fbb0d0 100644
--- a/src/square/requests/terminal_checkout_updated_event_data.py
+++ b/src/square/requests/terminal_checkout_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_checkout_updated_event_object import TerminalCheckoutUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/terminal_checkout_updated_event_object.py b/src/square/requests/terminal_checkout_updated_event_object.py
index c75ac7c4..d17cd956 100644
--- a/src/square/requests/terminal_checkout_updated_event_object.py
+++ b/src/square/requests/terminal_checkout_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .terminal_checkout import TerminalCheckoutParams
 
diff --git a/src/square/requests/terminal_refund.py b/src/square/requests/terminal_refund.py
index 277f13da..919bb414 100644
--- a/src/square/requests/terminal_refund.py
+++ b/src/square/requests/terminal_refund.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .money import MoneyParams
 import typing
+
+import typing_extensions
 from ..types.action_cancel_reason import ActionCancelReason
+from .money import MoneyParams
 
 
 class TerminalRefundParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/terminal_refund_created_event.py b/src/square/requests/terminal_refund_created_event.py
index 6b78e78a..6da7689e 100644
--- a/src/square/requests/terminal_refund_created_event.py
+++ b/src/square/requests/terminal_refund_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_refund_created_event_data import TerminalRefundCreatedEventDataParams
 
 
diff --git a/src/square/requests/terminal_refund_created_event_data.py b/src/square/requests/terminal_refund_created_event_data.py
index d0c28840..7fd127de 100644
--- a/src/square/requests/terminal_refund_created_event_data.py
+++ b/src/square/requests/terminal_refund_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_refund_created_event_object import TerminalRefundCreatedEventObjectParams
 
 
diff --git a/src/square/requests/terminal_refund_created_event_object.py b/src/square/requests/terminal_refund_created_event_object.py
index 02dd792d..1ea59baa 100644
--- a/src/square/requests/terminal_refund_created_event_object.py
+++ b/src/square/requests/terminal_refund_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .terminal_refund import TerminalRefundParams
 
diff --git a/src/square/requests/terminal_refund_query.py b/src/square/requests/terminal_refund_query.py
index 7365aad9..9ebe3b65 100644
--- a/src/square/requests/terminal_refund_query.py
+++ b/src/square/requests/terminal_refund_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .terminal_refund_query_filter import TerminalRefundQueryFilterParams
 from .terminal_refund_query_sort import TerminalRefundQuerySortParams
diff --git a/src/square/requests/terminal_refund_query_filter.py b/src/square/requests/terminal_refund_query_filter.py
index 59932733..496d531b 100644
--- a/src/square/requests/terminal_refund_query_filter.py
+++ b/src/square/requests/terminal_refund_query_filter.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .time_range import TimeRangeParams
 
 
diff --git a/src/square/requests/terminal_refund_query_sort.py b/src/square/requests/terminal_refund_query_sort.py
index 2dd8de16..0e70d903 100644
--- a/src/square/requests/terminal_refund_query_sort.py
+++ b/src/square/requests/terminal_refund_query_sort.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class TerminalRefundQuerySortParams(typing_extensions.TypedDict):
     sort_order: typing_extensions.NotRequired[typing.Optional[str]]
diff --git a/src/square/requests/terminal_refund_updated_event.py b/src/square/requests/terminal_refund_updated_event.py
index 4e3e1dbd..662a1f0f 100644
--- a/src/square/requests/terminal_refund_updated_event.py
+++ b/src/square/requests/terminal_refund_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_refund_updated_event_data import TerminalRefundUpdatedEventDataParams
 
 
diff --git a/src/square/requests/terminal_refund_updated_event_data.py b/src/square/requests/terminal_refund_updated_event_data.py
index 38f52f1f..8f9dc5b6 100644
--- a/src/square/requests/terminal_refund_updated_event_data.py
+++ b/src/square/requests/terminal_refund_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .terminal_refund_updated_event_object import TerminalRefundUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/terminal_refund_updated_event_object.py b/src/square/requests/terminal_refund_updated_event_object.py
index 3d813009..e90ca1ba 100644
--- a/src/square/requests/terminal_refund_updated_event_object.py
+++ b/src/square/requests/terminal_refund_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .terminal_refund import TerminalRefundParams
 
diff --git a/src/square/requests/test_webhook_subscription_response.py b/src/square/requests/test_webhook_subscription_response.py
index 77e779de..bf5bdeb1 100644
--- a/src/square/requests/test_webhook_subscription_response.py
+++ b/src/square/requests/test_webhook_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription_test_result import SubscriptionTestResultParams
 
diff --git a/src/square/requests/time_range.py b/src/square/requests/time_range.py
index b2e14704..571e51d0 100644
--- a/src/square/requests/time_range.py
+++ b/src/square/requests/time_range.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class TimeRangeParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/timecard.py b/src/square/requests/timecard.py
index b128f6a6..eff6a27a 100644
--- a/src/square/requests/timecard.py
+++ b/src/square/requests/timecard.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .timecard_wage import TimecardWageParams
-from .break_ import BreakParams
+
+import typing_extensions
 from ..types.timecard_status import TimecardStatus
+from .break_ import BreakParams
 from .money import MoneyParams
+from .timecard_wage import TimecardWageParams
 
 
 class TimecardParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/timecard_filter.py b/src/square/requests/timecard_filter.py
index 833a5f74..5e9fe2fb 100644
--- a/src/square/requests/timecard_filter.py
+++ b/src/square/requests/timecard_filter.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.timecard_filter_status import TimecardFilterStatus
 from .time_range import TimeRangeParams
 from .timecard_workday import TimecardWorkdayParams
diff --git a/src/square/requests/timecard_query.py b/src/square/requests/timecard_query.py
index b7fd7dd6..b4f4ae40 100644
--- a/src/square/requests/timecard_query.py
+++ b/src/square/requests/timecard_query.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .timecard_filter import TimecardFilterParams
 from .timecard_sort import TimecardSortParams
diff --git a/src/square/requests/timecard_sort.py b/src/square/requests/timecard_sort.py
index d2702590..7b1760d0 100644
--- a/src/square/requests/timecard_sort.py
+++ b/src/square/requests/timecard_sort.py
@@ -1,9 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
-from ..types.timecard_sort_field import TimecardSortField
 from ..types.sort_order import SortOrder
+from ..types.timecard_sort_field import TimecardSortField
 
 
 class TimecardSortParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/timecard_wage.py b/src/square/requests/timecard_wage.py
index c7d1bee3..366b04bd 100644
--- a/src/square/requests/timecard_wage.py
+++ b/src/square/requests/timecard_wage.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .money import MoneyParams
 
 
diff --git a/src/square/requests/timecard_workday.py b/src/square/requests/timecard_workday.py
index c3f710a1..81399569 100644
--- a/src/square/requests/timecard_workday.py
+++ b/src/square/requests/timecard_workday.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
 import typing_extensions
-import typing_extensions
-from .date_range import DateRangeParams
 from ..types.timecard_workday_matcher import TimecardWorkdayMatcher
-import typing
+from .date_range import DateRangeParams
 
 
 class TimecardWorkdayParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/tip_settings.py b/src/square/requests/tip_settings.py
index 75b4cc86..1f858881 100644
--- a/src/square/requests/tip_settings.py
+++ b/src/square/requests/tip_settings.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class TipSettingsParams(typing_extensions.TypedDict):
     allow_tipping: typing_extensions.NotRequired[typing.Optional[bool]]
diff --git a/src/square/requests/transaction.py b/src/square/requests/transaction.py
index e90896f1..a851a4b1 100644
--- a/src/square/requests/transaction.py
+++ b/src/square/requests/transaction.py
@@ -1,12 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .tender import TenderParams
-from .refund import RefundParams
+
+import typing_extensions
 from ..types.transaction_product import TransactionProduct
 from .address import AddressParams
+from .refund import RefundParams
+from .tender import TenderParams
 
 
 class TransactionParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/unlink_customer_from_gift_card_response.py b/src/square/requests/unlink_customer_from_gift_card_response.py
index 6c8bdd96..b5b547a1 100644
--- a/src/square/requests/unlink_customer_from_gift_card_response.py
+++ b/src/square/requests/unlink_customer_from_gift_card_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .gift_card import GiftCardParams
 
diff --git a/src/square/requests/update_booking_custom_attribute_definition_response.py b/src/square/requests/update_booking_custom_attribute_definition_response.py
index 384e4289..fcbf489b 100644
--- a/src/square/requests/update_booking_custom_attribute_definition_response.py
+++ b/src/square/requests/update_booking_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_booking_response.py b/src/square/requests/update_booking_response.py
index 0e6f9a3a..6bc6b64c 100644
--- a/src/square/requests/update_booking_response.py
+++ b/src/square/requests/update_booking_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .booking import BookingParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_break_type_response.py b/src/square/requests/update_break_type_response.py
index 88080a68..b0469bf6 100644
--- a/src/square/requests/update_break_type_response.py
+++ b/src/square/requests/update_break_type_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .break_type import BreakTypeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_catalog_image_response.py b/src/square/requests/update_catalog_image_response.py
index 744425c8..12e4512f 100644
--- a/src/square/requests/update_catalog_image_response.py
+++ b/src/square/requests/update_catalog_image_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .catalog_object import CatalogObjectParams
+from .error import ErrorParams
 
 
 class UpdateCatalogImageResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_customer_custom_attribute_definition_response.py b/src/square/requests/update_customer_custom_attribute_definition_response.py
index fbdac86d..166bbeba 100644
--- a/src/square/requests/update_customer_custom_attribute_definition_response.py
+++ b/src/square/requests/update_customer_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_customer_group_response.py b/src/square/requests/update_customer_group_response.py
index fb13daa2..536d4ee8 100644
--- a/src/square/requests/update_customer_group_response.py
+++ b/src/square/requests/update_customer_group_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer_group import CustomerGroupParams
+from .error import ErrorParams
 
 
 class UpdateCustomerGroupResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_customer_response.py b/src/square/requests/update_customer_response.py
index 6ab19543..327a31f6 100644
--- a/src/square/requests/update_customer_response.py
+++ b/src/square/requests/update_customer_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .customer import CustomerParams
+from .error import ErrorParams
 
 
 class UpdateCustomerResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_invoice_response.py b/src/square/requests/update_invoice_response.py
index c5e0f5a6..1a1b0a46 100644
--- a/src/square/requests/update_invoice_response.py
+++ b/src/square/requests/update_invoice_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .invoice import InvoiceParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .invoice import InvoiceParams
 
 
 class UpdateInvoiceResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_item_modifier_lists_response.py b/src/square/requests/update_item_modifier_lists_response.py
index effa0f67..483bd155 100644
--- a/src/square/requests/update_item_modifier_lists_response.py
+++ b/src/square/requests/update_item_modifier_lists_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_item_taxes_response.py b/src/square/requests/update_item_taxes_response.py
index 57fdb7e4..68f30735 100644
--- a/src/square/requests/update_item_taxes_response.py
+++ b/src/square/requests/update_item_taxes_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_job_response.py b/src/square/requests/update_job_response.py
index 26aac973..0ed8f5a7 100644
--- a/src/square/requests/update_job_response.py
+++ b/src/square/requests/update_job_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .job import JobParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .job import JobParams
 
 
 class UpdateJobResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_location_custom_attribute_definition_response.py b/src/square/requests/update_location_custom_attribute_definition_response.py
index fc30eaa1..d048dafc 100644
--- a/src/square/requests/update_location_custom_attribute_definition_response.py
+++ b/src/square/requests/update_location_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_location_response.py b/src/square/requests/update_location_response.py
index 012f6e40..39ea07e2 100644
--- a/src/square/requests/update_location_response.py
+++ b/src/square/requests/update_location_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .location import LocationParams
 
diff --git a/src/square/requests/update_location_settings_response.py b/src/square/requests/update_location_settings_response.py
index e6f8162a..1baec76f 100644
--- a/src/square/requests/update_location_settings_response.py
+++ b/src/square/requests/update_location_settings_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .checkout_location_settings import CheckoutLocationSettingsParams
+from .error import ErrorParams
 
 
 class UpdateLocationSettingsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_merchant_custom_attribute_definition_response.py b/src/square/requests/update_merchant_custom_attribute_definition_response.py
index 45836a30..2496b814 100644
--- a/src/square/requests/update_merchant_custom_attribute_definition_response.py
+++ b/src/square/requests/update_merchant_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_merchant_settings_response.py b/src/square/requests/update_merchant_settings_response.py
index d0470471..c01e2473 100644
--- a/src/square/requests/update_merchant_settings_response.py
+++ b/src/square/requests/update_merchant_settings_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from .checkout_merchant_settings import CheckoutMerchantSettingsParams
+from .error import ErrorParams
 
 
 class UpdateMerchantSettingsResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_order_custom_attribute_definition_response.py b/src/square/requests/update_order_custom_attribute_definition_response.py
index 7355c1d0..4f017ce9 100644
--- a/src/square/requests/update_order_custom_attribute_definition_response.py
+++ b/src/square/requests/update_order_custom_attribute_definition_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute_definition import CustomAttributeDefinitionParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_order_response.py b/src/square/requests/update_order_response.py
index 6a1bb6dc..5de4049a 100644
--- a/src/square/requests/update_order_response.py
+++ b/src/square/requests/update_order_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .order import OrderParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .order import OrderParams
 
 
 class UpdateOrderResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_payment_link_response.py b/src/square/requests/update_payment_link_response.py
index da847e4e..cca78889 100644
--- a/src/square/requests/update_payment_link_response.py
+++ b/src/square/requests/update_payment_link_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment_link import PaymentLinkParams
 
diff --git a/src/square/requests/update_payment_response.py b/src/square/requests/update_payment_response.py
index ab511b34..9f2e2a02 100644
--- a/src/square/requests/update_payment_response.py
+++ b/src/square/requests/update_payment_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .payment import PaymentParams
 
diff --git a/src/square/requests/update_scheduled_shift_response.py b/src/square/requests/update_scheduled_shift_response.py
index fcc21e63..654f2df2 100644
--- a/src/square/requests/update_scheduled_shift_response.py
+++ b/src/square/requests/update_scheduled_shift_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .scheduled_shift import ScheduledShiftParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .scheduled_shift import ScheduledShiftParams
 
 
 class UpdateScheduledShiftResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_shift_response.py b/src/square/requests/update_shift_response.py
index 1749ba06..190b0a10 100644
--- a/src/square/requests/update_shift_response.py
+++ b/src/square/requests/update_shift_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .shift import ShiftParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .shift import ShiftParams
 
 
 class UpdateShiftResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_subscription_response.py b/src/square/requests/update_subscription_response.py
index 3dd0e07f..522752d5 100644
--- a/src/square/requests/update_subscription_response.py
+++ b/src/square/requests/update_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .subscription import SubscriptionParams
 
diff --git a/src/square/requests/update_team_member_request.py b/src/square/requests/update_team_member_request.py
index d03dfcff..ad652136 100644
--- a/src/square/requests/update_team_member_request.py
+++ b/src/square/requests/update_team_member_request.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from .team_member import TeamMemberParams
 
diff --git a/src/square/requests/update_team_member_response.py b/src/square/requests/update_team_member_response.py
index 39f6ee3b..72d8dc36 100644
--- a/src/square/requests/update_team_member_response.py
+++ b/src/square/requests/update_team_member_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .team_member import TeamMemberParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .team_member import TeamMemberParams
 
 
 class UpdateTeamMemberResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_timecard_response.py b/src/square/requests/update_timecard_response.py
index ead80da7..313a6ab2 100644
--- a/src/square/requests/update_timecard_response.py
+++ b/src/square/requests/update_timecard_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .timecard import TimecardParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .timecard import TimecardParams
 
 
 class UpdateTimecardResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_vendor_request.py b/src/square/requests/update_vendor_request.py
index 743d10d1..04176e0c 100644
--- a/src/square/requests/update_vendor_request.py
+++ b/src/square/requests/update_vendor_request.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .vendor import VendorParams
 
 
diff --git a/src/square/requests/update_vendor_response.py b/src/square/requests/update_vendor_response.py
index 7f650293..05805b99 100644
--- a/src/square/requests/update_vendor_response.py
+++ b/src/square/requests/update_vendor_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .vendor import VendorParams
 
diff --git a/src/square/requests/update_wage_setting_response.py b/src/square/requests/update_wage_setting_response.py
index 78cc16a1..401d762c 100644
--- a/src/square/requests/update_wage_setting_response.py
+++ b/src/square/requests/update_wage_setting_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .wage_setting import WageSettingParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .wage_setting import WageSettingParams
 
 
 class UpdateWageSettingResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/update_webhook_subscription_response.py b/src/square/requests/update_webhook_subscription_response.py
index 35207ef1..179c0804 100644
--- a/src/square/requests/update_webhook_subscription_response.py
+++ b/src/square/requests/update_webhook_subscription_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .webhook_subscription import WebhookSubscriptionParams
 
diff --git a/src/square/requests/update_webhook_subscription_signature_key_response.py b/src/square/requests/update_webhook_subscription_signature_key_response.py
index 7c32029e..7d1293a1 100644
--- a/src/square/requests/update_webhook_subscription_signature_key_response.py
+++ b/src/square/requests/update_webhook_subscription_signature_key_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/update_workweek_config_response.py b/src/square/requests/update_workweek_config_response.py
index 81f65126..fab22faa 100644
--- a/src/square/requests/update_workweek_config_response.py
+++ b/src/square/requests/update_workweek_config_response.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from .workweek_config import WorkweekConfigParams
 import typing
+
+import typing_extensions
 from .error import ErrorParams
+from .workweek_config import WorkweekConfigParams
 
 
 class UpdateWorkweekConfigResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/upsert_booking_custom_attribute_response.py b/src/square/requests/upsert_booking_custom_attribute_response.py
index b6f5f746..2dd695c3 100644
--- a/src/square/requests/upsert_booking_custom_attribute_response.py
+++ b/src/square/requests/upsert_booking_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/upsert_catalog_object_response.py b/src/square/requests/upsert_catalog_object_response.py
index eb5e362f..67111f36 100644
--- a/src/square/requests/upsert_catalog_object_response.py
+++ b/src/square/requests/upsert_catalog_object_response.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
-from .catalog_object import CatalogObjectParams
+
+import typing_extensions
 from .catalog_id_mapping import CatalogIdMappingParams
+from .catalog_object import CatalogObjectParams
+from .error import ErrorParams
 
 
 class UpsertCatalogObjectResponseParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/upsert_customer_custom_attribute_response.py b/src/square/requests/upsert_customer_custom_attribute_response.py
index 23b67899..bd1002f7 100644
--- a/src/square/requests/upsert_customer_custom_attribute_response.py
+++ b/src/square/requests/upsert_customer_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/upsert_location_custom_attribute_response.py b/src/square/requests/upsert_location_custom_attribute_response.py
index 7db6da5b..0426d562 100644
--- a/src/square/requests/upsert_location_custom_attribute_response.py
+++ b/src/square/requests/upsert_location_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/upsert_merchant_custom_attribute_response.py b/src/square/requests/upsert_merchant_custom_attribute_response.py
index 27d98a1e..e747c16a 100644
--- a/src/square/requests/upsert_merchant_custom_attribute_response.py
+++ b/src/square/requests/upsert_merchant_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/upsert_order_custom_attribute_response.py b/src/square/requests/upsert_order_custom_attribute_response.py
index 0719be3c..820cfe5f 100644
--- a/src/square/requests/upsert_order_custom_attribute_response.py
+++ b/src/square/requests/upsert_order_custom_attribute_response.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
+import typing
+
 import typing_extensions
 from .custom_attribute import CustomAttributeParams
-import typing
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/upsert_snippet_response.py b/src/square/requests/upsert_snippet_response.py
index 3adff5bf..6921aa03 100644
--- a/src/square/requests/upsert_snippet_response.py
+++ b/src/square/requests/upsert_snippet_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 from .snippet import SnippetParams
 
diff --git a/src/square/requests/v1money.py b/src/square/requests/v1money.py
index edf44a20..0e4fa4c2 100644
--- a/src/square/requests/v1money.py
+++ b/src/square/requests/v1money.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from ..types.currency import Currency
 
 
diff --git a/src/square/requests/v1order.py b/src/square/requests/v1order.py
index d9a68c9c..020a1b93 100644
--- a/src/square/requests/v1order.py
+++ b/src/square/requests/v1order.py
@@ -1,14 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
-from .error import ErrorParams
+
+import typing_extensions
 from ..types.v1order_state import V1OrderState
 from .address import AddressParams
+from .error import ErrorParams
 from .v1money import V1MoneyParams
-from .v1tender import V1TenderParams
 from .v1order_history_entry import V1OrderHistoryEntryParams
+from .v1tender import V1TenderParams
 
 
 class V1OrderParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/v1order_history_entry.py b/src/square/requests/v1order_history_entry.py
index 6ee178be..a4ffb99c 100644
--- a/src/square/requests/v1order_history_entry.py
+++ b/src/square/requests/v1order_history_entry.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.v1order_history_entry_action import V1OrderHistoryEntryAction
 
diff --git a/src/square/requests/v1tender.py b/src/square/requests/v1tender.py
index 63c1b9f9..2a45fe0c 100644
--- a/src/square/requests/v1tender.py
+++ b/src/square/requests/v1tender.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
-from ..types.v1tender_type import V1TenderType
 import typing
+
+import typing_extensions
 from ..types.v1tender_card_brand import V1TenderCardBrand
 from ..types.v1tender_entry_method import V1TenderEntryMethod
+from ..types.v1tender_type import V1TenderType
 from .v1money import V1MoneyParams
 
 
diff --git a/src/square/requests/vendor.py b/src/square/requests/vendor.py
index 7e2db184..bbb1247f 100644
--- a/src/square/requests/vendor.py
+++ b/src/square/requests/vendor.py
@@ -1,11 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
+from ..types.vendor_status import VendorStatus
 from .address import AddressParams
 from .vendor_contact import VendorContactParams
-from ..types.vendor_status import VendorStatus
 
 
 class VendorParams(typing_extensions.TypedDict):
diff --git a/src/square/requests/vendor_contact.py b/src/square/requests/vendor_contact.py
index bb0b7cc0..c7cf2d65 100644
--- a/src/square/requests/vendor_contact.py
+++ b/src/square/requests/vendor_contact.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class VendorContactParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/vendor_created_event.py b/src/square/requests/vendor_created_event.py
index 7408448e..d441df10 100644
--- a/src/square/requests/vendor_created_event.py
+++ b/src/square/requests/vendor_created_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .vendor_created_event_data import VendorCreatedEventDataParams
 
 
diff --git a/src/square/requests/vendor_created_event_data.py b/src/square/requests/vendor_created_event_data.py
index 68a245a2..b75b8fe6 100644
--- a/src/square/requests/vendor_created_event_data.py
+++ b/src/square/requests/vendor_created_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .vendor_created_event_object import VendorCreatedEventObjectParams
 
 
diff --git a/src/square/requests/vendor_created_event_object.py b/src/square/requests/vendor_created_event_object.py
index 7d6f2286..0c72b421 100644
--- a/src/square/requests/vendor_created_event_object.py
+++ b/src/square/requests/vendor_created_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.vendor_created_event_object_operation import VendorCreatedEventObjectOperation
 from .vendor import VendorParams
diff --git a/src/square/requests/vendor_updated_event.py b/src/square/requests/vendor_updated_event.py
index 653c88e3..0c33d282 100644
--- a/src/square/requests/vendor_updated_event.py
+++ b/src/square/requests/vendor_updated_event.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .vendor_updated_event_data import VendorUpdatedEventDataParams
 
 
diff --git a/src/square/requests/vendor_updated_event_data.py b/src/square/requests/vendor_updated_event_data.py
index 423490ab..5ee1813f 100644
--- a/src/square/requests/vendor_updated_event_data.py
+++ b/src/square/requests/vendor_updated_event_data.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .vendor_updated_event_object import VendorUpdatedEventObjectParams
 
 
diff --git a/src/square/requests/vendor_updated_event_object.py b/src/square/requests/vendor_updated_event_object.py
index e15e4ca9..e5daa87e 100644
--- a/src/square/requests/vendor_updated_event_object.py
+++ b/src/square/requests/vendor_updated_event_object.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.vendor_updated_event_object_operation import VendorUpdatedEventObjectOperation
 from .vendor import VendorParams
diff --git a/src/square/requests/void_transaction_response.py b/src/square/requests/void_transaction_response.py
index cf83738f..dab4a82e 100644
--- a/src/square/requests/void_transaction_response.py
+++ b/src/square/requests/void_transaction_response.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .error import ErrorParams
 
 
diff --git a/src/square/requests/wage_setting.py b/src/square/requests/wage_setting.py
index 823db935..d077c8fe 100644
--- a/src/square/requests/wage_setting.py
+++ b/src/square/requests/wage_setting.py
@@ -1,8 +1,8 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
+
+import typing_extensions
 from .job_assignment import JobAssignmentParams
 
 
diff --git a/src/square/requests/webhook_subscription.py b/src/square/requests/webhook_subscription.py
index e479801e..72d71dd4 100644
--- a/src/square/requests/webhook_subscription.py
+++ b/src/square/requests/webhook_subscription.py
@@ -1,9 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing_extensions
 import typing
 
+import typing_extensions
+
 
 class WebhookSubscriptionParams(typing_extensions.TypedDict):
     """
diff --git a/src/square/requests/workweek_config.py b/src/square/requests/workweek_config.py
index defc9435..ade9d7fb 100644
--- a/src/square/requests/workweek_config.py
+++ b/src/square/requests/workweek_config.py
@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
 import typing_extensions
 from ..types.weekday import Weekday
 
diff --git a/src/square/sites/__init__.py b/src/square/sites/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/sites/__init__.py
+++ b/src/square/sites/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/sites/client.py b/src/square/sites/client.py
index 4cecbc39..aae113f8 100644
--- a/src/square/sites/client.py
+++ b/src/square/sites/client.py
@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawSitesClient
 import typing
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
 from ..types.list_sites_response import ListSitesResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawSitesClient
+from .raw_client import AsyncRawSitesClient, RawSitesClient
 
 
 class SitesClient:
@@ -50,8 +49,8 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Li
         )
         client.sites.list()
         """
-        response = self._raw_client.list(request_options=request_options)
-        return response.data
+        _response = self._raw_client.list(request_options=request_options)
+        return _response.data
 
 
 class AsyncSitesClient:
@@ -103,5 +102,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.list(request_options=request_options)
-        return response.data
+        _response = await self._raw_client.list(request_options=request_options)
+        return _response.data
diff --git a/src/square/sites/raw_client.py b/src/square/sites/raw_client.py
index b9804ed4..67ee2a44 100644
--- a/src/square/sites/raw_client.py
+++ b/src/square/sites/raw_client.py
@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
 import typing
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.list_sites_response import ListSitesResponse
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.list_sites_response import ListSitesResponse
 
 
 class RawSitesClient:
@@ -50,8 +49,8 @@ def list(self, *, request_options: typing.Optional[RequestOptions] = None) -> Ht
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawSitesClient:
@@ -94,5 +93,5 @@ async def list(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/snippets/__init__.py b/src/square/snippets/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/snippets/__init__.py
+++ b/src/square/snippets/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/snippets/client.py b/src/square/snippets/client.py
index cd80df90..0257aff6 100644
--- a/src/square/snippets/client.py
+++ b/src/square/snippets/client.py
@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawSnippetsClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.get_snippet_response import GetSnippetResponse
 from ..requests.snippet import SnippetParams
-from ..types.upsert_snippet_response import UpsertSnippetResponse
 from ..types.delete_snippet_response import DeleteSnippetResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawSnippetsClient
+from ..types.get_snippet_response import GetSnippetResponse
+from ..types.upsert_snippet_response import UpsertSnippetResponse
+from .raw_client import AsyncRawSnippetsClient, RawSnippetsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -63,8 +62,8 @@ def get(self, site_id: str, *, request_options: typing.Optional[RequestOptions]
             site_id="site_id",
         )
         """
-        response = self._raw_client.get(site_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(site_id, request_options=request_options)
+        return _response.data
 
     def upsert(
         self, site_id: str, *, snippet: SnippetParams, request_options: typing.Optional[RequestOptions] = None
@@ -106,8 +105,8 @@ def upsert(
             snippet={"content": "<script>var js = 1;</script>"},
         )
         """
-        response = self._raw_client.upsert(site_id, snippet=snippet, request_options=request_options)
-        return response.data
+        _response = self._raw_client.upsert(site_id, snippet=snippet, request_options=request_options)
+        return _response.data
 
     def delete(self, site_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> DeleteSnippetResponse:
         """
@@ -142,8 +141,8 @@ def delete(self, site_id: str, *, request_options: typing.Optional[RequestOption
             site_id="site_id",
         )
         """
-        response = self._raw_client.delete(site_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(site_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncSnippetsClient:
@@ -202,8 +201,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(site_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(site_id, request_options=request_options)
+        return _response.data
 
     async def upsert(
         self, site_id: str, *, snippet: SnippetParams, request_options: typing.Optional[RequestOptions] = None
@@ -253,8 +252,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.upsert(site_id, snippet=snippet, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.upsert(site_id, snippet=snippet, request_options=request_options)
+        return _response.data
 
     async def delete(
         self, site_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -299,5 +298,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(site_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(site_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/snippets/raw_client.py b/src/square/snippets/raw_client.py
index bc576437..a327c08e 100644
--- a/src/square/snippets/raw_client.py
+++ b/src/square/snippets/raw_client.py
@@ -1,20 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.get_snippet_response import GetSnippetResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
-from ..requests.snippet import SnippetParams
-from ..types.upsert_snippet_response import UpsertSnippetResponse
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.request_options import RequestOptions
 from ..core.serialization import convert_and_respect_annotation_metadata
+from ..core.unchecked_base_model import construct_type
+from ..requests.snippet import SnippetParams
 from ..types.delete_snippet_response import DeleteSnippetResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.get_snippet_response import GetSnippetResponse
+from ..types.upsert_snippet_response import UpsertSnippetResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -65,8 +64,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def upsert(
         self, site_id: str, *, snippet: SnippetParams, request_options: typing.Optional[RequestOptions] = None
@@ -122,8 +121,8 @@ def upsert(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, site_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -166,8 +165,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawSnippetsClient:
@@ -215,8 +214,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def upsert(
         self, site_id: str, *, snippet: SnippetParams, request_options: typing.Optional[RequestOptions] = None
@@ -272,8 +271,8 @@ async def upsert(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, site_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -316,5 +315,5 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/subscriptions/__init__.py b/src/square/subscriptions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/subscriptions/__init__.py
+++ b/src/square/subscriptions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/subscriptions/client.py b/src/square/subscriptions/client.py
index 858ec776..717346de 100644
--- a/src/square/subscriptions/client.py
+++ b/src/square/subscriptions/client.py
@@ -1,37 +1,30 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawSubscriptionsClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.pagination import AsyncPager, SyncPager
+from ..core.request_options import RequestOptions
 from ..requests.money import MoneyParams
-from ..requests.subscription_source import SubscriptionSourceParams
 from ..requests.phase import PhaseParams
-from ..core.request_options import RequestOptions
-from ..types.create_subscription_response import CreateSubscriptionResponse
-from ..types.bulk_swap_plan_response import BulkSwapPlanResponse
+from ..requests.phase_input import PhaseInputParams
 from ..requests.search_subscriptions_query import SearchSubscriptionsQueryParams
-from ..types.search_subscriptions_response import SearchSubscriptionsResponse
-from ..types.get_subscription_response import GetSubscriptionResponse
 from ..requests.subscription import SubscriptionParams
-from ..types.update_subscription_response import UpdateSubscriptionResponse
-from ..types.delete_subscription_action_response import DeleteSubscriptionActionResponse
-from ..types.change_billing_anchor_date_response import ChangeBillingAnchorDateResponse
+from ..requests.subscription_source import SubscriptionSourceParams
+from ..types.bulk_swap_plan_response import BulkSwapPlanResponse
 from ..types.cancel_subscription_response import CancelSubscriptionResponse
-from ..core.pagination import SyncPager
-from ..types.subscription_event import SubscriptionEvent
-from ..core.jsonable_encoder import jsonable_encoder
-from ..types.list_subscription_events_response import ListSubscriptionEventsResponse
-from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
+from ..types.change_billing_anchor_date_response import ChangeBillingAnchorDateResponse
 from ..types.change_timing import ChangeTiming
+from ..types.create_subscription_response import CreateSubscriptionResponse
+from ..types.delete_subscription_action_response import DeleteSubscriptionActionResponse
+from ..types.get_subscription_response import GetSubscriptionResponse
 from ..types.pause_subscription_response import PauseSubscriptionResponse
 from ..types.resume_subscription_response import ResumeSubscriptionResponse
-from ..requests.phase_input import PhaseInputParams
+from ..types.search_subscriptions_response import SearchSubscriptionsResponse
+from ..types.subscription_event import SubscriptionEvent
 from ..types.swap_plan_response import SwapPlanResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawSubscriptionsClient
-from ..core.pagination import AsyncPager
+from ..types.update_subscription_response import UpdateSubscriptionResponse
+from .raw_client import AsyncRawSubscriptionsClient, RawSubscriptionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -172,7 +165,7 @@ def create(
             ],
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             location_id=location_id,
             customer_id=customer_id,
             idempotency_key=idempotency_key,
@@ -188,7 +181,7 @@ def create(
             phases=phases,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def bulk_swap_plan(
         self,
@@ -238,13 +231,13 @@ def bulk_swap_plan(
             location_id="S8GWD5R9QB376",
         )
         """
-        response = self._raw_client.bulk_swap_plan(
+        _response = self._raw_client.bulk_swap_plan(
             new_plan_variation_id=new_plan_variation_id,
             old_plan_variation_id=old_plan_variation_id,
             location_id=location_id,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -321,10 +314,10 @@ def search(
             },
         )
         """
-        response = self._raw_client.search(
+        _response = self._raw_client.search(
             cursor=cursor, limit=limit, query=query, include=include, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(
         self,
@@ -367,8 +360,8 @@ def get(
             subscription_id="subscription_id",
         )
         """
-        response = self._raw_client.get(subscription_id, include=include, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(subscription_id, include=include, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -411,8 +404,8 @@ def update(
             subscription={"card_id": "{NEW CARD ID}"},
         )
         """
-        response = self._raw_client.update(subscription_id, subscription=subscription, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update(subscription_id, subscription=subscription, request_options=request_options)
+        return _response.data
 
     def delete_action(
         self, subscription_id: str, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -448,8 +441,8 @@ def delete_action(
             action_id="action_id",
         )
         """
-        response = self._raw_client.delete_action(subscription_id, action_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete_action(subscription_id, action_id, request_options=request_options)
+        return _response.data
 
     def change_billing_anchor_date(
         self,
@@ -498,13 +491,13 @@ def change_billing_anchor_date(
             monthly_billing_anchor_date=1,
         )
         """
-        response = self._raw_client.change_billing_anchor_date(
+        _response = self._raw_client.change_billing_anchor_date(
             subscription_id,
             monthly_billing_anchor_date=monthly_billing_anchor_date,
             effective_date=effective_date,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def cancel(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -538,8 +531,8 @@ def cancel(
             subscription_id="subscription_id",
         )
         """
-        response = self._raw_client.cancel(subscription_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.cancel(subscription_id, request_options=request_options)
+        return _response.data
 
     def list_events(
         self,
@@ -592,38 +585,9 @@ def list_events(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/subscriptions/{jsonable_encoder(subscription_id)}/events",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return self._raw_client.list_events(
+            subscription_id, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListSubscriptionEventsResponse,
-                    construct_type(
-                        type_=ListSubscriptionEventsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list_events(
-                    subscription_id,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.subscription_events
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def pause(
         self,
@@ -688,7 +652,7 @@ def pause(
             subscription_id="subscription_id",
         )
         """
-        response = self._raw_client.pause(
+        _response = self._raw_client.pause(
             subscription_id,
             pause_effective_date=pause_effective_date,
             pause_cycle_duration=pause_cycle_duration,
@@ -697,7 +661,7 @@ def pause(
             pause_reason=pause_reason,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def resume(
         self,
@@ -742,13 +706,13 @@ def resume(
             subscription_id="subscription_id",
         )
         """
-        response = self._raw_client.resume(
+        _response = self._raw_client.resume(
             subscription_id,
             resume_effective_date=resume_effective_date,
             resume_change_timing=resume_change_timing,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     def swap_plan(
         self,
@@ -798,10 +762,10 @@ def swap_plan(
             ],
         )
         """
-        response = self._raw_client.swap_plan(
+        _response = self._raw_client.swap_plan(
             subscription_id, new_plan_variation_id=new_plan_variation_id, phases=phases, request_options=request_options
         )
-        return response.data
+        return _response.data
 
 
 class AsyncSubscriptionsClient:
@@ -947,7 +911,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             location_id=location_id,
             customer_id=customer_id,
             idempotency_key=idempotency_key,
@@ -963,7 +927,7 @@ async def main() -> None:
             phases=phases,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def bulk_swap_plan(
         self,
@@ -1021,13 +985,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.bulk_swap_plan(
+        _response = await self._raw_client.bulk_swap_plan(
             new_plan_variation_id=new_plan_variation_id,
             old_plan_variation_id=old_plan_variation_id,
             location_id=location_id,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -1112,10 +1076,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             cursor=cursor, limit=limit, query=query, include=include, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self,
@@ -1166,8 +1130,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(subscription_id, include=include, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(subscription_id, include=include, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -1218,10 +1182,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             subscription_id, subscription=subscription, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def delete_action(
         self, subscription_id: str, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1265,8 +1229,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete_action(subscription_id, action_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete_action(subscription_id, action_id, request_options=request_options)
+        return _response.data
 
     async def change_billing_anchor_date(
         self,
@@ -1323,13 +1287,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.change_billing_anchor_date(
+        _response = await self._raw_client.change_billing_anchor_date(
             subscription_id,
             monthly_billing_anchor_date=monthly_billing_anchor_date,
             effective_date=effective_date,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def cancel(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1371,8 +1335,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.cancel(subscription_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.cancel(subscription_id, request_options=request_options)
+        return _response.data
 
     async def list_events(
         self,
@@ -1426,6 +1390,7 @@ async def main() -> None:
             )
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -1433,38 +1398,9 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            f"v2/subscriptions/{jsonable_encoder(subscription_id)}/events",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "limit": limit,
-            },
-            request_options=request_options,
+        return await self._raw_client.list_events(
+            subscription_id, cursor=cursor, limit=limit, request_options=request_options
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListSubscriptionEventsResponse,
-                    construct_type(
-                        type_=ListSubscriptionEventsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list_events(
-                    subscription_id,
-                    cursor=_parsed_next,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.subscription_events
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def pause(
         self,
@@ -1537,7 +1473,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.pause(
+        _response = await self._raw_client.pause(
             subscription_id,
             pause_effective_date=pause_effective_date,
             pause_cycle_duration=pause_cycle_duration,
@@ -1546,7 +1482,7 @@ async def main() -> None:
             pause_reason=pause_reason,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def resume(
         self,
@@ -1599,13 +1535,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.resume(
+        _response = await self._raw_client.resume(
             subscription_id,
             resume_effective_date=resume_effective_date,
             resume_change_timing=resume_change_timing,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
     async def swap_plan(
         self,
@@ -1663,7 +1599,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.swap_plan(
+        _response = await self._raw_client.swap_plan(
             subscription_id, new_plan_variation_id=new_plan_variation_id, phases=phases, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/subscriptions/raw_client.py b/src/square/subscriptions/raw_client.py
index 299bfa56..02f856a5 100644
--- a/src/square/subscriptions/raw_client.py
+++ b/src/square/subscriptions/raw_client.py
@@ -1,34 +1,36 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.money import MoneyParams
-from ..requests.subscription_source import SubscriptionSourceParams
-from ..requests.phase import PhaseParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_subscription_response import CreateSubscriptionResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..types.bulk_swap_plan_response import BulkSwapPlanResponse
+from ..requests.money import MoneyParams
+from ..requests.phase import PhaseParams
+from ..requests.phase_input import PhaseInputParams
 from ..requests.search_subscriptions_query import SearchSubscriptionsQueryParams
-from ..types.search_subscriptions_response import SearchSubscriptionsResponse
-from ..types.get_subscription_response import GetSubscriptionResponse
-from ..core.jsonable_encoder import jsonable_encoder
 from ..requests.subscription import SubscriptionParams
-from ..types.update_subscription_response import UpdateSubscriptionResponse
-from ..types.delete_subscription_action_response import DeleteSubscriptionActionResponse
-from ..types.change_billing_anchor_date_response import ChangeBillingAnchorDateResponse
+from ..requests.subscription_source import SubscriptionSourceParams
+from ..types.bulk_swap_plan_response import BulkSwapPlanResponse
 from ..types.cancel_subscription_response import CancelSubscriptionResponse
+from ..types.change_billing_anchor_date_response import ChangeBillingAnchorDateResponse
 from ..types.change_timing import ChangeTiming
+from ..types.create_subscription_response import CreateSubscriptionResponse
+from ..types.delete_subscription_action_response import DeleteSubscriptionActionResponse
+from ..types.get_subscription_response import GetSubscriptionResponse
+from ..types.list_subscription_events_response import ListSubscriptionEventsResponse
 from ..types.pause_subscription_response import PauseSubscriptionResponse
 from ..types.resume_subscription_response import ResumeSubscriptionResponse
-from ..requests.phase_input import PhaseInputParams
+from ..types.search_subscriptions_response import SearchSubscriptionsResponse
+from ..types.subscription_event import SubscriptionEvent
 from ..types.swap_plan_response import SwapPlanResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
+from ..types.update_subscription_response import UpdateSubscriptionResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -179,8 +181,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def bulk_swap_plan(
         self,
@@ -243,8 +245,8 @@ def bulk_swap_plan(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -333,8 +335,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self,
@@ -386,8 +388,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -444,8 +446,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete_action(
         self, subscription_id: str, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -486,8 +488,8 @@ def delete_action(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def change_billing_anchor_date(
         self,
@@ -549,8 +551,8 @@ def change_billing_anchor_date(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def cancel(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -590,8 +592,78 @@ def cancel(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    def list_events(
+        self,
+        subscription_id: str,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[SubscriptionEvent]:
+        """
+        Lists all [events](https://developer.squareup.com/docs/subscriptions-api/actions-events) for a specific subscription.
+
+        Parameters
+        ----------
+        subscription_id : str
+            The ID of the subscription to retrieve the events for.
+
+        cursor : typing.Optional[str]
+            When the total number of resulting subscription events exceeds the limit of a paged response,
+            specify the cursor returned from a preceding response here to fetch the next set of results.
+            If the cursor is unset, the response contains the last page of the results.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The upper limit on the number of subscription events to return
+            in a paged response.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[SubscriptionEvent]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            f"v2/subscriptions/{jsonable_encoder(subscription_id)}/events",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListSubscriptionEventsResponse,
+                    construct_type(
+                        type_=ListSubscriptionEventsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.subscription_events
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list_events(
+                    subscription_id,
+                    cursor=_parsed_next,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def pause(
         self,
@@ -673,8 +745,8 @@ def pause(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def resume(
         self,
@@ -733,8 +805,8 @@ def resume(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def swap_plan(
         self,
@@ -796,8 +868,8 @@ def swap_plan(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawSubscriptionsClient:
@@ -945,8 +1017,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def bulk_swap_plan(
         self,
@@ -1009,8 +1081,8 @@ async def bulk_swap_plan(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -1099,8 +1171,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self,
@@ -1152,8 +1224,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -1210,8 +1282,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete_action(
         self, subscription_id: str, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1252,8 +1324,8 @@ async def delete_action(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def change_billing_anchor_date(
         self,
@@ -1315,8 +1387,8 @@ async def change_billing_anchor_date(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def cancel(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -1356,8 +1428,81 @@ async def cancel(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
+    async def list_events(
+        self,
+        subscription_id: str,
+        *,
+        cursor: typing.Optional[str] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[SubscriptionEvent]:
+        """
+        Lists all [events](https://developer.squareup.com/docs/subscriptions-api/actions-events) for a specific subscription.
+
+        Parameters
+        ----------
+        subscription_id : str
+            The ID of the subscription to retrieve the events for.
+
+        cursor : typing.Optional[str]
+            When the total number of resulting subscription events exceeds the limit of a paged response,
+            specify the cursor returned from a preceding response here to fetch the next set of results.
+            If the cursor is unset, the response contains the last page of the results.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        limit : typing.Optional[int]
+            The upper limit on the number of subscription events to return
+            in a paged response.
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[SubscriptionEvent]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            f"v2/subscriptions/{jsonable_encoder(subscription_id)}/events",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListSubscriptionEventsResponse,
+                    construct_type(
+                        type_=ListSubscriptionEventsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.subscription_events
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list_events(
+                        subscription_id,
+                        cursor=_parsed_next,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def pause(
         self,
@@ -1439,8 +1584,8 @@ async def pause(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def resume(
         self,
@@ -1499,8 +1644,8 @@ async def resume(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def swap_plan(
         self,
@@ -1562,5 +1707,5 @@ async def swap_plan(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/team/__init__.py b/src/square/team/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/team/__init__.py
+++ b/src/square/team/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/team/client.py b/src/square/team/client.py
index 67504970..9cf26420 100644
--- a/src/square/team/client.py
+++ b/src/square/team/client.py
@@ -1,16 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawTeamClient
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.list_jobs_response import ListJobsResponse
 from ..requests.job import JobParams
 from ..types.create_job_response import CreateJobResponse
+from ..types.list_jobs_response import ListJobsResponse
 from ..types.retrieve_job_response import RetrieveJobResponse
 from ..types.update_job_response import UpdateJobResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawTeamClient
+from .raw_client import AsyncRawTeamClient, RawTeamClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -61,8 +60,8 @@ def list_jobs(
         )
         client.team.list_jobs()
         """
-        response = self._raw_client.list_jobs(cursor=cursor, request_options=request_options)
-        return response.data
+        _response = self._raw_client.list_jobs(cursor=cursor, request_options=request_options)
+        return _response.data
 
     def create_job(
         self, *, job: JobParams, idempotency_key: str, request_options: typing.Optional[RequestOptions] = None
@@ -101,10 +100,10 @@ def create_job(
             idempotency_key="idempotency-key-0",
         )
         """
-        response = self._raw_client.create_job(
+        _response = self._raw_client.create_job(
             job=job, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def retrieve_job(
         self, job_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -136,8 +135,8 @@ def retrieve_job(
             job_id="job_id",
         )
         """
-        response = self._raw_client.retrieve_job(job_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.retrieve_job(job_id, request_options=request_options)
+        return _response.data
 
     def update_job(
         self, job_id: str, *, job: JobParams, request_options: typing.Optional[RequestOptions] = None
@@ -176,8 +175,8 @@ def update_job(
             job={"title": "Cashier 1", "is_tip_eligible": True},
         )
         """
-        response = self._raw_client.update_job(job_id, job=job, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update_job(job_id, job=job, request_options=request_options)
+        return _response.data
 
 
 class AsyncTeamClient:
@@ -233,8 +232,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.list_jobs(cursor=cursor, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.list_jobs(cursor=cursor, request_options=request_options)
+        return _response.data
 
     async def create_job(
         self, *, job: JobParams, idempotency_key: str, request_options: typing.Optional[RequestOptions] = None
@@ -281,10 +280,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create_job(
+        _response = await self._raw_client.create_job(
             job=job, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def retrieve_job(
         self, job_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -324,8 +323,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.retrieve_job(job_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.retrieve_job(job_id, request_options=request_options)
+        return _response.data
 
     async def update_job(
         self, job_id: str, *, job: JobParams, request_options: typing.Optional[RequestOptions] = None
@@ -372,5 +371,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update_job(job_id, job=job, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.update_job(job_id, job=job, request_options=request_options)
+        return _response.data
diff --git a/src/square/team/raw_client.py b/src/square/team/raw_client.py
index f614e329..cdcbd1e7 100644
--- a/src/square/team/raw_client.py
+++ b/src/square/team/raw_client.py
@@ -1,21 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.list_jobs_response import ListJobsResponse
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.request_options import RequestOptions
+from ..core.serialization import convert_and_respect_annotation_metadata
+from ..core.unchecked_base_model import construct_type
 from ..requests.job import JobParams
 from ..types.create_job_response import CreateJobResponse
-from ..core.serialization import convert_and_respect_annotation_metadata
+from ..types.list_jobs_response import ListJobsResponse
 from ..types.retrieve_job_response import RetrieveJobResponse
-from ..core.jsonable_encoder import jsonable_encoder
 from ..types.update_job_response import UpdateJobResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -66,8 +65,8 @@ def list_jobs(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def create_job(
         self, *, job: JobParams, idempotency_key: str, request_options: typing.Optional[RequestOptions] = None
@@ -119,8 +118,8 @@ def create_job(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def retrieve_job(
         self, job_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -158,8 +157,8 @@ def retrieve_job(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update_job(
         self, job_id: str, *, job: JobParams, request_options: typing.Optional[RequestOptions] = None
@@ -210,8 +209,8 @@ def update_job(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawTeamClient:
@@ -259,8 +258,8 @@ async def list_jobs(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def create_job(
         self, *, job: JobParams, idempotency_key: str, request_options: typing.Optional[RequestOptions] = None
@@ -312,8 +311,8 @@ async def create_job(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def retrieve_job(
         self, job_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -351,8 +350,8 @@ async def retrieve_job(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update_job(
         self, job_id: str, *, job: JobParams, request_options: typing.Optional[RequestOptions] = None
@@ -403,5 +402,5 @@ async def update_job(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/team_members/__init__.py b/src/square/team_members/__init__.py
index 437b8e02..6b947428 100644
--- a/src/square/team_members/__init__.py
+++ b/src/square/team_members/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import wage_setting
 
 __all__ = ["wage_setting"]
diff --git a/src/square/team_members/client.py b/src/square/team_members/client.py
index 75ba050f..7a684670 100644
--- a/src/square/team_members/client.py
+++ b/src/square/team_members/client.py
@@ -1,23 +1,21 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawTeamMembersClient
-from .wage_setting.client import WageSettingClient
-from ..requests.team_member import TeamMemberParams
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
-from ..types.create_team_member_response import CreateTeamMemberResponse
 from ..requests.create_team_member_request import CreateTeamMemberRequestParams
-from ..types.batch_create_team_members_response import BatchCreateTeamMembersResponse
+from ..requests.search_team_members_query import SearchTeamMembersQueryParams
+from ..requests.team_member import TeamMemberParams
 from ..requests.update_team_member_request import UpdateTeamMemberRequestParams
+from ..types.batch_create_team_members_response import BatchCreateTeamMembersResponse
 from ..types.batch_update_team_members_response import BatchUpdateTeamMembersResponse
-from ..requests.search_team_members_query import SearchTeamMembersQueryParams
-from ..types.search_team_members_response import SearchTeamMembersResponse
+from ..types.create_team_member_response import CreateTeamMemberResponse
 from ..types.get_team_member_response import GetTeamMemberResponse
+from ..types.search_team_members_response import SearchTeamMembersResponse
 from ..types.update_team_member_response import UpdateTeamMemberResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawTeamMembersClient
-from .wage_setting.client import AsyncWageSettingClient
+from .raw_client import AsyncRawTeamMembersClient, RawTeamMembersClient
+from .wage_setting.client import AsyncWageSettingClient, WageSettingClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -114,10 +112,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key, team_member=team_member, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def batch_create(
         self,
@@ -187,8 +185,8 @@ def batch_create(
             },
         )
         """
-        response = self._raw_client.batch_create(team_members=team_members, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_create(team_members=team_members, request_options=request_options)
+        return _response.data
 
     def batch_update(
         self,
@@ -262,8 +260,8 @@ def batch_update(
             },
         )
         """
-        response = self._raw_client.batch_update(team_members=team_members, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_update(team_members=team_members, request_options=request_options)
+        return _response.data
 
     def search(
         self,
@@ -310,8 +308,8 @@ def search(
             limit=10,
         )
         """
-        response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search(query=query, limit=limit, cursor=cursor, request_options=request_options)
+        return _response.data
 
     def get(
         self, team_member_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -344,8 +342,8 @@ def get(
             team_member_id="team_member_id",
         )
         """
-        response = self._raw_client.get(team_member_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(team_member_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -415,8 +413,8 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(team_member_id, team_member=team_member, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update(team_member_id, team_member=team_member, request_options=request_options)
+        return _response.data
 
 
 class AsyncTeamMembersClient:
@@ -518,10 +516,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key, team_member=team_member, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def batch_create(
         self,
@@ -599,8 +597,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_create(team_members=team_members, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_create(team_members=team_members, request_options=request_options)
+        return _response.data
 
     async def batch_update(
         self,
@@ -682,8 +680,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_update(team_members=team_members, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_update(team_members=team_members, request_options=request_options)
+        return _response.data
 
     async def search(
         self,
@@ -740,10 +738,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             query=query, limit=limit, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, team_member_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -784,8 +782,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(team_member_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(team_member_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -863,7 +861,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             team_member_id, team_member=team_member, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/team_members/raw_client.py b/src/square/team_members/raw_client.py
index 5be92401..b47fbdf3 100644
--- a/src/square/team_members/raw_client.py
+++ b/src/square/team_members/raw_client.py
@@ -1,26 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.team_member import TeamMemberParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.create_team_member_response import CreateTeamMemberResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
 from ..requests.create_team_member_request import CreateTeamMemberRequestParams
-from ..types.batch_create_team_members_response import BatchCreateTeamMembersResponse
+from ..requests.search_team_members_query import SearchTeamMembersQueryParams
+from ..requests.team_member import TeamMemberParams
 from ..requests.update_team_member_request import UpdateTeamMemberRequestParams
+from ..types.batch_create_team_members_response import BatchCreateTeamMembersResponse
 from ..types.batch_update_team_members_response import BatchUpdateTeamMembersResponse
-from ..requests.search_team_members_query import SearchTeamMembersQueryParams
-from ..types.search_team_members_response import SearchTeamMembersResponse
+from ..types.create_team_member_response import CreateTeamMemberResponse
 from ..types.get_team_member_response import GetTeamMemberResponse
-from ..core.jsonable_encoder import jsonable_encoder
+from ..types.search_team_members_response import SearchTeamMembersResponse
 from ..types.update_team_member_response import UpdateTeamMemberResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -75,6 +74,9 @@ def create(
                     object_=team_member, annotation=TeamMemberParams, direction="write"
                 ),
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -90,8 +92,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_create(
         self,
@@ -150,8 +152,8 @@ def batch_create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_update(
         self,
@@ -210,8 +212,8 @@ def batch_update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -274,8 +276,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, team_member_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -314,8 +316,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -354,6 +356,9 @@ def update(
                     object_=team_member, annotation=TeamMemberParams, direction="write"
                 ),
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -369,8 +374,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawTeamMembersClient:
@@ -422,6 +427,9 @@ async def create(
                     object_=team_member, annotation=TeamMemberParams, direction="write"
                 ),
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -437,8 +445,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_create(
         self,
@@ -497,8 +505,8 @@ async def batch_create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_update(
         self,
@@ -557,8 +565,8 @@ async def batch_update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -621,8 +629,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, team_member_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -661,8 +669,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -701,6 +709,9 @@ async def update(
                     object_=team_member, annotation=TeamMemberParams, direction="write"
                 ),
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -716,5 +727,5 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/team_members/wage_setting/__init__.py b/src/square/team_members/wage_setting/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/team_members/wage_setting/__init__.py
+++ b/src/square/team_members/wage_setting/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/team_members/wage_setting/client.py b/src/square/team_members/wage_setting/client.py
index d355d32f..9d5b4ccc 100644
--- a/src/square/team_members/wage_setting/client.py
+++ b/src/square/team_members/wage_setting/client.py
@@ -1,14 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawWageSettingClient
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.get_wage_setting_response import GetWageSettingResponse
 from ...requests.wage_setting import WageSettingParams
+from ...types.get_wage_setting_response import GetWageSettingResponse
 from ...types.update_wage_setting_response import UpdateWageSettingResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawWageSettingClient
+from .raw_client import AsyncRawWageSettingClient, RawWageSettingClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -64,8 +63,8 @@ def get(
             team_member_id="team_member_id",
         )
         """
-        response = self._raw_client.get(team_member_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(team_member_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -131,8 +130,8 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(team_member_id, wage_setting=wage_setting, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update(team_member_id, wage_setting=wage_setting, request_options=request_options)
+        return _response.data
 
 
 class AsyncWageSettingClient:
@@ -193,8 +192,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(team_member_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(team_member_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -268,7 +267,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             team_member_id, wage_setting=wage_setting, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/team_members/wage_setting/raw_client.py b/src/square/team_members/wage_setting/raw_client.py
index ba1be623..35ddec82 100644
--- a/src/square/team_members/wage_setting/raw_client.py
+++ b/src/square/team_members/wage_setting/raw_client.py
@@ -1,19 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.get_wage_setting_response import GetWageSettingResponse
-from ...core.jsonable_encoder import jsonable_encoder
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.request_options import RequestOptions
+from ...core.serialization import convert_and_respect_annotation_metadata
+from ...core.unchecked_base_model import construct_type
 from ...requests.wage_setting import WageSettingParams
+from ...types.get_wage_setting_response import GetWageSettingResponse
 from ...types.update_wage_setting_response import UpdateWageSettingResponse
-from ...core.serialization import convert_and_respect_annotation_metadata
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -64,8 +63,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -130,8 +129,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawWageSettingClient:
@@ -179,8 +178,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -245,5 +244,5 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/terminal/__init__.py b/src/square/terminal/__init__.py
index c12a7ecb..78b5601e 100644
--- a/src/square/terminal/__init__.py
+++ b/src/square/terminal/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import actions, checkouts, refunds
 
 __all__ = ["actions", "checkouts", "refunds"]
diff --git a/src/square/terminal/actions/__init__.py b/src/square/terminal/actions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/terminal/actions/__init__.py
+++ b/src/square/terminal/actions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/terminal/actions/client.py b/src/square/terminal/actions/client.py
index 126745ec..e7209de5 100644
--- a/src/square/terminal/actions/client.py
+++ b/src/square/terminal/actions/client.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawActionsClient
-from ...requests.terminal_action import TerminalActionParams
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.create_terminal_action_response import CreateTerminalActionResponse
+from ...requests.terminal_action import TerminalActionParams
 from ...requests.terminal_action_query import TerminalActionQueryParams
-from ...types.search_terminal_actions_response import SearchTerminalActionsResponse
-from ...types.get_terminal_action_response import GetTerminalActionResponse
 from ...types.cancel_terminal_action_response import CancelTerminalActionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawActionsClient
+from ...types.create_terminal_action_response import CreateTerminalActionResponse
+from ...types.get_terminal_action_response import GetTerminalActionResponse
+from ...types.search_terminal_actions_response import SearchTerminalActionsResponse
+from .raw_client import AsyncRawActionsClient, RawActionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -82,10 +81,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key, action=action, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -136,8 +135,8 @@ def search(
             limit=2,
         )
         """
-        response = self._raw_client.search(query=query, cursor=cursor, limit=limit, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search(query=query, cursor=cursor, limit=limit, request_options=request_options)
+        return _response.data
 
     def get(
         self, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -169,8 +168,8 @@ def get(
             action_id="action_id",
         )
         """
-        response = self._raw_client.get(action_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(action_id, request_options=request_options)
+        return _response.data
 
     def cancel(
         self, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -202,8 +201,8 @@ def cancel(
             action_id="action_id",
         )
         """
-        response = self._raw_client.cancel(action_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.cancel(action_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncActionsClient:
@@ -279,10 +278,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key, action=action, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -341,10 +340,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             query=query, cursor=cursor, limit=limit, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -384,8 +383,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(action_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(action_id, request_options=request_options)
+        return _response.data
 
     async def cancel(
         self, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -425,5 +424,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.cancel(action_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.cancel(action_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/terminal/actions/raw_client.py b/src/square/terminal/actions/raw_client.py
index 7ad5ea69..e65e41b5 100644
--- a/src/square/terminal/actions/raw_client.py
+++ b/src/square/terminal/actions/raw_client.py
@@ -1,22 +1,21 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.terminal_action import TerminalActionParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_terminal_action_response import CreateTerminalActionResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.terminal_action import TerminalActionParams
 from ...requests.terminal_action_query import TerminalActionQueryParams
-from ...types.search_terminal_actions_response import SearchTerminalActionsResponse
-from ...types.get_terminal_action_response import GetTerminalActionResponse
-from ...core.jsonable_encoder import jsonable_encoder
 from ...types.cancel_terminal_action_response import CancelTerminalActionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.create_terminal_action_response import CreateTerminalActionResponse
+from ...types.get_terminal_action_response import GetTerminalActionResponse
+from ...types.search_terminal_actions_response import SearchTerminalActionsResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -83,8 +82,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -148,8 +147,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -187,8 +186,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def cancel(
         self, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -226,8 +225,8 @@ def cancel(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawActionsClient:
@@ -291,8 +290,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -356,8 +355,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -395,8 +394,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def cancel(
         self, action_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -434,5 +433,5 @@ async def cancel(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/terminal/checkouts/__init__.py b/src/square/terminal/checkouts/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/terminal/checkouts/__init__.py
+++ b/src/square/terminal/checkouts/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/terminal/checkouts/client.py b/src/square/terminal/checkouts/client.py
index be752860..9c124ea3 100644
--- a/src/square/terminal/checkouts/client.py
+++ b/src/square/terminal/checkouts/client.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawCheckoutsClient
-from ...requests.terminal_checkout import TerminalCheckoutParams
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.create_terminal_checkout_response import CreateTerminalCheckoutResponse
+from ...requests.terminal_checkout import TerminalCheckoutParams
 from ...requests.terminal_checkout_query import TerminalCheckoutQueryParams
-from ...types.search_terminal_checkouts_response import SearchTerminalCheckoutsResponse
-from ...types.get_terminal_checkout_response import GetTerminalCheckoutResponse
 from ...types.cancel_terminal_checkout_response import CancelTerminalCheckoutResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawCheckoutsClient
+from ...types.create_terminal_checkout_response import CreateTerminalCheckoutResponse
+from ...types.get_terminal_checkout_response import GetTerminalCheckoutResponse
+from ...types.search_terminal_checkouts_response import SearchTerminalCheckoutsResponse
+from .raw_client import AsyncRawCheckoutsClient, RawCheckoutsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -79,10 +78,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key, checkout=checkout, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -129,8 +128,8 @@ def search(
             limit=2,
         )
         """
-        response = self._raw_client.search(query=query, cursor=cursor, limit=limit, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search(query=query, cursor=cursor, limit=limit, request_options=request_options)
+        return _response.data
 
     def get(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -162,8 +161,8 @@ def get(
             checkout_id="checkout_id",
         )
         """
-        response = self._raw_client.get(checkout_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(checkout_id, request_options=request_options)
+        return _response.data
 
     def cancel(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -195,8 +194,8 @@ def cancel(
             checkout_id="checkout_id",
         )
         """
-        response = self._raw_client.cancel(checkout_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.cancel(checkout_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncCheckoutsClient:
@@ -271,10 +270,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key, checkout=checkout, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -329,10 +328,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             query=query, cursor=cursor, limit=limit, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -372,8 +371,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(checkout_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(checkout_id, request_options=request_options)
+        return _response.data
 
     async def cancel(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -413,5 +412,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.cancel(checkout_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.cancel(checkout_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/terminal/checkouts/raw_client.py b/src/square/terminal/checkouts/raw_client.py
index 9567001d..66b66deb 100644
--- a/src/square/terminal/checkouts/raw_client.py
+++ b/src/square/terminal/checkouts/raw_client.py
@@ -1,22 +1,21 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.terminal_checkout import TerminalCheckoutParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_terminal_checkout_response import CreateTerminalCheckoutResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.terminal_checkout import TerminalCheckoutParams
 from ...requests.terminal_checkout_query import TerminalCheckoutQueryParams
-from ...types.search_terminal_checkouts_response import SearchTerminalCheckoutsResponse
-from ...types.get_terminal_checkout_response import GetTerminalCheckoutResponse
-from ...core.jsonable_encoder import jsonable_encoder
 from ...types.cancel_terminal_checkout_response import CancelTerminalCheckoutResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.create_terminal_checkout_response import CreateTerminalCheckoutResponse
+from ...types.get_terminal_checkout_response import GetTerminalCheckoutResponse
+from ...types.search_terminal_checkouts_response import SearchTerminalCheckoutsResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -83,8 +82,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -147,8 +146,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -186,8 +185,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def cancel(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -225,8 +224,8 @@ def cancel(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawCheckoutsClient:
@@ -290,8 +289,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -354,8 +353,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -393,8 +392,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def cancel(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -432,5 +431,5 @@ async def cancel(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/terminal/client.py b/src/square/terminal/client.py
index 9ab0a2c4..a60488ee 100644
--- a/src/square/terminal/client.py
+++ b/src/square/terminal/client.py
@@ -1,20 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawTerminalClient
-from .actions.client import ActionsClient
-from .checkouts.client import CheckoutsClient
-from .refunds.client import RefundsClient
 import typing
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
 from ..types.dismiss_terminal_action_response import DismissTerminalActionResponse
 from ..types.dismiss_terminal_checkout_response import DismissTerminalCheckoutResponse
 from ..types.dismiss_terminal_refund_response import DismissTerminalRefundResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawTerminalClient
-from .actions.client import AsyncActionsClient
-from .checkouts.client import AsyncCheckoutsClient
-from .refunds.client import AsyncRefundsClient
+from .actions.client import ActionsClient, AsyncActionsClient
+from .checkouts.client import AsyncCheckoutsClient, CheckoutsClient
+from .raw_client import AsyncRawTerminalClient, RawTerminalClient
+from .refunds.client import AsyncRefundsClient, RefundsClient
 
 
 class TerminalClient:
@@ -69,8 +65,8 @@ def dismiss_terminal_action(
             action_id="action_id",
         )
         """
-        response = self._raw_client.dismiss_terminal_action(action_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.dismiss_terminal_action(action_id, request_options=request_options)
+        return _response.data
 
     def dismiss_terminal_checkout(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -102,8 +98,8 @@ def dismiss_terminal_checkout(
             checkout_id="checkout_id",
         )
         """
-        response = self._raw_client.dismiss_terminal_checkout(checkout_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.dismiss_terminal_checkout(checkout_id, request_options=request_options)
+        return _response.data
 
     def dismiss_terminal_refund(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -135,8 +131,8 @@ def dismiss_terminal_refund(
             terminal_refund_id="terminal_refund_id",
         )
         """
-        response = self._raw_client.dismiss_terminal_refund(terminal_refund_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.dismiss_terminal_refund(terminal_refund_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncTerminalClient:
@@ -199,8 +195,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.dismiss_terminal_action(action_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.dismiss_terminal_action(action_id, request_options=request_options)
+        return _response.data
 
     async def dismiss_terminal_checkout(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -240,8 +236,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.dismiss_terminal_checkout(checkout_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.dismiss_terminal_checkout(checkout_id, request_options=request_options)
+        return _response.data
 
     async def dismiss_terminal_refund(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -281,5 +277,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.dismiss_terminal_refund(terminal_refund_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.dismiss_terminal_refund(terminal_refund_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/terminal/raw_client.py b/src/square/terminal/raw_client.py
index 96ad6068..4b3dbe6e 100644
--- a/src/square/terminal/raw_client.py
+++ b/src/square/terminal/raw_client.py
@@ -1,18 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
 import typing
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.dismiss_terminal_action_response import DismissTerminalActionResponse
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.dismiss_terminal_action_response import DismissTerminalActionResponse
 from ..types.dismiss_terminal_checkout_response import DismissTerminalCheckoutResponse
 from ..types.dismiss_terminal_refund_response import DismissTerminalRefundResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 
 class RawTerminalClient:
@@ -57,8 +56,8 @@ def dismiss_terminal_action(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def dismiss_terminal_checkout(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -96,8 +95,8 @@ def dismiss_terminal_checkout(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def dismiss_terminal_refund(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -135,8 +134,8 @@ def dismiss_terminal_refund(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawTerminalClient:
@@ -181,8 +180,8 @@ async def dismiss_terminal_action(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def dismiss_terminal_checkout(
         self, checkout_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -220,8 +219,8 @@ async def dismiss_terminal_checkout(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def dismiss_terminal_refund(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -259,5 +258,5 @@ async def dismiss_terminal_refund(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/terminal/refunds/__init__.py b/src/square/terminal/refunds/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/terminal/refunds/__init__.py
+++ b/src/square/terminal/refunds/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/terminal/refunds/client.py b/src/square/terminal/refunds/client.py
index d900f00c..3df92941 100644
--- a/src/square/terminal/refunds/client.py
+++ b/src/square/terminal/refunds/client.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawRefundsClient
-from ...requests.terminal_refund import TerminalRefundParams
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
-from ...types.create_terminal_refund_response import CreateTerminalRefundResponse
+from ...requests.terminal_refund import TerminalRefundParams
 from ...requests.terminal_refund_query import TerminalRefundQueryParams
-from ...types.search_terminal_refunds_response import SearchTerminalRefundsResponse
-from ...types.get_terminal_refund_response import GetTerminalRefundResponse
 from ...types.cancel_terminal_refund_response import CancelTerminalRefundResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawRefundsClient
+from ...types.create_terminal_refund_response import CreateTerminalRefundResponse
+from ...types.get_terminal_refund_response import GetTerminalRefundResponse
+from ...types.search_terminal_refunds_response import SearchTerminalRefundsResponse
+from .raw_client import AsyncRawRefundsClient, RawRefundsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -78,10 +77,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key, refund=refund, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -128,8 +127,8 @@ def search(
             limit=1,
         )
         """
-        response = self._raw_client.search(query=query, cursor=cursor, limit=limit, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search(query=query, cursor=cursor, limit=limit, request_options=request_options)
+        return _response.data
 
     def get(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -161,8 +160,8 @@ def get(
             terminal_refund_id="terminal_refund_id",
         )
         """
-        response = self._raw_client.get(terminal_refund_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(terminal_refund_id, request_options=request_options)
+        return _response.data
 
     def cancel(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -194,8 +193,8 @@ def cancel(
             terminal_refund_id="terminal_refund_id",
         )
         """
-        response = self._raw_client.cancel(terminal_refund_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.cancel(terminal_refund_id, request_options=request_options)
+        return _response.data
 
 
 class AsyncRefundsClient:
@@ -267,10 +266,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key, refund=refund, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -325,10 +324,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             query=query, cursor=cursor, limit=limit, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -368,8 +367,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(terminal_refund_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(terminal_refund_id, request_options=request_options)
+        return _response.data
 
     async def cancel(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -409,5 +408,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.cancel(terminal_refund_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.cancel(terminal_refund_id, request_options=request_options)
+        return _response.data
diff --git a/src/square/terminal/refunds/raw_client.py b/src/square/terminal/refunds/raw_client.py
index 0dc1553d..3ed83e41 100644
--- a/src/square/terminal/refunds/raw_client.py
+++ b/src/square/terminal/refunds/raw_client.py
@@ -1,22 +1,21 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.terminal_refund import TerminalRefundParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_terminal_refund_response import CreateTerminalRefundResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.terminal_refund import TerminalRefundParams
 from ...requests.terminal_refund_query import TerminalRefundQueryParams
-from ...types.search_terminal_refunds_response import SearchTerminalRefundsResponse
-from ...types.get_terminal_refund_response import GetTerminalRefundResponse
-from ...core.jsonable_encoder import jsonable_encoder
 from ...types.cancel_terminal_refund_response import CancelTerminalRefundResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.create_terminal_refund_response import CreateTerminalRefundResponse
+from ...types.get_terminal_refund_response import GetTerminalRefundResponse
+from ...types.search_terminal_refunds_response import SearchTerminalRefundsResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -82,8 +81,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -146,8 +145,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -185,8 +184,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def cancel(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -224,8 +223,8 @@ def cancel(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawRefundsClient:
@@ -288,8 +287,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -352,8 +351,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -391,8 +390,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def cancel(
         self, terminal_refund_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -430,5 +429,5 @@ async def cancel(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/types/__init__.py b/src/square/types/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/types/__init__.py
+++ b/src/square/types/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/types/accept_dispute_response.py b/src/square/types/accept_dispute_response.py
index 9f0bf8b1..1f8a7edb 100644
--- a/src/square/types/accept_dispute_response.py
+++ b/src/square/types/accept_dispute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .dispute import Dispute
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
+from .error import Error
 
 
 class AcceptDisputeResponse(UncheckedBaseModel):
diff --git a/src/square/types/accepted_payment_methods.py b/src/square/types/accepted_payment_methods.py
index 77f21b90..71e3175c 100644
--- a/src/square/types/accepted_payment_methods.py
+++ b/src/square/types/accepted_payment_methods.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class AcceptedPaymentMethods(UncheckedBaseModel):
diff --git a/src/square/types/accumulate_loyalty_points_response.py b/src/square/types/accumulate_loyalty_points_response.py
index e325083f..29d2527e 100644
--- a/src/square/types/accumulate_loyalty_points_response.py
+++ b/src/square/types/accumulate_loyalty_points_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_event import LoyaltyEvent
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_event import LoyaltyEvent
 
 
 class AccumulateLoyaltyPointsResponse(UncheckedBaseModel):
diff --git a/src/square/types/ach_details.py b/src/square/types/ach_details.py
index 93008cf2..d74fe7dc 100644
--- a/src/square/types/ach_details.py
+++ b/src/square/types/ach_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class AchDetails(UncheckedBaseModel):
diff --git a/src/square/types/add_group_to_customer_response.py b/src/square/types/add_group_to_customer_response.py
index 024dc6db..66230cb2 100644
--- a/src/square/types/add_group_to_customer_response.py
+++ b/src/square/types/add_group_to_customer_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class AddGroupToCustomerResponse(UncheckedBaseModel):
diff --git a/src/square/types/additional_recipient.py b/src/square/types/additional_recipient.py
index e004fd97..33d422e1 100644
--- a/src/square/types/additional_recipient.py
+++ b/src/square/types/additional_recipient.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .money import Money
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class AdditionalRecipient(UncheckedBaseModel):
diff --git a/src/square/types/address.py b/src/square/types/address.py
index e8845466..2a521d93 100644
--- a/src/square/types/address.py
+++ b/src/square/types/address.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import typing_extensions
 import typing
-from ..core.serialization import FieldMetadata
+
 import pydantic
-from .country import Country
+import typing_extensions
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .country import Country
 
 
 class Address(UncheckedBaseModel):
diff --git a/src/square/types/adjust_loyalty_points_response.py b/src/square/types/adjust_loyalty_points_response.py
index f1b92bac..631c79ed 100644
--- a/src/square/types/adjust_loyalty_points_response.py
+++ b/src/square/types/adjust_loyalty_points_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_event import LoyaltyEvent
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_event import LoyaltyEvent
 
 
 class AdjustLoyaltyPointsResponse(UncheckedBaseModel):
diff --git a/src/square/types/afterpay_details.py b/src/square/types/afterpay_details.py
index cf691d9b..e031dd74 100644
--- a/src/square/types/afterpay_details.py
+++ b/src/square/types/afterpay_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class AfterpayDetails(UncheckedBaseModel):
diff --git a/src/square/types/application_details.py b/src/square/types/application_details.py
index 0a040830..f5130c43 100644
--- a/src/square/types/application_details.py
+++ b/src/square/types/application_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .application_details_external_square_product import ApplicationDetailsExternalSquareProduct
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .application_details_external_square_product import ApplicationDetailsExternalSquareProduct
 
 
 class ApplicationDetails(UncheckedBaseModel):
diff --git a/src/square/types/appointment_segment.py b/src/square/types/appointment_segment.py
index 9e8a8b97..670043b2 100644
--- a/src/square/types/appointment_segment.py
+++ b/src/square/types/appointment_segment.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class AppointmentSegment(UncheckedBaseModel):
diff --git a/src/square/types/availability.py b/src/square/types/availability.py
index 27e210a4..abe78790 100644
--- a/src/square/types/availability.py
+++ b/src/square/types/availability.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .appointment_segment import AppointmentSegment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .appointment_segment import AppointmentSegment
 
 
 class Availability(UncheckedBaseModel):
diff --git a/src/square/types/bank_account.py b/src/square/types/bank_account.py
index 6972aa8d..6ded1ce9 100644
--- a/src/square/types/bank_account.py
+++ b/src/square/types/bank_account.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account_status import BankAccountStatus
+from .bank_account_type import BankAccountType
 from .country import Country
 from .currency import Currency
-from .bank_account_type import BankAccountType
-import typing
-from .bank_account_status import BankAccountStatus
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BankAccount(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_created_event.py b/src/square/types/bank_account_created_event.py
index b3872935..737c8b35 100644
--- a/src/square/types/bank_account_created_event.py
+++ b/src/square/types/bank_account_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .bank_account_created_event_data import BankAccountCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account_created_event_data import BankAccountCreatedEventData
 
 
 class BankAccountCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_created_event_data.py b/src/square/types/bank_account_created_event_data.py
index 78b5860b..1cf23caa 100644
--- a/src/square/types/bank_account_created_event_data.py
+++ b/src/square/types/bank_account_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .bank_account_created_event_object import BankAccountCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account_created_event_object import BankAccountCreatedEventObject
 
 
 class BankAccountCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_created_event_object.py b/src/square/types/bank_account_created_event_object.py
index 30826635..8d02b0c6 100644
--- a/src/square/types/bank_account_created_event_object.py
+++ b/src/square/types/bank_account_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .bank_account import BankAccount
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account import BankAccount
 
 
 class BankAccountCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_disabled_event.py b/src/square/types/bank_account_disabled_event.py
index 87a676a4..7dedd436 100644
--- a/src/square/types/bank_account_disabled_event.py
+++ b/src/square/types/bank_account_disabled_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .bank_account_disabled_event_data import BankAccountDisabledEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account_disabled_event_data import BankAccountDisabledEventData
 
 
 class BankAccountDisabledEvent(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_disabled_event_data.py b/src/square/types/bank_account_disabled_event_data.py
index ca4fd970..eb4b8ad3 100644
--- a/src/square/types/bank_account_disabled_event_data.py
+++ b/src/square/types/bank_account_disabled_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .bank_account_disabled_event_object import BankAccountDisabledEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account_disabled_event_object import BankAccountDisabledEventObject
 
 
 class BankAccountDisabledEventData(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_disabled_event_object.py b/src/square/types/bank_account_disabled_event_object.py
index 09b066e1..f218ad66 100644
--- a/src/square/types/bank_account_disabled_event_object.py
+++ b/src/square/types/bank_account_disabled_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .bank_account import BankAccount
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account import BankAccount
 
 
 class BankAccountDisabledEventObject(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_payment_details.py b/src/square/types/bank_account_payment_details.py
index 322e9995..df83d3c9 100644
--- a/src/square/types/bank_account_payment_details.py
+++ b/src/square/types/bank_account_payment_details.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .ach_details import AchDetails
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BankAccountPaymentDetails(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_verified_event.py b/src/square/types/bank_account_verified_event.py
index 0a137308..7f0c08a9 100644
--- a/src/square/types/bank_account_verified_event.py
+++ b/src/square/types/bank_account_verified_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .bank_account_verified_event_data import BankAccountVerifiedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account_verified_event_data import BankAccountVerifiedEventData
 
 
 class BankAccountVerifiedEvent(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_verified_event_data.py b/src/square/types/bank_account_verified_event_data.py
index 2d9cfb5a..6bc3f160 100644
--- a/src/square/types/bank_account_verified_event_data.py
+++ b/src/square/types/bank_account_verified_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .bank_account_verified_event_object import BankAccountVerifiedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account_verified_event_object import BankAccountVerifiedEventObject
 
 
 class BankAccountVerifiedEventData(UncheckedBaseModel):
diff --git a/src/square/types/bank_account_verified_event_object.py b/src/square/types/bank_account_verified_event_object.py
index 3639dc4c..dff2c54c 100644
--- a/src/square/types/bank_account_verified_event_object.py
+++ b/src/square/types/bank_account_verified_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .bank_account import BankAccount
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account import BankAccount
 
 
 class BankAccountVerifiedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/batch_change_inventory_request.py b/src/square/types/batch_change_inventory_request.py
index b07be8df..ef6df43e 100644
--- a/src/square/types/batch_change_inventory_request.py
+++ b/src/square/types/batch_change_inventory_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .inventory_change import InventoryChange
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .inventory_change import InventoryChange
 
 
 class BatchChangeInventoryRequest(UncheckedBaseModel):
diff --git a/src/square/types/batch_change_inventory_response.py b/src/square/types/batch_change_inventory_response.py
index 0f992bab..c297c9fe 100644
--- a/src/square/types/batch_change_inventory_response.py
+++ b/src/square/types/batch_change_inventory_response.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .inventory_count import InventoryCount
-from .inventory_change import InventoryChange
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .inventory_change import InventoryChange
+from .inventory_count import InventoryCount
 
 
 class BatchChangeInventoryResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_create_team_members_response.py b/src/square/types/batch_create_team_members_response.py
index 19f93d61..3abc2a02 100644
--- a/src/square/types/batch_create_team_members_response.py
+++ b/src/square/types/batch_create_team_members_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .create_team_member_response import CreateTeamMemberResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .create_team_member_response import CreateTeamMemberResponse
+from .error import Error
 
 
 class BatchCreateTeamMembersResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_create_vendors_response.py b/src/square/types/batch_create_vendors_response.py
index 3ab97f2e..cea4b23d 100644
--- a/src/square/types/batch_create_vendors_response.py
+++ b/src/square/types/batch_create_vendors_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .create_vendor_response import CreateVendorResponse
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .create_vendor_response import CreateVendorResponse
+from .error import Error
 
 
 class BatchCreateVendorsResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_delete_catalog_objects_response.py b/src/square/types/batch_delete_catalog_objects_response.py
index a59d6ba6..a69c2218 100644
--- a/src/square/types/batch_delete_catalog_objects_response.py
+++ b/src/square/types/batch_delete_catalog_objects_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class BatchDeleteCatalogObjectsResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_get_catalog_objects_response.py b/src/square/types/batch_get_catalog_objects_response.py
index 57ca01ca..746c7ad4 100644
--- a/src/square/types/batch_get_catalog_objects_response.py
+++ b/src/square/types/batch_get_catalog_objects_response.py
@@ -1,21 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
-from .catalog_object import CatalogObject
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class BatchGetCatalogObjectsResponse(UncheckedBaseModel):
@@ -24,12 +16,12 @@ class BatchGetCatalogObjectsResponse(UncheckedBaseModel):
     Any errors that occurred during the request.
     """
 
-    objects: typing.Optional[typing.List[CatalogObject]] = pydantic.Field(default=None)
+    objects: typing.Optional[typing.List["CatalogObject"]] = pydantic.Field(default=None)
     """
     A list of [CatalogObject](entity:CatalogObject)s returned.
     """
 
-    related_objects: typing.Optional[typing.List[CatalogObject]] = pydantic.Field(default=None)
+    related_objects: typing.Optional[typing.List["CatalogObject"]] = pydantic.Field(default=None)
     """
     A list of [CatalogObject](entity:CatalogObject)s referenced by the object in the `objects` field.
     """
@@ -42,3 +34,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(BatchGetCatalogObjectsResponse)
diff --git a/src/square/types/batch_get_inventory_changes_response.py b/src/square/types/batch_get_inventory_changes_response.py
index 6d4225a9..3f1ca249 100644
--- a/src/square/types/batch_get_inventory_changes_response.py
+++ b/src/square/types/batch_get_inventory_changes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .inventory_change import InventoryChange
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .inventory_change import InventoryChange
 
 
 class BatchGetInventoryChangesResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_get_inventory_counts_request.py b/src/square/types/batch_get_inventory_counts_request.py
index 4b5d166d..b8b0ec34 100644
--- a/src/square/types/batch_get_inventory_counts_request.py
+++ b/src/square/types/batch_get_inventory_counts_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .inventory_state import InventoryState
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .inventory_state import InventoryState
 
 
 class BatchGetInventoryCountsRequest(UncheckedBaseModel):
diff --git a/src/square/types/batch_get_inventory_counts_response.py b/src/square/types/batch_get_inventory_counts_response.py
index 26111e33..0404e55f 100644
--- a/src/square/types/batch_get_inventory_counts_response.py
+++ b/src/square/types/batch_get_inventory_counts_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .inventory_count import InventoryCount
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .inventory_count import InventoryCount
 
 
 class BatchGetInventoryCountsResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_get_orders_response.py b/src/square/types/batch_get_orders_response.py
index 735f6795..0d3dab83 100644
--- a/src/square/types/batch_get_orders_response.py
+++ b/src/square/types/batch_get_orders_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order import Order
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .order import Order
 
 
 class BatchGetOrdersResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_get_vendors_response.py b/src/square/types/batch_get_vendors_response.py
index b88d2efe..f3b81215 100644
--- a/src/square/types/batch_get_vendors_response.py
+++ b/src/square/types/batch_get_vendors_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .get_vendor_response import GetVendorResponse
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .get_vendor_response import GetVendorResponse
 
 
 class BatchGetVendorsResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_retrieve_inventory_changes_request.py b/src/square/types/batch_retrieve_inventory_changes_request.py
index 5659616b..dcdf8497 100644
--- a/src/square/types/batch_retrieve_inventory_changes_request.py
+++ b/src/square/types/batch_retrieve_inventory_changes_request.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .inventory_change_type import InventoryChangeType
 from .inventory_state import InventoryState
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BatchRetrieveInventoryChangesRequest(UncheckedBaseModel):
diff --git a/src/square/types/batch_update_team_members_response.py b/src/square/types/batch_update_team_members_response.py
index 479f4a00..2cd85479 100644
--- a/src/square/types/batch_update_team_members_response.py
+++ b/src/square/types/batch_update_team_members_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .update_team_member_response import UpdateTeamMemberResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .update_team_member_response import UpdateTeamMemberResponse
 
 
 class BatchUpdateTeamMembersResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_update_vendors_response.py b/src/square/types/batch_update_vendors_response.py
index dc30f6ca..160e9480 100644
--- a/src/square/types/batch_update_vendors_response.py
+++ b/src/square/types/batch_update_vendors_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .update_vendor_response import UpdateVendorResponse
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .update_vendor_response import UpdateVendorResponse
 
 
 class BatchUpdateVendorsResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_upsert_catalog_objects_response.py b/src/square/types/batch_upsert_catalog_objects_response.py
index 64381bcd..214dd202 100644
--- a/src/square/types/batch_upsert_catalog_objects_response.py
+++ b/src/square/types/batch_upsert_catalog_objects_response.py
@@ -1,22 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
-from .catalog_object import CatalogObject
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_id_mapping import CatalogIdMapping
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .error import Error
 
 
 class BatchUpsertCatalogObjectsResponse(UncheckedBaseModel):
@@ -25,7 +17,7 @@ class BatchUpsertCatalogObjectsResponse(UncheckedBaseModel):
     Any errors that occurred during the request.
     """
 
-    objects: typing.Optional[typing.List[CatalogObject]] = pydantic.Field(default=None)
+    objects: typing.Optional[typing.List["CatalogObject"]] = pydantic.Field(default=None)
     """
     The created successfully created CatalogObjects.
     """
@@ -48,3 +40,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(BatchUpsertCatalogObjectsResponse)
diff --git a/src/square/types/batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request.py b/src/square/types/batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request.py
index f1419dd7..f015e341 100644
--- a/src/square/types/batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request.py
+++ b/src/square/types/batch_upsert_customer_custom_attributes_request_customer_custom_attribute_upsert_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
-from .custom_attribute import CustomAttribute
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
 
 
 class BatchUpsertCustomerCustomAttributesRequestCustomerCustomAttributeUpsertRequest(UncheckedBaseModel):
diff --git a/src/square/types/batch_upsert_customer_custom_attributes_response.py b/src/square/types/batch_upsert_customer_custom_attributes_response.py
index d39627ef..802822ab 100644
--- a/src/square/types/batch_upsert_customer_custom_attributes_response.py
+++ b/src/square/types/batch_upsert_customer_custom_attributes_response.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response import (
     BatchUpsertCustomerCustomAttributesResponseCustomerCustomAttributeUpsertResponse,
 )
-import pydantic
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BatchUpsertCustomerCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response.py b/src/square/types/batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response.py
index 52407342..f35386d0 100644
--- a/src/square/types/batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response.py
+++ b/src/square/types/batch_upsert_customer_custom_attributes_response_customer_custom_attribute_upsert_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .custom_attribute import CustomAttribute
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BatchUpsertCustomerCustomAttributesResponseCustomerCustomAttributeUpsertResponse(UncheckedBaseModel):
diff --git a/src/square/types/booking.py b/src/square/types/booking.py
index 54e6f2e0..122ccf8c 100644
--- a/src/square/types/booking.py
+++ b/src/square/types/booking.py
@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .booking_status import BookingStatus
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .address import Address
 from .appointment_segment import AppointmentSegment
-from .business_appointment_settings_booking_location_type import BusinessAppointmentSettingsBookingLocationType
-from .booking_creator_details import BookingCreatorDetails
 from .booking_booking_source import BookingBookingSource
-from .address import Address
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .booking_creator_details import BookingCreatorDetails
+from .booking_status import BookingStatus
+from .business_appointment_settings_booking_location_type import BusinessAppointmentSettingsBookingLocationType
 
 
 class Booking(UncheckedBaseModel):
diff --git a/src/square/types/booking_created_event.py b/src/square/types/booking_created_event.py
index 34a60913..efe1ff42 100644
--- a/src/square/types/booking_created_event.py
+++ b/src/square/types/booking_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .booking_created_event_data import BookingCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking_created_event_data import BookingCreatedEventData
 
 
 class BookingCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_created_event_data.py b/src/square/types/booking_created_event_data.py
index 8a2b80d5..6dd3c62b 100644
--- a/src/square/types/booking_created_event_data.py
+++ b/src/square/types/booking_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .booking_created_event_object import BookingCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking_created_event_object import BookingCreatedEventObject
 
 
 class BookingCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/booking_created_event_object.py b/src/square/types/booking_created_event_object.py
index 8e483b6e..d4255f56 100644
--- a/src/square/types/booking_created_event_object.py
+++ b/src/square/types/booking_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking import Booking
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking import Booking
 
 
 class BookingCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/booking_creator_details.py b/src/square/types/booking_creator_details.py
index 9e37b5bd..08d463ae 100644
--- a/src/square/types/booking_creator_details.py
+++ b/src/square/types/booking_creator_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking_creator_details_creator_type import BookingCreatorDetailsCreatorType
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking_creator_details_creator_type import BookingCreatorDetailsCreatorType
 
 
 class BookingCreatorDetails(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_definition_owned_created_event.py b/src/square/types/booking_custom_attribute_definition_owned_created_event.py
index 37751b09..e72d893a 100644
--- a/src/square/types/booking_custom_attribute_definition_owned_created_event.py
+++ b/src/square/types/booking_custom_attribute_definition_owned_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class BookingCustomAttributeDefinitionOwnedCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_definition_owned_deleted_event.py b/src/square/types/booking_custom_attribute_definition_owned_deleted_event.py
index 052565b5..a0904e1d 100644
--- a/src/square/types/booking_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/types/booking_custom_attribute_definition_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class BookingCustomAttributeDefinitionOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_definition_owned_updated_event.py b/src/square/types/booking_custom_attribute_definition_owned_updated_event.py
index 344871ba..86e7b5b4 100644
--- a/src/square/types/booking_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/types/booking_custom_attribute_definition_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class BookingCustomAttributeDefinitionOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_definition_visible_created_event.py b/src/square/types/booking_custom_attribute_definition_visible_created_event.py
index 09e84f12..8a3120d9 100644
--- a/src/square/types/booking_custom_attribute_definition_visible_created_event.py
+++ b/src/square/types/booking_custom_attribute_definition_visible_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class BookingCustomAttributeDefinitionVisibleCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_definition_visible_deleted_event.py b/src/square/types/booking_custom_attribute_definition_visible_deleted_event.py
index c1c8779f..614d1634 100644
--- a/src/square/types/booking_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/types/booking_custom_attribute_definition_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class BookingCustomAttributeDefinitionVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_definition_visible_updated_event.py b/src/square/types/booking_custom_attribute_definition_visible_updated_event.py
index d577e6d5..b38b614f 100644
--- a/src/square/types/booking_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/types/booking_custom_attribute_definition_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class BookingCustomAttributeDefinitionVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_delete_request.py b/src/square/types/booking_custom_attribute_delete_request.py
index c429f342..6e7bcf89 100644
--- a/src/square/types/booking_custom_attribute_delete_request.py
+++ b/src/square/types/booking_custom_attribute_delete_request.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class BookingCustomAttributeDeleteRequest(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_delete_response.py b/src/square/types/booking_custom_attribute_delete_response.py
index 0c1bf332..94bea07b 100644
--- a/src/square/types/booking_custom_attribute_delete_response.py
+++ b/src/square/types/booking_custom_attribute_delete_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class BookingCustomAttributeDeleteResponse(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_owned_deleted_event.py b/src/square/types/booking_custom_attribute_owned_deleted_event.py
index 6b2243e5..ad02fbb4 100644
--- a/src/square/types/booking_custom_attribute_owned_deleted_event.py
+++ b/src/square/types/booking_custom_attribute_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class BookingCustomAttributeOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_owned_updated_event.py b/src/square/types/booking_custom_attribute_owned_updated_event.py
index 44c1abca..f603760b 100644
--- a/src/square/types/booking_custom_attribute_owned_updated_event.py
+++ b/src/square/types/booking_custom_attribute_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class BookingCustomAttributeOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_upsert_request.py b/src/square/types/booking_custom_attribute_upsert_request.py
index 23fa6d38..3c4f4ad7 100644
--- a/src/square/types/booking_custom_attribute_upsert_request.py
+++ b/src/square/types/booking_custom_attribute_upsert_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
-from .custom_attribute import CustomAttribute
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
 
 
 class BookingCustomAttributeUpsertRequest(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_upsert_response.py b/src/square/types/booking_custom_attribute_upsert_response.py
index 50f15a02..f408c4b8 100644
--- a/src/square/types/booking_custom_attribute_upsert_response.py
+++ b/src/square/types/booking_custom_attribute_upsert_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .custom_attribute import CustomAttribute
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BookingCustomAttributeUpsertResponse(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_visible_deleted_event.py b/src/square/types/booking_custom_attribute_visible_deleted_event.py
index e8fd80d1..243f0905 100644
--- a/src/square/types/booking_custom_attribute_visible_deleted_event.py
+++ b/src/square/types/booking_custom_attribute_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class BookingCustomAttributeVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_custom_attribute_visible_updated_event.py b/src/square/types/booking_custom_attribute_visible_updated_event.py
index 0610be21..e5a8ebb2 100644
--- a/src/square/types/booking_custom_attribute_visible_updated_event.py
+++ b/src/square/types/booking_custom_attribute_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class BookingCustomAttributeVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_updated_event.py b/src/square/types/booking_updated_event.py
index b6d4a43b..ea72b5c5 100644
--- a/src/square/types/booking_updated_event.py
+++ b/src/square/types/booking_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .booking_updated_event_data import BookingUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking_updated_event_data import BookingUpdatedEventData
 
 
 class BookingUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/booking_updated_event_data.py b/src/square/types/booking_updated_event_data.py
index c547bae0..741b4ca1 100644
--- a/src/square/types/booking_updated_event_data.py
+++ b/src/square/types/booking_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .booking_updated_event_object import BookingUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking_updated_event_object import BookingUpdatedEventObject
 
 
 class BookingUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/booking_updated_event_object.py b/src/square/types/booking_updated_event_object.py
index 5437cbdd..4003d4b4 100644
--- a/src/square/types/booking_updated_event_object.py
+++ b/src/square/types/booking_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking import Booking
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking import Booking
 
 
 class BookingUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/break_.py b/src/square/types/break_.py
index 069c59bd..77da7832 100644
--- a/src/square/types/break_.py
+++ b/src/square/types/break_.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class Break(UncheckedBaseModel):
diff --git a/src/square/types/break_type.py b/src/square/types/break_type.py
index 2678da22..067acdd5 100644
--- a/src/square/types/break_type.py
+++ b/src/square/types/break_type.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class BreakType(UncheckedBaseModel):
diff --git a/src/square/types/bulk_create_customer_data.py b/src/square/types/bulk_create_customer_data.py
index f1ceff45..9ec61e8c 100644
--- a/src/square/types/bulk_create_customer_data.py
+++ b/src/square/types/bulk_create_customer_data.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .address import Address
 from .customer_tax_ids import CustomerTaxIds
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BulkCreateCustomerData(UncheckedBaseModel):
diff --git a/src/square/types/bulk_create_customers_response.py b/src/square/types/bulk_create_customers_response.py
index abd227cc..9fa9b316 100644
--- a/src/square/types/bulk_create_customers_response.py
+++ b/src/square/types/bulk_create_customers_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .create_customer_response import CreateCustomerResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .create_customer_response import CreateCustomerResponse
+from .error import Error
 
 
 class BulkCreateCustomersResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_booking_custom_attributes_response.py b/src/square/types/bulk_delete_booking_custom_attributes_response.py
index e55207e6..ed5a5cd6 100644
--- a/src/square/types/bulk_delete_booking_custom_attributes_response.py
+++ b/src/square/types/bulk_delete_booking_custom_attributes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking_custom_attribute_delete_response import BookingCustomAttributeDeleteResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking_custom_attribute_delete_response import BookingCustomAttributeDeleteResponse
+from .error import Error
 
 
 class BulkDeleteBookingCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_customers_response.py b/src/square/types/bulk_delete_customers_response.py
index 02e20618..8186fb09 100644
--- a/src/square/types/bulk_delete_customers_response.py
+++ b/src/square/types/bulk_delete_customers_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .delete_customer_response import DeleteCustomerResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .delete_customer_response import DeleteCustomerResponse
+from .error import Error
 
 
 class BulkDeleteCustomersResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request.py b/src/square/types/bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request.py
index 83aa75e4..25b1d9da 100644
--- a/src/square/types/bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request.py
+++ b/src/square/types/bulk_delete_location_custom_attributes_request_location_custom_attribute_delete_request.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class BulkDeleteLocationCustomAttributesRequestLocationCustomAttributeDeleteRequest(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_location_custom_attributes_response.py b/src/square/types/bulk_delete_location_custom_attributes_response.py
index dd0bfcad..0afdab7c 100644
--- a/src/square/types/bulk_delete_location_custom_attributes_response.py
+++ b/src/square/types/bulk_delete_location_custom_attributes_response.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response import (
     BulkDeleteLocationCustomAttributesResponseLocationCustomAttributeDeleteResponse,
 )
-import pydantic
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BulkDeleteLocationCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response.py b/src/square/types/bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response.py
index fb405c65..4580d8e6 100644
--- a/src/square/types/bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response.py
+++ b/src/square/types/bulk_delete_location_custom_attributes_response_location_custom_attribute_delete_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class BulkDeleteLocationCustomAttributesResponseLocationCustomAttributeDeleteResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request.py b/src/square/types/bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request.py
index 58c44699..5a039fbb 100644
--- a/src/square/types/bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request.py
+++ b/src/square/types/bulk_delete_merchant_custom_attributes_request_merchant_custom_attribute_delete_request.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class BulkDeleteMerchantCustomAttributesRequestMerchantCustomAttributeDeleteRequest(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_merchant_custom_attributes_response.py b/src/square/types/bulk_delete_merchant_custom_attributes_response.py
index 52f05920..792940d7 100644
--- a/src/square/types/bulk_delete_merchant_custom_attributes_response.py
+++ b/src/square/types/bulk_delete_merchant_custom_attributes_response.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response import (
     BulkDeleteMerchantCustomAttributesResponseMerchantCustomAttributeDeleteResponse,
 )
-import pydantic
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BulkDeleteMerchantCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response.py b/src/square/types/bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response.py
index e19318b9..2e0489bc 100644
--- a/src/square/types/bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response.py
+++ b/src/square/types/bulk_delete_merchant_custom_attributes_response_merchant_custom_attribute_delete_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class BulkDeleteMerchantCustomAttributesResponseMerchantCustomAttributeDeleteResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_order_custom_attributes_request_delete_custom_attribute.py b/src/square/types/bulk_delete_order_custom_attributes_request_delete_custom_attribute.py
index bee10c47..e2f092cb 100644
--- a/src/square/types/bulk_delete_order_custom_attributes_request_delete_custom_attribute.py
+++ b/src/square/types/bulk_delete_order_custom_attributes_request_delete_custom_attribute.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class BulkDeleteOrderCustomAttributesRequestDeleteCustomAttribute(UncheckedBaseModel):
diff --git a/src/square/types/bulk_delete_order_custom_attributes_response.py b/src/square/types/bulk_delete_order_custom_attributes_response.py
index 09d1e52c..2d3c2714 100644
--- a/src/square/types/bulk_delete_order_custom_attributes_response.py
+++ b/src/square/types/bulk_delete_order_custom_attributes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .delete_order_custom_attribute_response import DeleteOrderCustomAttributeResponse
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .delete_order_custom_attribute_response import DeleteOrderCustomAttributeResponse
+from .error import Error
 
 
 class BulkDeleteOrderCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_publish_scheduled_shifts_data.py b/src/square/types/bulk_publish_scheduled_shifts_data.py
index c2d5a27d..eae202f9 100644
--- a/src/square/types/bulk_publish_scheduled_shifts_data.py
+++ b/src/square/types/bulk_publish_scheduled_shifts_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class BulkPublishScheduledShiftsData(UncheckedBaseModel):
diff --git a/src/square/types/bulk_publish_scheduled_shifts_response.py b/src/square/types/bulk_publish_scheduled_shifts_response.py
index 0cead3cb..61640447 100644
--- a/src/square/types/bulk_publish_scheduled_shifts_response.py
+++ b/src/square/types/bulk_publish_scheduled_shifts_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .publish_scheduled_shift_response import PublishScheduledShiftResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .publish_scheduled_shift_response import PublishScheduledShiftResponse
 
 
 class BulkPublishScheduledShiftsResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_retrieve_bookings_response.py b/src/square/types/bulk_retrieve_bookings_response.py
index 5921446a..5b12336e 100644
--- a/src/square/types/bulk_retrieve_bookings_response.py
+++ b/src/square/types/bulk_retrieve_bookings_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .get_booking_response import GetBookingResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .get_booking_response import GetBookingResponse
 
 
 class BulkRetrieveBookingsResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_retrieve_customers_response.py b/src/square/types/bulk_retrieve_customers_response.py
index 37fe6bdc..db08eb1f 100644
--- a/src/square/types/bulk_retrieve_customers_response.py
+++ b/src/square/types/bulk_retrieve_customers_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .get_customer_response import GetCustomerResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .get_customer_response import GetCustomerResponse
 
 
 class BulkRetrieveCustomersResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_retrieve_team_member_booking_profiles_response.py b/src/square/types/bulk_retrieve_team_member_booking_profiles_response.py
index 5c9f6c30..e1dc8972 100644
--- a/src/square/types/bulk_retrieve_team_member_booking_profiles_response.py
+++ b/src/square/types/bulk_retrieve_team_member_booking_profiles_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .get_team_member_booking_profile_response import GetTeamMemberBookingProfileResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .get_team_member_booking_profile_response import GetTeamMemberBookingProfileResponse
 
 
 class BulkRetrieveTeamMemberBookingProfilesResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_swap_plan_response.py b/src/square/types/bulk_swap_plan_response.py
index ed661de4..e002e411 100644
--- a/src/square/types/bulk_swap_plan_response.py
+++ b/src/square/types/bulk_swap_plan_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class BulkSwapPlanResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_update_customer_data.py b/src/square/types/bulk_update_customer_data.py
index 03236b08..7c2eb3d5 100644
--- a/src/square/types/bulk_update_customer_data.py
+++ b/src/square/types/bulk_update_customer_data.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .address import Address
 from .customer_tax_ids import CustomerTaxIds
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BulkUpdateCustomerData(UncheckedBaseModel):
diff --git a/src/square/types/bulk_update_customers_response.py b/src/square/types/bulk_update_customers_response.py
index 755cd8bc..804c708e 100644
--- a/src/square/types/bulk_update_customers_response.py
+++ b/src/square/types/bulk_update_customers_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .update_customer_response import UpdateCustomerResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .update_customer_response import UpdateCustomerResponse
 
 
 class BulkUpdateCustomersResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_upsert_booking_custom_attributes_response.py b/src/square/types/bulk_upsert_booking_custom_attributes_response.py
index e9631e7a..d6a0da93 100644
--- a/src/square/types/bulk_upsert_booking_custom_attributes_response.py
+++ b/src/square/types/bulk_upsert_booking_custom_attributes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking_custom_attribute_upsert_response import BookingCustomAttributeUpsertResponse
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking_custom_attribute_upsert_response import BookingCustomAttributeUpsertResponse
+from .error import Error
 
 
 class BulkUpsertBookingCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request.py b/src/square/types/bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request.py
index c6024c34..c3e794b5 100644
--- a/src/square/types/bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request.py
+++ b/src/square/types/bulk_upsert_location_custom_attributes_request_location_custom_attribute_upsert_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
-from .custom_attribute import CustomAttribute
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
 
 
 class BulkUpsertLocationCustomAttributesRequestLocationCustomAttributeUpsertRequest(UncheckedBaseModel):
diff --git a/src/square/types/bulk_upsert_location_custom_attributes_response.py b/src/square/types/bulk_upsert_location_custom_attributes_response.py
index 71212b1d..762ffbff 100644
--- a/src/square/types/bulk_upsert_location_custom_attributes_response.py
+++ b/src/square/types/bulk_upsert_location_custom_attributes_response.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response import (
     BulkUpsertLocationCustomAttributesResponseLocationCustomAttributeUpsertResponse,
 )
-import pydantic
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BulkUpsertLocationCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response.py b/src/square/types/bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response.py
index 62b7d92b..e30c6196 100644
--- a/src/square/types/bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response.py
+++ b/src/square/types/bulk_upsert_location_custom_attributes_response_location_custom_attribute_upsert_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .custom_attribute import CustomAttribute
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BulkUpsertLocationCustomAttributesResponseLocationCustomAttributeUpsertResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request.py b/src/square/types/bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request.py
index b8c0be43..91cb2096 100644
--- a/src/square/types/bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request.py
+++ b/src/square/types/bulk_upsert_merchant_custom_attributes_request_merchant_custom_attribute_upsert_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
-from .custom_attribute import CustomAttribute
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
 
 
 class BulkUpsertMerchantCustomAttributesRequestMerchantCustomAttributeUpsertRequest(UncheckedBaseModel):
diff --git a/src/square/types/bulk_upsert_merchant_custom_attributes_response.py b/src/square/types/bulk_upsert_merchant_custom_attributes_response.py
index 65bbe54e..cbe56a86 100644
--- a/src/square/types/bulk_upsert_merchant_custom_attributes_response.py
+++ b/src/square/types/bulk_upsert_merchant_custom_attributes_response.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response import (
     BulkUpsertMerchantCustomAttributesResponseMerchantCustomAttributeUpsertResponse,
 )
-import pydantic
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BulkUpsertMerchantCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response.py b/src/square/types/bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response.py
index 7f890090..3d7ef7e3 100644
--- a/src/square/types/bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response.py
+++ b/src/square/types/bulk_upsert_merchant_custom_attributes_response_merchant_custom_attribute_upsert_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .custom_attribute import CustomAttribute
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BulkUpsertMerchantCustomAttributesResponseMerchantCustomAttributeUpsertResponse(UncheckedBaseModel):
diff --git a/src/square/types/bulk_upsert_order_custom_attributes_request_upsert_custom_attribute.py b/src/square/types/bulk_upsert_order_custom_attributes_request_upsert_custom_attribute.py
index 15e06957..3dd4b292 100644
--- a/src/square/types/bulk_upsert_order_custom_attributes_request_upsert_custom_attribute.py
+++ b/src/square/types/bulk_upsert_order_custom_attributes_request_upsert_custom_attribute.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .custom_attribute import CustomAttribute
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
 
 
 class BulkUpsertOrderCustomAttributesRequestUpsertCustomAttribute(UncheckedBaseModel):
diff --git a/src/square/types/bulk_upsert_order_custom_attributes_response.py b/src/square/types/bulk_upsert_order_custom_attributes_response.py
index 4ac16df6..b09f66f2 100644
--- a/src/square/types/bulk_upsert_order_custom_attributes_response.py
+++ b/src/square/types/bulk_upsert_order_custom_attributes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .upsert_order_custom_attribute_response import UpsertOrderCustomAttributeResponse
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .upsert_order_custom_attribute_response import UpsertOrderCustomAttributeResponse
 
 
 class BulkUpsertOrderCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/business_appointment_settings.py b/src/square/types/business_appointment_settings.py
index 30eddb32..af5de66c 100644
--- a/src/square/types/business_appointment_settings.py
+++ b/src/square/types/business_appointment_settings.py
@@ -1,16 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .business_appointment_settings_booking_location_type import BusinessAppointmentSettingsBookingLocationType
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .business_appointment_settings_alignment_time import BusinessAppointmentSettingsAlignmentTime
+from .business_appointment_settings_booking_location_type import BusinessAppointmentSettingsBookingLocationType
+from .business_appointment_settings_cancellation_policy import BusinessAppointmentSettingsCancellationPolicy
 from .business_appointment_settings_max_appointments_per_day_limit_type import (
     BusinessAppointmentSettingsMaxAppointmentsPerDayLimitType,
 )
 from .money import Money
-from .business_appointment_settings_cancellation_policy import BusinessAppointmentSettingsCancellationPolicy
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BusinessAppointmentSettings(UncheckedBaseModel):
diff --git a/src/square/types/business_booking_profile.py b/src/square/types/business_booking_profile.py
index 3f9fdf40..ce21ba2d 100644
--- a/src/square/types/business_booking_profile.py
+++ b/src/square/types/business_booking_profile.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .business_booking_profile_customer_timezone_choice import BusinessBookingProfileCustomerTimezoneChoice
-from .business_booking_profile_booking_policy import BusinessBookingProfileBookingPolicy
-from .business_appointment_settings import BusinessAppointmentSettings
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .business_appointment_settings import BusinessAppointmentSettings
+from .business_booking_profile_booking_policy import BusinessBookingProfileBookingPolicy
+from .business_booking_profile_customer_timezone_choice import BusinessBookingProfileCustomerTimezoneChoice
 
 
 class BusinessBookingProfile(UncheckedBaseModel):
diff --git a/src/square/types/business_hours.py b/src/square/types/business_hours.py
index 375eeed8..63507106 100644
--- a/src/square/types/business_hours.py
+++ b/src/square/types/business_hours.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .business_hours_period import BusinessHoursPeriod
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .business_hours_period import BusinessHoursPeriod
 
 
 class BusinessHours(UncheckedBaseModel):
diff --git a/src/square/types/business_hours_period.py b/src/square/types/business_hours_period.py
index d4ca2994..80a0c02c 100644
--- a/src/square/types/business_hours_period.py
+++ b/src/square/types/business_hours_period.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .day_of_week import DayOfWeek
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .day_of_week import DayOfWeek
 
 
 class BusinessHoursPeriod(UncheckedBaseModel):
diff --git a/src/square/types/buy_now_pay_later_details.py b/src/square/types/buy_now_pay_later_details.py
index 26a40cbd..bcc219c5 100644
--- a/src/square/types/buy_now_pay_later_details.py
+++ b/src/square/types/buy_now_pay_later_details.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .afterpay_details import AfterpayDetails
 from .clearpay_details import ClearpayDetails
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class BuyNowPayLaterDetails(UncheckedBaseModel):
diff --git a/src/square/types/calculate_loyalty_points_response.py b/src/square/types/calculate_loyalty_points_response.py
index 2afdc678..db1cbd65 100644
--- a/src/square/types/calculate_loyalty_points_response.py
+++ b/src/square/types/calculate_loyalty_points_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class CalculateLoyaltyPointsResponse(UncheckedBaseModel):
diff --git a/src/square/types/calculate_order_response.py b/src/square/types/calculate_order_response.py
index d89ba237..63d596bb 100644
--- a/src/square/types/calculate_order_response.py
+++ b/src/square/types/calculate_order_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order import Order
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .order import Order
 
 
 class CalculateOrderResponse(UncheckedBaseModel):
diff --git a/src/square/types/cancel_booking_response.py b/src/square/types/cancel_booking_response.py
index ddac7350..52e29727 100644
--- a/src/square/types/cancel_booking_response.py
+++ b/src/square/types/cancel_booking_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking import Booking
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking import Booking
+from .error import Error
 
 
 class CancelBookingResponse(UncheckedBaseModel):
diff --git a/src/square/types/cancel_invoice_response.py b/src/square/types/cancel_invoice_response.py
index f612eff6..75e4eee1 100644
--- a/src/square/types/cancel_invoice_response.py
+++ b/src/square/types/cancel_invoice_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .invoice import Invoice
 
 
 class CancelInvoiceResponse(UncheckedBaseModel):
diff --git a/src/square/types/cancel_loyalty_promotion_response.py b/src/square/types/cancel_loyalty_promotion_response.py
index d1ade92d..6f6872a0 100644
--- a/src/square/types/cancel_loyalty_promotion_response.py
+++ b/src/square/types/cancel_loyalty_promotion_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_promotion import LoyaltyPromotion
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_promotion import LoyaltyPromotion
 
 
 class CancelLoyaltyPromotionResponse(UncheckedBaseModel):
diff --git a/src/square/types/cancel_payment_by_idempotency_key_response.py b/src/square/types/cancel_payment_by_idempotency_key_response.py
index 368ec5d3..e04f399c 100644
--- a/src/square/types/cancel_payment_by_idempotency_key_response.py
+++ b/src/square/types/cancel_payment_by_idempotency_key_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class CancelPaymentByIdempotencyKeyResponse(UncheckedBaseModel):
diff --git a/src/square/types/cancel_payment_response.py b/src/square/types/cancel_payment_response.py
index 94a7ac32..4c77fec9 100644
--- a/src/square/types/cancel_payment_response.py
+++ b/src/square/types/cancel_payment_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment import Payment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment import Payment
 
 
 class CancelPaymentResponse(UncheckedBaseModel):
diff --git a/src/square/types/cancel_subscription_response.py b/src/square/types/cancel_subscription_response.py
index 63a78284..4527ba0b 100644
--- a/src/square/types/cancel_subscription_response.py
+++ b/src/square/types/cancel_subscription_response.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 from .subscription import Subscription
 from .subscription_action import SubscriptionAction
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CancelSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/cancel_terminal_action_response.py b/src/square/types/cancel_terminal_action_response.py
index 4e393d9e..74d9875f 100644
--- a/src/square/types/cancel_terminal_action_response.py
+++ b/src/square/types/cancel_terminal_action_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_action import TerminalAction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_action import TerminalAction
 
 
 class CancelTerminalActionResponse(UncheckedBaseModel):
diff --git a/src/square/types/cancel_terminal_checkout_response.py b/src/square/types/cancel_terminal_checkout_response.py
index 8a99df36..918c3207 100644
--- a/src/square/types/cancel_terminal_checkout_response.py
+++ b/src/square/types/cancel_terminal_checkout_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_checkout import TerminalCheckout
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_checkout import TerminalCheckout
 
 
 class CancelTerminalCheckoutResponse(UncheckedBaseModel):
diff --git a/src/square/types/cancel_terminal_refund_response.py b/src/square/types/cancel_terminal_refund_response.py
index 6c73b8af..f1b1cd3f 100644
--- a/src/square/types/cancel_terminal_refund_response.py
+++ b/src/square/types/cancel_terminal_refund_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_refund import TerminalRefund
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_refund import TerminalRefund
 
 
 class CancelTerminalRefundResponse(UncheckedBaseModel):
diff --git a/src/square/types/capture_transaction_response.py b/src/square/types/capture_transaction_response.py
index a552918f..1ad61d65 100644
--- a/src/square/types/capture_transaction_response.py
+++ b/src/square/types/capture_transaction_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class CaptureTransactionResponse(UncheckedBaseModel):
diff --git a/src/square/types/card.py b/src/square/types/card.py
index 93aa7eb2..e959ab2a 100644
--- a/src/square/types/card.py
+++ b/src/square/types/card.py
@@ -1,17 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_brand import CardBrand
 import typing_extensions
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .address import Address
-from .card_type import CardType
-from .card_prepaid_type import CardPrepaidType
+from .card_brand import CardBrand
 from .card_co_brand import CardCoBrand
 from .card_issuer_alert import CardIssuerAlert
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .card_prepaid_type import CardPrepaidType
+from .card_type import CardType
 
 
 class Card(UncheckedBaseModel):
diff --git a/src/square/types/card_automatically_updated_event.py b/src/square/types/card_automatically_updated_event.py
index 87870776..be8d2ed9 100644
--- a/src/square/types/card_automatically_updated_event.py
+++ b/src/square/types/card_automatically_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_automatically_updated_event_data import CardAutomaticallyUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_automatically_updated_event_data import CardAutomaticallyUpdatedEventData
 
 
 class CardAutomaticallyUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/card_automatically_updated_event_data.py b/src/square/types/card_automatically_updated_event_data.py
index 5540b595..2b65f1a3 100644
--- a/src/square/types/card_automatically_updated_event_data.py
+++ b/src/square/types/card_automatically_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_automatically_updated_event_object import CardAutomaticallyUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_automatically_updated_event_object import CardAutomaticallyUpdatedEventObject
 
 
 class CardAutomaticallyUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/card_automatically_updated_event_object.py b/src/square/types/card_automatically_updated_event_object.py
index 82f90040..a073a90d 100644
--- a/src/square/types/card_automatically_updated_event_object.py
+++ b/src/square/types/card_automatically_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .card import Card
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
 
 
 class CardAutomaticallyUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/card_created_event.py b/src/square/types/card_created_event.py
index 5f93f6e9..67fbb239 100644
--- a/src/square/types/card_created_event.py
+++ b/src/square/types/card_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_created_event_data import CardCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_created_event_data import CardCreatedEventData
 
 
 class CardCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/card_created_event_data.py b/src/square/types/card_created_event_data.py
index 10e14290..118ff842 100644
--- a/src/square/types/card_created_event_data.py
+++ b/src/square/types/card_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_created_event_object import CardCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_created_event_object import CardCreatedEventObject
 
 
 class CardCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/card_created_event_object.py b/src/square/types/card_created_event_object.py
index 98dd7d69..f1bfcd58 100644
--- a/src/square/types/card_created_event_object.py
+++ b/src/square/types/card_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .card import Card
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
 
 
 class CardCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/card_disabled_event.py b/src/square/types/card_disabled_event.py
index fd9c4a5d..8ac71ee4 100644
--- a/src/square/types/card_disabled_event.py
+++ b/src/square/types/card_disabled_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_disabled_event_data import CardDisabledEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_disabled_event_data import CardDisabledEventData
 
 
 class CardDisabledEvent(UncheckedBaseModel):
diff --git a/src/square/types/card_disabled_event_data.py b/src/square/types/card_disabled_event_data.py
index 53d71abc..7eae28a1 100644
--- a/src/square/types/card_disabled_event_data.py
+++ b/src/square/types/card_disabled_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_disabled_event_object import CardDisabledEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_disabled_event_object import CardDisabledEventObject
 
 
 class CardDisabledEventData(UncheckedBaseModel):
diff --git a/src/square/types/card_disabled_event_object.py b/src/square/types/card_disabled_event_object.py
index b5840e37..5029e079 100644
--- a/src/square/types/card_disabled_event_object.py
+++ b/src/square/types/card_disabled_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .card import Card
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
 
 
 class CardDisabledEventObject(UncheckedBaseModel):
diff --git a/src/square/types/card_forgotten_event.py b/src/square/types/card_forgotten_event.py
index 3cbb3d28..26ad3067 100644
--- a/src/square/types/card_forgotten_event.py
+++ b/src/square/types/card_forgotten_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_forgotten_event_data import CardForgottenEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_forgotten_event_data import CardForgottenEventData
 
 
 class CardForgottenEvent(UncheckedBaseModel):
diff --git a/src/square/types/card_forgotten_event_card.py b/src/square/types/card_forgotten_event_card.py
index ecfb63f0..3696fdac 100644
--- a/src/square/types/card_forgotten_event_card.py
+++ b/src/square/types/card_forgotten_event_card.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CardForgottenEventCard(UncheckedBaseModel):
diff --git a/src/square/types/card_forgotten_event_data.py b/src/square/types/card_forgotten_event_data.py
index de78aeba..f26729de 100644
--- a/src/square/types/card_forgotten_event_data.py
+++ b/src/square/types/card_forgotten_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_forgotten_event_object import CardForgottenEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_forgotten_event_object import CardForgottenEventObject
 
 
 class CardForgottenEventData(UncheckedBaseModel):
diff --git a/src/square/types/card_forgotten_event_object.py b/src/square/types/card_forgotten_event_object.py
index b4cf61dc..2bb2ac16 100644
--- a/src/square/types/card_forgotten_event_object.py
+++ b/src/square/types/card_forgotten_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .card_forgotten_event_card import CardForgottenEventCard
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_forgotten_event_card import CardForgottenEventCard
 
 
 class CardForgottenEventObject(UncheckedBaseModel):
diff --git a/src/square/types/card_payment_details.py b/src/square/types/card_payment_details.py
index 8dd7b108..f8c0eba0 100644
--- a/src/square/types/card_payment_details.py
+++ b/src/square/types/card_payment_details.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .card import Card
-from .device_details import DeviceDetails
 from .card_payment_timeline import CardPaymentTimeline
+from .device_details import DeviceDetails
 from .error import Error
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CardPaymentDetails(UncheckedBaseModel):
diff --git a/src/square/types/card_payment_timeline.py b/src/square/types/card_payment_timeline.py
index 57869896..49467632 100644
--- a/src/square/types/card_payment_timeline.py
+++ b/src/square/types/card_payment_timeline.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CardPaymentTimeline(UncheckedBaseModel):
diff --git a/src/square/types/card_updated_event.py b/src/square/types/card_updated_event.py
index 1f1cf38b..a5943f9b 100644
--- a/src/square/types/card_updated_event.py
+++ b/src/square/types/card_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_updated_event_data import CardUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_updated_event_data import CardUpdatedEventData
 
 
 class CardUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/card_updated_event_data.py b/src/square/types/card_updated_event_data.py
index ff129f11..d6e6027c 100644
--- a/src/square/types/card_updated_event_data.py
+++ b/src/square/types/card_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .card_updated_event_object import CardUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_updated_event_object import CardUpdatedEventObject
 
 
 class CardUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/card_updated_event_object.py b/src/square/types/card_updated_event_object.py
index f84388bf..5c31ee88 100644
--- a/src/square/types/card_updated_event_object.py
+++ b/src/square/types/card_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .card import Card
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
 
 
 class CardUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/cash_app_details.py b/src/square/types/cash_app_details.py
index 6d72a572..996e7770 100644
--- a/src/square/types/cash_app_details.py
+++ b/src/square/types/cash_app_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CashAppDetails(UncheckedBaseModel):
diff --git a/src/square/types/cash_drawer_device.py b/src/square/types/cash_drawer_device.py
index 7515396d..10cd29bf 100644
--- a/src/square/types/cash_drawer_device.py
+++ b/src/square/types/cash_drawer_device.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CashDrawerDevice(UncheckedBaseModel):
diff --git a/src/square/types/cash_drawer_shift.py b/src/square/types/cash_drawer_shift.py
index a222d903..967ddfe8 100644
--- a/src/square/types/cash_drawer_shift.py
+++ b/src/square/types/cash_drawer_shift.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .cash_drawer_device import CashDrawerDevice
 from .cash_drawer_shift_state import CashDrawerShiftState
 from .money import Money
-from .cash_drawer_device import CashDrawerDevice
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CashDrawerShift(UncheckedBaseModel):
diff --git a/src/square/types/cash_drawer_shift_event.py b/src/square/types/cash_drawer_shift_event.py
index e239a85b..49a2cba7 100644
--- a/src/square/types/cash_drawer_shift_event.py
+++ b/src/square/types/cash_drawer_shift_event.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .cash_drawer_event_type import CashDrawerEventType
 from .money import Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CashDrawerShiftEvent(UncheckedBaseModel):
diff --git a/src/square/types/cash_drawer_shift_summary.py b/src/square/types/cash_drawer_shift_summary.py
index 7005c6c4..ef988c82 100644
--- a/src/square/types/cash_drawer_shift_summary.py
+++ b/src/square/types/cash_drawer_shift_summary.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .cash_drawer_shift_state import CashDrawerShiftState
 from .money import Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CashDrawerShiftSummary(UncheckedBaseModel):
diff --git a/src/square/types/cash_payment_details.py b/src/square/types/cash_payment_details.py
index bc0fd033..afe88268 100644
--- a/src/square/types/cash_payment_details.py
+++ b/src/square/types/cash_payment_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class CashPaymentDetails(UncheckedBaseModel):
diff --git a/src/square/types/catalog_availability_period.py b/src/square/types/catalog_availability_period.py
index 64d21261..d6a4f2d4 100644
--- a/src/square/types/catalog_availability_period.py
+++ b/src/square/types/catalog_availability_period.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .day_of_week import DayOfWeek
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .day_of_week import DayOfWeek
 
 
 class CatalogAvailabilityPeriod(UncheckedBaseModel):
diff --git a/src/square/types/catalog_category.py b/src/square/types/catalog_category.py
index 2a185f17..0afee47e 100644
--- a/src/square/types/catalog_category.py
+++ b/src/square/types/catalog_category.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
+
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_category_type import CatalogCategoryType
 from .catalog_ecom_seo_data import CatalogEcomSeoData
 from .category_path_to_root_node import CategoryPathToRootNode
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
 
 
 class CatalogCategory(UncheckedBaseModel):
@@ -84,6 +85,6 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_object_category import CatalogObjectCategory  # noqa: E402
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogCategory)
diff --git a/src/square/types/catalog_custom_attribute_definition.py b/src/square/types/catalog_custom_attribute_definition.py
index d4fe0883..93cf4bea 100644
--- a/src/square/types/catalog_custom_attribute_definition.py
+++ b/src/square/types/catalog_custom_attribute_definition.py
@@ -1,17 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_custom_attribute_definition_type import CatalogCustomAttributeDefinitionType
-import pydantic
 import typing
-from .source_application import SourceApplication
-from .catalog_object_type import CatalogObjectType
-from .catalog_custom_attribute_definition_seller_visibility import CatalogCustomAttributeDefinitionSellerVisibility
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_custom_attribute_definition_app_visibility import CatalogCustomAttributeDefinitionAppVisibility
-from .catalog_custom_attribute_definition_string_config import CatalogCustomAttributeDefinitionStringConfig
 from .catalog_custom_attribute_definition_number_config import CatalogCustomAttributeDefinitionNumberConfig
 from .catalog_custom_attribute_definition_selection_config import CatalogCustomAttributeDefinitionSelectionConfig
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .catalog_custom_attribute_definition_seller_visibility import CatalogCustomAttributeDefinitionSellerVisibility
+from .catalog_custom_attribute_definition_string_config import CatalogCustomAttributeDefinitionStringConfig
+from .catalog_custom_attribute_definition_type import CatalogCustomAttributeDefinitionType
+from .catalog_object_type import CatalogObjectType
+from .source_application import SourceApplication
 
 
 class CatalogCustomAttributeDefinition(UncheckedBaseModel):
diff --git a/src/square/types/catalog_custom_attribute_definition_number_config.py b/src/square/types/catalog_custom_attribute_definition_number_config.py
index 4869d458..8c722499 100644
--- a/src/square/types/catalog_custom_attribute_definition_number_config.py
+++ b/src/square/types/catalog_custom_attribute_definition_number_config.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogCustomAttributeDefinitionNumberConfig(UncheckedBaseModel):
diff --git a/src/square/types/catalog_custom_attribute_definition_selection_config.py b/src/square/types/catalog_custom_attribute_definition_selection_config.py
index 34e42e21..ccaf9071 100644
--- a/src/square/types/catalog_custom_attribute_definition_selection_config.py
+++ b/src/square/types/catalog_custom_attribute_definition_selection_config.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_custom_attribute_definition_selection_config_custom_attribute_selection import (
     CatalogCustomAttributeDefinitionSelectionConfigCustomAttributeSelection,
 )
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CatalogCustomAttributeDefinitionSelectionConfig(UncheckedBaseModel):
diff --git a/src/square/types/catalog_custom_attribute_definition_selection_config_custom_attribute_selection.py b/src/square/types/catalog_custom_attribute_definition_selection_config_custom_attribute_selection.py
index cda11f87..c48b3588 100644
--- a/src/square/types/catalog_custom_attribute_definition_selection_config_custom_attribute_selection.py
+++ b/src/square/types/catalog_custom_attribute_definition_selection_config_custom_attribute_selection.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogCustomAttributeDefinitionSelectionConfigCustomAttributeSelection(UncheckedBaseModel):
diff --git a/src/square/types/catalog_custom_attribute_definition_string_config.py b/src/square/types/catalog_custom_attribute_definition_string_config.py
index eac438ba..14a89109 100644
--- a/src/square/types/catalog_custom_attribute_definition_string_config.py
+++ b/src/square/types/catalog_custom_attribute_definition_string_config.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogCustomAttributeDefinitionStringConfig(UncheckedBaseModel):
diff --git a/src/square/types/catalog_custom_attribute_value.py b/src/square/types/catalog_custom_attribute_value.py
index 519f60bb..5eca36ab 100644
--- a/src/square/types/catalog_custom_attribute_value.py
+++ b/src/square/types/catalog_custom_attribute_value.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .catalog_custom_attribute_definition_type import CatalogCustomAttributeDefinitionType
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_definition_type import CatalogCustomAttributeDefinitionType
 
 
 class CatalogCustomAttributeValue(UncheckedBaseModel):
diff --git a/src/square/types/catalog_discount.py b/src/square/types/catalog_discount.py
index 66179f39..3aa239af 100644
--- a/src/square/types/catalog_discount.py
+++ b/src/square/types/catalog_discount.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_discount_modify_tax_basis import CatalogDiscountModifyTaxBasis
 from .catalog_discount_type import CatalogDiscountType
 from .money import Money
-from .catalog_discount_modify_tax_basis import CatalogDiscountModifyTaxBasis
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CatalogDiscount(UncheckedBaseModel):
diff --git a/src/square/types/catalog_ecom_seo_data.py b/src/square/types/catalog_ecom_seo_data.py
index f6ac1540..af9947f3 100644
--- a/src/square/types/catalog_ecom_seo_data.py
+++ b/src/square/types/catalog_ecom_seo_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogEcomSeoData(UncheckedBaseModel):
diff --git a/src/square/types/catalog_id_mapping.py b/src/square/types/catalog_id_mapping.py
index 6a146a50..97d5d4a5 100644
--- a/src/square/types/catalog_id_mapping.py
+++ b/src/square/types/catalog_id_mapping.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogIdMapping(UncheckedBaseModel):
diff --git a/src/square/types/catalog_image.py b/src/square/types/catalog_image.py
index 5628e596..94fef941 100644
--- a/src/square/types/catalog_image.py
+++ b/src/square/types/catalog_image.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogImage(UncheckedBaseModel):
diff --git a/src/square/types/catalog_info_response.py b/src/square/types/catalog_info_response.py
index 01adbd1b..2a8a909b 100644
--- a/src/square/types/catalog_info_response.py
+++ b/src/square/types/catalog_info_response.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_info_response_limits import CatalogInfoResponseLimits
+from .error import Error
 from .standard_unit_description_group import StandardUnitDescriptionGroup
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CatalogInfoResponse(UncheckedBaseModel):
diff --git a/src/square/types/catalog_info_response_limits.py b/src/square/types/catalog_info_response_limits.py
index 4a603979..4de62bb4 100644
--- a/src/square/types/catalog_info_response_limits.py
+++ b/src/square/types/catalog_info_response_limits.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogInfoResponseLimits(UncheckedBaseModel):
diff --git a/src/square/types/catalog_item.py b/src/square/types/catalog_item.py
index 0d3a66cc..0e679cd9 100644
--- a/src/square/types/catalog_item.py
+++ b/src/square/types/catalog_item.py
@@ -1,18 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_object_category import CatalogObjectCategory
+
 import typing
+
 import pydantic
-from .catalog_item_modifier_list_info import CatalogItemModifierListInfo
-from .catalog_item_product_type import CatalogItemProductType
-from .catalog_item_option_for_item import CatalogItemOptionForItem
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_ecom_seo_data import CatalogEcomSeoData
 from .catalog_item_food_and_beverage_details import CatalogItemFoodAndBeverageDetails
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
+from .catalog_item_modifier_list_info import CatalogItemModifierListInfo
+from .catalog_item_option_for_item import CatalogItemOptionForItem
+from .catalog_item_product_type import CatalogItemProductType
 
 
 class CatalogItem(UncheckedBaseModel):
@@ -132,7 +131,7 @@ class CatalogItem(UncheckedBaseModel):
     It is currently supported for sellers of the Japanese locale only.
     """
 
-    categories: typing.Optional[typing.List[CatalogObjectCategory]] = pydantic.Field(default=None)
+    categories: typing.Optional[typing.List["CatalogObjectCategory"]] = pydantic.Field(default=None)
     """
     The list of categories.
     """
@@ -191,7 +190,7 @@ class CatalogItem(UncheckedBaseModel):
     The food and beverage-specific details for the `FOOD_AND_BEV` item.
     """
 
-    reporting_category: typing.Optional[CatalogObjectCategory] = pydantic.Field(default=None)
+    reporting_category: typing.Optional["CatalogObjectCategory"] = pydantic.Field(default=None)
     """
     The item's reporting category.
     """
@@ -211,13 +210,15 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_item_option import CatalogItemOption  # noqa: E402
-from .catalog_modifier_list import CatalogModifierList  # noqa: E402
-from .catalog_object_item import CatalogObjectItem  # noqa: E402
-from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402
-from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402
-from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402
-from .catalog_object import CatalogObject  # noqa: E402
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogItem)
diff --git a/src/square/types/catalog_item_food_and_beverage_details.py b/src/square/types/catalog_item_food_and_beverage_details.py
index 56041d08..c2a8c78c 100644
--- a/src/square/types/catalog_item_food_and_beverage_details.py
+++ b/src/square/types/catalog_item_food_and_beverage_details.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_item_food_and_beverage_details_dietary_preference import (
     CatalogItemFoodAndBeverageDetailsDietaryPreference,
 )
 from .catalog_item_food_and_beverage_details_ingredient import CatalogItemFoodAndBeverageDetailsIngredient
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CatalogItemFoodAndBeverageDetails(UncheckedBaseModel):
diff --git a/src/square/types/catalog_item_food_and_beverage_details_dietary_preference.py b/src/square/types/catalog_item_food_and_beverage_details_dietary_preference.py
index 282ba86f..9371dba5 100644
--- a/src/square/types/catalog_item_food_and_beverage_details_dietary_preference.py
+++ b/src/square/types/catalog_item_food_and_beverage_details_dietary_preference.py
@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_item_food_and_beverage_details_dietary_preference_type import (
-    CatalogItemFoodAndBeverageDetailsDietaryPreferenceType,
-)
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_item_food_and_beverage_details_dietary_preference_standard_dietary_preference import (
     CatalogItemFoodAndBeverageDetailsDietaryPreferenceStandardDietaryPreference,
 )
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .catalog_item_food_and_beverage_details_dietary_preference_type import (
+    CatalogItemFoodAndBeverageDetailsDietaryPreferenceType,
+)
 
 
 class CatalogItemFoodAndBeverageDetailsDietaryPreference(UncheckedBaseModel):
diff --git a/src/square/types/catalog_item_food_and_beverage_details_ingredient.py b/src/square/types/catalog_item_food_and_beverage_details_ingredient.py
index 7a4bdc7c..19cb1f5e 100644
--- a/src/square/types/catalog_item_food_and_beverage_details_ingredient.py
+++ b/src/square/types/catalog_item_food_and_beverage_details_ingredient.py
@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_item_food_and_beverage_details_dietary_preference_type import (
     CatalogItemFoodAndBeverageDetailsDietaryPreferenceType,
 )
-import pydantic
 from .catalog_item_food_and_beverage_details_ingredient_standard_ingredient import (
     CatalogItemFoodAndBeverageDetailsIngredientStandardIngredient,
 )
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CatalogItemFoodAndBeverageDetailsIngredient(UncheckedBaseModel):
diff --git a/src/square/types/catalog_item_modifier_list_info.py b/src/square/types/catalog_item_modifier_list_info.py
index ea039797..5c217643 100644
--- a/src/square/types/catalog_item_modifier_list_info.py
+++ b/src/square/types/catalog_item_modifier_list_info.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .catalog_modifier_override import CatalogModifierOverride
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_modifier_override import CatalogModifierOverride
 
 
 class CatalogItemModifierListInfo(UncheckedBaseModel):
diff --git a/src/square/types/catalog_item_option.py b/src/square/types/catalog_item_option.py
index 20514637..0bc82005 100644
--- a/src/square/types/catalog_item_option.py
+++ b/src/square/types/catalog_item_option.py
@@ -1,13 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_object_category import CatalogObjectCategory
+
 import typing
+
 import pydantic
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogItemOption(UncheckedBaseModel):
@@ -54,13 +53,15 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_item import CatalogItem  # noqa: E402
-from .catalog_modifier_list import CatalogModifierList  # noqa: E402
-from .catalog_object_item import CatalogObjectItem  # noqa: E402
-from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402
-from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402
-from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402
-from .catalog_object import CatalogObject  # noqa: E402
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogItemOption)
diff --git a/src/square/types/catalog_item_option_for_item.py b/src/square/types/catalog_item_option_for_item.py
index b08ad542..109e10ee 100644
--- a/src/square/types/catalog_item_option_for_item.py
+++ b/src/square/types/catalog_item_option_for_item.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogItemOptionForItem(UncheckedBaseModel):
diff --git a/src/square/types/catalog_item_option_value.py b/src/square/types/catalog_item_option_value.py
index 426de7c5..e60f9004 100644
--- a/src/square/types/catalog_item_option_value.py
+++ b/src/square/types/catalog_item_option_value.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogItemOptionValue(UncheckedBaseModel):
diff --git a/src/square/types/catalog_item_option_value_for_item_variation.py b/src/square/types/catalog_item_option_value_for_item_variation.py
index 058ab819..fe38369c 100644
--- a/src/square/types/catalog_item_option_value_for_item_variation.py
+++ b/src/square/types/catalog_item_option_value_for_item_variation.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogItemOptionValueForItemVariation(UncheckedBaseModel):
diff --git a/src/square/types/catalog_item_variation.py b/src/square/types/catalog_item_variation.py
index 1c9b658c..ff638fd5 100644
--- a/src/square/types/catalog_item_variation.py
+++ b/src/square/types/catalog_item_variation.py
@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .catalog_pricing_type import CatalogPricingType
-from .money import Money
-from .item_variation_location_overrides import ItemVariationLocationOverrides
-from .inventory_alert_type import InventoryAlertType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_item_option_value_for_item_variation import CatalogItemOptionValueForItemVariation
+from .catalog_pricing_type import CatalogPricingType
 from .catalog_stock_conversion import CatalogStockConversion
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .inventory_alert_type import InventoryAlertType
+from .item_variation_location_overrides import ItemVariationLocationOverrides
+from .money import Money
 
 
 class CatalogItemVariation(UncheckedBaseModel):
diff --git a/src/square/types/catalog_measurement_unit.py b/src/square/types/catalog_measurement_unit.py
index fd659c6d..77cfe4a8 100644
--- a/src/square/types/catalog_measurement_unit.py
+++ b/src/square/types/catalog_measurement_unit.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .measurement_unit import MeasurementUnit
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .measurement_unit import MeasurementUnit
 
 
 class CatalogMeasurementUnit(UncheckedBaseModel):
diff --git a/src/square/types/catalog_modifier.py b/src/square/types/catalog_modifier.py
index 692abcc7..196f8267 100644
--- a/src/square/types/catalog_modifier.py
+++ b/src/square/types/catalog_modifier.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
-from .modifier_location_overrides import ModifierLocationOverrides
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .modifier_location_overrides import ModifierLocationOverrides
+from .money import Money
 
 
 class CatalogModifier(UncheckedBaseModel):
diff --git a/src/square/types/catalog_modifier_list.py b/src/square/types/catalog_modifier_list.py
index 1ad14452..48ce8011 100644
--- a/src/square/types/catalog_modifier_list.py
+++ b/src/square/types/catalog_modifier_list.py
@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_object_category import CatalogObjectCategory
+
 import typing
+
 import pydantic
-from .catalog_modifier_list_selection_type import CatalogModifierListSelectionType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_modifier_list_modifier_type import CatalogModifierListModifierType
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
+from .catalog_modifier_list_selection_type import CatalogModifierListSelectionType
 
 
 class CatalogModifierList(UncheckedBaseModel):
@@ -142,13 +141,15 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_item import CatalogItem  # noqa: E402
-from .catalog_item_option import CatalogItemOption  # noqa: E402
-from .catalog_object_item import CatalogObjectItem  # noqa: E402
-from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402
-from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402
-from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402
-from .catalog_object import CatalogObject  # noqa: E402
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogModifierList)
diff --git a/src/square/types/catalog_modifier_override.py b/src/square/types/catalog_modifier_override.py
index c45f0601..59bd2851 100644
--- a/src/square/types/catalog_modifier_override.py
+++ b/src/square/types/catalog_modifier_override.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogModifierOverride(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object.py b/src/square/types/catalog_object.py
index d1415888..167f2f54 100644
--- a/src/square/types/catalog_object.py
+++ b/src/square/types/catalog_object.py
@@ -1,28 +1,29 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
+
 import typing
-from .catalog_object_image import CatalogObjectImage
+
+from .catalog_object_availability_period import CatalogObjectAvailabilityPeriod
 from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item_variation import CatalogObjectItemVariation
-from .catalog_object_tax import CatalogObjectTax
+from .catalog_object_custom_attribute_definition import CatalogObjectCustomAttributeDefinition
 from .catalog_object_discount import CatalogObjectDiscount
+from .catalog_object_image import CatalogObjectImage
+from .catalog_object_item_option_value import CatalogObjectItemOptionValue
+from .catalog_object_item_variation import CatalogObjectItemVariation
+from .catalog_object_measurement_unit import CatalogObjectMeasurementUnit
 from .catalog_object_modifier import CatalogObjectModifier
 from .catalog_object_pricing_rule import CatalogObjectPricingRule
 from .catalog_object_product_set import CatalogObjectProductSet
-from .catalog_object_time_period import CatalogObjectTimePeriod
-from .catalog_object_measurement_unit import CatalogObjectMeasurementUnit
-from .catalog_object_subscription_plan_variation import CatalogObjectSubscriptionPlanVariation
-from .catalog_object_item_option_value import CatalogObjectItemOptionValue
-from .catalog_object_custom_attribute_definition import CatalogObjectCustomAttributeDefinition
 from .catalog_object_quick_amounts_settings import CatalogObjectQuickAmountsSettings
-from .catalog_object_availability_period import CatalogObjectAvailabilityPeriod
-import typing
+from .catalog_object_subscription_plan_variation import CatalogObjectSubscriptionPlanVariation
+from .catalog_object_tax import CatalogObjectTax
+from .catalog_object_time_period import CatalogObjectTimePeriod
 
 if typing.TYPE_CHECKING:
     from .catalog_object_item import CatalogObjectItem
-    from .catalog_object_modifier_list import CatalogObjectModifierList
     from .catalog_object_item_option import CatalogObjectItemOption
+    from .catalog_object_modifier_list import CatalogObjectModifierList
     from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
 CatalogObject = typing.Union[
     "CatalogObjectItem",
diff --git a/src/square/types/catalog_object_availability_period.py b/src/square/types/catalog_object_availability_period.py
index 32a9532a..df76f0bb 100644
--- a/src/square/types/catalog_object_availability_period.py
+++ b/src/square/types/catalog_object_availability_period.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_availability_period import CatalogAvailabilityPeriod
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_availability_period import CatalogAvailabilityPeriod
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectAvailabilityPeriod(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_base.py b/src/square/types/catalog_object_base.py
index 3e1a69f1..467a19f3 100644
--- a/src/square/types/catalog_object_base.py
+++ b/src/square/types/catalog_object_base.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_object_type import CatalogObjectType
-import pydantic
 import typing
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+
+import pydantic
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_object_type import CatalogObjectType
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectBase(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_batch.py b/src/square/types/catalog_object_batch.py
index 4b16a125..79b04f9a 100644
--- a/src/square/types/catalog_object_batch.py
+++ b/src/square/types/catalog_object_batch.py
@@ -1,20 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .catalog_object import CatalogObject
+
 import pydantic
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogObjectBatch(UncheckedBaseModel):
@@ -22,7 +14,7 @@ class CatalogObjectBatch(UncheckedBaseModel):
     A batch of catalog objects.
     """
 
-    objects: typing.List[CatalogObject] = pydantic.Field()
+    objects: typing.List["CatalogObject"] = pydantic.Field()
     """
     A list of CatalogObjects belonging to this batch.
     """
@@ -35,3 +27,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(CatalogObjectBatch)
diff --git a/src/square/types/catalog_object_category.py b/src/square/types/catalog_object_category.py
index 750a10fa..a2a78824 100644
--- a/src/square/types/catalog_object_category.py
+++ b/src/square/types/catalog_object_category.py
@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
+
 import typing
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
 from ..core.serialization import FieldMetadata
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectCategory(UncheckedBaseModel):
@@ -118,6 +119,6 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_category import CatalogCategory  # noqa: E402
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogObjectCategory)
diff --git a/src/square/types/catalog_object_custom_attribute_definition.py b/src/square/types/catalog_object_custom_attribute_definition.py
index b80f70b6..aeb77ee6 100644
--- a/src/square/types/catalog_object_custom_attribute_definition.py
+++ b/src/square/types/catalog_object_custom_attribute_definition.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_custom_attribute_definition import CatalogCustomAttributeDefinition
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_definition import CatalogCustomAttributeDefinition
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectCustomAttributeDefinition(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_discount.py b/src/square/types/catalog_object_discount.py
index ea534797..aae3de08 100644
--- a/src/square/types/catalog_object_discount.py
+++ b/src/square/types/catalog_object_discount.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_discount import CatalogDiscount
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_discount import CatalogDiscount
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectDiscount(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_image.py b/src/square/types/catalog_object_image.py
index 0f638d49..be690e52 100644
--- a/src/square/types/catalog_object_image.py
+++ b/src/square/types/catalog_object_image.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_image import CatalogImage
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_image import CatalogImage
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectImage(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_item.py b/src/square/types/catalog_object_item.py
index 7f334f6e..1d88d187 100644
--- a/src/square/types/catalog_object_item.py
+++ b/src/square/types/catalog_object_item.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_object_category import CatalogObjectCategory
+
 import typing
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
 from ..core.serialization import FieldMetadata
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectItem(UncheckedBaseModel):
@@ -115,12 +114,14 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_item import CatalogItem  # noqa: E402
-from .catalog_item_option import CatalogItemOption  # noqa: E402
-from .catalog_modifier_list import CatalogModifierList  # noqa: E402
-from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402
-from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402
-from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogObjectItem)
diff --git a/src/square/types/catalog_object_item_option.py b/src/square/types/catalog_object_item_option.py
index f01bb65e..3b6d321f 100644
--- a/src/square/types/catalog_object_item_option.py
+++ b/src/square/types/catalog_object_item_option.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_object_category import CatalogObjectCategory
+
 import typing
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
 from ..core.serialization import FieldMetadata
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectItemOption(UncheckedBaseModel):
@@ -115,12 +114,14 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_item import CatalogItem  # noqa: E402
-from .catalog_item_option import CatalogItemOption  # noqa: E402
-from .catalog_modifier_list import CatalogModifierList  # noqa: E402
-from .catalog_object_item import CatalogObjectItem  # noqa: E402
-from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402
-from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogObjectItemOption)
diff --git a/src/square/types/catalog_object_item_option_value.py b/src/square/types/catalog_object_item_option_value.py
index ec9e294b..87f53952 100644
--- a/src/square/types/catalog_object_item_option_value.py
+++ b/src/square/types/catalog_object_item_option_value.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_item_option_value import CatalogItemOptionValue
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_item_option_value import CatalogItemOptionValue
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectItemOptionValue(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_item_variation.py b/src/square/types/catalog_object_item_variation.py
index 66bc0ef9..49c60c91 100644
--- a/src/square/types/catalog_object_item_variation.py
+++ b/src/square/types/catalog_object_item_variation.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_item_variation import CatalogItemVariation
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_item_variation import CatalogItemVariation
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectItemVariation(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_measurement_unit.py b/src/square/types/catalog_object_measurement_unit.py
index ef2fc943..e4c7eae9 100644
--- a/src/square/types/catalog_object_measurement_unit.py
+++ b/src/square/types/catalog_object_measurement_unit.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_measurement_unit import CatalogMeasurementUnit
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_measurement_unit import CatalogMeasurementUnit
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectMeasurementUnit(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_modifier.py b/src/square/types/catalog_object_modifier.py
index a73e8e47..5f7759fc 100644
--- a/src/square/types/catalog_object_modifier.py
+++ b/src/square/types/catalog_object_modifier.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_modifier import CatalogModifier
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_modifier import CatalogModifier
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectModifier(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_modifier_list.py b/src/square/types/catalog_object_modifier_list.py
index 5c89ee17..159a2c9f 100644
--- a/src/square/types/catalog_object_modifier_list.py
+++ b/src/square/types/catalog_object_modifier_list.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_object_category import CatalogObjectCategory
+
 import typing
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
 from ..core.serialization import FieldMetadata
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectModifierList(UncheckedBaseModel):
@@ -115,12 +114,14 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_item import CatalogItem  # noqa: E402
-from .catalog_item_option import CatalogItemOption  # noqa: E402
-from .catalog_modifier_list import CatalogModifierList  # noqa: E402
-from .catalog_object_item import CatalogObjectItem  # noqa: E402
-from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402
-from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogObjectModifierList)
diff --git a/src/square/types/catalog_object_pricing_rule.py b/src/square/types/catalog_object_pricing_rule.py
index ed3ecf78..c80e2707 100644
--- a/src/square/types/catalog_object_pricing_rule.py
+++ b/src/square/types/catalog_object_pricing_rule.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_pricing_rule import CatalogPricingRule
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_pricing_rule import CatalogPricingRule
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectPricingRule(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_product_set.py b/src/square/types/catalog_object_product_set.py
index 323a16d1..c7b907e6 100644
--- a/src/square/types/catalog_object_product_set.py
+++ b/src/square/types/catalog_object_product_set.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_product_set import CatalogProductSet
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_product_set import CatalogProductSet
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectProductSet(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_quick_amounts_settings.py b/src/square/types/catalog_object_quick_amounts_settings.py
index bf58cacb..da6de61f 100644
--- a/src/square/types/catalog_object_quick_amounts_settings.py
+++ b/src/square/types/catalog_object_quick_amounts_settings.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_quick_amounts_settings import CatalogQuickAmountsSettings
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_quick_amounts_settings import CatalogQuickAmountsSettings
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectQuickAmountsSettings(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_reference.py b/src/square/types/catalog_object_reference.py
index 66efefe9..306c8d91 100644
--- a/src/square/types/catalog_object_reference.py
+++ b/src/square/types/catalog_object_reference.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogObjectReference(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_subscription_plan.py b/src/square/types/catalog_object_subscription_plan.py
index 62abc245..b93380b3 100644
--- a/src/square/types/catalog_object_subscription_plan.py
+++ b/src/square/types/catalog_object_subscription_plan.py
@@ -1,17 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_object_category import CatalogObjectCategory
+
 import typing
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
 from ..core.serialization import FieldMetadata
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectSubscriptionPlan(UncheckedBaseModel):
@@ -115,12 +114,14 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_item import CatalogItem  # noqa: E402
-from .catalog_item_option import CatalogItemOption  # noqa: E402
-from .catalog_modifier_list import CatalogModifierList  # noqa: E402
-from .catalog_object_item import CatalogObjectItem  # noqa: E402
-from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402
-from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402
-from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogObjectSubscriptionPlan)
diff --git a/src/square/types/catalog_object_subscription_plan_variation.py b/src/square/types/catalog_object_subscription_plan_variation.py
index c44d936f..eb2649f7 100644
--- a/src/square/types/catalog_object_subscription_plan_variation.py
+++ b/src/square/types/catalog_object_subscription_plan_variation.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_subscription_plan_variation import CatalogSubscriptionPlanVariation
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_subscription_plan_variation import CatalogSubscriptionPlanVariation
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectSubscriptionPlanVariation(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_tax.py b/src/square/types/catalog_object_tax.py
index 2e99852b..cfbbe611 100644
--- a/src/square/types/catalog_object_tax.py
+++ b/src/square/types/catalog_object_tax.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_tax import CatalogTax
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_tax import CatalogTax
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectTax(UncheckedBaseModel):
diff --git a/src/square/types/catalog_object_time_period.py b/src/square/types/catalog_object_time_period.py
index 1f6f321d..c307d930 100644
--- a/src/square/types/catalog_object_time_period.py
+++ b/src/square/types/catalog_object_time_period.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_time_period import CatalogTimePeriod
+
 import pydantic
-from .catalog_custom_attribute_value import CatalogCustomAttributeValue
 import typing_extensions
-from .catalog_v1id import CatalogV1Id
-from ..core.serialization import FieldMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_custom_attribute_value import CatalogCustomAttributeValue
+from .catalog_time_period import CatalogTimePeriod
+from .catalog_v1id import CatalogV1Id
 
 
 class CatalogObjectTimePeriod(UncheckedBaseModel):
diff --git a/src/square/types/catalog_pricing_rule.py b/src/square/types/catalog_pricing_rule.py
index 6ac864f8..34d67f22 100644
--- a/src/square/types/catalog_pricing_rule.py
+++ b/src/square/types/catalog_pricing_rule.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .exclude_strategy import ExcludeStrategy
 from .money import Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CatalogPricingRule(UncheckedBaseModel):
diff --git a/src/square/types/catalog_product_set.py b/src/square/types/catalog_product_set.py
index 059d5b62..a2bbe4d9 100644
--- a/src/square/types/catalog_product_set.py
+++ b/src/square/types/catalog_product_set.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogProductSet(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query.py b/src/square/types/catalog_query.py
index 7ed799a0..e7c8056e 100644
--- a/src/square/types/catalog_query.py
+++ b/src/square/types/catalog_query.py
@@ -1,19 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_query_sorted_attribute import CatalogQuerySortedAttribute
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_query_exact import CatalogQueryExact
-from .catalog_query_set import CatalogQuerySet
+from .catalog_query_item_variations_for_item_option_values import CatalogQueryItemVariationsForItemOptionValues
+from .catalog_query_items_for_item_options import CatalogQueryItemsForItemOptions
+from .catalog_query_items_for_modifier_list import CatalogQueryItemsForModifierList
+from .catalog_query_items_for_tax import CatalogQueryItemsForTax
 from .catalog_query_prefix import CatalogQueryPrefix
 from .catalog_query_range import CatalogQueryRange
+from .catalog_query_set import CatalogQuerySet
+from .catalog_query_sorted_attribute import CatalogQuerySortedAttribute
 from .catalog_query_text import CatalogQueryText
-from .catalog_query_items_for_tax import CatalogQueryItemsForTax
-from .catalog_query_items_for_modifier_list import CatalogQueryItemsForModifierList
-from .catalog_query_items_for_item_options import CatalogQueryItemsForItemOptions
-from .catalog_query_item_variations_for_item_option_values import CatalogQueryItemVariationsForItemOptionValues
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CatalogQuery(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_exact.py b/src/square/types/catalog_query_exact.py
index e0d8eb7a..65e5c018 100644
--- a/src/square/types/catalog_query_exact.py
+++ b/src/square/types/catalog_query_exact.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogQueryExact(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_item_variations_for_item_option_values.py b/src/square/types/catalog_query_item_variations_for_item_option_values.py
index 82d0c47c..64a6c4c6 100644
--- a/src/square/types/catalog_query_item_variations_for_item_option_values.py
+++ b/src/square/types/catalog_query_item_variations_for_item_option_values.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogQueryItemVariationsForItemOptionValues(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_items_for_item_options.py b/src/square/types/catalog_query_items_for_item_options.py
index 710ac260..8d91fb60 100644
--- a/src/square/types/catalog_query_items_for_item_options.py
+++ b/src/square/types/catalog_query_items_for_item_options.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogQueryItemsForItemOptions(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_items_for_modifier_list.py b/src/square/types/catalog_query_items_for_modifier_list.py
index d9b99c99..316b120a 100644
--- a/src/square/types/catalog_query_items_for_modifier_list.py
+++ b/src/square/types/catalog_query_items_for_modifier_list.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogQueryItemsForModifierList(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_items_for_tax.py b/src/square/types/catalog_query_items_for_tax.py
index b64afa5e..f11732a7 100644
--- a/src/square/types/catalog_query_items_for_tax.py
+++ b/src/square/types/catalog_query_items_for_tax.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogQueryItemsForTax(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_prefix.py b/src/square/types/catalog_query_prefix.py
index 80fadb37..e899f8be 100644
--- a/src/square/types/catalog_query_prefix.py
+++ b/src/square/types/catalog_query_prefix.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogQueryPrefix(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_range.py b/src/square/types/catalog_query_range.py
index c267d45c..ff28a911 100644
--- a/src/square/types/catalog_query_range.py
+++ b/src/square/types/catalog_query_range.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogQueryRange(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_set.py b/src/square/types/catalog_query_set.py
index 870f6b06..cfaa0400 100644
--- a/src/square/types/catalog_query_set.py
+++ b/src/square/types/catalog_query_set.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogQuerySet(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_sorted_attribute.py b/src/square/types/catalog_query_sorted_attribute.py
index aff24fe7..e0ce6246 100644
--- a/src/square/types/catalog_query_sorted_attribute.py
+++ b/src/square/types/catalog_query_sorted_attribute.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .sort_order import SortOrder
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .sort_order import SortOrder
 
 
 class CatalogQuerySortedAttribute(UncheckedBaseModel):
diff --git a/src/square/types/catalog_query_text.py b/src/square/types/catalog_query_text.py
index 99e068e5..c985a3f8 100644
--- a/src/square/types/catalog_query_text.py
+++ b/src/square/types/catalog_query_text.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogQueryText(UncheckedBaseModel):
diff --git a/src/square/types/catalog_quick_amount.py b/src/square/types/catalog_quick_amount.py
index 1b2803f2..34844197 100644
--- a/src/square/types/catalog_quick_amount.py
+++ b/src/square/types/catalog_quick_amount.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_quick_amount_type import CatalogQuickAmountType
-import pydantic
 from .money import Money
-import typing
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CatalogQuickAmount(UncheckedBaseModel):
diff --git a/src/square/types/catalog_quick_amounts_settings.py b/src/square/types/catalog_quick_amounts_settings.py
index 164a40c9..4fb7af27 100644
--- a/src/square/types/catalog_quick_amounts_settings.py
+++ b/src/square/types/catalog_quick_amounts_settings.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_quick_amounts_settings_option import CatalogQuickAmountsSettingsOption
-import pydantic
 import typing
-from .catalog_quick_amount import CatalogQuickAmount
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_quick_amount import CatalogQuickAmount
+from .catalog_quick_amounts_settings_option import CatalogQuickAmountsSettingsOption
 
 
 class CatalogQuickAmountsSettings(UncheckedBaseModel):
diff --git a/src/square/types/catalog_stock_conversion.py b/src/square/types/catalog_stock_conversion.py
index 9b89c736..830af230 100644
--- a/src/square/types/catalog_stock_conversion.py
+++ b/src/square/types/catalog_stock_conversion.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogStockConversion(UncheckedBaseModel):
diff --git a/src/square/types/catalog_subscription_plan.py b/src/square/types/catalog_subscription_plan.py
index 77f53682..38e259cb 100644
--- a/src/square/types/catalog_subscription_plan.py
+++ b/src/square/types/catalog_subscription_plan.py
@@ -1,14 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_object_category import CatalogObjectCategory
-import pydantic
+
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .subscription_phase import SubscriptionPhase
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-from ..core.pydantic_utilities import update_forward_refs
 
 
 class CatalogSubscriptionPlan(UncheckedBaseModel):
@@ -58,13 +57,15 @@ class Config:
             extra = pydantic.Extra.allow
 
 
-from .catalog_item import CatalogItem  # noqa: E402
-from .catalog_item_option import CatalogItemOption  # noqa: E402
-from .catalog_modifier_list import CatalogModifierList  # noqa: E402
-from .catalog_object_item import CatalogObjectItem  # noqa: E402
-from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402
-from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402
-from .catalog_object import CatalogObject  # noqa: E402
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
 
 update_forward_refs(CatalogSubscriptionPlan)
diff --git a/src/square/types/catalog_subscription_plan_variation.py b/src/square/types/catalog_subscription_plan_variation.py
index dad063aa..59f262b0 100644
--- a/src/square/types/catalog_subscription_plan_variation.py
+++ b/src/square/types/catalog_subscription_plan_variation.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .subscription_phase import SubscriptionPhase
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .subscription_phase import SubscriptionPhase
 
 
 class CatalogSubscriptionPlanVariation(UncheckedBaseModel):
diff --git a/src/square/types/catalog_tax.py b/src/square/types/catalog_tax.py
index e01bdff8..2720c96c 100644
--- a/src/square/types/catalog_tax.py
+++ b/src/square/types/catalog_tax.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .tax_calculation_phase import TaxCalculationPhase
 from .tax_inclusion_type import TaxInclusionType
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CatalogTax(UncheckedBaseModel):
diff --git a/src/square/types/catalog_time_period.py b/src/square/types/catalog_time_period.py
index 7304c082..8029fb03 100644
--- a/src/square/types/catalog_time_period.py
+++ b/src/square/types/catalog_time_period.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogTimePeriod(UncheckedBaseModel):
diff --git a/src/square/types/catalog_v1id.py b/src/square/types/catalog_v1id.py
index 9ae9c1e4..955ca24e 100644
--- a/src/square/types/catalog_v1id.py
+++ b/src/square/types/catalog_v1id.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import typing_extensions
 import typing
-from ..core.serialization import FieldMetadata
+
 import pydantic
+import typing_extensions
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogV1Id(UncheckedBaseModel):
diff --git a/src/square/types/catalog_version_updated_event.py b/src/square/types/catalog_version_updated_event.py
index dd6752ca..7047e42c 100644
--- a/src/square/types/catalog_version_updated_event.py
+++ b/src/square/types/catalog_version_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .catalog_version_updated_event_data import CatalogVersionUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_version_updated_event_data import CatalogVersionUpdatedEventData
 
 
 class CatalogVersionUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/catalog_version_updated_event_catalog_version.py b/src/square/types/catalog_version_updated_event_catalog_version.py
index 149a74bd..61f6df96 100644
--- a/src/square/types/catalog_version_updated_event_catalog_version.py
+++ b/src/square/types/catalog_version_updated_event_catalog_version.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CatalogVersionUpdatedEventCatalogVersion(UncheckedBaseModel):
diff --git a/src/square/types/catalog_version_updated_event_data.py b/src/square/types/catalog_version_updated_event_data.py
index 2eddcff0..780a6b96 100644
--- a/src/square/types/catalog_version_updated_event_data.py
+++ b/src/square/types/catalog_version_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .catalog_version_updated_event_object import CatalogVersionUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_version_updated_event_object import CatalogVersionUpdatedEventObject
 
 
 class CatalogVersionUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/catalog_version_updated_event_object.py b/src/square/types/catalog_version_updated_event_object.py
index db16a378..65320500 100644
--- a/src/square/types/catalog_version_updated_event_object.py
+++ b/src/square/types/catalog_version_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .catalog_version_updated_event_catalog_version import CatalogVersionUpdatedEventCatalogVersion
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_version_updated_event_catalog_version import CatalogVersionUpdatedEventCatalogVersion
 
 
 class CatalogVersionUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/category_path_to_root_node.py b/src/square/types/category_path_to_root_node.py
index 881dc9a1..4f4833e7 100644
--- a/src/square/types/category_path_to_root_node.py
+++ b/src/square/types/category_path_to_root_node.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CategoryPathToRootNode(UncheckedBaseModel):
diff --git a/src/square/types/change_billing_anchor_date_response.py b/src/square/types/change_billing_anchor_date_response.py
index ba439a8a..7fb14ecb 100644
--- a/src/square/types/change_billing_anchor_date_response.py
+++ b/src/square/types/change_billing_anchor_date_response.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 from .subscription import Subscription
 from .subscription_action import SubscriptionAction
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class ChangeBillingAnchorDateResponse(UncheckedBaseModel):
diff --git a/src/square/types/charge_request_additional_recipient.py b/src/square/types/charge_request_additional_recipient.py
index a8dd257d..b5392aa2 100644
--- a/src/square/types/charge_request_additional_recipient.py
+++ b/src/square/types/charge_request_additional_recipient.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class ChargeRequestAdditionalRecipient(UncheckedBaseModel):
diff --git a/src/square/types/checkout.py b/src/square/types/checkout.py
index abd0649c..484faea8 100644
--- a/src/square/types/checkout.py
+++ b/src/square/types/checkout.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .additional_recipient import AdditionalRecipient
 from .address import Address
 from .order import Order
-from .additional_recipient import AdditionalRecipient
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Checkout(UncheckedBaseModel):
diff --git a/src/square/types/checkout_location_settings.py b/src/square/types/checkout_location_settings.py
index 27dff4b5..c88d9c3f 100644
--- a/src/square/types/checkout_location_settings.py
+++ b/src/square/types/checkout_location_settings.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .checkout_location_settings_policy import CheckoutLocationSettingsPolicy
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .checkout_location_settings_branding import CheckoutLocationSettingsBranding
-from .checkout_location_settings_tipping import CheckoutLocationSettingsTipping
 from .checkout_location_settings_coupons import CheckoutLocationSettingsCoupons
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .checkout_location_settings_policy import CheckoutLocationSettingsPolicy
+from .checkout_location_settings_tipping import CheckoutLocationSettingsTipping
 
 
 class CheckoutLocationSettings(UncheckedBaseModel):
diff --git a/src/square/types/checkout_location_settings_branding.py b/src/square/types/checkout_location_settings_branding.py
index 24a9c1da..50440f02 100644
--- a/src/square/types/checkout_location_settings_branding.py
+++ b/src/square/types/checkout_location_settings_branding.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .checkout_location_settings_branding_header_type import CheckoutLocationSettingsBrandingHeaderType
+
 import pydantic
-from .checkout_location_settings_branding_button_shape import CheckoutLocationSettingsBrandingButtonShape
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .checkout_location_settings_branding_button_shape import CheckoutLocationSettingsBrandingButtonShape
+from .checkout_location_settings_branding_header_type import CheckoutLocationSettingsBrandingHeaderType
 
 
 class CheckoutLocationSettingsBranding(UncheckedBaseModel):
diff --git a/src/square/types/checkout_location_settings_coupons.py b/src/square/types/checkout_location_settings_coupons.py
index 80992b8c..47a318ee 100644
--- a/src/square/types/checkout_location_settings_coupons.py
+++ b/src/square/types/checkout_location_settings_coupons.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CheckoutLocationSettingsCoupons(UncheckedBaseModel):
diff --git a/src/square/types/checkout_location_settings_policy.py b/src/square/types/checkout_location_settings_policy.py
index 63c5483e..4b93b8aa 100644
--- a/src/square/types/checkout_location_settings_policy.py
+++ b/src/square/types/checkout_location_settings_policy.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CheckoutLocationSettingsPolicy(UncheckedBaseModel):
diff --git a/src/square/types/checkout_location_settings_tipping.py b/src/square/types/checkout_location_settings_tipping.py
index 86f004ec..1505e8f0 100644
--- a/src/square/types/checkout_location_settings_tipping.py
+++ b/src/square/types/checkout_location_settings_tipping.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class CheckoutLocationSettingsTipping(UncheckedBaseModel):
diff --git a/src/square/types/checkout_merchant_settings.py b/src/square/types/checkout_merchant_settings.py
index 8cdf65ea..3bf647c7 100644
--- a/src/square/types/checkout_merchant_settings.py
+++ b/src/square/types/checkout_merchant_settings.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .checkout_merchant_settings_payment_methods import CheckoutMerchantSettingsPaymentMethods
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .checkout_merchant_settings_payment_methods import CheckoutMerchantSettingsPaymentMethods
 
 
 class CheckoutMerchantSettings(UncheckedBaseModel):
diff --git a/src/square/types/checkout_merchant_settings_payment_methods.py b/src/square/types/checkout_merchant_settings_payment_methods.py
index b4508353..954e9c5d 100644
--- a/src/square/types/checkout_merchant_settings_payment_methods.py
+++ b/src/square/types/checkout_merchant_settings_payment_methods.py
@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .checkout_merchant_settings_payment_methods_payment_method import (
-    CheckoutMerchantSettingsPaymentMethodsPaymentMethod,
-)
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .checkout_merchant_settings_payment_methods_afterpay_clearpay import (
     CheckoutMerchantSettingsPaymentMethodsAfterpayClearpay,
 )
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import pydantic
+from .checkout_merchant_settings_payment_methods_payment_method import (
+    CheckoutMerchantSettingsPaymentMethodsPaymentMethod,
+)
 
 
 class CheckoutMerchantSettingsPaymentMethods(UncheckedBaseModel):
diff --git a/src/square/types/checkout_merchant_settings_payment_methods_afterpay_clearpay.py b/src/square/types/checkout_merchant_settings_payment_methods_afterpay_clearpay.py
index a84a4d25..55cc6dee 100644
--- a/src/square/types/checkout_merchant_settings_payment_methods_afterpay_clearpay.py
+++ b/src/square/types/checkout_merchant_settings_payment_methods_afterpay_clearpay.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .checkout_merchant_settings_payment_methods_afterpay_clearpay_eligibility_range import (
     CheckoutMerchantSettingsPaymentMethodsAfterpayClearpayEligibilityRange,
 )
-import pydantic
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CheckoutMerchantSettingsPaymentMethodsAfterpayClearpay(UncheckedBaseModel):
diff --git a/src/square/types/checkout_merchant_settings_payment_methods_afterpay_clearpay_eligibility_range.py b/src/square/types/checkout_merchant_settings_payment_methods_afterpay_clearpay_eligibility_range.py
index 4b3f2b01..e29473d4 100644
--- a/src/square/types/checkout_merchant_settings_payment_methods_afterpay_clearpay_eligibility_range.py
+++ b/src/square/types/checkout_merchant_settings_payment_methods_afterpay_clearpay_eligibility_range.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class CheckoutMerchantSettingsPaymentMethodsAfterpayClearpayEligibilityRange(UncheckedBaseModel):
diff --git a/src/square/types/checkout_merchant_settings_payment_methods_payment_method.py b/src/square/types/checkout_merchant_settings_payment_methods_payment_method.py
index 6c644404..5236d208 100644
--- a/src/square/types/checkout_merchant_settings_payment_methods_payment_method.py
+++ b/src/square/types/checkout_merchant_settings_payment_methods_payment_method.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CheckoutMerchantSettingsPaymentMethodsPaymentMethod(UncheckedBaseModel):
diff --git a/src/square/types/checkout_options.py b/src/square/types/checkout_options.py
index b448fe81..68822035 100644
--- a/src/square/types/checkout_options.py
+++ b/src/square/types/checkout_options.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_field import CustomField
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .accepted_payment_methods import AcceptedPaymentMethods
+from .custom_field import CustomField
 from .money import Money
 from .shipping_fee import ShippingFee
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CheckoutOptions(UncheckedBaseModel):
diff --git a/src/square/types/clearpay_details.py b/src/square/types/clearpay_details.py
index 30fed324..e85b7e5d 100644
--- a/src/square/types/clearpay_details.py
+++ b/src/square/types/clearpay_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class ClearpayDetails(UncheckedBaseModel):
diff --git a/src/square/types/clone_order_response.py b/src/square/types/clone_order_response.py
index 83aaaa6d..ee7c6bc6 100644
--- a/src/square/types/clone_order_response.py
+++ b/src/square/types/clone_order_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order import Order
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .order import Order
 
 
 class CloneOrderResponse(UncheckedBaseModel):
diff --git a/src/square/types/collected_data.py b/src/square/types/collected_data.py
index 28c77d19..cc00127d 100644
--- a/src/square/types/collected_data.py
+++ b/src/square/types/collected_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CollectedData(UncheckedBaseModel):
diff --git a/src/square/types/complete_payment_response.py b/src/square/types/complete_payment_response.py
index e74c0268..72e4db75 100644
--- a/src/square/types/complete_payment_response.py
+++ b/src/square/types/complete_payment_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment import Payment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment import Payment
 
 
 class CompletePaymentResponse(UncheckedBaseModel):
diff --git a/src/square/types/component.py b/src/square/types/component.py
index bcfc42c5..7c8f6e53 100644
--- a/src/square/types/component.py
+++ b/src/square/types/component.py
@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.unchecked_base_model import UncheckedBaseModel
 from .component_component_type import ComponentComponentType
-import pydantic
-import typing
 from .device_component_details_application_details import DeviceComponentDetailsApplicationDetails
-from .device_component_details_card_reader_details import DeviceComponentDetailsCardReaderDetails
 from .device_component_details_battery_details import DeviceComponentDetailsBatteryDetails
-from .device_component_details_wi_fi_details import DeviceComponentDetailsWiFiDetails
+from .device_component_details_card_reader_details import DeviceComponentDetailsCardReaderDetails
 from .device_component_details_ethernet_details import DeviceComponentDetailsEthernetDetails
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .device_component_details_wi_fi_details import DeviceComponentDetailsWiFiDetails
 
 
 class Component(UncheckedBaseModel):
diff --git a/src/square/types/confirmation_decision.py b/src/square/types/confirmation_decision.py
index 912a2a04..46832250 100644
--- a/src/square/types/confirmation_decision.py
+++ b/src/square/types/confirmation_decision.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class ConfirmationDecision(UncheckedBaseModel):
diff --git a/src/square/types/confirmation_options.py b/src/square/types/confirmation_options.py
index df53b048..de1814ca 100644
--- a/src/square/types/confirmation_options.py
+++ b/src/square/types/confirmation_options.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .confirmation_decision import ConfirmationDecision
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .confirmation_decision import ConfirmationDecision
 
 
 class ConfirmationOptions(UncheckedBaseModel):
diff --git a/src/square/types/coordinates.py b/src/square/types/coordinates.py
index 4c140d94..2c0a2162 100644
--- a/src/square/types/coordinates.py
+++ b/src/square/types/coordinates.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class Coordinates(UncheckedBaseModel):
diff --git a/src/square/types/create_booking_custom_attribute_definition_response.py b/src/square/types/create_booking_custom_attribute_definition_response.py
index 3417bdcf..b2f1ad24 100644
--- a/src/square/types/create_booking_custom_attribute_definition_response.py
+++ b/src/square/types/create_booking_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class CreateBookingCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_booking_response.py b/src/square/types/create_booking_response.py
index 65281283..ff23b8e5 100644
--- a/src/square/types/create_booking_response.py
+++ b/src/square/types/create_booking_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking import Booking
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking import Booking
+from .error import Error
 
 
 class CreateBookingResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_break_type_response.py b/src/square/types/create_break_type_response.py
index f3b50e42..c94f0be0 100644
--- a/src/square/types/create_break_type_response.py
+++ b/src/square/types/create_break_type_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .break_type import BreakType
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .break_type import BreakType
+from .error import Error
 
 
 class CreateBreakTypeResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_card_response.py b/src/square/types/create_card_response.py
index 469f2553..df743a3c 100644
--- a/src/square/types/create_card_response.py
+++ b/src/square/types/create_card_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .card import Card
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
+from .error import Error
 
 
 class CreateCardResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_catalog_image_request.py b/src/square/types/create_catalog_image_request.py
index f653ab65..e1e2a995 100644
--- a/src/square/types/create_catalog_image_request.py
+++ b/src/square/types/create_catalog_image_request.py
@@ -1,20 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
-import pydantic
+from __future__ import annotations
+
 import typing
-from .catalog_object import CatalogObject
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CreateCatalogImageRequest(UncheckedBaseModel):
@@ -33,7 +25,7 @@ class CreateCatalogImageRequest(UncheckedBaseModel):
     where an image can be attached to catalog items at a later time.
     """
 
-    image: CatalogObject = pydantic.Field()
+    image: "CatalogObject" = pydantic.Field()
     """
     The new `CatalogObject` of the `IMAGE` type, namely, a `CatalogImage` object, to encapsulate the specified image file.
     """
@@ -55,3 +47,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(CreateCatalogImageRequest)
diff --git a/src/square/types/create_catalog_image_response.py b/src/square/types/create_catalog_image_response.py
index a203d007..982300ae 100644
--- a/src/square/types/create_catalog_image_response.py
+++ b/src/square/types/create_catalog_image_response.py
@@ -1,21 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
-from .catalog_object import CatalogObject
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class CreateCatalogImageResponse(UncheckedBaseModel):
@@ -24,7 +16,7 @@ class CreateCatalogImageResponse(UncheckedBaseModel):
     Any errors that occurred during the request.
     """
 
-    image: typing.Optional[CatalogObject] = pydantic.Field(default=None)
+    image: typing.Optional["CatalogObject"] = pydantic.Field(default=None)
     """
     The newly created `CatalogImage` including a Square-generated
     URL for the encapsulated image file.
@@ -38,3 +30,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(CreateCatalogImageResponse)
diff --git a/src/square/types/create_checkout_response.py b/src/square/types/create_checkout_response.py
index 113a155e..e7ba21a4 100644
--- a/src/square/types/create_checkout_response.py
+++ b/src/square/types/create_checkout_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .checkout import Checkout
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .checkout import Checkout
+from .error import Error
 
 
 class CreateCheckoutResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_customer_card_response.py b/src/square/types/create_customer_card_response.py
index aa0a44d2..cc103bea 100644
--- a/src/square/types/create_customer_card_response.py
+++ b/src/square/types/create_customer_card_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .card import Card
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
+from .error import Error
 
 
 class CreateCustomerCardResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_customer_custom_attribute_definition_response.py b/src/square/types/create_customer_custom_attribute_definition_response.py
index 71904724..a71577f1 100644
--- a/src/square/types/create_customer_custom_attribute_definition_response.py
+++ b/src/square/types/create_customer_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class CreateCustomerCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_customer_group_response.py b/src/square/types/create_customer_group_response.py
index 11c8b7d5..cff01a58 100644
--- a/src/square/types/create_customer_group_response.py
+++ b/src/square/types/create_customer_group_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer_group import CustomerGroup
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_group import CustomerGroup
+from .error import Error
 
 
 class CreateCustomerGroupResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_customer_response.py b/src/square/types/create_customer_response.py
index df908c5b..6dbdda2f 100644
--- a/src/square/types/create_customer_response.py
+++ b/src/square/types/create_customer_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer import Customer
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer import Customer
+from .error import Error
 
 
 class CreateCustomerResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_device_code_response.py b/src/square/types/create_device_code_response.py
index 71fd0350..af3e9ecd 100644
--- a/src/square/types/create_device_code_response.py
+++ b/src/square/types/create_device_code_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .device_code import DeviceCode
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_code import DeviceCode
+from .error import Error
 
 
 class CreateDeviceCodeResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_dispute_evidence_file_request.py b/src/square/types/create_dispute_evidence_file_request.py
index d31e7cf5..cfc343e2 100644
--- a/src/square/types/create_dispute_evidence_file_request.py
+++ b/src/square/types/create_dispute_evidence_file_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .dispute_evidence_type import DisputeEvidenceType
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence_type import DisputeEvidenceType
 
 
 class CreateDisputeEvidenceFileRequest(UncheckedBaseModel):
diff --git a/src/square/types/create_dispute_evidence_file_response.py b/src/square/types/create_dispute_evidence_file_response.py
index 01bf03c3..87bf0c4a 100644
--- a/src/square/types/create_dispute_evidence_file_response.py
+++ b/src/square/types/create_dispute_evidence_file_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .dispute_evidence import DisputeEvidence
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence import DisputeEvidence
+from .error import Error
 
 
 class CreateDisputeEvidenceFileResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_dispute_evidence_text_response.py b/src/square/types/create_dispute_evidence_text_response.py
index bcc6ea29..8aeab84e 100644
--- a/src/square/types/create_dispute_evidence_text_response.py
+++ b/src/square/types/create_dispute_evidence_text_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .dispute_evidence import DisputeEvidence
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence import DisputeEvidence
+from .error import Error
 
 
 class CreateDisputeEvidenceTextResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_gift_card_activity_response.py b/src/square/types/create_gift_card_activity_response.py
index 5e10aec5..4348b663 100644
--- a/src/square/types/create_gift_card_activity_response.py
+++ b/src/square/types/create_gift_card_activity_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .gift_card_activity import GiftCardActivity
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .gift_card_activity import GiftCardActivity
 
 
 class CreateGiftCardActivityResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_gift_card_response.py b/src/square/types/create_gift_card_response.py
index 2508b464..b1ddefe5 100644
--- a/src/square/types/create_gift_card_response.py
+++ b/src/square/types/create_gift_card_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .gift_card import GiftCard
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .gift_card import GiftCard
 
 
 class CreateGiftCardResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_invoice_attachment_request_data.py b/src/square/types/create_invoice_attachment_request_data.py
index 28adb657..80c65953 100644
--- a/src/square/types/create_invoice_attachment_request_data.py
+++ b/src/square/types/create_invoice_attachment_request_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CreateInvoiceAttachmentRequestData(UncheckedBaseModel):
diff --git a/src/square/types/create_invoice_attachment_response.py b/src/square/types/create_invoice_attachment_response.py
index 3e300d24..9717b07a 100644
--- a/src/square/types/create_invoice_attachment_response.py
+++ b/src/square/types/create_invoice_attachment_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice_attachment import InvoiceAttachment
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .invoice_attachment import InvoiceAttachment
 
 
 class CreateInvoiceAttachmentResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_invoice_response.py b/src/square/types/create_invoice_response.py
index fa8da908..db58eda9 100644
--- a/src/square/types/create_invoice_response.py
+++ b/src/square/types/create_invoice_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .invoice import Invoice
 
 
 class CreateInvoiceResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_job_response.py b/src/square/types/create_job_response.py
index da6c4aff..ad7a58da 100644
--- a/src/square/types/create_job_response.py
+++ b/src/square/types/create_job_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .job import Job
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .job import Job
 
 
 class CreateJobResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_location_custom_attribute_definition_response.py b/src/square/types/create_location_custom_attribute_definition_response.py
index c5f23ced..ae7e3772 100644
--- a/src/square/types/create_location_custom_attribute_definition_response.py
+++ b/src/square/types/create_location_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class CreateLocationCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_location_response.py b/src/square/types/create_location_response.py
index ebae04d7..ed516c6f 100644
--- a/src/square/types/create_location_response.py
+++ b/src/square/types/create_location_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .location import Location
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .location import Location
 
 
 class CreateLocationResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_loyalty_account_response.py b/src/square/types/create_loyalty_account_response.py
index ba46cb72..4a2c977c 100644
--- a/src/square/types/create_loyalty_account_response.py
+++ b/src/square/types/create_loyalty_account_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_account import LoyaltyAccount
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_account import LoyaltyAccount
 
 
 class CreateLoyaltyAccountResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_loyalty_promotion_response.py b/src/square/types/create_loyalty_promotion_response.py
index 71641617..43dc8204 100644
--- a/src/square/types/create_loyalty_promotion_response.py
+++ b/src/square/types/create_loyalty_promotion_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_promotion import LoyaltyPromotion
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_promotion import LoyaltyPromotion
 
 
 class CreateLoyaltyPromotionResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_loyalty_reward_response.py b/src/square/types/create_loyalty_reward_response.py
index 904c811c..3e778ff6 100644
--- a/src/square/types/create_loyalty_reward_response.py
+++ b/src/square/types/create_loyalty_reward_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_reward import LoyaltyReward
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_reward import LoyaltyReward
 
 
 class CreateLoyaltyRewardResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_merchant_custom_attribute_definition_response.py b/src/square/types/create_merchant_custom_attribute_definition_response.py
index 5c40bf95..5d5ebe1c 100644
--- a/src/square/types/create_merchant_custom_attribute_definition_response.py
+++ b/src/square/types/create_merchant_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class CreateMerchantCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_mobile_authorization_code_response.py b/src/square/types/create_mobile_authorization_code_response.py
index 1a53e80b..3507adae 100644
--- a/src/square/types/create_mobile_authorization_code_response.py
+++ b/src/square/types/create_mobile_authorization_code_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class CreateMobileAuthorizationCodeResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_order_custom_attribute_definition_response.py b/src/square/types/create_order_custom_attribute_definition_response.py
index d5f956b9..8a9eb385 100644
--- a/src/square/types/create_order_custom_attribute_definition_response.py
+++ b/src/square/types/create_order_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class CreateOrderCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_order_request.py b/src/square/types/create_order_request.py
index 9dff1e8b..ee417de4 100644
--- a/src/square/types/create_order_request.py
+++ b/src/square/types/create_order_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order import Order
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order import Order
 
 
 class CreateOrderRequest(UncheckedBaseModel):
diff --git a/src/square/types/create_order_response.py b/src/square/types/create_order_response.py
index fcbef0ee..1ad91085 100644
--- a/src/square/types/create_order_response.py
+++ b/src/square/types/create_order_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order import Order
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .order import Order
 
 
 class CreateOrderResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_payment_link_response.py b/src/square/types/create_payment_link_response.py
index 7320c531..80c281e9 100644
--- a/src/square/types/create_payment_link_response.py
+++ b/src/square/types/create_payment_link_response.py
@@ -1,22 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 from .payment_link import PaymentLink
 from .payment_link_related_resources import PaymentLinkRelatedResources
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CreatePaymentLinkResponse(UncheckedBaseModel):
@@ -43,3 +36,17 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+
+update_forward_refs(CreatePaymentLinkResponse)
diff --git a/src/square/types/create_payment_response.py b/src/square/types/create_payment_response.py
index 470b7a7a..2419cb95 100644
--- a/src/square/types/create_payment_response.py
+++ b/src/square/types/create_payment_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment import Payment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment import Payment
 
 
 class CreatePaymentResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_scheduled_shift_response.py b/src/square/types/create_scheduled_shift_response.py
index ade68fe5..352519a6 100644
--- a/src/square/types/create_scheduled_shift_response.py
+++ b/src/square/types/create_scheduled_shift_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .scheduled_shift import ScheduledShift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .scheduled_shift import ScheduledShift
 
 
 class CreateScheduledShiftResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_shift_response.py b/src/square/types/create_shift_response.py
index d637d234..e3d90e21 100644
--- a/src/square/types/create_shift_response.py
+++ b/src/square/types/create_shift_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .shift import Shift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .shift import Shift
 
 
 class CreateShiftResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_subscription_response.py b/src/square/types/create_subscription_response.py
index ee622bac..40e3039b 100644
--- a/src/square/types/create_subscription_response.py
+++ b/src/square/types/create_subscription_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .subscription import Subscription
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .subscription import Subscription
 
 
 class CreateSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_team_member_request.py b/src/square/types/create_team_member_request.py
index 6376fa04..90b202e7 100644
--- a/src/square/types/create_team_member_request.py
+++ b/src/square/types/create_team_member_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .team_member import TeamMember
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member import TeamMember
 
 
 class CreateTeamMemberRequest(UncheckedBaseModel):
diff --git a/src/square/types/create_team_member_response.py b/src/square/types/create_team_member_response.py
index bf395f32..4caa65d4 100644
--- a/src/square/types/create_team_member_response.py
+++ b/src/square/types/create_team_member_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member import TeamMember
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .team_member import TeamMember
 
 
 class CreateTeamMemberResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_terminal_action_response.py b/src/square/types/create_terminal_action_response.py
index 1bdcfbcc..a169832b 100644
--- a/src/square/types/create_terminal_action_response.py
+++ b/src/square/types/create_terminal_action_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_action import TerminalAction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_action import TerminalAction
 
 
 class CreateTerminalActionResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_terminal_checkout_response.py b/src/square/types/create_terminal_checkout_response.py
index 77713948..3fcee09a 100644
--- a/src/square/types/create_terminal_checkout_response.py
+++ b/src/square/types/create_terminal_checkout_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_checkout import TerminalCheckout
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_checkout import TerminalCheckout
 
 
 class CreateTerminalCheckoutResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_terminal_refund_response.py b/src/square/types/create_terminal_refund_response.py
index 46aa5487..240d8872 100644
--- a/src/square/types/create_terminal_refund_response.py
+++ b/src/square/types/create_terminal_refund_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_refund import TerminalRefund
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_refund import TerminalRefund
 
 
 class CreateTerminalRefundResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_timecard_response.py b/src/square/types/create_timecard_response.py
index f7b2fb9a..f2ebe487 100644
--- a/src/square/types/create_timecard_response.py
+++ b/src/square/types/create_timecard_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .timecard import Timecard
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .timecard import Timecard
 
 
 class CreateTimecardResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_vendor_response.py b/src/square/types/create_vendor_response.py
index 804bde73..42b56a1f 100644
--- a/src/square/types/create_vendor_response.py
+++ b/src/square/types/create_vendor_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .vendor import Vendor
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .vendor import Vendor
 
 
 class CreateVendorResponse(UncheckedBaseModel):
diff --git a/src/square/types/create_webhook_subscription_response.py b/src/square/types/create_webhook_subscription_response.py
index 05e2c8f7..57e826c4 100644
--- a/src/square/types/create_webhook_subscription_response.py
+++ b/src/square/types/create_webhook_subscription_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .webhook_subscription import WebhookSubscription
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .webhook_subscription import WebhookSubscription
 
 
 class CreateWebhookSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/custom_attribute.py b/src/square/types/custom_attribute.py
index 80ede3ad..3fa08e66 100644
--- a/src/square/types/custom_attribute.py
+++ b/src/square/types/custom_attribute.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_visibility import CustomAttributeDefinitionVisibility
-from .custom_attribute_definition import CustomAttributeDefinition
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .custom_attribute_definition_visibility import CustomAttributeDefinitionVisibility
 
 
 class CustomAttribute(UncheckedBaseModel):
diff --git a/src/square/types/custom_attribute_definition.py b/src/square/types/custom_attribute_definition.py
index b0b2bdca..a944a9c5 100644
--- a/src/square/types/custom_attribute_definition.py
+++ b/src/square/types/custom_attribute_definition.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 import typing_extensions
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .custom_attribute_definition_visibility import CustomAttributeDefinitionVisibility
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CustomAttributeDefinition(UncheckedBaseModel):
diff --git a/src/square/types/custom_attribute_definition_event_data.py b/src/square/types/custom_attribute_definition_event_data.py
index 3f7fc445..9bb86f37 100644
--- a/src/square/types/custom_attribute_definition_event_data.py
+++ b/src/square/types/custom_attribute_definition_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data_object import CustomAttributeDefinitionEventDataObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data_object import CustomAttributeDefinitionEventDataObject
 
 
 class CustomAttributeDefinitionEventData(UncheckedBaseModel):
diff --git a/src/square/types/custom_attribute_definition_event_data_object.py b/src/square/types/custom_attribute_definition_event_data_object.py
index ea490ac9..295c2d57 100644
--- a/src/square/types/custom_attribute_definition_event_data_object.py
+++ b/src/square/types/custom_attribute_definition_event_data_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
 
 
 class CustomAttributeDefinitionEventDataObject(UncheckedBaseModel):
diff --git a/src/square/types/custom_attribute_event_data.py b/src/square/types/custom_attribute_event_data.py
index 21580754..f290a54f 100644
--- a/src/square/types/custom_attribute_event_data.py
+++ b/src/square/types/custom_attribute_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data_object import CustomAttributeEventDataObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data_object import CustomAttributeEventDataObject
 
 
 class CustomAttributeEventData(UncheckedBaseModel):
diff --git a/src/square/types/custom_attribute_event_data_object.py b/src/square/types/custom_attribute_event_data_object.py
index 4be7b1cc..3fe4e446 100644
--- a/src/square/types/custom_attribute_event_data_object.py
+++ b/src/square/types/custom_attribute_event_data_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
 
 
 class CustomAttributeEventDataObject(UncheckedBaseModel):
diff --git a/src/square/types/custom_attribute_filter.py b/src/square/types/custom_attribute_filter.py
index f4cf8e61..22021796 100644
--- a/src/square/types/custom_attribute_filter.py
+++ b/src/square/types/custom_attribute_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .range import Range
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .range import Range
 
 
 class CustomAttributeFilter(UncheckedBaseModel):
diff --git a/src/square/types/custom_field.py b/src/square/types/custom_field.py
index 7e941376..90d49ad3 100644
--- a/src/square/types/custom_field.py
+++ b/src/square/types/custom_field.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CustomField(UncheckedBaseModel):
diff --git a/src/square/types/customer.py b/src/square/types/customer.py
index 8f508ba3..5f6b89c5 100644
--- a/src/square/types/customer.py
+++ b/src/square/types/customer.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .address import Address
-from .customer_preferences import CustomerPreferences
 from .customer_creation_source import CustomerCreationSource
+from .customer_preferences import CustomerPreferences
 from .customer_tax_ids import CustomerTaxIds
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Customer(UncheckedBaseModel):
diff --git a/src/square/types/customer_address_filter.py b/src/square/types/customer_address_filter.py
index 27f1ac21..05648134 100644
--- a/src/square/types/customer_address_filter.py
+++ b/src/square/types/customer_address_filter.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer_text_filter import CustomerTextFilter
+
 import pydantic
-from .country import Country
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .country import Country
+from .customer_text_filter import CustomerTextFilter
 
 
 class CustomerAddressFilter(UncheckedBaseModel):
diff --git a/src/square/types/customer_created_event.py b/src/square/types/customer_created_event.py
index 988224b0..3e5a0491 100644
--- a/src/square/types/customer_created_event.py
+++ b/src/square/types/customer_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .customer_created_event_data import CustomerCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_created_event_data import CustomerCreatedEventData
 
 
 class CustomerCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_created_event_data.py b/src/square/types/customer_created_event_data.py
index f7f54819..c381c2a2 100644
--- a/src/square/types/customer_created_event_data.py
+++ b/src/square/types/customer_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .customer_created_event_object import CustomerCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_created_event_object import CustomerCreatedEventObject
 
 
 class CustomerCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/customer_created_event_event_context.py b/src/square/types/customer_created_event_event_context.py
index 9082667c..73ff66c9 100644
--- a/src/square/types/customer_created_event_event_context.py
+++ b/src/square/types/customer_created_event_event_context.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer_created_event_event_context_merge import CustomerCreatedEventEventContextMerge
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_created_event_event_context_merge import CustomerCreatedEventEventContextMerge
 
 
 class CustomerCreatedEventEventContext(UncheckedBaseModel):
diff --git a/src/square/types/customer_created_event_event_context_merge.py b/src/square/types/customer_created_event_event_context_merge.py
index 4ac0f0fe..a6d14910 100644
--- a/src/square/types/customer_created_event_event_context_merge.py
+++ b/src/square/types/customer_created_event_event_context_merge.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CustomerCreatedEventEventContextMerge(UncheckedBaseModel):
diff --git a/src/square/types/customer_created_event_object.py b/src/square/types/customer_created_event_object.py
index e9f453e4..0847af26 100644
--- a/src/square/types/customer_created_event_object.py
+++ b/src/square/types/customer_created_event_object.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer import Customer
+
 import pydantic
-from .customer_created_event_event_context import CustomerCreatedEventEventContext
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer import Customer
+from .customer_created_event_event_context import CustomerCreatedEventEventContext
 
 
 class CustomerCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/customer_creation_source_filter.py b/src/square/types/customer_creation_source_filter.py
index 162ccb1d..9f46f06b 100644
--- a/src/square/types/customer_creation_source_filter.py
+++ b/src/square/types/customer_creation_source_filter.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer_creation_source import CustomerCreationSource
+
 import pydantic
-from .customer_inclusion_exclusion import CustomerInclusionExclusion
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_creation_source import CustomerCreationSource
+from .customer_inclusion_exclusion import CustomerInclusionExclusion
 
 
 class CustomerCreationSourceFilter(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_created_event.py b/src/square/types/customer_custom_attribute_definition_created_event.py
index 989816ba..2a3fa28c 100644
--- a/src/square/types/customer_custom_attribute_definition_created_event.py
+++ b/src/square/types/customer_custom_attribute_definition_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_created_public_event.py b/src/square/types/customer_custom_attribute_definition_created_public_event.py
index a3267097..9edae7fe 100644
--- a/src/square/types/customer_custom_attribute_definition_created_public_event.py
+++ b/src/square/types/customer_custom_attribute_definition_created_public_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionCreatedPublicEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_deleted_event.py b/src/square/types/customer_custom_attribute_definition_deleted_event.py
index c0115561..3d7228c7 100644
--- a/src/square/types/customer_custom_attribute_definition_deleted_event.py
+++ b/src/square/types/customer_custom_attribute_definition_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_deleted_public_event.py b/src/square/types/customer_custom_attribute_definition_deleted_public_event.py
index a401008e..a320cf9a 100644
--- a/src/square/types/customer_custom_attribute_definition_deleted_public_event.py
+++ b/src/square/types/customer_custom_attribute_definition_deleted_public_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionDeletedPublicEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_owned_created_event.py b/src/square/types/customer_custom_attribute_definition_owned_created_event.py
index 25e32403..5edcedb4 100644
--- a/src/square/types/customer_custom_attribute_definition_owned_created_event.py
+++ b/src/square/types/customer_custom_attribute_definition_owned_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionOwnedCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_owned_deleted_event.py b/src/square/types/customer_custom_attribute_definition_owned_deleted_event.py
index 6434c496..4cb2c8dd 100644
--- a/src/square/types/customer_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/types/customer_custom_attribute_definition_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_owned_updated_event.py b/src/square/types/customer_custom_attribute_definition_owned_updated_event.py
index 3c563f9b..bdbfb501 100644
--- a/src/square/types/customer_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/types/customer_custom_attribute_definition_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_updated_event.py b/src/square/types/customer_custom_attribute_definition_updated_event.py
index 8c44db84..9fa11287 100644
--- a/src/square/types/customer_custom_attribute_definition_updated_event.py
+++ b/src/square/types/customer_custom_attribute_definition_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_updated_public_event.py b/src/square/types/customer_custom_attribute_definition_updated_public_event.py
index 22528640..72e63a22 100644
--- a/src/square/types/customer_custom_attribute_definition_updated_public_event.py
+++ b/src/square/types/customer_custom_attribute_definition_updated_public_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionUpdatedPublicEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_visible_created_event.py b/src/square/types/customer_custom_attribute_definition_visible_created_event.py
index ce02d793..3a31af0f 100644
--- a/src/square/types/customer_custom_attribute_definition_visible_created_event.py
+++ b/src/square/types/customer_custom_attribute_definition_visible_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionVisibleCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_visible_deleted_event.py b/src/square/types/customer_custom_attribute_definition_visible_deleted_event.py
index 3d03175f..11dac80c 100644
--- a/src/square/types/customer_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/types/customer_custom_attribute_definition_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_definition_visible_updated_event.py b/src/square/types/customer_custom_attribute_definition_visible_updated_event.py
index 9ce0d647..eafe63ae 100644
--- a/src/square/types/customer_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/types/customer_custom_attribute_definition_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class CustomerCustomAttributeDefinitionVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_deleted_event.py b/src/square/types/customer_custom_attribute_deleted_event.py
index 9ce021a1..8cbea39a 100644
--- a/src/square/types/customer_custom_attribute_deleted_event.py
+++ b/src/square/types/customer_custom_attribute_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class CustomerCustomAttributeDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_deleted_public_event.py b/src/square/types/customer_custom_attribute_deleted_public_event.py
index 299d5812..a57168ce 100644
--- a/src/square/types/customer_custom_attribute_deleted_public_event.py
+++ b/src/square/types/customer_custom_attribute_deleted_public_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class CustomerCustomAttributeDeletedPublicEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_filter.py b/src/square/types/customer_custom_attribute_filter.py
index b534dffc..eab42ed6 100644
--- a/src/square/types/customer_custom_attribute_filter.py
+++ b/src/square/types/customer_custom_attribute_filter.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .customer_custom_attribute_filter_value import CustomerCustomAttributeFilterValue
 from .time_range import TimeRange
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class CustomerCustomAttributeFilter(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_filter_value.py b/src/square/types/customer_custom_attribute_filter_value.py
index e46592a5..ee798673 100644
--- a/src/square/types/customer_custom_attribute_filter_value.py
+++ b/src/square/types/customer_custom_attribute_filter_value.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer_text_filter import CustomerTextFilter
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_address_filter import CustomerAddressFilter
+from .customer_text_filter import CustomerTextFilter
 from .filter_value import FilterValue
-from .time_range import TimeRange
 from .float_number_range import FloatNumberRange
-from .customer_address_filter import CustomerAddressFilter
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .time_range import TimeRange
 
 
 class CustomerCustomAttributeFilterValue(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_filters.py b/src/square/types/customer_custom_attribute_filters.py
index 1505ff62..ab5f0da4 100644
--- a/src/square/types/customer_custom_attribute_filters.py
+++ b/src/square/types/customer_custom_attribute_filters.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer_custom_attribute_filter import CustomerCustomAttributeFilter
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_custom_attribute_filter import CustomerCustomAttributeFilter
 
 
 class CustomerCustomAttributeFilters(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_owned_deleted_event.py b/src/square/types/customer_custom_attribute_owned_deleted_event.py
index 68cf0685..6d79c1c4 100644
--- a/src/square/types/customer_custom_attribute_owned_deleted_event.py
+++ b/src/square/types/customer_custom_attribute_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class CustomerCustomAttributeOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_owned_updated_event.py b/src/square/types/customer_custom_attribute_owned_updated_event.py
index 03642009..3a3cf342 100644
--- a/src/square/types/customer_custom_attribute_owned_updated_event.py
+++ b/src/square/types/customer_custom_attribute_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class CustomerCustomAttributeOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_updated_event.py b/src/square/types/customer_custom_attribute_updated_event.py
index bc89ec88..12d25228 100644
--- a/src/square/types/customer_custom_attribute_updated_event.py
+++ b/src/square/types/customer_custom_attribute_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class CustomerCustomAttributeUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_updated_public_event.py b/src/square/types/customer_custom_attribute_updated_public_event.py
index 52e1ea2a..830f911b 100644
--- a/src/square/types/customer_custom_attribute_updated_public_event.py
+++ b/src/square/types/customer_custom_attribute_updated_public_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class CustomerCustomAttributeUpdatedPublicEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_visible_deleted_event.py b/src/square/types/customer_custom_attribute_visible_deleted_event.py
index b2d47fcf..095b9f5a 100644
--- a/src/square/types/customer_custom_attribute_visible_deleted_event.py
+++ b/src/square/types/customer_custom_attribute_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class CustomerCustomAttributeVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_custom_attribute_visible_updated_event.py b/src/square/types/customer_custom_attribute_visible_updated_event.py
index e4d0f42c..e6d2dce8 100644
--- a/src/square/types/customer_custom_attribute_visible_updated_event.py
+++ b/src/square/types/customer_custom_attribute_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class CustomerCustomAttributeVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_deleted_event.py b/src/square/types/customer_deleted_event.py
index 25fad357..5d4ba073 100644
--- a/src/square/types/customer_deleted_event.py
+++ b/src/square/types/customer_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .customer_deleted_event_data import CustomerDeletedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_deleted_event_data import CustomerDeletedEventData
 
 
 class CustomerDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_deleted_event_data.py b/src/square/types/customer_deleted_event_data.py
index 0dfbb086..a065be13 100644
--- a/src/square/types/customer_deleted_event_data.py
+++ b/src/square/types/customer_deleted_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .customer_deleted_event_object import CustomerDeletedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_deleted_event_object import CustomerDeletedEventObject
 
 
 class CustomerDeletedEventData(UncheckedBaseModel):
diff --git a/src/square/types/customer_deleted_event_event_context.py b/src/square/types/customer_deleted_event_event_context.py
index 4126f959..1ab32dba 100644
--- a/src/square/types/customer_deleted_event_event_context.py
+++ b/src/square/types/customer_deleted_event_event_context.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer_deleted_event_event_context_merge import CustomerDeletedEventEventContextMerge
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_deleted_event_event_context_merge import CustomerDeletedEventEventContextMerge
 
 
 class CustomerDeletedEventEventContext(UncheckedBaseModel):
diff --git a/src/square/types/customer_deleted_event_event_context_merge.py b/src/square/types/customer_deleted_event_event_context_merge.py
index b0b34b4c..8299bfd2 100644
--- a/src/square/types/customer_deleted_event_event_context_merge.py
+++ b/src/square/types/customer_deleted_event_event_context_merge.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CustomerDeletedEventEventContextMerge(UncheckedBaseModel):
diff --git a/src/square/types/customer_deleted_event_object.py b/src/square/types/customer_deleted_event_object.py
index 0e45bffa..efeace43 100644
--- a/src/square/types/customer_deleted_event_object.py
+++ b/src/square/types/customer_deleted_event_object.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer import Customer
+
 import pydantic
-from .customer_deleted_event_event_context import CustomerDeletedEventEventContext
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer import Customer
+from .customer_deleted_event_event_context import CustomerDeletedEventEventContext
 
 
 class CustomerDeletedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/customer_details.py b/src/square/types/customer_details.py
index d87a3d54..b67c6433 100644
--- a/src/square/types/customer_details.py
+++ b/src/square/types/customer_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CustomerDetails(UncheckedBaseModel):
diff --git a/src/square/types/customer_filter.py b/src/square/types/customer_filter.py
index 659c262d..6e50ed08 100644
--- a/src/square/types/customer_filter.py
+++ b/src/square/types/customer_filter.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer_creation_source_filter import CustomerCreationSourceFilter
+
 import pydantic
-from .time_range import TimeRange
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_creation_source_filter import CustomerCreationSourceFilter
+from .customer_custom_attribute_filters import CustomerCustomAttributeFilters
 from .customer_text_filter import CustomerTextFilter
 from .filter_value import FilterValue
-from .customer_custom_attribute_filters import CustomerCustomAttributeFilters
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .time_range import TimeRange
 
 
 class CustomerFilter(UncheckedBaseModel):
diff --git a/src/square/types/customer_group.py b/src/square/types/customer_group.py
index d8e303cd..99e33f18 100644
--- a/src/square/types/customer_group.py
+++ b/src/square/types/customer_group.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CustomerGroup(UncheckedBaseModel):
diff --git a/src/square/types/customer_preferences.py b/src/square/types/customer_preferences.py
index 9b792c40..a41c9529 100644
--- a/src/square/types/customer_preferences.py
+++ b/src/square/types/customer_preferences.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CustomerPreferences(UncheckedBaseModel):
diff --git a/src/square/types/customer_query.py b/src/square/types/customer_query.py
index c152e558..c661fbaf 100644
--- a/src/square/types/customer_query.py
+++ b/src/square/types/customer_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer_filter import CustomerFilter
+
 import pydantic
-from .customer_sort import CustomerSort
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_filter import CustomerFilter
+from .customer_sort import CustomerSort
 
 
 class CustomerQuery(UncheckedBaseModel):
diff --git a/src/square/types/customer_segment.py b/src/square/types/customer_segment.py
index 75d01afe..7b56625d 100644
--- a/src/square/types/customer_segment.py
+++ b/src/square/types/customer_segment.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CustomerSegment(UncheckedBaseModel):
diff --git a/src/square/types/customer_sort.py b/src/square/types/customer_sort.py
index 39383f39..f9ecc310 100644
--- a/src/square/types/customer_sort.py
+++ b/src/square/types/customer_sort.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer_sort_field import CustomerSortField
+
 import pydantic
-from .sort_order import SortOrder
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_sort_field import CustomerSortField
+from .sort_order import SortOrder
 
 
 class CustomerSort(UncheckedBaseModel):
diff --git a/src/square/types/customer_tax_ids.py b/src/square/types/customer_tax_ids.py
index b8970d52..24f26508 100644
--- a/src/square/types/customer_tax_ids.py
+++ b/src/square/types/customer_tax_ids.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CustomerTaxIds(UncheckedBaseModel):
diff --git a/src/square/types/customer_text_filter.py b/src/square/types/customer_text_filter.py
index d7756a78..281a03c7 100644
--- a/src/square/types/customer_text_filter.py
+++ b/src/square/types/customer_text_filter.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class CustomerTextFilter(UncheckedBaseModel):
diff --git a/src/square/types/customer_updated_event.py b/src/square/types/customer_updated_event.py
index 50578b1b..04190025 100644
--- a/src/square/types/customer_updated_event.py
+++ b/src/square/types/customer_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .customer_updated_event_data import CustomerUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_updated_event_data import CustomerUpdatedEventData
 
 
 class CustomerUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/customer_updated_event_data.py b/src/square/types/customer_updated_event_data.py
index 5a59a5d1..27d91793 100644
--- a/src/square/types/customer_updated_event_data.py
+++ b/src/square/types/customer_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .customer_updated_event_object import CustomerUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_updated_event_object import CustomerUpdatedEventObject
 
 
 class CustomerUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/customer_updated_event_object.py b/src/square/types/customer_updated_event_object.py
index e083ee40..96efe62c 100644
--- a/src/square/types/customer_updated_event_object.py
+++ b/src/square/types/customer_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .customer import Customer
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer import Customer
 
 
 class CustomerUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/data_collection_options.py b/src/square/types/data_collection_options.py
index 8a296090..c1947bee 100644
--- a/src/square/types/data_collection_options.py
+++ b/src/square/types/data_collection_options.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
-from .data_collection_options_input_type import DataCollectionOptionsInputType
 import typing
-from .collected_data import CollectedData
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .collected_data import CollectedData
+from .data_collection_options_input_type import DataCollectionOptionsInputType
 
 
 class DataCollectionOptions(UncheckedBaseModel):
diff --git a/src/square/types/date_range.py b/src/square/types/date_range.py
index 68c962c5..9f56f1ff 100644
--- a/src/square/types/date_range.py
+++ b/src/square/types/date_range.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class DateRange(UncheckedBaseModel):
diff --git a/src/square/types/delete_booking_custom_attribute_definition_response.py b/src/square/types/delete_booking_custom_attribute_definition_response.py
index dc334e77..efb04830 100644
--- a/src/square/types/delete_booking_custom_attribute_definition_response.py
+++ b/src/square/types/delete_booking_custom_attribute_definition_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteBookingCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_booking_custom_attribute_response.py b/src/square/types/delete_booking_custom_attribute_response.py
index 9c6c0fda..93cfef6d 100644
--- a/src/square/types/delete_booking_custom_attribute_response.py
+++ b/src/square/types/delete_booking_custom_attribute_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteBookingCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_break_type_response.py b/src/square/types/delete_break_type_response.py
index f7384cfd..dc138912 100644
--- a/src/square/types/delete_break_type_response.py
+++ b/src/square/types/delete_break_type_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteBreakTypeResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_catalog_object_response.py b/src/square/types/delete_catalog_object_response.py
index 28ab1f99..e0a9a464 100644
--- a/src/square/types/delete_catalog_object_response.py
+++ b/src/square/types/delete_catalog_object_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteCatalogObjectResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_customer_card_response.py b/src/square/types/delete_customer_card_response.py
index 23e39b36..ad02e8e7 100644
--- a/src/square/types/delete_customer_card_response.py
+++ b/src/square/types/delete_customer_card_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteCustomerCardResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_customer_custom_attribute_definition_response.py b/src/square/types/delete_customer_custom_attribute_definition_response.py
index 5f172807..5c808299 100644
--- a/src/square/types/delete_customer_custom_attribute_definition_response.py
+++ b/src/square/types/delete_customer_custom_attribute_definition_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteCustomerCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_customer_custom_attribute_response.py b/src/square/types/delete_customer_custom_attribute_response.py
index 205e5ad5..8fc2f14e 100644
--- a/src/square/types/delete_customer_custom_attribute_response.py
+++ b/src/square/types/delete_customer_custom_attribute_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteCustomerCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_customer_group_response.py b/src/square/types/delete_customer_group_response.py
index ea872c55..0dcb60a9 100644
--- a/src/square/types/delete_customer_group_response.py
+++ b/src/square/types/delete_customer_group_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteCustomerGroupResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_customer_response.py b/src/square/types/delete_customer_response.py
index 81ba61f8..1939c491 100644
--- a/src/square/types/delete_customer_response.py
+++ b/src/square/types/delete_customer_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteCustomerResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_dispute_evidence_response.py b/src/square/types/delete_dispute_evidence_response.py
index eacb8d4d..97316658 100644
--- a/src/square/types/delete_dispute_evidence_response.py
+++ b/src/square/types/delete_dispute_evidence_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteDisputeEvidenceResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_invoice_attachment_response.py b/src/square/types/delete_invoice_attachment_response.py
index 8c4f264b..aad64e4b 100644
--- a/src/square/types/delete_invoice_attachment_response.py
+++ b/src/square/types/delete_invoice_attachment_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteInvoiceAttachmentResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_invoice_response.py b/src/square/types/delete_invoice_response.py
index 8c1e8bcc..81a83ba0 100644
--- a/src/square/types/delete_invoice_response.py
+++ b/src/square/types/delete_invoice_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteInvoiceResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_location_custom_attribute_definition_response.py b/src/square/types/delete_location_custom_attribute_definition_response.py
index b346939e..ecc4f370 100644
--- a/src/square/types/delete_location_custom_attribute_definition_response.py
+++ b/src/square/types/delete_location_custom_attribute_definition_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteLocationCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_location_custom_attribute_response.py b/src/square/types/delete_location_custom_attribute_response.py
index 9e29d95d..a354271d 100644
--- a/src/square/types/delete_location_custom_attribute_response.py
+++ b/src/square/types/delete_location_custom_attribute_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteLocationCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_loyalty_reward_response.py b/src/square/types/delete_loyalty_reward_response.py
index 15942a98..fda4898c 100644
--- a/src/square/types/delete_loyalty_reward_response.py
+++ b/src/square/types/delete_loyalty_reward_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteLoyaltyRewardResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_merchant_custom_attribute_definition_response.py b/src/square/types/delete_merchant_custom_attribute_definition_response.py
index 3746c71a..97bcff02 100644
--- a/src/square/types/delete_merchant_custom_attribute_definition_response.py
+++ b/src/square/types/delete_merchant_custom_attribute_definition_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteMerchantCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_merchant_custom_attribute_response.py b/src/square/types/delete_merchant_custom_attribute_response.py
index 8d9fea73..7c19340f 100644
--- a/src/square/types/delete_merchant_custom_attribute_response.py
+++ b/src/square/types/delete_merchant_custom_attribute_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteMerchantCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_order_custom_attribute_definition_response.py b/src/square/types/delete_order_custom_attribute_definition_response.py
index 3c296d80..553295be 100644
--- a/src/square/types/delete_order_custom_attribute_definition_response.py
+++ b/src/square/types/delete_order_custom_attribute_definition_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteOrderCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_order_custom_attribute_response.py b/src/square/types/delete_order_custom_attribute_response.py
index b93d5a2f..a62455d7 100644
--- a/src/square/types/delete_order_custom_attribute_response.py
+++ b/src/square/types/delete_order_custom_attribute_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteOrderCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_payment_link_response.py b/src/square/types/delete_payment_link_response.py
index 938cc1b5..c8842937 100644
--- a/src/square/types/delete_payment_link_response.py
+++ b/src/square/types/delete_payment_link_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeletePaymentLinkResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_shift_response.py b/src/square/types/delete_shift_response.py
index 5b2b0e80..fbc6ef08 100644
--- a/src/square/types/delete_shift_response.py
+++ b/src/square/types/delete_shift_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteShiftResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_snippet_response.py b/src/square/types/delete_snippet_response.py
index 4b2579ff..c120080d 100644
--- a/src/square/types/delete_snippet_response.py
+++ b/src/square/types/delete_snippet_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteSnippetResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_subscription_action_response.py b/src/square/types/delete_subscription_action_response.py
index 4750bc10..2076315c 100644
--- a/src/square/types/delete_subscription_action_response.py
+++ b/src/square/types/delete_subscription_action_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .subscription import Subscription
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .subscription import Subscription
 
 
 class DeleteSubscriptionActionResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_timecard_response.py b/src/square/types/delete_timecard_response.py
index 9cc10b30..e44b2b15 100644
--- a/src/square/types/delete_timecard_response.py
+++ b/src/square/types/delete_timecard_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteTimecardResponse(UncheckedBaseModel):
diff --git a/src/square/types/delete_webhook_subscription_response.py b/src/square/types/delete_webhook_subscription_response.py
index 463bc462..7a474a72 100644
--- a/src/square/types/delete_webhook_subscription_response.py
+++ b/src/square/types/delete_webhook_subscription_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DeleteWebhookSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/destination.py b/src/square/types/destination.py
index a645698b..77bf3f22 100644
--- a/src/square/types/destination.py
+++ b/src/square/types/destination.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .destination_type import DestinationType
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .destination_type import DestinationType
 
 
 class Destination(UncheckedBaseModel):
diff --git a/src/square/types/destination_details.py b/src/square/types/destination_details.py
index 2415f258..5e73c64d 100644
--- a/src/square/types/destination_details.py
+++ b/src/square/types/destination_details.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .destination_details_card_refund_details import DestinationDetailsCardRefundDetails
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .destination_details_card_refund_details import DestinationDetailsCardRefundDetails
 from .destination_details_cash_refund_details import DestinationDetailsCashRefundDetails
 from .destination_details_external_refund_details import DestinationDetailsExternalRefundDetails
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class DestinationDetails(UncheckedBaseModel):
diff --git a/src/square/types/destination_details_card_refund_details.py b/src/square/types/destination_details_card_refund_details.py
index 476bcc28..d40edbb7 100644
--- a/src/square/types/destination_details_card_refund_details.py
+++ b/src/square/types/destination_details_card_refund_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .card import Card
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
 
 
 class DestinationDetailsCardRefundDetails(UncheckedBaseModel):
diff --git a/src/square/types/destination_details_cash_refund_details.py b/src/square/types/destination_details_cash_refund_details.py
index 8287bd3b..e9648eeb 100644
--- a/src/square/types/destination_details_cash_refund_details.py
+++ b/src/square/types/destination_details_cash_refund_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class DestinationDetailsCashRefundDetails(UncheckedBaseModel):
diff --git a/src/square/types/destination_details_external_refund_details.py b/src/square/types/destination_details_external_refund_details.py
index 2d537661..9edb02f3 100644
--- a/src/square/types/destination_details_external_refund_details.py
+++ b/src/square/types/destination_details_external_refund_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class DestinationDetailsExternalRefundDetails(UncheckedBaseModel):
diff --git a/src/square/types/device.py b/src/square/types/device.py
index e33d9c41..ef89542f 100644
--- a/src/square/types/device.py
+++ b/src/square/types/device.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .device_attributes import DeviceAttributes
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .component import Component
+from .device_attributes import DeviceAttributes
 from .device_status import DeviceStatus
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Device(UncheckedBaseModel):
diff --git a/src/square/types/device_attributes.py b/src/square/types/device_attributes.py
index 36eea8e1..b9947b97 100644
--- a/src/square/types/device_attributes.py
+++ b/src/square/types/device_attributes.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .device_attributes_device_type import DeviceAttributesDeviceType
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_attributes_device_type import DeviceAttributesDeviceType
 
 
 class DeviceAttributes(UncheckedBaseModel):
diff --git a/src/square/types/device_checkout_options.py b/src/square/types/device_checkout_options.py
index c5992b3e..3d35290d 100644
--- a/src/square/types/device_checkout_options.py
+++ b/src/square/types/device_checkout_options.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .tip_settings import TipSettings
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .tip_settings import TipSettings
 
 
 class DeviceCheckoutOptions(UncheckedBaseModel):
diff --git a/src/square/types/device_code.py b/src/square/types/device_code.py
index 263f71ef..7cecc1b7 100644
--- a/src/square/types/device_code.py
+++ b/src/square/types/device_code.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .product_type import ProductType
-from .device_code_status import DeviceCodeStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_code_status import DeviceCodeStatus
+from .product_type import ProductType
 
 
 class DeviceCode(UncheckedBaseModel):
diff --git a/src/square/types/device_code_paired_event.py b/src/square/types/device_code_paired_event.py
index 641f835f..248cae92 100644
--- a/src/square/types/device_code_paired_event.py
+++ b/src/square/types/device_code_paired_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .device_code_paired_event_data import DeviceCodePairedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_code_paired_event_data import DeviceCodePairedEventData
 
 
 class DeviceCodePairedEvent(UncheckedBaseModel):
diff --git a/src/square/types/device_code_paired_event_data.py b/src/square/types/device_code_paired_event_data.py
index b3aba033..43d47c29 100644
--- a/src/square/types/device_code_paired_event_data.py
+++ b/src/square/types/device_code_paired_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .device_code_paired_event_object import DeviceCodePairedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_code_paired_event_object import DeviceCodePairedEventObject
 
 
 class DeviceCodePairedEventData(UncheckedBaseModel):
diff --git a/src/square/types/device_code_paired_event_object.py b/src/square/types/device_code_paired_event_object.py
index 443af8b7..ec08ce88 100644
--- a/src/square/types/device_code_paired_event_object.py
+++ b/src/square/types/device_code_paired_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .device_code import DeviceCode
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_code import DeviceCode
 
 
 class DeviceCodePairedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/device_component_details_application_details.py b/src/square/types/device_component_details_application_details.py
index 35cb4da5..5139c80b 100644
--- a/src/square/types/device_component_details_application_details.py
+++ b/src/square/types/device_component_details_application_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .application_type import ApplicationType
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .application_type import ApplicationType
 
 
 class DeviceComponentDetailsApplicationDetails(UncheckedBaseModel):
diff --git a/src/square/types/device_component_details_battery_details.py b/src/square/types/device_component_details_battery_details.py
index 79e7e5bc..1549f5a2 100644
--- a/src/square/types/device_component_details_battery_details.py
+++ b/src/square/types/device_component_details_battery_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .device_component_details_external_power import DeviceComponentDetailsExternalPower
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_component_details_external_power import DeviceComponentDetailsExternalPower
 
 
 class DeviceComponentDetailsBatteryDetails(UncheckedBaseModel):
diff --git a/src/square/types/device_component_details_card_reader_details.py b/src/square/types/device_component_details_card_reader_details.py
index 1feba19c..5aa48e58 100644
--- a/src/square/types/device_component_details_card_reader_details.py
+++ b/src/square/types/device_component_details_card_reader_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class DeviceComponentDetailsCardReaderDetails(UncheckedBaseModel):
diff --git a/src/square/types/device_component_details_ethernet_details.py b/src/square/types/device_component_details_ethernet_details.py
index 2afad8e2..d2a050be 100644
--- a/src/square/types/device_component_details_ethernet_details.py
+++ b/src/square/types/device_component_details_ethernet_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class DeviceComponentDetailsEthernetDetails(UncheckedBaseModel):
diff --git a/src/square/types/device_component_details_measurement.py b/src/square/types/device_component_details_measurement.py
index 2be5a790..60b73f28 100644
--- a/src/square/types/device_component_details_measurement.py
+++ b/src/square/types/device_component_details_measurement.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class DeviceComponentDetailsMeasurement(UncheckedBaseModel):
diff --git a/src/square/types/device_component_details_wi_fi_details.py b/src/square/types/device_component_details_wi_fi_details.py
index 39ac6597..7dafff81 100644
--- a/src/square/types/device_component_details_wi_fi_details.py
+++ b/src/square/types/device_component_details_wi_fi_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .device_component_details_measurement import DeviceComponentDetailsMeasurement
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_component_details_measurement import DeviceComponentDetailsMeasurement
 
 
 class DeviceComponentDetailsWiFiDetails(UncheckedBaseModel):
diff --git a/src/square/types/device_created_event.py b/src/square/types/device_created_event.py
index db0ce1cb..4606a2a6 100644
--- a/src/square/types/device_created_event.py
+++ b/src/square/types/device_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .device_created_event_data import DeviceCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_created_event_data import DeviceCreatedEventData
 
 
 class DeviceCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/device_created_event_data.py b/src/square/types/device_created_event_data.py
index eacfecac..d6f841f6 100644
--- a/src/square/types/device_created_event_data.py
+++ b/src/square/types/device_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .device_created_event_object import DeviceCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_created_event_object import DeviceCreatedEventObject
 
 
 class DeviceCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/device_created_event_object.py b/src/square/types/device_created_event_object.py
index e81d69b5..605a2f0d 100644
--- a/src/square/types/device_created_event_object.py
+++ b/src/square/types/device_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .device import Device
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device import Device
 
 
 class DeviceCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/device_details.py b/src/square/types/device_details.py
index 2c39eb52..e2eceead 100644
--- a/src/square/types/device_details.py
+++ b/src/square/types/device_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class DeviceDetails(UncheckedBaseModel):
diff --git a/src/square/types/device_metadata.py b/src/square/types/device_metadata.py
index 91637c71..4feade1d 100644
--- a/src/square/types/device_metadata.py
+++ b/src/square/types/device_metadata.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class DeviceMetadata(UncheckedBaseModel):
diff --git a/src/square/types/device_status.py b/src/square/types/device_status.py
index 3430fb9a..aca1c917 100644
--- a/src/square/types/device_status.py
+++ b/src/square/types/device_status.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .device_status_category import DeviceStatusCategory
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_status_category import DeviceStatusCategory
 
 
 class DeviceStatus(UncheckedBaseModel):
diff --git a/src/square/types/digital_wallet_details.py b/src/square/types/digital_wallet_details.py
index 7e7c6553..9c64d6ae 100644
--- a/src/square/types/digital_wallet_details.py
+++ b/src/square/types/digital_wallet_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .cash_app_details import CashAppDetails
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .cash_app_details import CashAppDetails
 
 
 class DigitalWalletDetails(UncheckedBaseModel):
diff --git a/src/square/types/disable_card_response.py b/src/square/types/disable_card_response.py
index f216f61f..e079b1be 100644
--- a/src/square/types/disable_card_response.py
+++ b/src/square/types/disable_card_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .card import Card
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
+from .error import Error
 
 
 class DisableCardResponse(UncheckedBaseModel):
diff --git a/src/square/types/disable_events_response.py b/src/square/types/disable_events_response.py
index fea31385..a89801d1 100644
--- a/src/square/types/disable_events_response.py
+++ b/src/square/types/disable_events_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class DisableEventsResponse(UncheckedBaseModel):
diff --git a/src/square/types/dismiss_terminal_action_response.py b/src/square/types/dismiss_terminal_action_response.py
index acbe9a02..7a8a757d 100644
--- a/src/square/types/dismiss_terminal_action_response.py
+++ b/src/square/types/dismiss_terminal_action_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_action import TerminalAction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_action import TerminalAction
 
 
 class DismissTerminalActionResponse(UncheckedBaseModel):
diff --git a/src/square/types/dismiss_terminal_checkout_response.py b/src/square/types/dismiss_terminal_checkout_response.py
index 2d896121..795b93ca 100644
--- a/src/square/types/dismiss_terminal_checkout_response.py
+++ b/src/square/types/dismiss_terminal_checkout_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_checkout import TerminalCheckout
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_checkout import TerminalCheckout
 
 
 class DismissTerminalCheckoutResponse(UncheckedBaseModel):
diff --git a/src/square/types/dismiss_terminal_refund_response.py b/src/square/types/dismiss_terminal_refund_response.py
index d85dda21..ab0af9ca 100644
--- a/src/square/types/dismiss_terminal_refund_response.py
+++ b/src/square/types/dismiss_terminal_refund_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_refund import TerminalRefund
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_refund import TerminalRefund
 
 
 class DismissTerminalRefundResponse(UncheckedBaseModel):
diff --git a/src/square/types/dispute.py b/src/square/types/dispute.py
index 90dadfe1..5bac4a57 100644
--- a/src/square/types/dispute.py
+++ b/src/square/types/dispute.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card_brand import CardBrand
 from .dispute_reason import DisputeReason
 from .dispute_state import DisputeState
 from .disputed_payment import DisputedPayment
-from .card_brand import CardBrand
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .money import Money
 
 
 class Dispute(UncheckedBaseModel):
diff --git a/src/square/types/dispute_created_event.py b/src/square/types/dispute_created_event.py
index 1a4241b6..5e08797d 100644
--- a/src/square/types/dispute_created_event.py
+++ b/src/square/types/dispute_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_created_event_data import DisputeCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_created_event_data import DisputeCreatedEventData
 
 
 class DisputeCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/dispute_created_event_data.py b/src/square/types/dispute_created_event_data.py
index b273855f..4f0d3c6b 100644
--- a/src/square/types/dispute_created_event_data.py
+++ b/src/square/types/dispute_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_created_event_object import DisputeCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_created_event_object import DisputeCreatedEventObject
 
 
 class DisputeCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/dispute_created_event_object.py b/src/square/types/dispute_created_event_object.py
index 34d96d71..25bbf23d 100644
--- a/src/square/types/dispute_created_event_object.py
+++ b/src/square/types/dispute_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .dispute import Dispute
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
 
 
 class DisputeCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence.py b/src/square/types/dispute_evidence.py
index 93f6eb92..6a77a2ea 100644
--- a/src/square/types/dispute_evidence.py
+++ b/src/square/types/dispute_evidence.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .dispute_evidence_file import DisputeEvidenceFile
 from .dispute_evidence_type import DisputeEvidenceType
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class DisputeEvidence(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_added_event.py b/src/square/types/dispute_evidence_added_event.py
index 3e7c1208..98717c54 100644
--- a/src/square/types/dispute_evidence_added_event.py
+++ b/src/square/types/dispute_evidence_added_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_evidence_added_event_data import DisputeEvidenceAddedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence_added_event_data import DisputeEvidenceAddedEventData
 
 
 class DisputeEvidenceAddedEvent(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_added_event_data.py b/src/square/types/dispute_evidence_added_event_data.py
index 23a4f9a0..803af88b 100644
--- a/src/square/types/dispute_evidence_added_event_data.py
+++ b/src/square/types/dispute_evidence_added_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_evidence_added_event_object import DisputeEvidenceAddedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence_added_event_object import DisputeEvidenceAddedEventObject
 
 
 class DisputeEvidenceAddedEventData(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_added_event_object.py b/src/square/types/dispute_evidence_added_event_object.py
index 6e69b560..ad5ccc25 100644
--- a/src/square/types/dispute_evidence_added_event_object.py
+++ b/src/square/types/dispute_evidence_added_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .dispute import Dispute
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
 
 
 class DisputeEvidenceAddedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_created_event.py b/src/square/types/dispute_evidence_created_event.py
index b133ef50..3f80b747 100644
--- a/src/square/types/dispute_evidence_created_event.py
+++ b/src/square/types/dispute_evidence_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_evidence_created_event_data import DisputeEvidenceCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence_created_event_data import DisputeEvidenceCreatedEventData
 
 
 class DisputeEvidenceCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_created_event_data.py b/src/square/types/dispute_evidence_created_event_data.py
index a9960b43..2db83cf3 100644
--- a/src/square/types/dispute_evidence_created_event_data.py
+++ b/src/square/types/dispute_evidence_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_evidence_created_event_object import DisputeEvidenceCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence_created_event_object import DisputeEvidenceCreatedEventObject
 
 
 class DisputeEvidenceCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_created_event_object.py b/src/square/types/dispute_evidence_created_event_object.py
index 46b8a0aa..13b3028a 100644
--- a/src/square/types/dispute_evidence_created_event_object.py
+++ b/src/square/types/dispute_evidence_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .dispute import Dispute
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
 
 
 class DisputeEvidenceCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_deleted_event.py b/src/square/types/dispute_evidence_deleted_event.py
index 23bd2b1a..869f4808 100644
--- a/src/square/types/dispute_evidence_deleted_event.py
+++ b/src/square/types/dispute_evidence_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_evidence_deleted_event_data import DisputeEvidenceDeletedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence_deleted_event_data import DisputeEvidenceDeletedEventData
 
 
 class DisputeEvidenceDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_deleted_event_data.py b/src/square/types/dispute_evidence_deleted_event_data.py
index 05baa7f8..ac2f1932 100644
--- a/src/square/types/dispute_evidence_deleted_event_data.py
+++ b/src/square/types/dispute_evidence_deleted_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_evidence_deleted_event_object import DisputeEvidenceDeletedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence_deleted_event_object import DisputeEvidenceDeletedEventObject
 
 
 class DisputeEvidenceDeletedEventData(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_deleted_event_object.py b/src/square/types/dispute_evidence_deleted_event_object.py
index bdcdb2d9..cfb2d197 100644
--- a/src/square/types/dispute_evidence_deleted_event_object.py
+++ b/src/square/types/dispute_evidence_deleted_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .dispute import Dispute
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
 
 
 class DisputeEvidenceDeletedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_file.py b/src/square/types/dispute_evidence_file.py
index b8380b9d..d9391a16 100644
--- a/src/square/types/dispute_evidence_file.py
+++ b/src/square/types/dispute_evidence_file.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class DisputeEvidenceFile(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_removed_event.py b/src/square/types/dispute_evidence_removed_event.py
index e018b4c2..0783e0cc 100644
--- a/src/square/types/dispute_evidence_removed_event.py
+++ b/src/square/types/dispute_evidence_removed_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_evidence_removed_event_data import DisputeEvidenceRemovedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence_removed_event_data import DisputeEvidenceRemovedEventData
 
 
 class DisputeEvidenceRemovedEvent(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_removed_event_data.py b/src/square/types/dispute_evidence_removed_event_data.py
index 4f261f9d..bdd0b85c 100644
--- a/src/square/types/dispute_evidence_removed_event_data.py
+++ b/src/square/types/dispute_evidence_removed_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_evidence_removed_event_object import DisputeEvidenceRemovedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence_removed_event_object import DisputeEvidenceRemovedEventObject
 
 
 class DisputeEvidenceRemovedEventData(UncheckedBaseModel):
diff --git a/src/square/types/dispute_evidence_removed_event_object.py b/src/square/types/dispute_evidence_removed_event_object.py
index e7feefaf..842bf9ba 100644
--- a/src/square/types/dispute_evidence_removed_event_object.py
+++ b/src/square/types/dispute_evidence_removed_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .dispute import Dispute
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
 
 
 class DisputeEvidenceRemovedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/dispute_state_changed_event.py b/src/square/types/dispute_state_changed_event.py
index 39ebce6f..3f6d8a7e 100644
--- a/src/square/types/dispute_state_changed_event.py
+++ b/src/square/types/dispute_state_changed_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_state_changed_event_data import DisputeStateChangedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_state_changed_event_data import DisputeStateChangedEventData
 
 
 class DisputeStateChangedEvent(UncheckedBaseModel):
diff --git a/src/square/types/dispute_state_changed_event_data.py b/src/square/types/dispute_state_changed_event_data.py
index 25e50f43..37c6e938 100644
--- a/src/square/types/dispute_state_changed_event_data.py
+++ b/src/square/types/dispute_state_changed_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_state_changed_event_object import DisputeStateChangedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_state_changed_event_object import DisputeStateChangedEventObject
 
 
 class DisputeStateChangedEventData(UncheckedBaseModel):
diff --git a/src/square/types/dispute_state_changed_event_object.py b/src/square/types/dispute_state_changed_event_object.py
index fe90907a..1efce6ae 100644
--- a/src/square/types/dispute_state_changed_event_object.py
+++ b/src/square/types/dispute_state_changed_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .dispute import Dispute
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
 
 
 class DisputeStateChangedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/dispute_state_updated_event.py b/src/square/types/dispute_state_updated_event.py
index 597d58f7..770fa7d4 100644
--- a/src/square/types/dispute_state_updated_event.py
+++ b/src/square/types/dispute_state_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_state_updated_event_data import DisputeStateUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_state_updated_event_data import DisputeStateUpdatedEventData
 
 
 class DisputeStateUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/dispute_state_updated_event_data.py b/src/square/types/dispute_state_updated_event_data.py
index 0929a97e..d409dac7 100644
--- a/src/square/types/dispute_state_updated_event_data.py
+++ b/src/square/types/dispute_state_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .dispute_state_updated_event_object import DisputeStateUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_state_updated_event_object import DisputeStateUpdatedEventObject
 
 
 class DisputeStateUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/dispute_state_updated_event_object.py b/src/square/types/dispute_state_updated_event_object.py
index 2d5f8d2d..713a16cf 100644
--- a/src/square/types/dispute_state_updated_event_object.py
+++ b/src/square/types/dispute_state_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .dispute import Dispute
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
 
 
 class DisputeStateUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/disputed_payment.py b/src/square/types/disputed_payment.py
index e2ae3dd2..180513d8 100644
--- a/src/square/types/disputed_payment.py
+++ b/src/square/types/disputed_payment.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class DisputedPayment(UncheckedBaseModel):
diff --git a/src/square/types/employee.py b/src/square/types/employee.py
index c2e39775..edf17f94 100644
--- a/src/square/types/employee.py
+++ b/src/square/types/employee.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .employee_status import EmployeeStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .employee_status import EmployeeStatus
 
 
 class Employee(UncheckedBaseModel):
diff --git a/src/square/types/employee_wage.py b/src/square/types/employee_wage.py
index cc0d0f35..6e57c69e 100644
--- a/src/square/types/employee_wage.py
+++ b/src/square/types/employee_wage.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class EmployeeWage(UncheckedBaseModel):
diff --git a/src/square/types/enable_events_response.py b/src/square/types/enable_events_response.py
index d7387ac6..bcb4d43c 100644
--- a/src/square/types/enable_events_response.py
+++ b/src/square/types/enable_events_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class EnableEventsResponse(UncheckedBaseModel):
diff --git a/src/square/types/error.py b/src/square/types/error.py
index 8842ebfc..dc72150a 100644
--- a/src/square/types/error.py
+++ b/src/square/types/error.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.unchecked_base_model import UncheckedBaseModel
 from .error_category import ErrorCategory
-import pydantic
 from .error_code import ErrorCode
-import typing
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Error(UncheckedBaseModel):
diff --git a/src/square/types/event.py b/src/square/types/event.py
index 3b7d602d..e4938454 100644
--- a/src/square/types/event.py
+++ b/src/square/types/event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .event_data import EventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .event_data import EventData
 
 
 class Event(UncheckedBaseModel):
diff --git a/src/square/types/event_data.py b/src/square/types/event_data.py
index 3b895e0b..6cdcadab 100644
--- a/src/square/types/event_data.py
+++ b/src/square/types/event_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class EventData(UncheckedBaseModel):
diff --git a/src/square/types/event_metadata.py b/src/square/types/event_metadata.py
index 310b6c94..d102f5e2 100644
--- a/src/square/types/event_metadata.py
+++ b/src/square/types/event_metadata.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class EventMetadata(UncheckedBaseModel):
diff --git a/src/square/types/event_type_metadata.py b/src/square/types/event_type_metadata.py
index 2712d3c6..b1bbcbc6 100644
--- a/src/square/types/event_type_metadata.py
+++ b/src/square/types/event_type_metadata.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class EventTypeMetadata(UncheckedBaseModel):
diff --git a/src/square/types/external_payment_details.py b/src/square/types/external_payment_details.py
index 7de9754e..15d16e02 100644
--- a/src/square/types/external_payment_details.py
+++ b/src/square/types/external_payment_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .money import Money
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class ExternalPaymentDetails(UncheckedBaseModel):
diff --git a/src/square/types/filter_value.py b/src/square/types/filter_value.py
index 4f6577a4..c54867cb 100644
--- a/src/square/types/filter_value.py
+++ b/src/square/types/filter_value.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import typing_extensions
 import typing
-from ..core.serialization import FieldMetadata
+
 import pydantic
+import typing_extensions
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class FilterValue(UncheckedBaseModel):
diff --git a/src/square/types/float_number_range.py b/src/square/types/float_number_range.py
index 29319f67..26822706 100644
--- a/src/square/types/float_number_range.py
+++ b/src/square/types/float_number_range.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class FloatNumberRange(UncheckedBaseModel):
diff --git a/src/square/types/fulfillment.py b/src/square/types/fulfillment.py
index b8b992c1..5ba2478e 100644
--- a/src/square/types/fulfillment.py
+++ b/src/square/types/fulfillment.py
@@ -1,16 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .fulfillment_type import FulfillmentType
-from .fulfillment_state import FulfillmentState
-from .fulfillment_fulfillment_line_item_application import FulfillmentFulfillmentLineItemApplication
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .fulfillment_delivery_details import FulfillmentDeliveryDetails
 from .fulfillment_fulfillment_entry import FulfillmentFulfillmentEntry
+from .fulfillment_fulfillment_line_item_application import FulfillmentFulfillmentLineItemApplication
 from .fulfillment_pickup_details import FulfillmentPickupDetails
 from .fulfillment_shipment_details import FulfillmentShipmentDetails
-from .fulfillment_delivery_details import FulfillmentDeliveryDetails
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .fulfillment_state import FulfillmentState
+from .fulfillment_type import FulfillmentType
 
 
 class Fulfillment(UncheckedBaseModel):
diff --git a/src/square/types/fulfillment_delivery_details.py b/src/square/types/fulfillment_delivery_details.py
index 9d132927..f30c51eb 100644
--- a/src/square/types/fulfillment_delivery_details.py
+++ b/src/square/types/fulfillment_delivery_details.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .fulfillment_recipient import FulfillmentRecipient
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .fulfillment_delivery_details_order_fulfillment_delivery_details_schedule_type import (
     FulfillmentDeliveryDetailsOrderFulfillmentDeliveryDetailsScheduleType,
 )
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .fulfillment_recipient import FulfillmentRecipient
 
 
 class FulfillmentDeliveryDetails(UncheckedBaseModel):
diff --git a/src/square/types/fulfillment_fulfillment_entry.py b/src/square/types/fulfillment_fulfillment_entry.py
index 09fa1b4e..43dc3c08 100644
--- a/src/square/types/fulfillment_fulfillment_entry.py
+++ b/src/square/types/fulfillment_fulfillment_entry.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class FulfillmentFulfillmentEntry(UncheckedBaseModel):
diff --git a/src/square/types/fulfillment_pickup_details.py b/src/square/types/fulfillment_pickup_details.py
index 70a61559..4a9eaa38 100644
--- a/src/square/types/fulfillment_pickup_details.py
+++ b/src/square/types/fulfillment_pickup_details.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .fulfillment_recipient import FulfillmentRecipient
+
 import pydantic
-from .fulfillment_pickup_details_schedule_type import FulfillmentPickupDetailsScheduleType
-from .fulfillment_pickup_details_curbside_pickup_details import FulfillmentPickupDetailsCurbsidePickupDetails
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .fulfillment_pickup_details_curbside_pickup_details import FulfillmentPickupDetailsCurbsidePickupDetails
+from .fulfillment_pickup_details_schedule_type import FulfillmentPickupDetailsScheduleType
+from .fulfillment_recipient import FulfillmentRecipient
 
 
 class FulfillmentPickupDetails(UncheckedBaseModel):
diff --git a/src/square/types/fulfillment_pickup_details_curbside_pickup_details.py b/src/square/types/fulfillment_pickup_details_curbside_pickup_details.py
index c7564c75..7e13579c 100644
--- a/src/square/types/fulfillment_pickup_details_curbside_pickup_details.py
+++ b/src/square/types/fulfillment_pickup_details_curbside_pickup_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class FulfillmentPickupDetailsCurbsidePickupDetails(UncheckedBaseModel):
diff --git a/src/square/types/fulfillment_recipient.py b/src/square/types/fulfillment_recipient.py
index 024fa566..63f773bf 100644
--- a/src/square/types/fulfillment_recipient.py
+++ b/src/square/types/fulfillment_recipient.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .address import Address
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .address import Address
 
 
 class FulfillmentRecipient(UncheckedBaseModel):
diff --git a/src/square/types/fulfillment_shipment_details.py b/src/square/types/fulfillment_shipment_details.py
index 7b9abee3..781c03d5 100644
--- a/src/square/types/fulfillment_shipment_details.py
+++ b/src/square/types/fulfillment_shipment_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .fulfillment_recipient import FulfillmentRecipient
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .fulfillment_recipient import FulfillmentRecipient
 
 
 class FulfillmentShipmentDetails(UncheckedBaseModel):
diff --git a/src/square/types/get_bank_account_by_v1id_response.py b/src/square/types/get_bank_account_by_v1id_response.py
index 7cc96a4e..425a958d 100644
--- a/src/square/types/get_bank_account_by_v1id_response.py
+++ b/src/square/types/get_bank_account_by_v1id_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .bank_account import BankAccount
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account import BankAccount
+from .error import Error
 
 
 class GetBankAccountByV1IdResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_bank_account_response.py b/src/square/types/get_bank_account_response.py
index 8d99e410..f6392365 100644
--- a/src/square/types/get_bank_account_response.py
+++ b/src/square/types/get_bank_account_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .bank_account import BankAccount
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account import BankAccount
+from .error import Error
 
 
 class GetBankAccountResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_booking_response.py b/src/square/types/get_booking_response.py
index e17c1e1f..ff400562 100644
--- a/src/square/types/get_booking_response.py
+++ b/src/square/types/get_booking_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking import Booking
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking import Booking
+from .error import Error
 
 
 class GetBookingResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_break_type_response.py b/src/square/types/get_break_type_response.py
index a65ef24d..d2e6be67 100644
--- a/src/square/types/get_break_type_response.py
+++ b/src/square/types/get_break_type_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .break_type import BreakType
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .break_type import BreakType
+from .error import Error
 
 
 class GetBreakTypeResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_business_booking_profile_response.py b/src/square/types/get_business_booking_profile_response.py
index 74187d92..07b1b002 100644
--- a/src/square/types/get_business_booking_profile_response.py
+++ b/src/square/types/get_business_booking_profile_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .business_booking_profile import BusinessBookingProfile
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .business_booking_profile import BusinessBookingProfile
+from .error import Error
 
 
 class GetBusinessBookingProfileResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_card_response.py b/src/square/types/get_card_response.py
index eaaf4d6b..e0db0941 100644
--- a/src/square/types/get_card_response.py
+++ b/src/square/types/get_card_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .card import Card
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
+from .error import Error
 
 
 class GetCardResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_cash_drawer_shift_response.py b/src/square/types/get_cash_drawer_shift_response.py
index 183deda1..fbc923aa 100644
--- a/src/square/types/get_cash_drawer_shift_response.py
+++ b/src/square/types/get_cash_drawer_shift_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .cash_drawer_shift import CashDrawerShift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .cash_drawer_shift import CashDrawerShift
+from .error import Error
 
 
 class GetCashDrawerShiftResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_catalog_object_response.py b/src/square/types/get_catalog_object_response.py
index 4d3885d2..fcde3695 100644
--- a/src/square/types/get_catalog_object_response.py
+++ b/src/square/types/get_catalog_object_response.py
@@ -1,21 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
-from .catalog_object import CatalogObject
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class GetCatalogObjectResponse(UncheckedBaseModel):
@@ -24,12 +16,12 @@ class GetCatalogObjectResponse(UncheckedBaseModel):
     Any errors that occurred during the request.
     """
 
-    object: typing.Optional[CatalogObject] = pydantic.Field(default=None)
+    object: typing.Optional["CatalogObject"] = pydantic.Field(default=None)
     """
     The `CatalogObject`s returned.
     """
 
-    related_objects: typing.Optional[typing.List[CatalogObject]] = pydantic.Field(default=None)
+    related_objects: typing.Optional[typing.List["CatalogObject"]] = pydantic.Field(default=None)
     """
     A list of `CatalogObject`s referenced by the object in the `object` field.
     """
@@ -42,3 +34,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(GetCatalogObjectResponse)
diff --git a/src/square/types/get_customer_custom_attribute_definition_response.py b/src/square/types/get_customer_custom_attribute_definition_response.py
index 5d7aed80..6694089a 100644
--- a/src/square/types/get_customer_custom_attribute_definition_response.py
+++ b/src/square/types/get_customer_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class GetCustomerCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_customer_custom_attribute_response.py b/src/square/types/get_customer_custom_attribute_response.py
index 05695f58..767a1e9d 100644
--- a/src/square/types/get_customer_custom_attribute_response.py
+++ b/src/square/types/get_customer_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class GetCustomerCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_customer_group_response.py b/src/square/types/get_customer_group_response.py
index 0c5c82da..761f6a00 100644
--- a/src/square/types/get_customer_group_response.py
+++ b/src/square/types/get_customer_group_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer_group import CustomerGroup
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_group import CustomerGroup
+from .error import Error
 
 
 class GetCustomerGroupResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_customer_response.py b/src/square/types/get_customer_response.py
index e4b40eeb..fc85b0e2 100644
--- a/src/square/types/get_customer_response.py
+++ b/src/square/types/get_customer_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer import Customer
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer import Customer
+from .error import Error
 
 
 class GetCustomerResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_customer_segment_response.py b/src/square/types/get_customer_segment_response.py
index 66b1211c..15fa22b6 100644
--- a/src/square/types/get_customer_segment_response.py
+++ b/src/square/types/get_customer_segment_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer_segment import CustomerSegment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_segment import CustomerSegment
+from .error import Error
 
 
 class GetCustomerSegmentResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_device_code_response.py b/src/square/types/get_device_code_response.py
index ecf5bafb..3ead359e 100644
--- a/src/square/types/get_device_code_response.py
+++ b/src/square/types/get_device_code_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .device_code import DeviceCode
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_code import DeviceCode
+from .error import Error
 
 
 class GetDeviceCodeResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_device_response.py b/src/square/types/get_device_response.py
index 5386b201..6f1b1b27 100644
--- a/src/square/types/get_device_response.py
+++ b/src/square/types/get_device_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .device import Device
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device import Device
+from .error import Error
 
 
 class GetDeviceResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_dispute_evidence_response.py b/src/square/types/get_dispute_evidence_response.py
index 9d5aac44..32d0ecad 100644
--- a/src/square/types/get_dispute_evidence_response.py
+++ b/src/square/types/get_dispute_evidence_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .dispute_evidence import DisputeEvidence
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence import DisputeEvidence
+from .error import Error
 
 
 class GetDisputeEvidenceResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_dispute_response.py b/src/square/types/get_dispute_response.py
index a82d9a0b..19446348 100644
--- a/src/square/types/get_dispute_response.py
+++ b/src/square/types/get_dispute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .dispute import Dispute
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
+from .error import Error
 
 
 class GetDisputeResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_employee_response.py b/src/square/types/get_employee_response.py
index bc8fb7b2..b77ac9ac 100644
--- a/src/square/types/get_employee_response.py
+++ b/src/square/types/get_employee_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .employee import Employee
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .employee import Employee
+from .error import Error
 
 
 class GetEmployeeResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_employee_wage_response.py b/src/square/types/get_employee_wage_response.py
index 064787e0..27ecb32d 100644
--- a/src/square/types/get_employee_wage_response.py
+++ b/src/square/types/get_employee_wage_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .employee_wage import EmployeeWage
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .employee_wage import EmployeeWage
+from .error import Error
 
 
 class GetEmployeeWageResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_gift_card_from_gan_response.py b/src/square/types/get_gift_card_from_gan_response.py
index e7894d30..d216a685 100644
--- a/src/square/types/get_gift_card_from_gan_response.py
+++ b/src/square/types/get_gift_card_from_gan_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .gift_card import GiftCard
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .gift_card import GiftCard
 
 
 class GetGiftCardFromGanResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_gift_card_from_nonce_response.py b/src/square/types/get_gift_card_from_nonce_response.py
index cd55c226..a6d8c783 100644
--- a/src/square/types/get_gift_card_from_nonce_response.py
+++ b/src/square/types/get_gift_card_from_nonce_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .gift_card import GiftCard
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .gift_card import GiftCard
 
 
 class GetGiftCardFromNonceResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_gift_card_response.py b/src/square/types/get_gift_card_response.py
index 5c383d79..65b0cd3e 100644
--- a/src/square/types/get_gift_card_response.py
+++ b/src/square/types/get_gift_card_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .gift_card import GiftCard
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .gift_card import GiftCard
 
 
 class GetGiftCardResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_inventory_adjustment_response.py b/src/square/types/get_inventory_adjustment_response.py
index 54d8322e..d593f6d2 100644
--- a/src/square/types/get_inventory_adjustment_response.py
+++ b/src/square/types/get_inventory_adjustment_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .inventory_adjustment import InventoryAdjustment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .inventory_adjustment import InventoryAdjustment
 
 
 class GetInventoryAdjustmentResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_inventory_changes_response.py b/src/square/types/get_inventory_changes_response.py
index a0ee68d0..56302240 100644
--- a/src/square/types/get_inventory_changes_response.py
+++ b/src/square/types/get_inventory_changes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .inventory_change import InventoryChange
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .inventory_change import InventoryChange
 
 
 class GetInventoryChangesResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_inventory_count_response.py b/src/square/types/get_inventory_count_response.py
index 6618be90..1e14ebb2 100644
--- a/src/square/types/get_inventory_count_response.py
+++ b/src/square/types/get_inventory_count_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .inventory_count import InventoryCount
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .inventory_count import InventoryCount
 
 
 class GetInventoryCountResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_inventory_physical_count_response.py b/src/square/types/get_inventory_physical_count_response.py
index 4b7dbc2f..33df9926 100644
--- a/src/square/types/get_inventory_physical_count_response.py
+++ b/src/square/types/get_inventory_physical_count_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .inventory_physical_count import InventoryPhysicalCount
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .inventory_physical_count import InventoryPhysicalCount
 
 
 class GetInventoryPhysicalCountResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_inventory_transfer_response.py b/src/square/types/get_inventory_transfer_response.py
index baa94733..d37d1b43 100644
--- a/src/square/types/get_inventory_transfer_response.py
+++ b/src/square/types/get_inventory_transfer_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .inventory_transfer import InventoryTransfer
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .inventory_transfer import InventoryTransfer
 
 
 class GetInventoryTransferResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_invoice_response.py b/src/square/types/get_invoice_response.py
index 2718de0e..21ca0730 100644
--- a/src/square/types/get_invoice_response.py
+++ b/src/square/types/get_invoice_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .invoice import Invoice
 
 
 class GetInvoiceResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_location_response.py b/src/square/types/get_location_response.py
index 777a9480..30bcf202 100644
--- a/src/square/types/get_location_response.py
+++ b/src/square/types/get_location_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .location import Location
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .location import Location
 
 
 class GetLocationResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_loyalty_account_response.py b/src/square/types/get_loyalty_account_response.py
index 8bc83fc5..a491a413 100644
--- a/src/square/types/get_loyalty_account_response.py
+++ b/src/square/types/get_loyalty_account_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_account import LoyaltyAccount
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_account import LoyaltyAccount
 
 
 class GetLoyaltyAccountResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_loyalty_program_response.py b/src/square/types/get_loyalty_program_response.py
index 22187a73..d900be87 100644
--- a/src/square/types/get_loyalty_program_response.py
+++ b/src/square/types/get_loyalty_program_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_program import LoyaltyProgram
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_program import LoyaltyProgram
 
 
 class GetLoyaltyProgramResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_loyalty_promotion_response.py b/src/square/types/get_loyalty_promotion_response.py
index b24b273b..96205394 100644
--- a/src/square/types/get_loyalty_promotion_response.py
+++ b/src/square/types/get_loyalty_promotion_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_promotion import LoyaltyPromotion
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_promotion import LoyaltyPromotion
 
 
 class GetLoyaltyPromotionResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_loyalty_reward_response.py b/src/square/types/get_loyalty_reward_response.py
index 3ab1bffa..8da7c923 100644
--- a/src/square/types/get_loyalty_reward_response.py
+++ b/src/square/types/get_loyalty_reward_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_reward import LoyaltyReward
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_reward import LoyaltyReward
 
 
 class GetLoyaltyRewardResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_merchant_response.py b/src/square/types/get_merchant_response.py
index eb46f13c..31bf69a4 100644
--- a/src/square/types/get_merchant_response.py
+++ b/src/square/types/get_merchant_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .merchant import Merchant
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .merchant import Merchant
 
 
 class GetMerchantResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_order_response.py b/src/square/types/get_order_response.py
index 4da063c0..d1c77c66 100644
--- a/src/square/types/get_order_response.py
+++ b/src/square/types/get_order_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order import Order
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .order import Order
 
 
 class GetOrderResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_payment_link_response.py b/src/square/types/get_payment_link_response.py
index 08ca81dd..16683513 100644
--- a/src/square/types/get_payment_link_response.py
+++ b/src/square/types/get_payment_link_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment_link import PaymentLink
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment_link import PaymentLink
 
 
 class GetPaymentLinkResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_payment_refund_response.py b/src/square/types/get_payment_refund_response.py
index 16da4096..19e44c62 100644
--- a/src/square/types/get_payment_refund_response.py
+++ b/src/square/types/get_payment_refund_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment_refund import PaymentRefund
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment_refund import PaymentRefund
 
 
 class GetPaymentRefundResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_payment_response.py b/src/square/types/get_payment_response.py
index 44b4b70c..fddbd224 100644
--- a/src/square/types/get_payment_response.py
+++ b/src/square/types/get_payment_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment import Payment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment import Payment
 
 
 class GetPaymentResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_payout_response.py b/src/square/types/get_payout_response.py
index a02a5c09..737b8bdf 100644
--- a/src/square/types/get_payout_response.py
+++ b/src/square/types/get_payout_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payout import Payout
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payout import Payout
 
 
 class GetPayoutResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_shift_response.py b/src/square/types/get_shift_response.py
index 64af8439..f593773e 100644
--- a/src/square/types/get_shift_response.py
+++ b/src/square/types/get_shift_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .shift import Shift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .shift import Shift
 
 
 class GetShiftResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_snippet_response.py b/src/square/types/get_snippet_response.py
index 9f5fcd3c..f5811cae 100644
--- a/src/square/types/get_snippet_response.py
+++ b/src/square/types/get_snippet_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .snippet import Snippet
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .snippet import Snippet
 
 
 class GetSnippetResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_subscription_response.py b/src/square/types/get_subscription_response.py
index f75bcdc1..5ecc82a0 100644
--- a/src/square/types/get_subscription_response.py
+++ b/src/square/types/get_subscription_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .subscription import Subscription
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .subscription import Subscription
 
 
 class GetSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_team_member_booking_profile_response.py b/src/square/types/get_team_member_booking_profile_response.py
index 969c72aa..7dde96a1 100644
--- a/src/square/types/get_team_member_booking_profile_response.py
+++ b/src/square/types/get_team_member_booking_profile_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member_booking_profile import TeamMemberBookingProfile
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .team_member_booking_profile import TeamMemberBookingProfile
 
 
 class GetTeamMemberBookingProfileResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_team_member_response.py b/src/square/types/get_team_member_response.py
index e9b8609c..72958031 100644
--- a/src/square/types/get_team_member_response.py
+++ b/src/square/types/get_team_member_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member import TeamMember
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .team_member import TeamMember
 
 
 class GetTeamMemberResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_team_member_wage_response.py b/src/square/types/get_team_member_wage_response.py
index 295ab058..885da26b 100644
--- a/src/square/types/get_team_member_wage_response.py
+++ b/src/square/types/get_team_member_wage_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member_wage import TeamMemberWage
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .team_member_wage import TeamMemberWage
 
 
 class GetTeamMemberWageResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_terminal_action_response.py b/src/square/types/get_terminal_action_response.py
index d7a18e74..89438e58 100644
--- a/src/square/types/get_terminal_action_response.py
+++ b/src/square/types/get_terminal_action_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_action import TerminalAction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_action import TerminalAction
 
 
 class GetTerminalActionResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_terminal_checkout_response.py b/src/square/types/get_terminal_checkout_response.py
index 636c923d..8f490965 100644
--- a/src/square/types/get_terminal_checkout_response.py
+++ b/src/square/types/get_terminal_checkout_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_checkout import TerminalCheckout
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_checkout import TerminalCheckout
 
 
 class GetTerminalCheckoutResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_terminal_refund_response.py b/src/square/types/get_terminal_refund_response.py
index 5f3d0bc7..b32b5d0d 100644
--- a/src/square/types/get_terminal_refund_response.py
+++ b/src/square/types/get_terminal_refund_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_refund import TerminalRefund
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_refund import TerminalRefund
 
 
 class GetTerminalRefundResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_transaction_response.py b/src/square/types/get_transaction_response.py
index 88e1dd3b..fef6cd76 100644
--- a/src/square/types/get_transaction_response.py
+++ b/src/square/types/get_transaction_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .transaction import Transaction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .transaction import Transaction
 
 
 class GetTransactionResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_vendor_response.py b/src/square/types/get_vendor_response.py
index 96219b9c..2bbad87c 100644
--- a/src/square/types/get_vendor_response.py
+++ b/src/square/types/get_vendor_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .vendor import Vendor
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .vendor import Vendor
 
 
 class GetVendorResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_wage_setting_response.py b/src/square/types/get_wage_setting_response.py
index 4ad8e5bc..ee7ac012 100644
--- a/src/square/types/get_wage_setting_response.py
+++ b/src/square/types/get_wage_setting_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .wage_setting import WageSetting
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .wage_setting import WageSetting
 
 
 class GetWageSettingResponse(UncheckedBaseModel):
diff --git a/src/square/types/get_webhook_subscription_response.py b/src/square/types/get_webhook_subscription_response.py
index c390b7e3..c05d9cf5 100644
--- a/src/square/types/get_webhook_subscription_response.py
+++ b/src/square/types/get_webhook_subscription_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .webhook_subscription import WebhookSubscription
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .webhook_subscription import WebhookSubscription
 
 
 class GetWebhookSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/gift_card.py b/src/square/types/gift_card.py
index 3d72e7b8..1b19a2e8 100644
--- a/src/square/types/gift_card.py
+++ b/src/square/types/gift_card.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_type import GiftCardType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .gift_card_gan_source import GiftCardGanSource
 from .gift_card_status import GiftCardStatus
+from .gift_card_type import GiftCardType
 from .money import Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class GiftCard(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity.py b/src/square/types/gift_card_activity.py
index 38045f4a..48e89983 100644
--- a/src/square/types/gift_card_activity.py
+++ b/src/square/types/gift_card_activity.py
@@ -1,26 +1,27 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_activity_type import GiftCardActivityType
-from .money import Money
-from .gift_card_activity_load import GiftCardActivityLoad
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .gift_card_activity_activate import GiftCardActivityActivate
-from .gift_card_activity_redeem import GiftCardActivityRedeem
+from .gift_card_activity_adjust_decrement import GiftCardActivityAdjustDecrement
+from .gift_card_activity_adjust_increment import GiftCardActivityAdjustIncrement
+from .gift_card_activity_block import GiftCardActivityBlock
 from .gift_card_activity_clear_balance import GiftCardActivityClearBalance
 from .gift_card_activity_deactivate import GiftCardActivityDeactivate
-from .gift_card_activity_adjust_increment import GiftCardActivityAdjustIncrement
-from .gift_card_activity_adjust_decrement import GiftCardActivityAdjustDecrement
-from .gift_card_activity_refund import GiftCardActivityRefund
-from .gift_card_activity_unlinked_activity_refund import GiftCardActivityUnlinkedActivityRefund
 from .gift_card_activity_import import GiftCardActivityImport
-from .gift_card_activity_block import GiftCardActivityBlock
-from .gift_card_activity_unblock import GiftCardActivityUnblock
 from .gift_card_activity_import_reversal import GiftCardActivityImportReversal
-from .gift_card_activity_transfer_balance_to import GiftCardActivityTransferBalanceTo
+from .gift_card_activity_load import GiftCardActivityLoad
+from .gift_card_activity_redeem import GiftCardActivityRedeem
+from .gift_card_activity_refund import GiftCardActivityRefund
 from .gift_card_activity_transfer_balance_from import GiftCardActivityTransferBalanceFrom
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .gift_card_activity_transfer_balance_to import GiftCardActivityTransferBalanceTo
+from .gift_card_activity_type import GiftCardActivityType
+from .gift_card_activity_unblock import GiftCardActivityUnblock
+from .gift_card_activity_unlinked_activity_refund import GiftCardActivityUnlinkedActivityRefund
+from .money import Money
 
 
 class GiftCardActivity(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_activate.py b/src/square/types/gift_card_activity_activate.py
index d147daf0..17eb514e 100644
--- a/src/square/types/gift_card_activity_activate.py
+++ b/src/square/types/gift_card_activity_activate.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .money import Money
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class GiftCardActivityActivate(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_adjust_decrement.py b/src/square/types/gift_card_activity_adjust_decrement.py
index 340baee2..64b2891d 100644
--- a/src/square/types/gift_card_activity_adjust_decrement.py
+++ b/src/square/types/gift_card_activity_adjust_decrement.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
+import typing
+
 import pydantic
-from .gift_card_activity_adjust_decrement_reason import GiftCardActivityAdjustDecrementReason
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_adjust_decrement_reason import GiftCardActivityAdjustDecrementReason
+from .money import Money
 
 
 class GiftCardActivityAdjustDecrement(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_adjust_increment.py b/src/square/types/gift_card_activity_adjust_increment.py
index e24b7ecd..6b3468c0 100644
--- a/src/square/types/gift_card_activity_adjust_increment.py
+++ b/src/square/types/gift_card_activity_adjust_increment.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
+import typing
+
 import pydantic
-from .gift_card_activity_adjust_increment_reason import GiftCardActivityAdjustIncrementReason
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_adjust_increment_reason import GiftCardActivityAdjustIncrementReason
+from .money import Money
 
 
 class GiftCardActivityAdjustIncrement(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_block.py b/src/square/types/gift_card_activity_block.py
index 6e737f9a..e392e569 100644
--- a/src/square/types/gift_card_activity_block.py
+++ b/src/square/types/gift_card_activity_block.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .gift_card_activity_block_reason import GiftCardActivityBlockReason
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_block_reason import GiftCardActivityBlockReason
 
 
 class GiftCardActivityBlock(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_clear_balance.py b/src/square/types/gift_card_activity_clear_balance.py
index a833872e..ec7c63bf 100644
--- a/src/square/types/gift_card_activity_clear_balance.py
+++ b/src/square/types/gift_card_activity_clear_balance.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .gift_card_activity_clear_balance_reason import GiftCardActivityClearBalanceReason
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_clear_balance_reason import GiftCardActivityClearBalanceReason
 
 
 class GiftCardActivityClearBalance(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_created_event.py b/src/square/types/gift_card_activity_created_event.py
index 6dbda1cb..68bca0ae 100644
--- a/src/square/types/gift_card_activity_created_event.py
+++ b/src/square/types/gift_card_activity_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_activity_created_event_data import GiftCardActivityCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_created_event_data import GiftCardActivityCreatedEventData
 
 
 class GiftCardActivityCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_created_event_data.py b/src/square/types/gift_card_activity_created_event_data.py
index 30065635..35e23e07 100644
--- a/src/square/types/gift_card_activity_created_event_data.py
+++ b/src/square/types/gift_card_activity_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_activity_created_event_object import GiftCardActivityCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_created_event_object import GiftCardActivityCreatedEventObject
 
 
 class GiftCardActivityCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_created_event_object.py b/src/square/types/gift_card_activity_created_event_object.py
index aeabd68d..8de1921c 100644
--- a/src/square/types/gift_card_activity_created_event_object.py
+++ b/src/square/types/gift_card_activity_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .gift_card_activity import GiftCardActivity
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity import GiftCardActivity
 
 
 class GiftCardActivityCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_deactivate.py b/src/square/types/gift_card_activity_deactivate.py
index 230aed4c..bc290906 100644
--- a/src/square/types/gift_card_activity_deactivate.py
+++ b/src/square/types/gift_card_activity_deactivate.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .gift_card_activity_deactivate_reason import GiftCardActivityDeactivateReason
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_deactivate_reason import GiftCardActivityDeactivateReason
 
 
 class GiftCardActivityDeactivate(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_import.py b/src/square/types/gift_card_activity_import.py
index 9b543d4e..1f144cd3 100644
--- a/src/square/types/gift_card_activity_import.py
+++ b/src/square/types/gift_card_activity_import.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class GiftCardActivityImport(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_import_reversal.py b/src/square/types/gift_card_activity_import_reversal.py
index ed8311f7..59e7a9b2 100644
--- a/src/square/types/gift_card_activity_import_reversal.py
+++ b/src/square/types/gift_card_activity_import_reversal.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class GiftCardActivityImportReversal(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_load.py b/src/square/types/gift_card_activity_load.py
index e6411661..aaf1ed1b 100644
--- a/src/square/types/gift_card_activity_load.py
+++ b/src/square/types/gift_card_activity_load.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .money import Money
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class GiftCardActivityLoad(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_redeem.py b/src/square/types/gift_card_activity_redeem.py
index b73653f6..47f1019f 100644
--- a/src/square/types/gift_card_activity_redeem.py
+++ b/src/square/types/gift_card_activity_redeem.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
-import pydantic
 import typing
-from .gift_card_activity_redeem_status import GiftCardActivityRedeemStatus
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_redeem_status import GiftCardActivityRedeemStatus
+from .money import Money
 
 
 class GiftCardActivityRedeem(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_refund.py b/src/square/types/gift_card_activity_refund.py
index c7a30d54..1a251cd6 100644
--- a/src/square/types/gift_card_activity_refund.py
+++ b/src/square/types/gift_card_activity_refund.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class GiftCardActivityRefund(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_transfer_balance_from.py b/src/square/types/gift_card_activity_transfer_balance_from.py
index 2afe4379..9ee41f35 100644
--- a/src/square/types/gift_card_activity_transfer_balance_from.py
+++ b/src/square/types/gift_card_activity_transfer_balance_from.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class GiftCardActivityTransferBalanceFrom(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_transfer_balance_to.py b/src/square/types/gift_card_activity_transfer_balance_to.py
index 63b061a5..36eba2c1 100644
--- a/src/square/types/gift_card_activity_transfer_balance_to.py
+++ b/src/square/types/gift_card_activity_transfer_balance_to.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class GiftCardActivityTransferBalanceTo(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_unblock.py b/src/square/types/gift_card_activity_unblock.py
index 84c0ed0a..7656c4bc 100644
--- a/src/square/types/gift_card_activity_unblock.py
+++ b/src/square/types/gift_card_activity_unblock.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .gift_card_activity_unblock_reason import GiftCardActivityUnblockReason
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_unblock_reason import GiftCardActivityUnblockReason
 
 
 class GiftCardActivityUnblock(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_unlinked_activity_refund.py b/src/square/types/gift_card_activity_unlinked_activity_refund.py
index c7a6c5fa..9ae68f5a 100644
--- a/src/square/types/gift_card_activity_unlinked_activity_refund.py
+++ b/src/square/types/gift_card_activity_unlinked_activity_refund.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class GiftCardActivityUnlinkedActivityRefund(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_updated_event.py b/src/square/types/gift_card_activity_updated_event.py
index 16ffbb0a..166cd4d4 100644
--- a/src/square/types/gift_card_activity_updated_event.py
+++ b/src/square/types/gift_card_activity_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_activity_updated_event_data import GiftCardActivityUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_updated_event_data import GiftCardActivityUpdatedEventData
 
 
 class GiftCardActivityUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_updated_event_data.py b/src/square/types/gift_card_activity_updated_event_data.py
index 510b10ed..d513e19c 100644
--- a/src/square/types/gift_card_activity_updated_event_data.py
+++ b/src/square/types/gift_card_activity_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_activity_updated_event_object import GiftCardActivityUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity_updated_event_object import GiftCardActivityUpdatedEventObject
 
 
 class GiftCardActivityUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_activity_updated_event_object.py b/src/square/types/gift_card_activity_updated_event_object.py
index 9f4c6edf..cab7586f 100644
--- a/src/square/types/gift_card_activity_updated_event_object.py
+++ b/src/square/types/gift_card_activity_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .gift_card_activity import GiftCardActivity
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_activity import GiftCardActivity
 
 
 class GiftCardActivityUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_created_event.py b/src/square/types/gift_card_created_event.py
index 728d2e96..983c92a7 100644
--- a/src/square/types/gift_card_created_event.py
+++ b/src/square/types/gift_card_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_created_event_data import GiftCardCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_created_event_data import GiftCardCreatedEventData
 
 
 class GiftCardCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_created_event_data.py b/src/square/types/gift_card_created_event_data.py
index 0472e556..56dfb7df 100644
--- a/src/square/types/gift_card_created_event_data.py
+++ b/src/square/types/gift_card_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_created_event_object import GiftCardCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_created_event_object import GiftCardCreatedEventObject
 
 
 class GiftCardCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_created_event_object.py b/src/square/types/gift_card_created_event_object.py
index 508e5e40..d86dfc11 100644
--- a/src/square/types/gift_card_created_event_object.py
+++ b/src/square/types/gift_card_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .gift_card import GiftCard
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card import GiftCard
 
 
 class GiftCardCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_customer_linked_event.py b/src/square/types/gift_card_customer_linked_event.py
index 5e34ebd6..4cb250e8 100644
--- a/src/square/types/gift_card_customer_linked_event.py
+++ b/src/square/types/gift_card_customer_linked_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_customer_linked_event_data import GiftCardCustomerLinkedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_customer_linked_event_data import GiftCardCustomerLinkedEventData
 
 
 class GiftCardCustomerLinkedEvent(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_customer_linked_event_data.py b/src/square/types/gift_card_customer_linked_event_data.py
index 9a095b76..0427fe4f 100644
--- a/src/square/types/gift_card_customer_linked_event_data.py
+++ b/src/square/types/gift_card_customer_linked_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_customer_linked_event_object import GiftCardCustomerLinkedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_customer_linked_event_object import GiftCardCustomerLinkedEventObject
 
 
 class GiftCardCustomerLinkedEventData(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_customer_linked_event_object.py b/src/square/types/gift_card_customer_linked_event_object.py
index ee408d51..dfbe7480 100644
--- a/src/square/types/gift_card_customer_linked_event_object.py
+++ b/src/square/types/gift_card_customer_linked_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .gift_card import GiftCard
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card import GiftCard
 
 
 class GiftCardCustomerLinkedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_customer_unlinked_event.py b/src/square/types/gift_card_customer_unlinked_event.py
index 228641ba..16e5bf57 100644
--- a/src/square/types/gift_card_customer_unlinked_event.py
+++ b/src/square/types/gift_card_customer_unlinked_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_customer_unlinked_event_data import GiftCardCustomerUnlinkedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_customer_unlinked_event_data import GiftCardCustomerUnlinkedEventData
 
 
 class GiftCardCustomerUnlinkedEvent(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_customer_unlinked_event_data.py b/src/square/types/gift_card_customer_unlinked_event_data.py
index fc7a0dc0..02a0fe06 100644
--- a/src/square/types/gift_card_customer_unlinked_event_data.py
+++ b/src/square/types/gift_card_customer_unlinked_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_customer_unlinked_event_object import GiftCardCustomerUnlinkedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_customer_unlinked_event_object import GiftCardCustomerUnlinkedEventObject
 
 
 class GiftCardCustomerUnlinkedEventData(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_customer_unlinked_event_object.py b/src/square/types/gift_card_customer_unlinked_event_object.py
index 02938d65..579f99b0 100644
--- a/src/square/types/gift_card_customer_unlinked_event_object.py
+++ b/src/square/types/gift_card_customer_unlinked_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .gift_card import GiftCard
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card import GiftCard
 
 
 class GiftCardCustomerUnlinkedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_updated_event.py b/src/square/types/gift_card_updated_event.py
index 3b694535..ff62ab28 100644
--- a/src/square/types/gift_card_updated_event.py
+++ b/src/square/types/gift_card_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_updated_event_data import GiftCardUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_updated_event_data import GiftCardUpdatedEventData
 
 
 class GiftCardUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_updated_event_data.py b/src/square/types/gift_card_updated_event_data.py
index 8fe0befb..a3d45414 100644
--- a/src/square/types/gift_card_updated_event_data.py
+++ b/src/square/types/gift_card_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .gift_card_updated_event_object import GiftCardUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card_updated_event_object import GiftCardUpdatedEventObject
 
 
 class GiftCardUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/gift_card_updated_event_object.py b/src/square/types/gift_card_updated_event_object.py
index 12bd3a2b..a2d90ee3 100644
--- a/src/square/types/gift_card_updated_event_object.py
+++ b/src/square/types/gift_card_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .gift_card import GiftCard
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .gift_card import GiftCard
 
 
 class GiftCardUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/inventory_adjustment.py b/src/square/types/inventory_adjustment.py
index 5ae6f905..971d171d 100644
--- a/src/square/types/inventory_adjustment.py
+++ b/src/square/types/inventory_adjustment.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .inventory_adjustment_group import InventoryAdjustmentGroup
 from .inventory_state import InventoryState
 from .money import Money
 from .source_application import SourceApplication
-from .inventory_adjustment_group import InventoryAdjustmentGroup
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class InventoryAdjustment(UncheckedBaseModel):
diff --git a/src/square/types/inventory_adjustment_group.py b/src/square/types/inventory_adjustment_group.py
index 802d1e99..a78346fe 100644
--- a/src/square/types/inventory_adjustment_group.py
+++ b/src/square/types/inventory_adjustment_group.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .inventory_state import InventoryState
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .inventory_state import InventoryState
 
 
 class InventoryAdjustmentGroup(UncheckedBaseModel):
diff --git a/src/square/types/inventory_change.py b/src/square/types/inventory_change.py
index 4094263b..4a66c495 100644
--- a/src/square/types/inventory_change.py
+++ b/src/square/types/inventory_change.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .inventory_change_type import InventoryChangeType
+
 import pydantic
-from .inventory_physical_count import InventoryPhysicalCount
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_measurement_unit import CatalogMeasurementUnit
 from .inventory_adjustment import InventoryAdjustment
+from .inventory_change_type import InventoryChangeType
+from .inventory_physical_count import InventoryPhysicalCount
 from .inventory_transfer import InventoryTransfer
-from .catalog_measurement_unit import CatalogMeasurementUnit
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class InventoryChange(UncheckedBaseModel):
diff --git a/src/square/types/inventory_count.py b/src/square/types/inventory_count.py
index 64787e4f..f7f48859 100644
--- a/src/square/types/inventory_count.py
+++ b/src/square/types/inventory_count.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .inventory_state import InventoryState
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .inventory_state import InventoryState
 
 
 class InventoryCount(UncheckedBaseModel):
diff --git a/src/square/types/inventory_count_updated_event.py b/src/square/types/inventory_count_updated_event.py
index 719b2ead..b086f1aa 100644
--- a/src/square/types/inventory_count_updated_event.py
+++ b/src/square/types/inventory_count_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .inventory_count_updated_event_data import InventoryCountUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .inventory_count_updated_event_data import InventoryCountUpdatedEventData
 
 
 class InventoryCountUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/inventory_count_updated_event_data.py b/src/square/types/inventory_count_updated_event_data.py
index 33a0fc31..9f82e78f 100644
--- a/src/square/types/inventory_count_updated_event_data.py
+++ b/src/square/types/inventory_count_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .inventory_count_updated_event_object import InventoryCountUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .inventory_count_updated_event_object import InventoryCountUpdatedEventObject
 
 
 class InventoryCountUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/inventory_count_updated_event_object.py b/src/square/types/inventory_count_updated_event_object.py
index 26e138f1..6037dd71 100644
--- a/src/square/types/inventory_count_updated_event_object.py
+++ b/src/square/types/inventory_count_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .inventory_count import InventoryCount
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .inventory_count import InventoryCount
 
 
 class InventoryCountUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/inventory_physical_count.py b/src/square/types/inventory_physical_count.py
index 652e6032..20bb2cf7 100644
--- a/src/square/types/inventory_physical_count.py
+++ b/src/square/types/inventory_physical_count.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .inventory_state import InventoryState
 from .source_application import SourceApplication
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class InventoryPhysicalCount(UncheckedBaseModel):
diff --git a/src/square/types/inventory_transfer.py b/src/square/types/inventory_transfer.py
index a3940e59..6dd5c25f 100644
--- a/src/square/types/inventory_transfer.py
+++ b/src/square/types/inventory_transfer.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .inventory_state import InventoryState
 from .source_application import SourceApplication
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class InventoryTransfer(UncheckedBaseModel):
diff --git a/src/square/types/invoice.py b/src/square/types/invoice.py
index 63c27a58..6963488e 100644
--- a/src/square/types/invoice.py
+++ b/src/square/types/invoice.py
@@ -1,17 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_recipient import InvoiceRecipient
-from .invoice_payment_request import InvoicePaymentRequest
-from .invoice_delivery_method import InvoiceDeliveryMethod
-from .money import Money
-from .invoice_status import InvoiceStatus
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .invoice_accepted_payment_methods import InvoiceAcceptedPaymentMethods
-from .invoice_custom_field import InvoiceCustomField
 from .invoice_attachment import InvoiceAttachment
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .invoice_custom_field import InvoiceCustomField
+from .invoice_delivery_method import InvoiceDeliveryMethod
+from .invoice_payment_request import InvoicePaymentRequest
+from .invoice_recipient import InvoiceRecipient
+from .invoice_status import InvoiceStatus
+from .money import Money
 
 
 class Invoice(UncheckedBaseModel):
diff --git a/src/square/types/invoice_accepted_payment_methods.py b/src/square/types/invoice_accepted_payment_methods.py
index 70f802cc..a4ffed06 100644
--- a/src/square/types/invoice_accepted_payment_methods.py
+++ b/src/square/types/invoice_accepted_payment_methods.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class InvoiceAcceptedPaymentMethods(UncheckedBaseModel):
diff --git a/src/square/types/invoice_attachment.py b/src/square/types/invoice_attachment.py
index 4c713cdc..5bb640ad 100644
--- a/src/square/types/invoice_attachment.py
+++ b/src/square/types/invoice_attachment.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class InvoiceAttachment(UncheckedBaseModel):
diff --git a/src/square/types/invoice_canceled_event.py b/src/square/types/invoice_canceled_event.py
index 1f9aa0e0..2db2953f 100644
--- a/src/square/types/invoice_canceled_event.py
+++ b/src/square/types/invoice_canceled_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_canceled_event_data import InvoiceCanceledEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_canceled_event_data import InvoiceCanceledEventData
 
 
 class InvoiceCanceledEvent(UncheckedBaseModel):
diff --git a/src/square/types/invoice_canceled_event_data.py b/src/square/types/invoice_canceled_event_data.py
index 2e5164a3..9eb1b406 100644
--- a/src/square/types/invoice_canceled_event_data.py
+++ b/src/square/types/invoice_canceled_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_canceled_event_object import InvoiceCanceledEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_canceled_event_object import InvoiceCanceledEventObject
 
 
 class InvoiceCanceledEventData(UncheckedBaseModel):
diff --git a/src/square/types/invoice_canceled_event_object.py b/src/square/types/invoice_canceled_event_object.py
index 962e4350..79a6bca3 100644
--- a/src/square/types/invoice_canceled_event_object.py
+++ b/src/square/types/invoice_canceled_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice import Invoice
 
 
 class InvoiceCanceledEventObject(UncheckedBaseModel):
diff --git a/src/square/types/invoice_created_event.py b/src/square/types/invoice_created_event.py
index afb5ff95..172f9afa 100644
--- a/src/square/types/invoice_created_event.py
+++ b/src/square/types/invoice_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_created_event_data import InvoiceCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_created_event_data import InvoiceCreatedEventData
 
 
 class InvoiceCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/invoice_created_event_data.py b/src/square/types/invoice_created_event_data.py
index 616949e3..e0dfdce8 100644
--- a/src/square/types/invoice_created_event_data.py
+++ b/src/square/types/invoice_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_created_event_object import InvoiceCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_created_event_object import InvoiceCreatedEventObject
 
 
 class InvoiceCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/invoice_created_event_object.py b/src/square/types/invoice_created_event_object.py
index c7512ba9..3de4a95c 100644
--- a/src/square/types/invoice_created_event_object.py
+++ b/src/square/types/invoice_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice import Invoice
 
 
 class InvoiceCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/invoice_custom_field.py b/src/square/types/invoice_custom_field.py
index bd6c7f1f..32f89302 100644
--- a/src/square/types/invoice_custom_field.py
+++ b/src/square/types/invoice_custom_field.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_custom_field_placement import InvoiceCustomFieldPlacement
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_custom_field_placement import InvoiceCustomFieldPlacement
 
 
 class InvoiceCustomField(UncheckedBaseModel):
diff --git a/src/square/types/invoice_deleted_event.py b/src/square/types/invoice_deleted_event.py
index e553d8ae..8339b17e 100644
--- a/src/square/types/invoice_deleted_event.py
+++ b/src/square/types/invoice_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_deleted_event_data import InvoiceDeletedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_deleted_event_data import InvoiceDeletedEventData
 
 
 class InvoiceDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/invoice_deleted_event_data.py b/src/square/types/invoice_deleted_event_data.py
index f7ef3f07..12eaf07b 100644
--- a/src/square/types/invoice_deleted_event_data.py
+++ b/src/square/types/invoice_deleted_event_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class InvoiceDeletedEventData(UncheckedBaseModel):
diff --git a/src/square/types/invoice_filter.py b/src/square/types/invoice_filter.py
index 2af926a7..fdce9087 100644
--- a/src/square/types/invoice_filter.py
+++ b/src/square/types/invoice_filter.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class InvoiceFilter(UncheckedBaseModel):
diff --git a/src/square/types/invoice_payment_made_event.py b/src/square/types/invoice_payment_made_event.py
index 52a3ae96..bdadbc1b 100644
--- a/src/square/types/invoice_payment_made_event.py
+++ b/src/square/types/invoice_payment_made_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_payment_made_event_data import InvoicePaymentMadeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_payment_made_event_data import InvoicePaymentMadeEventData
 
 
 class InvoicePaymentMadeEvent(UncheckedBaseModel):
diff --git a/src/square/types/invoice_payment_made_event_data.py b/src/square/types/invoice_payment_made_event_data.py
index c638c291..ebe4737c 100644
--- a/src/square/types/invoice_payment_made_event_data.py
+++ b/src/square/types/invoice_payment_made_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_payment_made_event_object import InvoicePaymentMadeEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_payment_made_event_object import InvoicePaymentMadeEventObject
 
 
 class InvoicePaymentMadeEventData(UncheckedBaseModel):
diff --git a/src/square/types/invoice_payment_made_event_object.py b/src/square/types/invoice_payment_made_event_object.py
index 7dba859e..a66c63c8 100644
--- a/src/square/types/invoice_payment_made_event_object.py
+++ b/src/square/types/invoice_payment_made_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice import Invoice
 
 
 class InvoicePaymentMadeEventObject(UncheckedBaseModel):
diff --git a/src/square/types/invoice_payment_reminder.py b/src/square/types/invoice_payment_reminder.py
index 202923da..94a7b4aa 100644
--- a/src/square/types/invoice_payment_reminder.py
+++ b/src/square/types/invoice_payment_reminder.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_payment_reminder_status import InvoicePaymentReminderStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_payment_reminder_status import InvoicePaymentReminderStatus
 
 
 class InvoicePaymentReminder(UncheckedBaseModel):
diff --git a/src/square/types/invoice_payment_request.py b/src/square/types/invoice_payment_request.py
index d22ef8a2..f86c1c34 100644
--- a/src/square/types/invoice_payment_request.py
+++ b/src/square/types/invoice_payment_request.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_automatic_payment_source import InvoiceAutomaticPaymentSource
+from .invoice_payment_reminder import InvoicePaymentReminder
 from .invoice_request_method import InvoiceRequestMethod
 from .invoice_request_type import InvoiceRequestType
 from .money import Money
-from .invoice_automatic_payment_source import InvoiceAutomaticPaymentSource
-from .invoice_payment_reminder import InvoicePaymentReminder
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class InvoicePaymentRequest(UncheckedBaseModel):
diff --git a/src/square/types/invoice_published_event.py b/src/square/types/invoice_published_event.py
index 0b0f5f09..8b98d5b9 100644
--- a/src/square/types/invoice_published_event.py
+++ b/src/square/types/invoice_published_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_published_event_data import InvoicePublishedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_published_event_data import InvoicePublishedEventData
 
 
 class InvoicePublishedEvent(UncheckedBaseModel):
diff --git a/src/square/types/invoice_published_event_data.py b/src/square/types/invoice_published_event_data.py
index 780eabf5..63aa5d1d 100644
--- a/src/square/types/invoice_published_event_data.py
+++ b/src/square/types/invoice_published_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_published_event_object import InvoicePublishedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_published_event_object import InvoicePublishedEventObject
 
 
 class InvoicePublishedEventData(UncheckedBaseModel):
diff --git a/src/square/types/invoice_published_event_object.py b/src/square/types/invoice_published_event_object.py
index a5e8a19b..bd45b970 100644
--- a/src/square/types/invoice_published_event_object.py
+++ b/src/square/types/invoice_published_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice import Invoice
 
 
 class InvoicePublishedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/invoice_query.py b/src/square/types/invoice_query.py
index 66991301..f155922d 100644
--- a/src/square/types/invoice_query.py
+++ b/src/square/types/invoice_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.unchecked_base_model import UncheckedBaseModel
 from .invoice_filter import InvoiceFilter
-import pydantic
-import typing
 from .invoice_sort import InvoiceSort
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class InvoiceQuery(UncheckedBaseModel):
diff --git a/src/square/types/invoice_recipient.py b/src/square/types/invoice_recipient.py
index 3a72894b..00c71f7d 100644
--- a/src/square/types/invoice_recipient.py
+++ b/src/square/types/invoice_recipient.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .address import Address
 from .invoice_recipient_tax_ids import InvoiceRecipientTaxIds
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class InvoiceRecipient(UncheckedBaseModel):
diff --git a/src/square/types/invoice_recipient_tax_ids.py b/src/square/types/invoice_recipient_tax_ids.py
index 3ea5eb44..1c9d5943 100644
--- a/src/square/types/invoice_recipient_tax_ids.py
+++ b/src/square/types/invoice_recipient_tax_ids.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class InvoiceRecipientTaxIds(UncheckedBaseModel):
diff --git a/src/square/types/invoice_refunded_event.py b/src/square/types/invoice_refunded_event.py
index e37cc9ad..71a415e6 100644
--- a/src/square/types/invoice_refunded_event.py
+++ b/src/square/types/invoice_refunded_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_refunded_event_data import InvoiceRefundedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_refunded_event_data import InvoiceRefundedEventData
 
 
 class InvoiceRefundedEvent(UncheckedBaseModel):
diff --git a/src/square/types/invoice_refunded_event_data.py b/src/square/types/invoice_refunded_event_data.py
index 3c442b5d..3d649954 100644
--- a/src/square/types/invoice_refunded_event_data.py
+++ b/src/square/types/invoice_refunded_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_refunded_event_object import InvoiceRefundedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_refunded_event_object import InvoiceRefundedEventObject
 
 
 class InvoiceRefundedEventData(UncheckedBaseModel):
diff --git a/src/square/types/invoice_refunded_event_object.py b/src/square/types/invoice_refunded_event_object.py
index 181f8eb5..6070ba6a 100644
--- a/src/square/types/invoice_refunded_event_object.py
+++ b/src/square/types/invoice_refunded_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice import Invoice
 
 
 class InvoiceRefundedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/invoice_scheduled_charge_failed_event.py b/src/square/types/invoice_scheduled_charge_failed_event.py
index 046fc104..47f6987e 100644
--- a/src/square/types/invoice_scheduled_charge_failed_event.py
+++ b/src/square/types/invoice_scheduled_charge_failed_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_scheduled_charge_failed_event_data import InvoiceScheduledChargeFailedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_scheduled_charge_failed_event_data import InvoiceScheduledChargeFailedEventData
 
 
 class InvoiceScheduledChargeFailedEvent(UncheckedBaseModel):
diff --git a/src/square/types/invoice_scheduled_charge_failed_event_data.py b/src/square/types/invoice_scheduled_charge_failed_event_data.py
index 816907d4..ff0132e0 100644
--- a/src/square/types/invoice_scheduled_charge_failed_event_data.py
+++ b/src/square/types/invoice_scheduled_charge_failed_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_scheduled_charge_failed_event_object import InvoiceScheduledChargeFailedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_scheduled_charge_failed_event_object import InvoiceScheduledChargeFailedEventObject
 
 
 class InvoiceScheduledChargeFailedEventData(UncheckedBaseModel):
diff --git a/src/square/types/invoice_scheduled_charge_failed_event_object.py b/src/square/types/invoice_scheduled_charge_failed_event_object.py
index 15b8067a..75965e89 100644
--- a/src/square/types/invoice_scheduled_charge_failed_event_object.py
+++ b/src/square/types/invoice_scheduled_charge_failed_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice import Invoice
 
 
 class InvoiceScheduledChargeFailedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/invoice_sort.py b/src/square/types/invoice_sort.py
index 3277f29b..34dcb583 100644
--- a/src/square/types/invoice_sort.py
+++ b/src/square/types/invoice_sort.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.unchecked_base_model import UncheckedBaseModel
 from .invoice_sort_field import InvoiceSortField
-import pydantic
-import typing
 from .sort_order import SortOrder
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class InvoiceSort(UncheckedBaseModel):
diff --git a/src/square/types/invoice_updated_event.py b/src/square/types/invoice_updated_event.py
index e7e7a535..1a8ec55a 100644
--- a/src/square/types/invoice_updated_event.py
+++ b/src/square/types/invoice_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_updated_event_data import InvoiceUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_updated_event_data import InvoiceUpdatedEventData
 
 
 class InvoiceUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/invoice_updated_event_data.py b/src/square/types/invoice_updated_event_data.py
index 2a3a08bb..8e59a4a4 100644
--- a/src/square/types/invoice_updated_event_data.py
+++ b/src/square/types/invoice_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .invoice_updated_event_object import InvoiceUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice_updated_event_object import InvoiceUpdatedEventObject
 
 
 class InvoiceUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/invoice_updated_event_object.py b/src/square/types/invoice_updated_event_object.py
index 615c1feb..a956adc3 100644
--- a/src/square/types/invoice_updated_event_object.py
+++ b/src/square/types/invoice_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .invoice import Invoice
 
 
 class InvoiceUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/item_variation_location_overrides.py b/src/square/types/item_variation_location_overrides.py
index d2769aa2..24d01cde 100644
--- a/src/square/types/item_variation_location_overrides.py
+++ b/src/square/types/item_variation_location_overrides.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_pricing_type import CatalogPricingType
 from .inventory_alert_type import InventoryAlertType
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .money import Money
 
 
 class ItemVariationLocationOverrides(UncheckedBaseModel):
diff --git a/src/square/types/job.py b/src/square/types/job.py
index 44daea28..c82bc4a7 100644
--- a/src/square/types/job.py
+++ b/src/square/types/job.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class Job(UncheckedBaseModel):
diff --git a/src/square/types/job_assignment.py b/src/square/types/job_assignment.py
index 2e7d5c55..c822c688 100644
--- a/src/square/types/job_assignment.py
+++ b/src/square/types/job_assignment.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .job_assignment_pay_type import JobAssignmentPayType
 from .money import Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class JobAssignment(UncheckedBaseModel):
diff --git a/src/square/types/job_created_event.py b/src/square/types/job_created_event.py
index 3aa6d7e8..c5274053 100644
--- a/src/square/types/job_created_event.py
+++ b/src/square/types/job_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .job_created_event_data import JobCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .job_created_event_data import JobCreatedEventData
 
 
 class JobCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/job_created_event_data.py b/src/square/types/job_created_event_data.py
index e396b6b4..b007b211 100644
--- a/src/square/types/job_created_event_data.py
+++ b/src/square/types/job_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .job_created_event_object import JobCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .job_created_event_object import JobCreatedEventObject
 
 
 class JobCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/job_created_event_object.py b/src/square/types/job_created_event_object.py
index 6214b7af..a735b4d9 100644
--- a/src/square/types/job_created_event_object.py
+++ b/src/square/types/job_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .job import Job
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .job import Job
 
 
 class JobCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/job_updated_event.py b/src/square/types/job_updated_event.py
index e597f78f..f48c5763 100644
--- a/src/square/types/job_updated_event.py
+++ b/src/square/types/job_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .job_updated_event_data import JobUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .job_updated_event_data import JobUpdatedEventData
 
 
 class JobUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/job_updated_event_data.py b/src/square/types/job_updated_event_data.py
index c5fd543c..c6ae68c0 100644
--- a/src/square/types/job_updated_event_data.py
+++ b/src/square/types/job_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .job_updated_event_object import JobUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .job_updated_event_object import JobUpdatedEventObject
 
 
 class JobUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/job_updated_event_object.py b/src/square/types/job_updated_event_object.py
index 5a7355ee..d6f5725b 100644
--- a/src/square/types/job_updated_event_object.py
+++ b/src/square/types/job_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .job import Job
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .job import Job
 
 
 class JobUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_created_event.py b/src/square/types/labor_scheduled_shift_created_event.py
index 55bf3e9a..70cf8998 100644
--- a/src/square/types/labor_scheduled_shift_created_event.py
+++ b/src/square/types/labor_scheduled_shift_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_scheduled_shift_created_event_data import LaborScheduledShiftCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_scheduled_shift_created_event_data import LaborScheduledShiftCreatedEventData
 
 
 class LaborScheduledShiftCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_created_event_data.py b/src/square/types/labor_scheduled_shift_created_event_data.py
index 14c52ae0..8064b29c 100644
--- a/src/square/types/labor_scheduled_shift_created_event_data.py
+++ b/src/square/types/labor_scheduled_shift_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_scheduled_shift_created_event_object import LaborScheduledShiftCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_scheduled_shift_created_event_object import LaborScheduledShiftCreatedEventObject
 
 
 class LaborScheduledShiftCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_created_event_object.py b/src/square/types/labor_scheduled_shift_created_event_object.py
index 92b7fa82..4e77f28c 100644
--- a/src/square/types/labor_scheduled_shift_created_event_object.py
+++ b/src/square/types/labor_scheduled_shift_created_event_object.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import typing_extensions
 import typing
-from .scheduled_shift import ScheduledShift
-from ..core.serialization import FieldMetadata
+
 import pydantic
+import typing_extensions
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .scheduled_shift import ScheduledShift
 
 
 class LaborScheduledShiftCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_deleted_event.py b/src/square/types/labor_scheduled_shift_deleted_event.py
index 6c3519aa..5d4a71a2 100644
--- a/src/square/types/labor_scheduled_shift_deleted_event.py
+++ b/src/square/types/labor_scheduled_shift_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_scheduled_shift_deleted_event_data import LaborScheduledShiftDeletedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_scheduled_shift_deleted_event_data import LaborScheduledShiftDeletedEventData
 
 
 class LaborScheduledShiftDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_deleted_event_data.py b/src/square/types/labor_scheduled_shift_deleted_event_data.py
index 07fcce72..47b86951 100644
--- a/src/square/types/labor_scheduled_shift_deleted_event_data.py
+++ b/src/square/types/labor_scheduled_shift_deleted_event_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LaborScheduledShiftDeletedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_published_event.py b/src/square/types/labor_scheduled_shift_published_event.py
index f6778219..d222966b 100644
--- a/src/square/types/labor_scheduled_shift_published_event.py
+++ b/src/square/types/labor_scheduled_shift_published_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_scheduled_shift_published_event_data import LaborScheduledShiftPublishedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_scheduled_shift_published_event_data import LaborScheduledShiftPublishedEventData
 
 
 class LaborScheduledShiftPublishedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_published_event_data.py b/src/square/types/labor_scheduled_shift_published_event_data.py
index 0a3de8b5..f4e15fea 100644
--- a/src/square/types/labor_scheduled_shift_published_event_data.py
+++ b/src/square/types/labor_scheduled_shift_published_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_scheduled_shift_published_event_object import LaborScheduledShiftPublishedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_scheduled_shift_published_event_object import LaborScheduledShiftPublishedEventObject
 
 
 class LaborScheduledShiftPublishedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_published_event_object.py b/src/square/types/labor_scheduled_shift_published_event_object.py
index f5ae3c17..7937baac 100644
--- a/src/square/types/labor_scheduled_shift_published_event_object.py
+++ b/src/square/types/labor_scheduled_shift_published_event_object.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import typing_extensions
 import typing
-from .scheduled_shift import ScheduledShift
-from ..core.serialization import FieldMetadata
+
 import pydantic
+import typing_extensions
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .scheduled_shift import ScheduledShift
 
 
 class LaborScheduledShiftPublishedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_updated_event.py b/src/square/types/labor_scheduled_shift_updated_event.py
index 852a11b3..1a67cdbb 100644
--- a/src/square/types/labor_scheduled_shift_updated_event.py
+++ b/src/square/types/labor_scheduled_shift_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_scheduled_shift_updated_event_data import LaborScheduledShiftUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_scheduled_shift_updated_event_data import LaborScheduledShiftUpdatedEventData
 
 
 class LaborScheduledShiftUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_updated_event_data.py b/src/square/types/labor_scheduled_shift_updated_event_data.py
index 4c2bfc5a..330b3cc2 100644
--- a/src/square/types/labor_scheduled_shift_updated_event_data.py
+++ b/src/square/types/labor_scheduled_shift_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_scheduled_shift_updated_event_object import LaborScheduledShiftUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_scheduled_shift_updated_event_object import LaborScheduledShiftUpdatedEventObject
 
 
 class LaborScheduledShiftUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_scheduled_shift_updated_event_object.py b/src/square/types/labor_scheduled_shift_updated_event_object.py
index 81001c48..ff8b712a 100644
--- a/src/square/types/labor_scheduled_shift_updated_event_object.py
+++ b/src/square/types/labor_scheduled_shift_updated_event_object.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import typing_extensions
 import typing
-from .scheduled_shift import ScheduledShift
-from ..core.serialization import FieldMetadata
+
 import pydantic
+import typing_extensions
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.serialization import FieldMetadata
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .scheduled_shift import ScheduledShift
 
 
 class LaborScheduledShiftUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/labor_shift_created_event.py b/src/square/types/labor_shift_created_event.py
index a5e11a86..726af24d 100644
--- a/src/square/types/labor_shift_created_event.py
+++ b/src/square/types/labor_shift_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_shift_created_event_data import LaborShiftCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_shift_created_event_data import LaborShiftCreatedEventData
 
 
 class LaborShiftCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_shift_created_event_data.py b/src/square/types/labor_shift_created_event_data.py
index 712946ca..8e8db533 100644
--- a/src/square/types/labor_shift_created_event_data.py
+++ b/src/square/types/labor_shift_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_shift_created_event_object import LaborShiftCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_shift_created_event_object import LaborShiftCreatedEventObject
 
 
 class LaborShiftCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_shift_created_event_object.py b/src/square/types/labor_shift_created_event_object.py
index 0701593b..e3d5fc80 100644
--- a/src/square/types/labor_shift_created_event_object.py
+++ b/src/square/types/labor_shift_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .shift import Shift
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .shift import Shift
 
 
 class LaborShiftCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/labor_shift_deleted_event.py b/src/square/types/labor_shift_deleted_event.py
index fa43bb67..fa94d134 100644
--- a/src/square/types/labor_shift_deleted_event.py
+++ b/src/square/types/labor_shift_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_shift_deleted_event_data import LaborShiftDeletedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_shift_deleted_event_data import LaborShiftDeletedEventData
 
 
 class LaborShiftDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_shift_deleted_event_data.py b/src/square/types/labor_shift_deleted_event_data.py
index 96ef3c97..fb5dfc8e 100644
--- a/src/square/types/labor_shift_deleted_event_data.py
+++ b/src/square/types/labor_shift_deleted_event_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LaborShiftDeletedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_shift_updated_event.py b/src/square/types/labor_shift_updated_event.py
index b00fcdf8..088cce6f 100644
--- a/src/square/types/labor_shift_updated_event.py
+++ b/src/square/types/labor_shift_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_shift_updated_event_data import LaborShiftUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_shift_updated_event_data import LaborShiftUpdatedEventData
 
 
 class LaborShiftUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_shift_updated_event_data.py b/src/square/types/labor_shift_updated_event_data.py
index 8ed052c6..7897aced 100644
--- a/src/square/types/labor_shift_updated_event_data.py
+++ b/src/square/types/labor_shift_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_shift_updated_event_object import LaborShiftUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_shift_updated_event_object import LaborShiftUpdatedEventObject
 
 
 class LaborShiftUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_shift_updated_event_object.py b/src/square/types/labor_shift_updated_event_object.py
index 4ec08819..9b0cbfb8 100644
--- a/src/square/types/labor_shift_updated_event_object.py
+++ b/src/square/types/labor_shift_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .shift import Shift
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .shift import Shift
 
 
 class LaborShiftUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/labor_timecard_created_event.py b/src/square/types/labor_timecard_created_event.py
index 732cb859..7676aa0e 100644
--- a/src/square/types/labor_timecard_created_event.py
+++ b/src/square/types/labor_timecard_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_timecard_created_event_data import LaborTimecardCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_timecard_created_event_data import LaborTimecardCreatedEventData
 
 
 class LaborTimecardCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_timecard_created_event_data.py b/src/square/types/labor_timecard_created_event_data.py
index 420585ea..29055d57 100644
--- a/src/square/types/labor_timecard_created_event_data.py
+++ b/src/square/types/labor_timecard_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_timecard_created_event_object import LaborTimecardCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_timecard_created_event_object import LaborTimecardCreatedEventObject
 
 
 class LaborTimecardCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_timecard_created_event_object.py b/src/square/types/labor_timecard_created_event_object.py
index 80af7577..262e0b92 100644
--- a/src/square/types/labor_timecard_created_event_object.py
+++ b/src/square/types/labor_timecard_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .timecard import Timecard
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .timecard import Timecard
 
 
 class LaborTimecardCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/labor_timecard_deleted_event.py b/src/square/types/labor_timecard_deleted_event.py
index 6b5d3c80..248417bd 100644
--- a/src/square/types/labor_timecard_deleted_event.py
+++ b/src/square/types/labor_timecard_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_timecard_deleted_event_data import LaborTimecardDeletedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_timecard_deleted_event_data import LaborTimecardDeletedEventData
 
 
 class LaborTimecardDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_timecard_deleted_event_data.py b/src/square/types/labor_timecard_deleted_event_data.py
index 48a91eba..990c9718 100644
--- a/src/square/types/labor_timecard_deleted_event_data.py
+++ b/src/square/types/labor_timecard_deleted_event_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LaborTimecardDeletedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_timecard_updated_event.py b/src/square/types/labor_timecard_updated_event.py
index 8d8682c6..5fb15041 100644
--- a/src/square/types/labor_timecard_updated_event.py
+++ b/src/square/types/labor_timecard_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_timecard_updated_event_data import LaborTimecardUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_timecard_updated_event_data import LaborTimecardUpdatedEventData
 
 
 class LaborTimecardUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/labor_timecard_updated_event_data.py b/src/square/types/labor_timecard_updated_event_data.py
index f23dd64a..e9e1e48d 100644
--- a/src/square/types/labor_timecard_updated_event_data.py
+++ b/src/square/types/labor_timecard_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .labor_timecard_updated_event_object import LaborTimecardUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .labor_timecard_updated_event_object import LaborTimecardUpdatedEventObject
 
 
 class LaborTimecardUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/labor_timecard_updated_event_object.py b/src/square/types/labor_timecard_updated_event_object.py
index e3384001..f83ea634 100644
--- a/src/square/types/labor_timecard_updated_event_object.py
+++ b/src/square/types/labor_timecard_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .timecard import Timecard
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .timecard import Timecard
 
 
 class LaborTimecardUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/link_customer_to_gift_card_response.py b/src/square/types/link_customer_to_gift_card_response.py
index 8127e820..5fa2dd67 100644
--- a/src/square/types/link_customer_to_gift_card_response.py
+++ b/src/square/types/link_customer_to_gift_card_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .gift_card import GiftCard
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .gift_card import GiftCard
 
 
 class LinkCustomerToGiftCardResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_bank_accounts_response.py b/src/square/types/list_bank_accounts_response.py
index ca196109..50e22a50 100644
--- a/src/square/types/list_bank_accounts_response.py
+++ b/src/square/types/list_bank_accounts_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .bank_account import BankAccount
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .bank_account import BankAccount
+from .error import Error
 
 
 class ListBankAccountsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_booking_custom_attribute_definitions_response.py b/src/square/types/list_booking_custom_attribute_definitions_response.py
index 45061a9b..66e594f0 100644
--- a/src/square/types/list_booking_custom_attribute_definitions_response.py
+++ b/src/square/types/list_booking_custom_attribute_definitions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class ListBookingCustomAttributeDefinitionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_booking_custom_attributes_response.py b/src/square/types/list_booking_custom_attributes_response.py
index 98137b11..0260598c 100644
--- a/src/square/types/list_booking_custom_attributes_response.py
+++ b/src/square/types/list_booking_custom_attributes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class ListBookingCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_bookings_response.py b/src/square/types/list_bookings_response.py
index 8eac83c5..54d4e916 100644
--- a/src/square/types/list_bookings_response.py
+++ b/src/square/types/list_bookings_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking import Booking
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking import Booking
+from .error import Error
 
 
 class ListBookingsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_break_types_response.py b/src/square/types/list_break_types_response.py
index cba654fc..2758a748 100644
--- a/src/square/types/list_break_types_response.py
+++ b/src/square/types/list_break_types_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .break_type import BreakType
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .break_type import BreakType
+from .error import Error
 
 
 class ListBreakTypesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_cards_response.py b/src/square/types/list_cards_response.py
index fa29ffa8..7e397daa 100644
--- a/src/square/types/list_cards_response.py
+++ b/src/square/types/list_cards_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .card import Card
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .card import Card
+from .error import Error
 
 
 class ListCardsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_cash_drawer_shift_events_response.py b/src/square/types/list_cash_drawer_shift_events_response.py
index f8cf6951..8c262e52 100644
--- a/src/square/types/list_cash_drawer_shift_events_response.py
+++ b/src/square/types/list_cash_drawer_shift_events_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .error import Error
-from .cash_drawer_shift_event import CashDrawerShiftEvent
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .cash_drawer_shift_event import CashDrawerShiftEvent
+from .error import Error
 
 
 class ListCashDrawerShiftEventsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_cash_drawer_shifts_response.py b/src/square/types/list_cash_drawer_shifts_response.py
index aeff136d..1eb4dac2 100644
--- a/src/square/types/list_cash_drawer_shifts_response.py
+++ b/src/square/types/list_cash_drawer_shifts_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .error import Error
-from .cash_drawer_shift_summary import CashDrawerShiftSummary
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .cash_drawer_shift_summary import CashDrawerShiftSummary
+from .error import Error
 
 
 class ListCashDrawerShiftsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_catalog_response.py b/src/square/types/list_catalog_response.py
index 371ebc3a..2e4c7e1d 100644
--- a/src/square/types/list_catalog_response.py
+++ b/src/square/types/list_catalog_response.py
@@ -1,21 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
-from .catalog_object import CatalogObject
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class ListCatalogResponse(UncheckedBaseModel):
@@ -30,7 +22,7 @@ class ListCatalogResponse(UncheckedBaseModel):
     See [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination) for more information.
     """
 
-    objects: typing.Optional[typing.List[CatalogObject]] = pydantic.Field(default=None)
+    objects: typing.Optional[typing.List["CatalogObject"]] = pydantic.Field(default=None)
     """
     The CatalogObjects returned.
     """
@@ -43,3 +35,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(ListCatalogResponse)
diff --git a/src/square/types/list_customer_custom_attribute_definitions_response.py b/src/square/types/list_customer_custom_attribute_definitions_response.py
index 33e91745..c7b0d478 100644
--- a/src/square/types/list_customer_custom_attribute_definitions_response.py
+++ b/src/square/types/list_customer_custom_attribute_definitions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class ListCustomerCustomAttributeDefinitionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_customer_custom_attributes_response.py b/src/square/types/list_customer_custom_attributes_response.py
index 143cccbf..51f6c5c8 100644
--- a/src/square/types/list_customer_custom_attributes_response.py
+++ b/src/square/types/list_customer_custom_attributes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class ListCustomerCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_customer_groups_response.py b/src/square/types/list_customer_groups_response.py
index 8cdf18c1..7bc5b0e4 100644
--- a/src/square/types/list_customer_groups_response.py
+++ b/src/square/types/list_customer_groups_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer_group import CustomerGroup
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_group import CustomerGroup
+from .error import Error
 
 
 class ListCustomerGroupsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_customer_segments_response.py b/src/square/types/list_customer_segments_response.py
index bbc8ac4f..5cf2b649 100644
--- a/src/square/types/list_customer_segments_response.py
+++ b/src/square/types/list_customer_segments_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer_segment import CustomerSegment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_segment import CustomerSegment
+from .error import Error
 
 
 class ListCustomerSegmentsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_customers_response.py b/src/square/types/list_customers_response.py
index 92855991..ff3a9569 100644
--- a/src/square/types/list_customers_response.py
+++ b/src/square/types/list_customers_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer import Customer
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer import Customer
+from .error import Error
 
 
 class ListCustomersResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_device_codes_response.py b/src/square/types/list_device_codes_response.py
index efdabea3..44612897 100644
--- a/src/square/types/list_device_codes_response.py
+++ b/src/square/types/list_device_codes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .device_code import DeviceCode
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device_code import DeviceCode
+from .error import Error
 
 
 class ListDeviceCodesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_devices_response.py b/src/square/types/list_devices_response.py
index efcce551..f909335b 100644
--- a/src/square/types/list_devices_response.py
+++ b/src/square/types/list_devices_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .device import Device
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .device import Device
+from .error import Error
 
 
 class ListDevicesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_dispute_evidence_response.py b/src/square/types/list_dispute_evidence_response.py
index 3e20fb05..96d3f49b 100644
--- a/src/square/types/list_dispute_evidence_response.py
+++ b/src/square/types/list_dispute_evidence_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .dispute_evidence import DisputeEvidence
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute_evidence import DisputeEvidence
+from .error import Error
 
 
 class ListDisputeEvidenceResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_disputes_response.py b/src/square/types/list_disputes_response.py
index db71a6af..76dd4b97 100644
--- a/src/square/types/list_disputes_response.py
+++ b/src/square/types/list_disputes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .dispute import Dispute
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
+from .error import Error
 
 
 class ListDisputesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_employee_wages_response.py b/src/square/types/list_employee_wages_response.py
index cf8b1631..14398743 100644
--- a/src/square/types/list_employee_wages_response.py
+++ b/src/square/types/list_employee_wages_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .employee_wage import EmployeeWage
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .employee_wage import EmployeeWage
+from .error import Error
 
 
 class ListEmployeeWagesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_employees_response.py b/src/square/types/list_employees_response.py
index 569a01b9..0449f868 100644
--- a/src/square/types/list_employees_response.py
+++ b/src/square/types/list_employees_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .employee import Employee
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .employee import Employee
+from .error import Error
 
 
 class ListEmployeesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_event_types_response.py b/src/square/types/list_event_types_response.py
index f68e8020..02feffeb 100644
--- a/src/square/types/list_event_types_response.py
+++ b/src/square/types/list_event_types_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .event_type_metadata import EventTypeMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .event_type_metadata import EventTypeMetadata
 
 
 class ListEventTypesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_gift_card_activities_response.py b/src/square/types/list_gift_card_activities_response.py
index 5c197cb7..7ec16d16 100644
--- a/src/square/types/list_gift_card_activities_response.py
+++ b/src/square/types/list_gift_card_activities_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .gift_card_activity import GiftCardActivity
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .gift_card_activity import GiftCardActivity
 
 
 class ListGiftCardActivitiesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_gift_cards_response.py b/src/square/types/list_gift_cards_response.py
index 5c7f14a2..21f527ef 100644
--- a/src/square/types/list_gift_cards_response.py
+++ b/src/square/types/list_gift_cards_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .gift_card import GiftCard
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .gift_card import GiftCard
 
 
 class ListGiftCardsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_invoices_response.py b/src/square/types/list_invoices_response.py
index 68c74056..ebbc7eca 100644
--- a/src/square/types/list_invoices_response.py
+++ b/src/square/types/list_invoices_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .invoice import Invoice
 
 
 class ListInvoicesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_jobs_response.py b/src/square/types/list_jobs_response.py
index 6b49008f..0d8c0326 100644
--- a/src/square/types/list_jobs_response.py
+++ b/src/square/types/list_jobs_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .job import Job
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .job import Job
 
 
 class ListJobsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_location_booking_profiles_response.py b/src/square/types/list_location_booking_profiles_response.py
index a4bf3699..e0376d9f 100644
--- a/src/square/types/list_location_booking_profiles_response.py
+++ b/src/square/types/list_location_booking_profiles_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .location_booking_profile import LocationBookingProfile
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .location_booking_profile import LocationBookingProfile
 
 
 class ListLocationBookingProfilesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_location_custom_attribute_definitions_response.py b/src/square/types/list_location_custom_attribute_definitions_response.py
index a9cc9b4c..a4689bf4 100644
--- a/src/square/types/list_location_custom_attribute_definitions_response.py
+++ b/src/square/types/list_location_custom_attribute_definitions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class ListLocationCustomAttributeDefinitionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_location_custom_attributes_response.py b/src/square/types/list_location_custom_attributes_response.py
index 7a6c978c..9488e279 100644
--- a/src/square/types/list_location_custom_attributes_response.py
+++ b/src/square/types/list_location_custom_attributes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class ListLocationCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_locations_response.py b/src/square/types/list_locations_response.py
index 437f64c6..29bae41a 100644
--- a/src/square/types/list_locations_response.py
+++ b/src/square/types/list_locations_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .location import Location
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .location import Location
 
 
 class ListLocationsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_loyalty_programs_response.py b/src/square/types/list_loyalty_programs_response.py
index 0108c0c5..65c73d5d 100644
--- a/src/square/types/list_loyalty_programs_response.py
+++ b/src/square/types/list_loyalty_programs_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_program import LoyaltyProgram
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_program import LoyaltyProgram
 
 
 class ListLoyaltyProgramsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_loyalty_promotions_response.py b/src/square/types/list_loyalty_promotions_response.py
index 950c541a..35b6d57f 100644
--- a/src/square/types/list_loyalty_promotions_response.py
+++ b/src/square/types/list_loyalty_promotions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_promotion import LoyaltyPromotion
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_promotion import LoyaltyPromotion
 
 
 class ListLoyaltyPromotionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_merchant_custom_attribute_definitions_response.py b/src/square/types/list_merchant_custom_attribute_definitions_response.py
index 9fe14fae..6092d89b 100644
--- a/src/square/types/list_merchant_custom_attribute_definitions_response.py
+++ b/src/square/types/list_merchant_custom_attribute_definitions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class ListMerchantCustomAttributeDefinitionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_merchant_custom_attributes_response.py b/src/square/types/list_merchant_custom_attributes_response.py
index b37508da..79090adc 100644
--- a/src/square/types/list_merchant_custom_attributes_response.py
+++ b/src/square/types/list_merchant_custom_attributes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class ListMerchantCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_merchants_response.py b/src/square/types/list_merchants_response.py
index f74453d8..cbcaa0de 100644
--- a/src/square/types/list_merchants_response.py
+++ b/src/square/types/list_merchants_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .merchant import Merchant
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .merchant import Merchant
 
 
 class ListMerchantsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_order_custom_attribute_definitions_response.py b/src/square/types/list_order_custom_attribute_definitions_response.py
index 53080db9..f41608c1 100644
--- a/src/square/types/list_order_custom_attribute_definitions_response.py
+++ b/src/square/types/list_order_custom_attribute_definitions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class ListOrderCustomAttributeDefinitionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_order_custom_attributes_response.py b/src/square/types/list_order_custom_attributes_response.py
index bc22397f..0e8bc2c4 100644
--- a/src/square/types/list_order_custom_attributes_response.py
+++ b/src/square/types/list_order_custom_attributes_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class ListOrderCustomAttributesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_payment_links_response.py b/src/square/types/list_payment_links_response.py
index 05e5f0b1..1bd87723 100644
--- a/src/square/types/list_payment_links_response.py
+++ b/src/square/types/list_payment_links_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment_link import PaymentLink
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment_link import PaymentLink
 
 
 class ListPaymentLinksResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_payment_refunds_response.py b/src/square/types/list_payment_refunds_response.py
index 5c906038..149c463f 100644
--- a/src/square/types/list_payment_refunds_response.py
+++ b/src/square/types/list_payment_refunds_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment_refund import PaymentRefund
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment_refund import PaymentRefund
 
 
 class ListPaymentRefundsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_payments_response.py b/src/square/types/list_payments_response.py
index 8257aa59..207a7890 100644
--- a/src/square/types/list_payments_response.py
+++ b/src/square/types/list_payments_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment import Payment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment import Payment
 
 
 class ListPaymentsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_payout_entries_response.py b/src/square/types/list_payout_entries_response.py
index 3481e727..f21917b4 100644
--- a/src/square/types/list_payout_entries_response.py
+++ b/src/square/types/list_payout_entries_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payout_entry import PayoutEntry
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payout_entry import PayoutEntry
 
 
 class ListPayoutEntriesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_payouts_response.py b/src/square/types/list_payouts_response.py
index faeda293..1e17438b 100644
--- a/src/square/types/list_payouts_response.py
+++ b/src/square/types/list_payouts_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payout import Payout
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payout import Payout
 
 
 class ListPayoutsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_sites_response.py b/src/square/types/list_sites_response.py
index 3833c8f5..a650e812 100644
--- a/src/square/types/list_sites_response.py
+++ b/src/square/types/list_sites_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .site import Site
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .site import Site
 
 
 class ListSitesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_subscription_events_response.py b/src/square/types/list_subscription_events_response.py
index 94e21f3d..fafd022b 100644
--- a/src/square/types/list_subscription_events_response.py
+++ b/src/square/types/list_subscription_events_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .subscription_event import SubscriptionEvent
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .subscription_event import SubscriptionEvent
 
 
 class ListSubscriptionEventsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_team_member_booking_profiles_response.py b/src/square/types/list_team_member_booking_profiles_response.py
index 71455e0c..a17abce5 100644
--- a/src/square/types/list_team_member_booking_profiles_response.py
+++ b/src/square/types/list_team_member_booking_profiles_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member_booking_profile import TeamMemberBookingProfile
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .team_member_booking_profile import TeamMemberBookingProfile
 
 
 class ListTeamMemberBookingProfilesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_team_member_wages_response.py b/src/square/types/list_team_member_wages_response.py
index 03861b55..bf9ffbef 100644
--- a/src/square/types/list_team_member_wages_response.py
+++ b/src/square/types/list_team_member_wages_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member_wage import TeamMemberWage
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .team_member_wage import TeamMemberWage
 
 
 class ListTeamMemberWagesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_transactions_response.py b/src/square/types/list_transactions_response.py
index a34f0d9f..3d28b6d4 100644
--- a/src/square/types/list_transactions_response.py
+++ b/src/square/types/list_transactions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .transaction import Transaction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .transaction import Transaction
 
 
 class ListTransactionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_webhook_event_types_response.py b/src/square/types/list_webhook_event_types_response.py
index 43038d7c..65068085 100644
--- a/src/square/types/list_webhook_event_types_response.py
+++ b/src/square/types/list_webhook_event_types_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .event_type_metadata import EventTypeMetadata
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .event_type_metadata import EventTypeMetadata
 
 
 class ListWebhookEventTypesResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_webhook_subscriptions_response.py b/src/square/types/list_webhook_subscriptions_response.py
index ccf2bddb..61506afb 100644
--- a/src/square/types/list_webhook_subscriptions_response.py
+++ b/src/square/types/list_webhook_subscriptions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .webhook_subscription import WebhookSubscription
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .webhook_subscription import WebhookSubscription
 
 
 class ListWebhookSubscriptionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/list_workweek_configs_response.py b/src/square/types/list_workweek_configs_response.py
index af5759a6..ce4c2f96 100644
--- a/src/square/types/list_workweek_configs_response.py
+++ b/src/square/types/list_workweek_configs_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .workweek_config import WorkweekConfig
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .workweek_config import WorkweekConfig
 
 
 class ListWorkweekConfigsResponse(UncheckedBaseModel):
diff --git a/src/square/types/location.py b/src/square/types/location.py
index 5c3367f7..798685f3 100644
--- a/src/square/types/location.py
+++ b/src/square/types/location.py
@@ -1,18 +1,19 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .address import Address
-from .location_capability import LocationCapability
-from .location_status import LocationStatus
+from .business_hours import BusinessHours
+from .coordinates import Coordinates
 from .country import Country
 from .currency import Currency
+from .location_capability import LocationCapability
+from .location_status import LocationStatus
 from .location_type import LocationType
-from .business_hours import BusinessHours
-from .coordinates import Coordinates
 from .tax_ids import TaxIds
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Location(UncheckedBaseModel):
diff --git a/src/square/types/location_booking_profile.py b/src/square/types/location_booking_profile.py
index a07fd497..ffa6d681 100644
--- a/src/square/types/location_booking_profile.py
+++ b/src/square/types/location_booking_profile.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LocationBookingProfile(UncheckedBaseModel):
diff --git a/src/square/types/location_created_event.py b/src/square/types/location_created_event.py
index 05ee11a9..6f2c6126 100644
--- a/src/square/types/location_created_event.py
+++ b/src/square/types/location_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .location_created_event_data import LocationCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .location_created_event_data import LocationCreatedEventData
 
 
 class LocationCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_created_event_data.py b/src/square/types/location_created_event_data.py
index 7ad2984b..a380c975 100644
--- a/src/square/types/location_created_event_data.py
+++ b/src/square/types/location_created_event_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LocationCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_definition_owned_created_event.py b/src/square/types/location_custom_attribute_definition_owned_created_event.py
index 30638905..4134b51b 100644
--- a/src/square/types/location_custom_attribute_definition_owned_created_event.py
+++ b/src/square/types/location_custom_attribute_definition_owned_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class LocationCustomAttributeDefinitionOwnedCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_definition_owned_deleted_event.py b/src/square/types/location_custom_attribute_definition_owned_deleted_event.py
index 31d521df..63b01705 100644
--- a/src/square/types/location_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/types/location_custom_attribute_definition_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class LocationCustomAttributeDefinitionOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_definition_owned_updated_event.py b/src/square/types/location_custom_attribute_definition_owned_updated_event.py
index 104cd97b..d436e165 100644
--- a/src/square/types/location_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/types/location_custom_attribute_definition_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class LocationCustomAttributeDefinitionOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_definition_visible_created_event.py b/src/square/types/location_custom_attribute_definition_visible_created_event.py
index 08286860..4ccec0a7 100644
--- a/src/square/types/location_custom_attribute_definition_visible_created_event.py
+++ b/src/square/types/location_custom_attribute_definition_visible_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class LocationCustomAttributeDefinitionVisibleCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_definition_visible_deleted_event.py b/src/square/types/location_custom_attribute_definition_visible_deleted_event.py
index b8c452d0..26b9ac52 100644
--- a/src/square/types/location_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/types/location_custom_attribute_definition_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class LocationCustomAttributeDefinitionVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_definition_visible_updated_event.py b/src/square/types/location_custom_attribute_definition_visible_updated_event.py
index 6390c607..e9602f17 100644
--- a/src/square/types/location_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/types/location_custom_attribute_definition_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class LocationCustomAttributeDefinitionVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_owned_deleted_event.py b/src/square/types/location_custom_attribute_owned_deleted_event.py
index 59dc0435..5592d4d7 100644
--- a/src/square/types/location_custom_attribute_owned_deleted_event.py
+++ b/src/square/types/location_custom_attribute_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class LocationCustomAttributeOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_owned_updated_event.py b/src/square/types/location_custom_attribute_owned_updated_event.py
index adb0e0ac..955bd8d5 100644
--- a/src/square/types/location_custom_attribute_owned_updated_event.py
+++ b/src/square/types/location_custom_attribute_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class LocationCustomAttributeOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_visible_deleted_event.py b/src/square/types/location_custom_attribute_visible_deleted_event.py
index 20f7c272..b11f878e 100644
--- a/src/square/types/location_custom_attribute_visible_deleted_event.py
+++ b/src/square/types/location_custom_attribute_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class LocationCustomAttributeVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_custom_attribute_visible_updated_event.py b/src/square/types/location_custom_attribute_visible_updated_event.py
index 5a838511..02935ecf 100644
--- a/src/square/types/location_custom_attribute_visible_updated_event.py
+++ b/src/square/types/location_custom_attribute_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class LocationCustomAttributeVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_settings_updated_event.py b/src/square/types/location_settings_updated_event.py
index fff0d6fd..2e1add06 100644
--- a/src/square/types/location_settings_updated_event.py
+++ b/src/square/types/location_settings_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .location_settings_updated_event_data import LocationSettingsUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .location_settings_updated_event_data import LocationSettingsUpdatedEventData
 
 
 class LocationSettingsUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_settings_updated_event_data.py b/src/square/types/location_settings_updated_event_data.py
index a19af8ce..1928a727 100644
--- a/src/square/types/location_settings_updated_event_data.py
+++ b/src/square/types/location_settings_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .location_settings_updated_event_object import LocationSettingsUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .location_settings_updated_event_object import LocationSettingsUpdatedEventObject
 
 
 class LocationSettingsUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/location_settings_updated_event_object.py b/src/square/types/location_settings_updated_event_object.py
index 762e5223..af761c07 100644
--- a/src/square/types/location_settings_updated_event_object.py
+++ b/src/square/types/location_settings_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .checkout_location_settings import CheckoutLocationSettings
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .checkout_location_settings import CheckoutLocationSettings
 
 
 class LocationSettingsUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/location_updated_event.py b/src/square/types/location_updated_event.py
index 42e68198..e83ec88b 100644
--- a/src/square/types/location_updated_event.py
+++ b/src/square/types/location_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .location_updated_event_data import LocationUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .location_updated_event_data import LocationUpdatedEventData
 
 
 class LocationUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/location_updated_event_data.py b/src/square/types/location_updated_event_data.py
index a037178a..3a40ad7e 100644
--- a/src/square/types/location_updated_event_data.py
+++ b/src/square/types/location_updated_event_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LocationUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account.py b/src/square/types/loyalty_account.py
index d3ffb8f1..76f078f7 100644
--- a/src/square/types/loyalty_account.py
+++ b/src/square/types/loyalty_account.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_account_mapping import LoyaltyAccountMapping
-from .loyalty_account_expiring_point_deadline import LoyaltyAccountExpiringPointDeadline
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account_expiring_point_deadline import LoyaltyAccountExpiringPointDeadline
+from .loyalty_account_mapping import LoyaltyAccountMapping
 
 
 class LoyaltyAccount(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_created_event.py b/src/square/types/loyalty_account_created_event.py
index 75e866d2..f68055a6 100644
--- a/src/square/types/loyalty_account_created_event.py
+++ b/src/square/types/loyalty_account_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_account_created_event_data import LoyaltyAccountCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account_created_event_data import LoyaltyAccountCreatedEventData
 
 
 class LoyaltyAccountCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_created_event_data.py b/src/square/types/loyalty_account_created_event_data.py
index 9d78acf9..58896dd1 100644
--- a/src/square/types/loyalty_account_created_event_data.py
+++ b/src/square/types/loyalty_account_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_account_created_event_object import LoyaltyAccountCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account_created_event_object import LoyaltyAccountCreatedEventObject
 
 
 class LoyaltyAccountCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_created_event_object.py b/src/square/types/loyalty_account_created_event_object.py
index 8dfcb85e..82722fe8 100644
--- a/src/square/types/loyalty_account_created_event_object.py
+++ b/src/square/types/loyalty_account_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_account import LoyaltyAccount
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account import LoyaltyAccount
 
 
 class LoyaltyAccountCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_deleted_event.py b/src/square/types/loyalty_account_deleted_event.py
index 29378981..215a9c40 100644
--- a/src/square/types/loyalty_account_deleted_event.py
+++ b/src/square/types/loyalty_account_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_account_deleted_event_data import LoyaltyAccountDeletedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account_deleted_event_data import LoyaltyAccountDeletedEventData
 
 
 class LoyaltyAccountDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_deleted_event_data.py b/src/square/types/loyalty_account_deleted_event_data.py
index 3ca91c2d..7a790709 100644
--- a/src/square/types/loyalty_account_deleted_event_data.py
+++ b/src/square/types/loyalty_account_deleted_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_account_deleted_event_object import LoyaltyAccountDeletedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account_deleted_event_object import LoyaltyAccountDeletedEventObject
 
 
 class LoyaltyAccountDeletedEventData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_deleted_event_object.py b/src/square/types/loyalty_account_deleted_event_object.py
index 1ec972de..69bfc3e7 100644
--- a/src/square/types/loyalty_account_deleted_event_object.py
+++ b/src/square/types/loyalty_account_deleted_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_account import LoyaltyAccount
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account import LoyaltyAccount
 
 
 class LoyaltyAccountDeletedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_expiring_point_deadline.py b/src/square/types/loyalty_account_expiring_point_deadline.py
index da82c37d..7675d429 100644
--- a/src/square/types/loyalty_account_expiring_point_deadline.py
+++ b/src/square/types/loyalty_account_expiring_point_deadline.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyAccountExpiringPointDeadline(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_mapping.py b/src/square/types/loyalty_account_mapping.py
index 2283f289..60bc057c 100644
--- a/src/square/types/loyalty_account_mapping.py
+++ b/src/square/types/loyalty_account_mapping.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyAccountMapping(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_updated_event.py b/src/square/types/loyalty_account_updated_event.py
index a0879765..d260bddd 100644
--- a/src/square/types/loyalty_account_updated_event.py
+++ b/src/square/types/loyalty_account_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_account_updated_event_data import LoyaltyAccountUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account_updated_event_data import LoyaltyAccountUpdatedEventData
 
 
 class LoyaltyAccountUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_updated_event_data.py b/src/square/types/loyalty_account_updated_event_data.py
index 28196e5b..26984a37 100644
--- a/src/square/types/loyalty_account_updated_event_data.py
+++ b/src/square/types/loyalty_account_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_account_updated_event_object import LoyaltyAccountUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account_updated_event_object import LoyaltyAccountUpdatedEventObject
 
 
 class LoyaltyAccountUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_account_updated_event_object.py b/src/square/types/loyalty_account_updated_event_object.py
index e1fdb46b..2c4960da 100644
--- a/src/square/types/loyalty_account_updated_event_object.py
+++ b/src/square/types/loyalty_account_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_account import LoyaltyAccount
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account import LoyaltyAccount
 
 
 class LoyaltyAccountUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event.py b/src/square/types/loyalty_event.py
index 89740350..3838ffba 100644
--- a/src/square/types/loyalty_event.py
+++ b/src/square/types/loyalty_event.py
@@ -1,19 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_event_type import LoyaltyEventType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .loyalty_event_accumulate_points import LoyaltyEventAccumulatePoints
+from .loyalty_event_accumulate_promotion_points import LoyaltyEventAccumulatePromotionPoints
+from .loyalty_event_adjust_points import LoyaltyEventAdjustPoints
 from .loyalty_event_create_reward import LoyaltyEventCreateReward
-from .loyalty_event_redeem_reward import LoyaltyEventRedeemReward
 from .loyalty_event_delete_reward import LoyaltyEventDeleteReward
-from .loyalty_event_adjust_points import LoyaltyEventAdjustPoints
-from .loyalty_event_source import LoyaltyEventSource
 from .loyalty_event_expire_points import LoyaltyEventExpirePoints
 from .loyalty_event_other import LoyaltyEventOther
-from .loyalty_event_accumulate_promotion_points import LoyaltyEventAccumulatePromotionPoints
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .loyalty_event_redeem_reward import LoyaltyEventRedeemReward
+from .loyalty_event_source import LoyaltyEventSource
+from .loyalty_event_type import LoyaltyEventType
 
 
 class LoyaltyEvent(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_accumulate_points.py b/src/square/types/loyalty_event_accumulate_points.py
index 7d4c4cfe..c6e9c1a3 100644
--- a/src/square/types/loyalty_event_accumulate_points.py
+++ b/src/square/types/loyalty_event_accumulate_points.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventAccumulatePoints(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_accumulate_promotion_points.py b/src/square/types/loyalty_event_accumulate_promotion_points.py
index c1db9a63..a6e9e84d 100644
--- a/src/square/types/loyalty_event_accumulate_promotion_points.py
+++ b/src/square/types/loyalty_event_accumulate_promotion_points.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventAccumulatePromotionPoints(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_adjust_points.py b/src/square/types/loyalty_event_adjust_points.py
index 64ca6c83..91da2947 100644
--- a/src/square/types/loyalty_event_adjust_points.py
+++ b/src/square/types/loyalty_event_adjust_points.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventAdjustPoints(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_create_reward.py b/src/square/types/loyalty_event_create_reward.py
index 79018482..9c2bdfa7 100644
--- a/src/square/types/loyalty_event_create_reward.py
+++ b/src/square/types/loyalty_event_create_reward.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventCreateReward(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_created_event.py b/src/square/types/loyalty_event_created_event.py
index 8e8104f6..2e98c2e5 100644
--- a/src/square/types/loyalty_event_created_event.py
+++ b/src/square/types/loyalty_event_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_event_created_event_data import LoyaltyEventCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_event_created_event_data import LoyaltyEventCreatedEventData
 
 
 class LoyaltyEventCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_created_event_data.py b/src/square/types/loyalty_event_created_event_data.py
index 2aee8891..dd04fbdd 100644
--- a/src/square/types/loyalty_event_created_event_data.py
+++ b/src/square/types/loyalty_event_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_event_created_event_object import LoyaltyEventCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_event_created_event_object import LoyaltyEventCreatedEventObject
 
 
 class LoyaltyEventCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_created_event_object.py b/src/square/types/loyalty_event_created_event_object.py
index 02f49ff9..12e8560b 100644
--- a/src/square/types/loyalty_event_created_event_object.py
+++ b/src/square/types/loyalty_event_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_event import LoyaltyEvent
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_event import LoyaltyEvent
 
 
 class LoyaltyEventCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_date_time_filter.py b/src/square/types/loyalty_event_date_time_filter.py
index f8f3f112..45abf17b 100644
--- a/src/square/types/loyalty_event_date_time_filter.py
+++ b/src/square/types/loyalty_event_date_time_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .time_range import TimeRange
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .time_range import TimeRange
 
 
 class LoyaltyEventDateTimeFilter(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_delete_reward.py b/src/square/types/loyalty_event_delete_reward.py
index 1afebbb4..d7701988 100644
--- a/src/square/types/loyalty_event_delete_reward.py
+++ b/src/square/types/loyalty_event_delete_reward.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventDeleteReward(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_expire_points.py b/src/square/types/loyalty_event_expire_points.py
index 57992517..53be60eb 100644
--- a/src/square/types/loyalty_event_expire_points.py
+++ b/src/square/types/loyalty_event_expire_points.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventExpirePoints(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_filter.py b/src/square/types/loyalty_event_filter.py
index 3aeaead8..f668cbbd 100644
--- a/src/square/types/loyalty_event_filter.py
+++ b/src/square/types/loyalty_event_filter.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_event_loyalty_account_filter import LoyaltyEventLoyaltyAccountFilter
+
 import pydantic
-from .loyalty_event_type_filter import LoyaltyEventTypeFilter
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .loyalty_event_date_time_filter import LoyaltyEventDateTimeFilter
 from .loyalty_event_location_filter import LoyaltyEventLocationFilter
+from .loyalty_event_loyalty_account_filter import LoyaltyEventLoyaltyAccountFilter
 from .loyalty_event_order_filter import LoyaltyEventOrderFilter
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .loyalty_event_type_filter import LoyaltyEventTypeFilter
 
 
 class LoyaltyEventFilter(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_location_filter.py b/src/square/types/loyalty_event_location_filter.py
index f5545f17..5d6dc72c 100644
--- a/src/square/types/loyalty_event_location_filter.py
+++ b/src/square/types/loyalty_event_location_filter.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventLocationFilter(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_loyalty_account_filter.py b/src/square/types/loyalty_event_loyalty_account_filter.py
index e1ce788f..3b189d8e 100644
--- a/src/square/types/loyalty_event_loyalty_account_filter.py
+++ b/src/square/types/loyalty_event_loyalty_account_filter.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventLoyaltyAccountFilter(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_order_filter.py b/src/square/types/loyalty_event_order_filter.py
index 7814ca6b..09a6b2b5 100644
--- a/src/square/types/loyalty_event_order_filter.py
+++ b/src/square/types/loyalty_event_order_filter.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventOrderFilter(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_other.py b/src/square/types/loyalty_event_other.py
index 9e5604cc..fc6f113c 100644
--- a/src/square/types/loyalty_event_other.py
+++ b/src/square/types/loyalty_event_other.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventOther(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_query.py b/src/square/types/loyalty_event_query.py
index ff74534b..02dde1d5 100644
--- a/src/square/types/loyalty_event_query.py
+++ b/src/square/types/loyalty_event_query.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_event_filter import LoyaltyEventFilter
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_event_filter import LoyaltyEventFilter
 
 
 class LoyaltyEventQuery(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_redeem_reward.py b/src/square/types/loyalty_event_redeem_reward.py
index d2df8a9b..76f49f79 100644
--- a/src/square/types/loyalty_event_redeem_reward.py
+++ b/src/square/types/loyalty_event_redeem_reward.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyEventRedeemReward(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_event_type_filter.py b/src/square/types/loyalty_event_type_filter.py
index dbbf6e17..7ae82722 100644
--- a/src/square/types/loyalty_event_type_filter.py
+++ b/src/square/types/loyalty_event_type_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_event_type import LoyaltyEventType
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_event_type import LoyaltyEventType
 
 
 class LoyaltyEventTypeFilter(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program.py b/src/square/types/loyalty_program.py
index 284d156b..7326e2e9 100644
--- a/src/square/types/loyalty_program.py
+++ b/src/square/types/loyalty_program.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_program_status import LoyaltyProgramStatus
-from .loyalty_program_reward_tier import LoyaltyProgramRewardTier
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program_accrual_rule import LoyaltyProgramAccrualRule
 from .loyalty_program_expiration_policy import LoyaltyProgramExpirationPolicy
+from .loyalty_program_reward_tier import LoyaltyProgramRewardTier
+from .loyalty_program_status import LoyaltyProgramStatus
 from .loyalty_program_terminology import LoyaltyProgramTerminology
-from .loyalty_program_accrual_rule import LoyaltyProgramAccrualRule
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class LoyaltyProgram(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_accrual_rule.py b/src/square/types/loyalty_program_accrual_rule.py
index f45da956..b22c0acc 100644
--- a/src/square/types/loyalty_program_accrual_rule.py
+++ b/src/square/types/loyalty_program_accrual_rule.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program_accrual_rule_category_data import LoyaltyProgramAccrualRuleCategoryData
+from .loyalty_program_accrual_rule_item_variation_data import LoyaltyProgramAccrualRuleItemVariationData
+from .loyalty_program_accrual_rule_spend_data import LoyaltyProgramAccrualRuleSpendData
 from .loyalty_program_accrual_rule_type import LoyaltyProgramAccrualRuleType
-import pydantic
-import typing
 from .loyalty_program_accrual_rule_visit_data import LoyaltyProgramAccrualRuleVisitData
-from .loyalty_program_accrual_rule_spend_data import LoyaltyProgramAccrualRuleSpendData
-from .loyalty_program_accrual_rule_item_variation_data import LoyaltyProgramAccrualRuleItemVariationData
-from .loyalty_program_accrual_rule_category_data import LoyaltyProgramAccrualRuleCategoryData
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class LoyaltyProgramAccrualRule(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_accrual_rule_category_data.py b/src/square/types/loyalty_program_accrual_rule_category_data.py
index b9b742bc..c0d8ff5f 100644
--- a/src/square/types/loyalty_program_accrual_rule_category_data.py
+++ b/src/square/types/loyalty_program_accrual_rule_category_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyProgramAccrualRuleCategoryData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_accrual_rule_item_variation_data.py b/src/square/types/loyalty_program_accrual_rule_item_variation_data.py
index 4696196c..dd1a5d78 100644
--- a/src/square/types/loyalty_program_accrual_rule_item_variation_data.py
+++ b/src/square/types/loyalty_program_accrual_rule_item_variation_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyProgramAccrualRuleItemVariationData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_accrual_rule_spend_data.py b/src/square/types/loyalty_program_accrual_rule_spend_data.py
index 8cc69e40..1391307a 100644
--- a/src/square/types/loyalty_program_accrual_rule_spend_data.py
+++ b/src/square/types/loyalty_program_accrual_rule_spend_data.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .money import Money
-import pydantic
 import typing
-from .loyalty_program_accrual_rule_tax_mode import LoyaltyProgramAccrualRuleTaxMode
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program_accrual_rule_tax_mode import LoyaltyProgramAccrualRuleTaxMode
+from .money import Money
 
 
 class LoyaltyProgramAccrualRuleSpendData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_accrual_rule_visit_data.py b/src/square/types/loyalty_program_accrual_rule_visit_data.py
index 8ead23e3..e0de3753 100644
--- a/src/square/types/loyalty_program_accrual_rule_visit_data.py
+++ b/src/square/types/loyalty_program_accrual_rule_visit_data.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .money import Money
+
 import pydantic
-from .loyalty_program_accrual_rule_tax_mode import LoyaltyProgramAccrualRuleTaxMode
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program_accrual_rule_tax_mode import LoyaltyProgramAccrualRuleTaxMode
+from .money import Money
 
 
 class LoyaltyProgramAccrualRuleVisitData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_created_event.py b/src/square/types/loyalty_program_created_event.py
index 281b9ff3..9d87a26d 100644
--- a/src/square/types/loyalty_program_created_event.py
+++ b/src/square/types/loyalty_program_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_program_created_event_data import LoyaltyProgramCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program_created_event_data import LoyaltyProgramCreatedEventData
 
 
 class LoyaltyProgramCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_created_event_data.py b/src/square/types/loyalty_program_created_event_data.py
index 93ffbac9..38b70b56 100644
--- a/src/square/types/loyalty_program_created_event_data.py
+++ b/src/square/types/loyalty_program_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_program_created_event_object import LoyaltyProgramCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program_created_event_object import LoyaltyProgramCreatedEventObject
 
 
 class LoyaltyProgramCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_created_event_object.py b/src/square/types/loyalty_program_created_event_object.py
index 15f8c805..c6b80a05 100644
--- a/src/square/types/loyalty_program_created_event_object.py
+++ b/src/square/types/loyalty_program_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_program import LoyaltyProgram
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program import LoyaltyProgram
 
 
 class LoyaltyProgramCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_expiration_policy.py b/src/square/types/loyalty_program_expiration_policy.py
index 659e8838..77cd976a 100644
--- a/src/square/types/loyalty_program_expiration_policy.py
+++ b/src/square/types/loyalty_program_expiration_policy.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyProgramExpirationPolicy(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_reward_tier.py b/src/square/types/loyalty_program_reward_tier.py
index 03e489c6..fd999fb1 100644
--- a/src/square/types/loyalty_program_reward_tier.py
+++ b/src/square/types/loyalty_program_reward_tier.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .catalog_object_reference import CatalogObjectReference
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .catalog_object_reference import CatalogObjectReference
 
 
 class LoyaltyProgramRewardTier(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_terminology.py b/src/square/types/loyalty_program_terminology.py
index 3724bad1..39d9a2f7 100644
--- a/src/square/types/loyalty_program_terminology.py
+++ b/src/square/types/loyalty_program_terminology.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyProgramTerminology(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_updated_event.py b/src/square/types/loyalty_program_updated_event.py
index 4ec574e3..0923aca8 100644
--- a/src/square/types/loyalty_program_updated_event.py
+++ b/src/square/types/loyalty_program_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_program_updated_event_data import LoyaltyProgramUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program_updated_event_data import LoyaltyProgramUpdatedEventData
 
 
 class LoyaltyProgramUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_updated_event_data.py b/src/square/types/loyalty_program_updated_event_data.py
index e8bf1c99..4f502605 100644
--- a/src/square/types/loyalty_program_updated_event_data.py
+++ b/src/square/types/loyalty_program_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_program_updated_event_object import LoyaltyProgramUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program_updated_event_object import LoyaltyProgramUpdatedEventObject
 
 
 class LoyaltyProgramUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_program_updated_event_object.py b/src/square/types/loyalty_program_updated_event_object.py
index ca0b1fe5..7193887d 100644
--- a/src/square/types/loyalty_program_updated_event_object.py
+++ b/src/square/types/loyalty_program_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_program import LoyaltyProgram
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_program import LoyaltyProgram
 
 
 class LoyaltyProgramUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion.py b/src/square/types/loyalty_promotion.py
index 08130727..9bf1b319 100644
--- a/src/square/types/loyalty_promotion.py
+++ b/src/square/types/loyalty_promotion.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_promotion_incentive import LoyaltyPromotionIncentive
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .loyalty_promotion_available_time_data import LoyaltyPromotionAvailableTimeData
-from .loyalty_promotion_trigger_limit import LoyaltyPromotionTriggerLimit
+from .loyalty_promotion_incentive import LoyaltyPromotionIncentive
 from .loyalty_promotion_status import LoyaltyPromotionStatus
+from .loyalty_promotion_trigger_limit import LoyaltyPromotionTriggerLimit
 from .money import Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class LoyaltyPromotion(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_available_time_data.py b/src/square/types/loyalty_promotion_available_time_data.py
index 3d8d93ae..2b859ab7 100644
--- a/src/square/types/loyalty_promotion_available_time_data.py
+++ b/src/square/types/loyalty_promotion_available_time_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyPromotionAvailableTimeData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_created_event.py b/src/square/types/loyalty_promotion_created_event.py
index 9f5bb9d6..76eb923f 100644
--- a/src/square/types/loyalty_promotion_created_event.py
+++ b/src/square/types/loyalty_promotion_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_promotion_created_event_data import LoyaltyPromotionCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_promotion_created_event_data import LoyaltyPromotionCreatedEventData
 
 
 class LoyaltyPromotionCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_created_event_data.py b/src/square/types/loyalty_promotion_created_event_data.py
index c71895a7..5c73e5d3 100644
--- a/src/square/types/loyalty_promotion_created_event_data.py
+++ b/src/square/types/loyalty_promotion_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_promotion_created_event_object import LoyaltyPromotionCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_promotion_created_event_object import LoyaltyPromotionCreatedEventObject
 
 
 class LoyaltyPromotionCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_created_event_object.py b/src/square/types/loyalty_promotion_created_event_object.py
index d60bf8f4..209c014f 100644
--- a/src/square/types/loyalty_promotion_created_event_object.py
+++ b/src/square/types/loyalty_promotion_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_promotion import LoyaltyPromotion
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_promotion import LoyaltyPromotion
 
 
 class LoyaltyPromotionCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_incentive.py b/src/square/types/loyalty_promotion_incentive.py
index f2f5cd9c..c286c978 100644
--- a/src/square/types/loyalty_promotion_incentive.py
+++ b/src/square/types/loyalty_promotion_incentive.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .loyalty_promotion_incentive_type import LoyaltyPromotionIncentiveType
-import pydantic
 import typing
-from .loyalty_promotion_incentive_points_multiplier_data import LoyaltyPromotionIncentivePointsMultiplierData
-from .loyalty_promotion_incentive_points_addition_data import LoyaltyPromotionIncentivePointsAdditionData
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_promotion_incentive_points_addition_data import LoyaltyPromotionIncentivePointsAdditionData
+from .loyalty_promotion_incentive_points_multiplier_data import LoyaltyPromotionIncentivePointsMultiplierData
+from .loyalty_promotion_incentive_type import LoyaltyPromotionIncentiveType
 
 
 class LoyaltyPromotionIncentive(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_incentive_points_addition_data.py b/src/square/types/loyalty_promotion_incentive_points_addition_data.py
index 75eae361..6a2ba3bc 100644
--- a/src/square/types/loyalty_promotion_incentive_points_addition_data.py
+++ b/src/square/types/loyalty_promotion_incentive_points_addition_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyPromotionIncentivePointsAdditionData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_incentive_points_multiplier_data.py b/src/square/types/loyalty_promotion_incentive_points_multiplier_data.py
index c94fb815..a589600d 100644
--- a/src/square/types/loyalty_promotion_incentive_points_multiplier_data.py
+++ b/src/square/types/loyalty_promotion_incentive_points_multiplier_data.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class LoyaltyPromotionIncentivePointsMultiplierData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_trigger_limit.py b/src/square/types/loyalty_promotion_trigger_limit.py
index 87cc37fe..13735b18 100644
--- a/src/square/types/loyalty_promotion_trigger_limit.py
+++ b/src/square/types/loyalty_promotion_trigger_limit.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .loyalty_promotion_trigger_limit_interval import LoyaltyPromotionTriggerLimitInterval
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_promotion_trigger_limit_interval import LoyaltyPromotionTriggerLimitInterval
 
 
 class LoyaltyPromotionTriggerLimit(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_updated_event.py b/src/square/types/loyalty_promotion_updated_event.py
index 719cad96..68ec4fbe 100644
--- a/src/square/types/loyalty_promotion_updated_event.py
+++ b/src/square/types/loyalty_promotion_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_promotion_updated_event_data import LoyaltyPromotionUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_promotion_updated_event_data import LoyaltyPromotionUpdatedEventData
 
 
 class LoyaltyPromotionUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_updated_event_data.py b/src/square/types/loyalty_promotion_updated_event_data.py
index c7158b99..f973d703 100644
--- a/src/square/types/loyalty_promotion_updated_event_data.py
+++ b/src/square/types/loyalty_promotion_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_promotion_updated_event_object import LoyaltyPromotionUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_promotion_updated_event_object import LoyaltyPromotionUpdatedEventObject
 
 
 class LoyaltyPromotionUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_promotion_updated_event_object.py b/src/square/types/loyalty_promotion_updated_event_object.py
index f1bb78f7..aea1755d 100644
--- a/src/square/types/loyalty_promotion_updated_event_object.py
+++ b/src/square/types/loyalty_promotion_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_promotion import LoyaltyPromotion
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_promotion import LoyaltyPromotion
 
 
 class LoyaltyPromotionUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/loyalty_reward.py b/src/square/types/loyalty_reward.py
index 1005227c..326e6f88 100644
--- a/src/square/types/loyalty_reward.py
+++ b/src/square/types/loyalty_reward.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .loyalty_reward_status import LoyaltyRewardStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_reward_status import LoyaltyRewardStatus
 
 
 class LoyaltyReward(UncheckedBaseModel):
diff --git a/src/square/types/measurement_unit.py b/src/square/types/measurement_unit.py
index 300d11ce..839d9016 100644
--- a/src/square/types/measurement_unit.py
+++ b/src/square/types/measurement_unit.py
@@ -1,17 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .measurement_unit_custom import MeasurementUnitCustom
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .measurement_unit_area import MeasurementUnitArea
-from .measurement_unit_length import MeasurementUnitLength
-from .measurement_unit_volume import MeasurementUnitVolume
-from .measurement_unit_weight import MeasurementUnitWeight
+from .measurement_unit_custom import MeasurementUnitCustom
 from .measurement_unit_generic import MeasurementUnitGeneric
+from .measurement_unit_length import MeasurementUnitLength
 from .measurement_unit_time import MeasurementUnitTime
 from .measurement_unit_unit_type import MeasurementUnitUnitType
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .measurement_unit_volume import MeasurementUnitVolume
+from .measurement_unit_weight import MeasurementUnitWeight
 
 
 class MeasurementUnit(UncheckedBaseModel):
diff --git a/src/square/types/measurement_unit_custom.py b/src/square/types/measurement_unit_custom.py
index b13aaa11..6892943a 100644
--- a/src/square/types/measurement_unit_custom.py
+++ b/src/square/types/measurement_unit_custom.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class MeasurementUnitCustom(UncheckedBaseModel):
diff --git a/src/square/types/merchant.py b/src/square/types/merchant.py
index 785b1f1e..4f85dec0 100644
--- a/src/square/types/merchant.py
+++ b/src/square/types/merchant.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .country import Country
 from .currency import Currency
 from .merchant_status import MerchantStatus
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Merchant(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_definition_owned_created_event.py b/src/square/types/merchant_custom_attribute_definition_owned_created_event.py
index 240e826d..3436e9bf 100644
--- a/src/square/types/merchant_custom_attribute_definition_owned_created_event.py
+++ b/src/square/types/merchant_custom_attribute_definition_owned_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class MerchantCustomAttributeDefinitionOwnedCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_definition_owned_deleted_event.py b/src/square/types/merchant_custom_attribute_definition_owned_deleted_event.py
index 82b8e4c6..2007d716 100644
--- a/src/square/types/merchant_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/types/merchant_custom_attribute_definition_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class MerchantCustomAttributeDefinitionOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_definition_owned_updated_event.py b/src/square/types/merchant_custom_attribute_definition_owned_updated_event.py
index 7bcb1d64..cb50de16 100644
--- a/src/square/types/merchant_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/types/merchant_custom_attribute_definition_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class MerchantCustomAttributeDefinitionOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_definition_visible_created_event.py b/src/square/types/merchant_custom_attribute_definition_visible_created_event.py
index b1918d8b..67a36675 100644
--- a/src/square/types/merchant_custom_attribute_definition_visible_created_event.py
+++ b/src/square/types/merchant_custom_attribute_definition_visible_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class MerchantCustomAttributeDefinitionVisibleCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_definition_visible_deleted_event.py b/src/square/types/merchant_custom_attribute_definition_visible_deleted_event.py
index 4d35c646..1cc0e4e3 100644
--- a/src/square/types/merchant_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/types/merchant_custom_attribute_definition_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class MerchantCustomAttributeDefinitionVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_definition_visible_updated_event.py b/src/square/types/merchant_custom_attribute_definition_visible_updated_event.py
index 1a3d5836..7e893a40 100644
--- a/src/square/types/merchant_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/types/merchant_custom_attribute_definition_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class MerchantCustomAttributeDefinitionVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_owned_deleted_event.py b/src/square/types/merchant_custom_attribute_owned_deleted_event.py
index 3c6558da..0c1f6720 100644
--- a/src/square/types/merchant_custom_attribute_owned_deleted_event.py
+++ b/src/square/types/merchant_custom_attribute_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class MerchantCustomAttributeOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_owned_updated_event.py b/src/square/types/merchant_custom_attribute_owned_updated_event.py
index 93131483..b0e319bb 100644
--- a/src/square/types/merchant_custom_attribute_owned_updated_event.py
+++ b/src/square/types/merchant_custom_attribute_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class MerchantCustomAttributeOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_visible_deleted_event.py b/src/square/types/merchant_custom_attribute_visible_deleted_event.py
index 0ddd3bad..2b6870b7 100644
--- a/src/square/types/merchant_custom_attribute_visible_deleted_event.py
+++ b/src/square/types/merchant_custom_attribute_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class MerchantCustomAttributeVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_custom_attribute_visible_updated_event.py b/src/square/types/merchant_custom_attribute_visible_updated_event.py
index 8d85ae73..9b96b0e4 100644
--- a/src/square/types/merchant_custom_attribute_visible_updated_event.py
+++ b/src/square/types/merchant_custom_attribute_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class MerchantCustomAttributeVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_settings_updated_event.py b/src/square/types/merchant_settings_updated_event.py
index ce718297..deee1351 100644
--- a/src/square/types/merchant_settings_updated_event.py
+++ b/src/square/types/merchant_settings_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .merchant_settings_updated_event_data import MerchantSettingsUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .merchant_settings_updated_event_data import MerchantSettingsUpdatedEventData
 
 
 class MerchantSettingsUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/merchant_settings_updated_event_data.py b/src/square/types/merchant_settings_updated_event_data.py
index 41ae17bb..7df67e63 100644
--- a/src/square/types/merchant_settings_updated_event_data.py
+++ b/src/square/types/merchant_settings_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .merchant_settings_updated_event_object import MerchantSettingsUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .merchant_settings_updated_event_object import MerchantSettingsUpdatedEventObject
 
 
 class MerchantSettingsUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/merchant_settings_updated_event_object.py b/src/square/types/merchant_settings_updated_event_object.py
index bf386820..52c00f7b 100644
--- a/src/square/types/merchant_settings_updated_event_object.py
+++ b/src/square/types/merchant_settings_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .checkout_merchant_settings import CheckoutMerchantSettings
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .checkout_merchant_settings import CheckoutMerchantSettings
 
 
 class MerchantSettingsUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/modifier_location_overrides.py b/src/square/types/modifier_location_overrides.py
index 69ebe6ee..113f32a3 100644
--- a/src/square/types/modifier_location_overrides.py
+++ b/src/square/types/modifier_location_overrides.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class ModifierLocationOverrides(UncheckedBaseModel):
diff --git a/src/square/types/money.py b/src/square/types/money.py
index b3a6ae8e..b26b593b 100644
--- a/src/square/types/money.py
+++ b/src/square/types/money.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .currency import Currency
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .currency import Currency
 
 
 class Money(UncheckedBaseModel):
diff --git a/src/square/types/oauth_authorization_revoked_event.py b/src/square/types/oauth_authorization_revoked_event.py
index 998589d0..b4ee7d83 100644
--- a/src/square/types/oauth_authorization_revoked_event.py
+++ b/src/square/types/oauth_authorization_revoked_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .oauth_authorization_revoked_event_data import OauthAuthorizationRevokedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .oauth_authorization_revoked_event_data import OauthAuthorizationRevokedEventData
 
 
 class OauthAuthorizationRevokedEvent(UncheckedBaseModel):
diff --git a/src/square/types/oauth_authorization_revoked_event_data.py b/src/square/types/oauth_authorization_revoked_event_data.py
index 9343d7e2..2bbb1f19 100644
--- a/src/square/types/oauth_authorization_revoked_event_data.py
+++ b/src/square/types/oauth_authorization_revoked_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .oauth_authorization_revoked_event_object import OauthAuthorizationRevokedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .oauth_authorization_revoked_event_object import OauthAuthorizationRevokedEventObject
 
 
 class OauthAuthorizationRevokedEventData(UncheckedBaseModel):
diff --git a/src/square/types/oauth_authorization_revoked_event_object.py b/src/square/types/oauth_authorization_revoked_event_object.py
index 69f26815..887453f9 100644
--- a/src/square/types/oauth_authorization_revoked_event_object.py
+++ b/src/square/types/oauth_authorization_revoked_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .oauth_authorization_revoked_event_revocation_object import OauthAuthorizationRevokedEventRevocationObject
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .oauth_authorization_revoked_event_revocation_object import OauthAuthorizationRevokedEventRevocationObject
 
 
 class OauthAuthorizationRevokedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/oauth_authorization_revoked_event_revocation_object.py b/src/square/types/oauth_authorization_revoked_event_revocation_object.py
index ea7fd43f..708ebeab 100644
--- a/src/square/types/oauth_authorization_revoked_event_revocation_object.py
+++ b/src/square/types/oauth_authorization_revoked_event_revocation_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .oauth_authorization_revoked_event_revoker_type import OauthAuthorizationRevokedEventRevokerType
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .oauth_authorization_revoked_event_revoker_type import OauthAuthorizationRevokedEventRevokerType
 
 
 class OauthAuthorizationRevokedEventRevocationObject(UncheckedBaseModel):
diff --git a/src/square/types/obtain_token_response.py b/src/square/types/obtain_token_response.py
index ad9c37c9..0e40ba2f 100644
--- a/src/square/types/obtain_token_response.py
+++ b/src/square/types/obtain_token_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class ObtainTokenResponse(UncheckedBaseModel):
diff --git a/src/square/types/offline_payment_details.py b/src/square/types/offline_payment_details.py
index 1e79d704..d540efc2 100644
--- a/src/square/types/offline_payment_details.py
+++ b/src/square/types/offline_payment_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class OfflinePaymentDetails(UncheckedBaseModel):
diff --git a/src/square/types/order.py b/src/square/types/order.py
index 09dc549e..695e15e7 100644
--- a/src/square/types/order.py
+++ b/src/square/types/order.py
@@ -1,24 +1,25 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_source import OrderSource
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .fulfillment import Fulfillment
+from .money import Money
 from .order_line_item import OrderLineItem
-from .order_line_item_tax import OrderLineItemTax
 from .order_line_item_discount import OrderLineItemDiscount
-from .order_service_charge import OrderServiceCharge
-from .fulfillment import Fulfillment
-from .order_return import OrderReturn
+from .order_line_item_tax import OrderLineItemTax
 from .order_money_amounts import OrderMoneyAmounts
-from .order_rounding_adjustment import OrderRoundingAdjustment
-from .tender import Tender
-from .refund import Refund
-from .order_state import OrderState
-from .money import Money
 from .order_pricing_options import OrderPricingOptions
+from .order_return import OrderReturn
 from .order_reward import OrderReward
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .order_rounding_adjustment import OrderRoundingAdjustment
+from .order_service_charge import OrderServiceCharge
+from .order_source import OrderSource
+from .order_state import OrderState
+from .refund import Refund
+from .tender import Tender
 
 
 class Order(UncheckedBaseModel):
diff --git a/src/square/types/order_created.py b/src/square/types/order_created.py
index af2a89d9..b2f150da 100644
--- a/src/square/types/order_created.py
+++ b/src/square/types/order_created.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_state import OrderState
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_state import OrderState
 
 
 class OrderCreated(UncheckedBaseModel):
diff --git a/src/square/types/order_created_event.py b/src/square/types/order_created_event.py
index 81f78bc3..91f90902 100644
--- a/src/square/types/order_created_event.py
+++ b/src/square/types/order_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_created_event_data import OrderCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_created_event_data import OrderCreatedEventData
 
 
 class OrderCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_created_event_data.py b/src/square/types/order_created_event_data.py
index cdae81eb..8cb8f95d 100644
--- a/src/square/types/order_created_event_data.py
+++ b/src/square/types/order_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_created_object import OrderCreatedObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_created_object import OrderCreatedObject
 
 
 class OrderCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/order_created_object.py b/src/square/types/order_created_object.py
index 4ba791cc..9000d583 100644
--- a/src/square/types/order_created_object.py
+++ b/src/square/types/order_created_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order_created import OrderCreated
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_created import OrderCreated
 
 
 class OrderCreatedObject(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_definition_owned_created_event.py b/src/square/types/order_custom_attribute_definition_owned_created_event.py
index 890a3896..70629c40 100644
--- a/src/square/types/order_custom_attribute_definition_owned_created_event.py
+++ b/src/square/types/order_custom_attribute_definition_owned_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class OrderCustomAttributeDefinitionOwnedCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_definition_owned_deleted_event.py b/src/square/types/order_custom_attribute_definition_owned_deleted_event.py
index 0429b838..4a74d2bf 100644
--- a/src/square/types/order_custom_attribute_definition_owned_deleted_event.py
+++ b/src/square/types/order_custom_attribute_definition_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class OrderCustomAttributeDefinitionOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_definition_owned_updated_event.py b/src/square/types/order_custom_attribute_definition_owned_updated_event.py
index ebd0290c..b7fd94a8 100644
--- a/src/square/types/order_custom_attribute_definition_owned_updated_event.py
+++ b/src/square/types/order_custom_attribute_definition_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class OrderCustomAttributeDefinitionOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_definition_visible_created_event.py b/src/square/types/order_custom_attribute_definition_visible_created_event.py
index 5efbfcee..9b04e378 100644
--- a/src/square/types/order_custom_attribute_definition_visible_created_event.py
+++ b/src/square/types/order_custom_attribute_definition_visible_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class OrderCustomAttributeDefinitionVisibleCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_definition_visible_deleted_event.py b/src/square/types/order_custom_attribute_definition_visible_deleted_event.py
index dc9adc7c..36802ea7 100644
--- a/src/square/types/order_custom_attribute_definition_visible_deleted_event.py
+++ b/src/square/types/order_custom_attribute_definition_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class OrderCustomAttributeDefinitionVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_definition_visible_updated_event.py b/src/square/types/order_custom_attribute_definition_visible_updated_event.py
index 850ffa7d..d0a80f0c 100644
--- a/src/square/types/order_custom_attribute_definition_visible_updated_event.py
+++ b/src/square/types/order_custom_attribute_definition_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition_event_data import CustomAttributeDefinitionEventData
 
 
 class OrderCustomAttributeDefinitionVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_owned_deleted_event.py b/src/square/types/order_custom_attribute_owned_deleted_event.py
index 7645e338..f6e9dcb4 100644
--- a/src/square/types/order_custom_attribute_owned_deleted_event.py
+++ b/src/square/types/order_custom_attribute_owned_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class OrderCustomAttributeOwnedDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_owned_updated_event.py b/src/square/types/order_custom_attribute_owned_updated_event.py
index a91ebaf4..395947fe 100644
--- a/src/square/types/order_custom_attribute_owned_updated_event.py
+++ b/src/square/types/order_custom_attribute_owned_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class OrderCustomAttributeOwnedUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_visible_deleted_event.py b/src/square/types/order_custom_attribute_visible_deleted_event.py
index 656e20cb..a2b550d7 100644
--- a/src/square/types/order_custom_attribute_visible_deleted_event.py
+++ b/src/square/types/order_custom_attribute_visible_deleted_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class OrderCustomAttributeVisibleDeletedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_custom_attribute_visible_updated_event.py b/src/square/types/order_custom_attribute_visible_updated_event.py
index 10cd9085..2156d81f 100644
--- a/src/square/types/order_custom_attribute_visible_updated_event.py
+++ b/src/square/types/order_custom_attribute_visible_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .custom_attribute_event_data import CustomAttributeEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_event_data import CustomAttributeEventData
 
 
 class OrderCustomAttributeVisibleUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_entry.py b/src/square/types/order_entry.py
index c3e297b2..019e3fbf 100644
--- a/src/square/types/order_entry.py
+++ b/src/square/types/order_entry.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class OrderEntry(UncheckedBaseModel):
diff --git a/src/square/types/order_fulfillment_updated.py b/src/square/types/order_fulfillment_updated.py
index ba807721..3b5baa71 100644
--- a/src/square/types/order_fulfillment_updated.py
+++ b/src/square/types/order_fulfillment_updated.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_state import OrderState
-from .order_fulfillment_updated_update import OrderFulfillmentUpdatedUpdate
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_fulfillment_updated_update import OrderFulfillmentUpdatedUpdate
+from .order_state import OrderState
 
 
 class OrderFulfillmentUpdated(UncheckedBaseModel):
diff --git a/src/square/types/order_fulfillment_updated_event.py b/src/square/types/order_fulfillment_updated_event.py
index c6b07472..91f06f17 100644
--- a/src/square/types/order_fulfillment_updated_event.py
+++ b/src/square/types/order_fulfillment_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_fulfillment_updated_event_data import OrderFulfillmentUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_fulfillment_updated_event_data import OrderFulfillmentUpdatedEventData
 
 
 class OrderFulfillmentUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_fulfillment_updated_event_data.py b/src/square/types/order_fulfillment_updated_event_data.py
index e88b0e22..74c41418 100644
--- a/src/square/types/order_fulfillment_updated_event_data.py
+++ b/src/square/types/order_fulfillment_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_fulfillment_updated_object import OrderFulfillmentUpdatedObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_fulfillment_updated_object import OrderFulfillmentUpdatedObject
 
 
 class OrderFulfillmentUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/order_fulfillment_updated_object.py b/src/square/types/order_fulfillment_updated_object.py
index 6058e4dd..741b9060 100644
--- a/src/square/types/order_fulfillment_updated_object.py
+++ b/src/square/types/order_fulfillment_updated_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order_fulfillment_updated import OrderFulfillmentUpdated
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_fulfillment_updated import OrderFulfillmentUpdated
 
 
 class OrderFulfillmentUpdatedObject(UncheckedBaseModel):
diff --git a/src/square/types/order_fulfillment_updated_update.py b/src/square/types/order_fulfillment_updated_update.py
index 899d1c5b..275b0642 100644
--- a/src/square/types/order_fulfillment_updated_update.py
+++ b/src/square/types/order_fulfillment_updated_update.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .fulfillment_state import FulfillmentState
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .fulfillment_state import FulfillmentState
 
 
 class OrderFulfillmentUpdatedUpdate(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item.py b/src/square/types/order_line_item.py
index 59a4c4a5..050df018 100644
--- a/src/square/types/order_line_item.py
+++ b/src/square/types/order_line_item.py
@@ -1,17 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_quantity_unit import OrderQuantityUnit
-from .order_line_item_item_type import OrderLineItemItemType
-from .order_line_item_modifier import OrderLineItemModifier
-from .order_line_item_applied_tax import OrderLineItemAppliedTax
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 from .order_line_item_applied_discount import OrderLineItemAppliedDiscount
 from .order_line_item_applied_service_charge import OrderLineItemAppliedServiceCharge
-from .money import Money
+from .order_line_item_applied_tax import OrderLineItemAppliedTax
+from .order_line_item_item_type import OrderLineItemItemType
+from .order_line_item_modifier import OrderLineItemModifier
 from .order_line_item_pricing_blocklists import OrderLineItemPricingBlocklists
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .order_quantity_unit import OrderQuantityUnit
 
 
 class OrderLineItem(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item_applied_discount.py b/src/square/types/order_line_item_applied_discount.py
index 8c6707d6..62e88bfa 100644
--- a/src/square/types/order_line_item_applied_discount.py
+++ b/src/square/types/order_line_item_applied_discount.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class OrderLineItemAppliedDiscount(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item_applied_service_charge.py b/src/square/types/order_line_item_applied_service_charge.py
index 5617baa7..bd263b31 100644
--- a/src/square/types/order_line_item_applied_service_charge.py
+++ b/src/square/types/order_line_item_applied_service_charge.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class OrderLineItemAppliedServiceCharge(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item_applied_tax.py b/src/square/types/order_line_item_applied_tax.py
index f43559f2..1db03f60 100644
--- a/src/square/types/order_line_item_applied_tax.py
+++ b/src/square/types/order_line_item_applied_tax.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class OrderLineItemAppliedTax(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item_discount.py b/src/square/types/order_line_item_discount.py
index d4bf409b..44379f12 100644
--- a/src/square/types/order_line_item_discount.py
+++ b/src/square/types/order_line_item_discount.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_line_item_discount_type import OrderLineItemDiscountType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .money import Money
 from .order_line_item_discount_scope import OrderLineItemDiscountScope
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .order_line_item_discount_type import OrderLineItemDiscountType
 
 
 class OrderLineItemDiscount(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item_modifier.py b/src/square/types/order_line_item_modifier.py
index 72b8cd97..50888a8d 100644
--- a/src/square/types/order_line_item_modifier.py
+++ b/src/square/types/order_line_item_modifier.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class OrderLineItemModifier(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item_pricing_blocklists.py b/src/square/types/order_line_item_pricing_blocklists.py
index 9bdcb770..e978da0f 100644
--- a/src/square/types/order_line_item_pricing_blocklists.py
+++ b/src/square/types/order_line_item_pricing_blocklists.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order_line_item_pricing_blocklists_blocked_discount import OrderLineItemPricingBlocklistsBlockedDiscount
+
 import pydantic
-from .order_line_item_pricing_blocklists_blocked_tax import OrderLineItemPricingBlocklistsBlockedTax
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_line_item_pricing_blocklists_blocked_discount import OrderLineItemPricingBlocklistsBlockedDiscount
+from .order_line_item_pricing_blocklists_blocked_tax import OrderLineItemPricingBlocklistsBlockedTax
 
 
 class OrderLineItemPricingBlocklists(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item_pricing_blocklists_blocked_discount.py b/src/square/types/order_line_item_pricing_blocklists_blocked_discount.py
index 64767cba..7bb099e7 100644
--- a/src/square/types/order_line_item_pricing_blocklists_blocked_discount.py
+++ b/src/square/types/order_line_item_pricing_blocklists_blocked_discount.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class OrderLineItemPricingBlocklistsBlockedDiscount(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item_pricing_blocklists_blocked_tax.py b/src/square/types/order_line_item_pricing_blocklists_blocked_tax.py
index 95047515..8426582d 100644
--- a/src/square/types/order_line_item_pricing_blocklists_blocked_tax.py
+++ b/src/square/types/order_line_item_pricing_blocklists_blocked_tax.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class OrderLineItemPricingBlocklistsBlockedTax(UncheckedBaseModel):
diff --git a/src/square/types/order_line_item_tax.py b/src/square/types/order_line_item_tax.py
index 1c30f056..3ded4046 100644
--- a/src/square/types/order_line_item_tax.py
+++ b/src/square/types/order_line_item_tax.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_line_item_tax_type import OrderLineItemTaxType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .money import Money
 from .order_line_item_tax_scope import OrderLineItemTaxScope
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .order_line_item_tax_type import OrderLineItemTaxType
 
 
 class OrderLineItemTax(UncheckedBaseModel):
diff --git a/src/square/types/order_money_amounts.py b/src/square/types/order_money_amounts.py
index 0e7e73de..dfc6ef72 100644
--- a/src/square/types/order_money_amounts.py
+++ b/src/square/types/order_money_amounts.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .money import Money
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class OrderMoneyAmounts(UncheckedBaseModel):
diff --git a/src/square/types/order_pricing_options.py b/src/square/types/order_pricing_options.py
index 47f2ee39..358a8acb 100644
--- a/src/square/types/order_pricing_options.py
+++ b/src/square/types/order_pricing_options.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class OrderPricingOptions(UncheckedBaseModel):
diff --git a/src/square/types/order_quantity_unit.py b/src/square/types/order_quantity_unit.py
index ae97717a..55918d8b 100644
--- a/src/square/types/order_quantity_unit.py
+++ b/src/square/types/order_quantity_unit.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .measurement_unit import MeasurementUnit
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .measurement_unit import MeasurementUnit
 
 
 class OrderQuantityUnit(UncheckedBaseModel):
diff --git a/src/square/types/order_return.py b/src/square/types/order_return.py
index 3c6cc02b..2a62a7d1 100644
--- a/src/square/types/order_return.py
+++ b/src/square/types/order_return.py
@@ -1,16 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_money_amounts import OrderMoneyAmounts
+from .order_return_discount import OrderReturnDiscount
 from .order_return_line_item import OrderReturnLineItem
 from .order_return_service_charge import OrderReturnServiceCharge
 from .order_return_tax import OrderReturnTax
-from .order_return_discount import OrderReturnDiscount
 from .order_return_tip import OrderReturnTip
 from .order_rounding_adjustment import OrderRoundingAdjustment
-from .order_money_amounts import OrderMoneyAmounts
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class OrderReturn(UncheckedBaseModel):
diff --git a/src/square/types/order_return_discount.py b/src/square/types/order_return_discount.py
index 22725a69..f2d1f703 100644
--- a/src/square/types/order_return_discount.py
+++ b/src/square/types/order_return_discount.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_line_item_discount_type import OrderLineItemDiscountType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .money import Money
 from .order_line_item_discount_scope import OrderLineItemDiscountScope
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .order_line_item_discount_type import OrderLineItemDiscountType
 
 
 class OrderReturnDiscount(UncheckedBaseModel):
diff --git a/src/square/types/order_return_line_item.py b/src/square/types/order_return_line_item.py
index 168473c5..d29033ba 100644
--- a/src/square/types/order_return_line_item.py
+++ b/src/square/types/order_return_line_item.py
@@ -1,16 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_quantity_unit import OrderQuantityUnit
-from .order_line_item_item_type import OrderLineItemItemType
-from .order_return_line_item_modifier import OrderReturnLineItemModifier
-from .order_line_item_applied_tax import OrderLineItemAppliedTax
-from .order_line_item_applied_discount import OrderLineItemAppliedDiscount
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .money import Money
+from .order_line_item_applied_discount import OrderLineItemAppliedDiscount
 from .order_line_item_applied_service_charge import OrderLineItemAppliedServiceCharge
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .order_line_item_applied_tax import OrderLineItemAppliedTax
+from .order_line_item_item_type import OrderLineItemItemType
+from .order_quantity_unit import OrderQuantityUnit
+from .order_return_line_item_modifier import OrderReturnLineItemModifier
 
 
 class OrderReturnLineItem(UncheckedBaseModel):
diff --git a/src/square/types/order_return_line_item_modifier.py b/src/square/types/order_return_line_item_modifier.py
index f7b63131..e2c8d1ae 100644
--- a/src/square/types/order_return_line_item_modifier.py
+++ b/src/square/types/order_return_line_item_modifier.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class OrderReturnLineItemModifier(UncheckedBaseModel):
diff --git a/src/square/types/order_return_service_charge.py b/src/square/types/order_return_service_charge.py
index d5f1ac60..05897ff3 100644
--- a/src/square/types/order_return_service_charge.py
+++ b/src/square/types/order_return_service_charge.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .money import Money
-from .order_service_charge_calculation_phase import OrderServiceChargeCalculationPhase
 from .order_line_item_applied_tax import OrderLineItemAppliedTax
-from .order_service_charge_treatment_type import OrderServiceChargeTreatmentType
+from .order_service_charge_calculation_phase import OrderServiceChargeCalculationPhase
 from .order_service_charge_scope import OrderServiceChargeScope
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .order_service_charge_treatment_type import OrderServiceChargeTreatmentType
 
 
 class OrderReturnServiceCharge(UncheckedBaseModel):
diff --git a/src/square/types/order_return_tax.py b/src/square/types/order_return_tax.py
index 5479b9d7..e7643418 100644
--- a/src/square/types/order_return_tax.py
+++ b/src/square/types/order_return_tax.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_line_item_tax_type import OrderLineItemTaxType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .money import Money
 from .order_line_item_tax_scope import OrderLineItemTaxScope
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .order_line_item_tax_type import OrderLineItemTaxType
 
 
 class OrderReturnTax(UncheckedBaseModel):
diff --git a/src/square/types/order_return_tip.py b/src/square/types/order_return_tip.py
index 1a7ce590..6d053012 100644
--- a/src/square/types/order_return_tip.py
+++ b/src/square/types/order_return_tip.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class OrderReturnTip(UncheckedBaseModel):
diff --git a/src/square/types/order_reward.py b/src/square/types/order_reward.py
index 244ca36c..7647b317 100644
--- a/src/square/types/order_reward.py
+++ b/src/square/types/order_reward.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class OrderReward(UncheckedBaseModel):
diff --git a/src/square/types/order_rounding_adjustment.py b/src/square/types/order_rounding_adjustment.py
index ef853e45..7a06e979 100644
--- a/src/square/types/order_rounding_adjustment.py
+++ b/src/square/types/order_rounding_adjustment.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class OrderRoundingAdjustment(UncheckedBaseModel):
diff --git a/src/square/types/order_service_charge.py b/src/square/types/order_service_charge.py
index 887a46d0..ed4d657d 100644
--- a/src/square/types/order_service_charge.py
+++ b/src/square/types/order_service_charge.py
@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .money import Money
-from .order_service_charge_calculation_phase import OrderServiceChargeCalculationPhase
 from .order_line_item_applied_tax import OrderLineItemAppliedTax
-from .order_service_charge_type import OrderServiceChargeType
-from .order_service_charge_treatment_type import OrderServiceChargeTreatmentType
+from .order_service_charge_calculation_phase import OrderServiceChargeCalculationPhase
 from .order_service_charge_scope import OrderServiceChargeScope
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .order_service_charge_treatment_type import OrderServiceChargeTreatmentType
+from .order_service_charge_type import OrderServiceChargeType
 
 
 class OrderServiceCharge(UncheckedBaseModel):
diff --git a/src/square/types/order_source.py b/src/square/types/order_source.py
index ec1345f1..10ff98a1 100644
--- a/src/square/types/order_source.py
+++ b/src/square/types/order_source.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class OrderSource(UncheckedBaseModel):
diff --git a/src/square/types/order_updated.py b/src/square/types/order_updated.py
index 03235a45..23b8870c 100644
--- a/src/square/types/order_updated.py
+++ b/src/square/types/order_updated.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_state import OrderState
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_state import OrderState
 
 
 class OrderUpdated(UncheckedBaseModel):
diff --git a/src/square/types/order_updated_event.py b/src/square/types/order_updated_event.py
index f339fad0..9747299c 100644
--- a/src/square/types/order_updated_event.py
+++ b/src/square/types/order_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_updated_event_data import OrderUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_updated_event_data import OrderUpdatedEventData
 
 
 class OrderUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/order_updated_event_data.py b/src/square/types/order_updated_event_data.py
index 2197c796..eff47378 100644
--- a/src/square/types/order_updated_event_data.py
+++ b/src/square/types/order_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .order_updated_object import OrderUpdatedObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_updated_object import OrderUpdatedObject
 
 
 class OrderUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/order_updated_object.py b/src/square/types/order_updated_object.py
index 144a4bfa..f828b8ea 100644
--- a/src/square/types/order_updated_object.py
+++ b/src/square/types/order_updated_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order_updated import OrderUpdated
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_updated import OrderUpdated
 
 
 class OrderUpdatedObject(UncheckedBaseModel):
diff --git a/src/square/types/pause_subscription_response.py b/src/square/types/pause_subscription_response.py
index 8d7181bd..629dd902 100644
--- a/src/square/types/pause_subscription_response.py
+++ b/src/square/types/pause_subscription_response.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 from .subscription import Subscription
 from .subscription_action import SubscriptionAction
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class PauseSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/pay_order_response.py b/src/square/types/pay_order_response.py
index 1bfb3ecf..a843bf2f 100644
--- a/src/square/types/pay_order_response.py
+++ b/src/square/types/pay_order_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .order import Order
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .order import Order
 
 
 class PayOrderResponse(UncheckedBaseModel):
diff --git a/src/square/types/payment.py b/src/square/types/payment.py
index c13f5203..0aa202c6 100644
--- a/src/square/types/payment.py
+++ b/src/square/types/payment.py
@@ -1,23 +1,24 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
-from .processing_fee import ProcessingFee
-from .card_payment_details import CardPaymentDetails
-from .cash_payment_details import CashPaymentDetails
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .address import Address
+from .application_details import ApplicationDetails
 from .bank_account_payment_details import BankAccountPaymentDetails
-from .external_payment_details import ExternalPaymentDetails
-from .digital_wallet_details import DigitalWalletDetails
 from .buy_now_pay_later_details import BuyNowPayLaterDetails
-from .square_account_details import SquareAccountDetails
-from .risk_evaluation import RiskEvaluation
-from .address import Address
+from .card_payment_details import CardPaymentDetails
+from .cash_payment_details import CashPaymentDetails
 from .device_details import DeviceDetails
-from .application_details import ApplicationDetails
+from .digital_wallet_details import DigitalWalletDetails
+from .external_payment_details import ExternalPaymentDetails
+from .money import Money
 from .offline_payment_details import OfflinePaymentDetails
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .processing_fee import ProcessingFee
+from .risk_evaluation import RiskEvaluation
+from .square_account_details import SquareAccountDetails
 
 
 class Payment(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_app_fee_refund_detail.py b/src/square/types/payment_balance_activity_app_fee_refund_detail.py
index 604033ab..5c3d7263 100644
--- a/src/square/types/payment_balance_activity_app_fee_refund_detail.py
+++ b/src/square/types/payment_balance_activity_app_fee_refund_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityAppFeeRefundDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_app_fee_revenue_detail.py b/src/square/types/payment_balance_activity_app_fee_revenue_detail.py
index 4f7b5ceb..a9837c88 100644
--- a/src/square/types/payment_balance_activity_app_fee_revenue_detail.py
+++ b/src/square/types/payment_balance_activity_app_fee_revenue_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityAppFeeRevenueDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_automatic_savings_detail.py b/src/square/types/payment_balance_activity_automatic_savings_detail.py
index 63aea8d9..194e28a5 100644
--- a/src/square/types/payment_balance_activity_automatic_savings_detail.py
+++ b/src/square/types/payment_balance_activity_automatic_savings_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityAutomaticSavingsDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_automatic_savings_reversed_detail.py b/src/square/types/payment_balance_activity_automatic_savings_reversed_detail.py
index 5c9d7534..7dd72efb 100644
--- a/src/square/types/payment_balance_activity_automatic_savings_reversed_detail.py
+++ b/src/square/types/payment_balance_activity_automatic_savings_reversed_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityAutomaticSavingsReversedDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_charge_detail.py b/src/square/types/payment_balance_activity_charge_detail.py
index 14165a91..68f4eb03 100644
--- a/src/square/types/payment_balance_activity_charge_detail.py
+++ b/src/square/types/payment_balance_activity_charge_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityChargeDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_deposit_fee_detail.py b/src/square/types/payment_balance_activity_deposit_fee_detail.py
index 0e3eee97..e5512efd 100644
--- a/src/square/types/payment_balance_activity_deposit_fee_detail.py
+++ b/src/square/types/payment_balance_activity_deposit_fee_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityDepositFeeDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_deposit_fee_reversed_detail.py b/src/square/types/payment_balance_activity_deposit_fee_reversed_detail.py
index 688a29e3..fe0862be 100644
--- a/src/square/types/payment_balance_activity_deposit_fee_reversed_detail.py
+++ b/src/square/types/payment_balance_activity_deposit_fee_reversed_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityDepositFeeReversedDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_dispute_detail.py b/src/square/types/payment_balance_activity_dispute_detail.py
index 529c7c80..76d9d5cd 100644
--- a/src/square/types/payment_balance_activity_dispute_detail.py
+++ b/src/square/types/payment_balance_activity_dispute_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityDisputeDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_fee_detail.py b/src/square/types/payment_balance_activity_fee_detail.py
index 4453b601..021ce622 100644
--- a/src/square/types/payment_balance_activity_fee_detail.py
+++ b/src/square/types/payment_balance_activity_fee_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityFeeDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_free_processing_detail.py b/src/square/types/payment_balance_activity_free_processing_detail.py
index 545d2b2f..ae7bf838 100644
--- a/src/square/types/payment_balance_activity_free_processing_detail.py
+++ b/src/square/types/payment_balance_activity_free_processing_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityFreeProcessingDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_hold_adjustment_detail.py b/src/square/types/payment_balance_activity_hold_adjustment_detail.py
index a64024d3..d338e95b 100644
--- a/src/square/types/payment_balance_activity_hold_adjustment_detail.py
+++ b/src/square/types/payment_balance_activity_hold_adjustment_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityHoldAdjustmentDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_open_dispute_detail.py b/src/square/types/payment_balance_activity_open_dispute_detail.py
index 6f1f9628..7ebc669c 100644
--- a/src/square/types/payment_balance_activity_open_dispute_detail.py
+++ b/src/square/types/payment_balance_activity_open_dispute_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityOpenDisputeDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_other_adjustment_detail.py b/src/square/types/payment_balance_activity_other_adjustment_detail.py
index 6fff84b7..c7467d04 100644
--- a/src/square/types/payment_balance_activity_other_adjustment_detail.py
+++ b/src/square/types/payment_balance_activity_other_adjustment_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityOtherAdjustmentDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_other_detail.py b/src/square/types/payment_balance_activity_other_detail.py
index 3b63d70b..f10f0494 100644
--- a/src/square/types/payment_balance_activity_other_detail.py
+++ b/src/square/types/payment_balance_activity_other_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityOtherDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_refund_detail.py b/src/square/types/payment_balance_activity_refund_detail.py
index a23f7dad..808111c8 100644
--- a/src/square/types/payment_balance_activity_refund_detail.py
+++ b/src/square/types/payment_balance_activity_refund_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityRefundDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_release_adjustment_detail.py b/src/square/types/payment_balance_activity_release_adjustment_detail.py
index f2eb2bbf..0b9b61a2 100644
--- a/src/square/types/payment_balance_activity_release_adjustment_detail.py
+++ b/src/square/types/payment_balance_activity_release_adjustment_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityReleaseAdjustmentDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_reserve_hold_detail.py b/src/square/types/payment_balance_activity_reserve_hold_detail.py
index cfb81ba9..12be4de0 100644
--- a/src/square/types/payment_balance_activity_reserve_hold_detail.py
+++ b/src/square/types/payment_balance_activity_reserve_hold_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityReserveHoldDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_reserve_release_detail.py b/src/square/types/payment_balance_activity_reserve_release_detail.py
index ab7a4c54..bfe662e5 100644
--- a/src/square/types/payment_balance_activity_reserve_release_detail.py
+++ b/src/square/types/payment_balance_activity_reserve_release_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityReserveReleaseDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_square_capital_payment_detail.py b/src/square/types/payment_balance_activity_square_capital_payment_detail.py
index b198bba5..670d0735 100644
--- a/src/square/types/payment_balance_activity_square_capital_payment_detail.py
+++ b/src/square/types/payment_balance_activity_square_capital_payment_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivitySquareCapitalPaymentDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_square_capital_reversed_payment_detail.py b/src/square/types/payment_balance_activity_square_capital_reversed_payment_detail.py
index f19c008f..e09b3e2b 100644
--- a/src/square/types/payment_balance_activity_square_capital_reversed_payment_detail.py
+++ b/src/square/types/payment_balance_activity_square_capital_reversed_payment_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivitySquareCapitalReversedPaymentDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_square_payroll_transfer_detail.py b/src/square/types/payment_balance_activity_square_payroll_transfer_detail.py
index 82368631..2e72a3fc 100644
--- a/src/square/types/payment_balance_activity_square_payroll_transfer_detail.py
+++ b/src/square/types/payment_balance_activity_square_payroll_transfer_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivitySquarePayrollTransferDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_square_payroll_transfer_reversed_detail.py b/src/square/types/payment_balance_activity_square_payroll_transfer_reversed_detail.py
index 5c0c983f..ccd86445 100644
--- a/src/square/types/payment_balance_activity_square_payroll_transfer_reversed_detail.py
+++ b/src/square/types/payment_balance_activity_square_payroll_transfer_reversed_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivitySquarePayrollTransferReversedDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_tax_on_fee_detail.py b/src/square/types/payment_balance_activity_tax_on_fee_detail.py
index 115e8334..f979d002 100644
--- a/src/square/types/payment_balance_activity_tax_on_fee_detail.py
+++ b/src/square/types/payment_balance_activity_tax_on_fee_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityTaxOnFeeDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_third_party_fee_detail.py b/src/square/types/payment_balance_activity_third_party_fee_detail.py
index ebbf52df..156925fb 100644
--- a/src/square/types/payment_balance_activity_third_party_fee_detail.py
+++ b/src/square/types/payment_balance_activity_third_party_fee_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityThirdPartyFeeDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_balance_activity_third_party_fee_refund_detail.py b/src/square/types/payment_balance_activity_third_party_fee_refund_detail.py
index 6952de9c..2242799f 100644
--- a/src/square/types/payment_balance_activity_third_party_fee_refund_detail.py
+++ b/src/square/types/payment_balance_activity_third_party_fee_refund_detail.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PaymentBalanceActivityThirdPartyFeeRefundDetail(UncheckedBaseModel):
diff --git a/src/square/types/payment_created_event.py b/src/square/types/payment_created_event.py
index ab79a811..4c648880 100644
--- a/src/square/types/payment_created_event.py
+++ b/src/square/types/payment_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payment_created_event_data import PaymentCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payment_created_event_data import PaymentCreatedEventData
 
 
 class PaymentCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/payment_created_event_data.py b/src/square/types/payment_created_event_data.py
index 2b23779a..44f4d192 100644
--- a/src/square/types/payment_created_event_data.py
+++ b/src/square/types/payment_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payment_created_event_object import PaymentCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payment_created_event_object import PaymentCreatedEventObject
 
 
 class PaymentCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/payment_created_event_object.py b/src/square/types/payment_created_event_object.py
index d5a95458..acd369e6 100644
--- a/src/square/types/payment_created_event_object.py
+++ b/src/square/types/payment_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payment import Payment
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payment import Payment
 
 
 class PaymentCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/payment_link.py b/src/square/types/payment_link.py
index ed449bf8..69fb541e 100644
--- a/src/square/types/payment_link.py
+++ b/src/square/types/payment_link.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .checkout_options import CheckoutOptions
 from .pre_populated_data import PrePopulatedData
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class PaymentLink(UncheckedBaseModel):
diff --git a/src/square/types/payment_link_related_resources.py b/src/square/types/payment_link_related_resources.py
index 03a09dd3..c0aee782 100644
--- a/src/square/types/payment_link_related_resources.py
+++ b/src/square/types/payment_link_related_resources.py
@@ -1,21 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .order import Order
+
 import pydantic
-from .catalog_object import CatalogObject
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order import Order
 
 
 class PaymentLinkRelatedResources(UncheckedBaseModel):
@@ -24,7 +16,7 @@ class PaymentLinkRelatedResources(UncheckedBaseModel):
     The order associated with the payment link.
     """
 
-    subscription_plans: typing.Optional[typing.List[CatalogObject]] = pydantic.Field(default=None)
+    subscription_plans: typing.Optional[typing.List["CatalogObject"]] = pydantic.Field(default=None)
     """
     The subscription plan associated with the payment link.
     """
@@ -37,3 +29,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(PaymentLinkRelatedResources)
diff --git a/src/square/types/payment_options.py b/src/square/types/payment_options.py
index b2df7da8..f08ebf6e 100644
--- a/src/square/types/payment_options.py
+++ b/src/square/types/payment_options.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payment_options_delay_action import PaymentOptionsDelayAction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payment_options_delay_action import PaymentOptionsDelayAction
 
 
 class PaymentOptions(UncheckedBaseModel):
diff --git a/src/square/types/payment_refund.py b/src/square/types/payment_refund.py
index 25669f65..d8ca22d5 100644
--- a/src/square/types/payment_refund.py
+++ b/src/square/types/payment_refund.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .destination_details import DestinationDetails
 from .money import Money
 from .processing_fee import ProcessingFee
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class PaymentRefund(UncheckedBaseModel):
diff --git a/src/square/types/payment_updated_event.py b/src/square/types/payment_updated_event.py
index c0780100..7d2a7bd1 100644
--- a/src/square/types/payment_updated_event.py
+++ b/src/square/types/payment_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payment_updated_event_data import PaymentUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payment_updated_event_data import PaymentUpdatedEventData
 
 
 class PaymentUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/payment_updated_event_data.py b/src/square/types/payment_updated_event_data.py
index 67f89b89..0b03f8e2 100644
--- a/src/square/types/payment_updated_event_data.py
+++ b/src/square/types/payment_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payment_updated_event_object import PaymentUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payment_updated_event_object import PaymentUpdatedEventObject
 
 
 class PaymentUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/payment_updated_event_object.py b/src/square/types/payment_updated_event_object.py
index eca63951..678e0714 100644
--- a/src/square/types/payment_updated_event_object.py
+++ b/src/square/types/payment_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payment import Payment
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payment import Payment
 
 
 class PaymentUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/payout.py b/src/square/types/payout.py
index 1ba629d3..558e8b94 100644
--- a/src/square/types/payout.py
+++ b/src/square/types/payout.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .payout_status import PayoutStatus
-from .money import Money
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .destination import Destination
-from .payout_type import PayoutType
+from .money import Money
 from .payout_fee import PayoutFee
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .payout_status import PayoutStatus
+from .payout_type import PayoutType
 
 
 class Payout(UncheckedBaseModel):
diff --git a/src/square/types/payout_entry.py b/src/square/types/payout_entry.py
index 3e5c206b..e2e402bf 100644
--- a/src/square/types/payout_entry.py
+++ b/src/square/types/payout_entry.py
@@ -1,12 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .activity_type import ActivityType
 from .money import Money
-from .payment_balance_activity_app_fee_revenue_detail import PaymentBalanceActivityAppFeeRevenueDetail
 from .payment_balance_activity_app_fee_refund_detail import PaymentBalanceActivityAppFeeRefundDetail
+from .payment_balance_activity_app_fee_revenue_detail import PaymentBalanceActivityAppFeeRevenueDetail
 from .payment_balance_activity_automatic_savings_detail import PaymentBalanceActivityAutomaticSavingsDetail
 from .payment_balance_activity_automatic_savings_reversed_detail import (
     PaymentBalanceActivityAutomaticSavingsReversedDetail,
@@ -19,8 +21,8 @@
 from .payment_balance_activity_free_processing_detail import PaymentBalanceActivityFreeProcessingDetail
 from .payment_balance_activity_hold_adjustment_detail import PaymentBalanceActivityHoldAdjustmentDetail
 from .payment_balance_activity_open_dispute_detail import PaymentBalanceActivityOpenDisputeDetail
-from .payment_balance_activity_other_detail import PaymentBalanceActivityOtherDetail
 from .payment_balance_activity_other_adjustment_detail import PaymentBalanceActivityOtherAdjustmentDetail
+from .payment_balance_activity_other_detail import PaymentBalanceActivityOtherDetail
 from .payment_balance_activity_refund_detail import PaymentBalanceActivityRefundDetail
 from .payment_balance_activity_release_adjustment_detail import PaymentBalanceActivityReleaseAdjustmentDetail
 from .payment_balance_activity_reserve_hold_detail import PaymentBalanceActivityReserveHoldDetail
@@ -29,14 +31,13 @@
 from .payment_balance_activity_square_capital_reversed_payment_detail import (
     PaymentBalanceActivitySquareCapitalReversedPaymentDetail,
 )
-from .payment_balance_activity_tax_on_fee_detail import PaymentBalanceActivityTaxOnFeeDetail
-from .payment_balance_activity_third_party_fee_detail import PaymentBalanceActivityThirdPartyFeeDetail
-from .payment_balance_activity_third_party_fee_refund_detail import PaymentBalanceActivityThirdPartyFeeRefundDetail
 from .payment_balance_activity_square_payroll_transfer_detail import PaymentBalanceActivitySquarePayrollTransferDetail
 from .payment_balance_activity_square_payroll_transfer_reversed_detail import (
     PaymentBalanceActivitySquarePayrollTransferReversedDetail,
 )
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .payment_balance_activity_tax_on_fee_detail import PaymentBalanceActivityTaxOnFeeDetail
+from .payment_balance_activity_third_party_fee_detail import PaymentBalanceActivityThirdPartyFeeDetail
+from .payment_balance_activity_third_party_fee_refund_detail import PaymentBalanceActivityThirdPartyFeeRefundDetail
 
 
 class PayoutEntry(UncheckedBaseModel):
diff --git a/src/square/types/payout_failed_event.py b/src/square/types/payout_failed_event.py
index 68fb4841..44ca89f1 100644
--- a/src/square/types/payout_failed_event.py
+++ b/src/square/types/payout_failed_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payout_failed_event_data import PayoutFailedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payout_failed_event_data import PayoutFailedEventData
 
 
 class PayoutFailedEvent(UncheckedBaseModel):
diff --git a/src/square/types/payout_failed_event_data.py b/src/square/types/payout_failed_event_data.py
index 98f95536..bd105d40 100644
--- a/src/square/types/payout_failed_event_data.py
+++ b/src/square/types/payout_failed_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payout_failed_event_object import PayoutFailedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payout_failed_event_object import PayoutFailedEventObject
 
 
 class PayoutFailedEventData(UncheckedBaseModel):
diff --git a/src/square/types/payout_failed_event_object.py b/src/square/types/payout_failed_event_object.py
index fee208f4..1ad87b7e 100644
--- a/src/square/types/payout_failed_event_object.py
+++ b/src/square/types/payout_failed_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payout import Payout
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payout import Payout
 
 
 class PayoutFailedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/payout_fee.py b/src/square/types/payout_fee.py
index 68ac46dc..a7405bdf 100644
--- a/src/square/types/payout_fee.py
+++ b/src/square/types/payout_fee.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .money import Money
+
 import pydantic
-from .payout_fee_type import PayoutFeeType
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
+from .payout_fee_type import PayoutFeeType
 
 
 class PayoutFee(UncheckedBaseModel):
diff --git a/src/square/types/payout_paid_event.py b/src/square/types/payout_paid_event.py
index 814ed56e..bcfed920 100644
--- a/src/square/types/payout_paid_event.py
+++ b/src/square/types/payout_paid_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payout_paid_event_data import PayoutPaidEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payout_paid_event_data import PayoutPaidEventData
 
 
 class PayoutPaidEvent(UncheckedBaseModel):
diff --git a/src/square/types/payout_paid_event_data.py b/src/square/types/payout_paid_event_data.py
index 572eb1de..93c770e5 100644
--- a/src/square/types/payout_paid_event_data.py
+++ b/src/square/types/payout_paid_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payout_paid_event_object import PayoutPaidEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payout_paid_event_object import PayoutPaidEventObject
 
 
 class PayoutPaidEventData(UncheckedBaseModel):
diff --git a/src/square/types/payout_paid_event_object.py b/src/square/types/payout_paid_event_object.py
index 5e6cf68e..cb61272f 100644
--- a/src/square/types/payout_paid_event_object.py
+++ b/src/square/types/payout_paid_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payout import Payout
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payout import Payout
 
 
 class PayoutPaidEventObject(UncheckedBaseModel):
diff --git a/src/square/types/payout_sent_event.py b/src/square/types/payout_sent_event.py
index 4584fac7..28a70d55 100644
--- a/src/square/types/payout_sent_event.py
+++ b/src/square/types/payout_sent_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payout_sent_event_data import PayoutSentEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payout_sent_event_data import PayoutSentEventData
 
 
 class PayoutSentEvent(UncheckedBaseModel):
diff --git a/src/square/types/payout_sent_event_data.py b/src/square/types/payout_sent_event_data.py
index e6f4d5ac..6fbceed3 100644
--- a/src/square/types/payout_sent_event_data.py
+++ b/src/square/types/payout_sent_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .payout_sent_event_object import PayoutSentEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payout_sent_event_object import PayoutSentEventObject
 
 
 class PayoutSentEventData(UncheckedBaseModel):
diff --git a/src/square/types/payout_sent_event_object.py b/src/square/types/payout_sent_event_object.py
index 3dbbe2c9..9260f305 100644
--- a/src/square/types/payout_sent_event_object.py
+++ b/src/square/types/payout_sent_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payout import Payout
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payout import Payout
 
 
 class PayoutSentEventObject(UncheckedBaseModel):
diff --git a/src/square/types/phase.py b/src/square/types/phase.py
index 10831034..8c14da28 100644
--- a/src/square/types/phase.py
+++ b/src/square/types/phase.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class Phase(UncheckedBaseModel):
diff --git a/src/square/types/phase_input.py b/src/square/types/phase_input.py
index 88cf50e0..e7700065 100644
--- a/src/square/types/phase_input.py
+++ b/src/square/types/phase_input.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class PhaseInput(UncheckedBaseModel):
diff --git a/src/square/types/pre_populated_data.py b/src/square/types/pre_populated_data.py
index 1519304b..e5b5142d 100644
--- a/src/square/types/pre_populated_data.py
+++ b/src/square/types/pre_populated_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .address import Address
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .address import Address
 
 
 class PrePopulatedData(UncheckedBaseModel):
diff --git a/src/square/types/processing_fee.py b/src/square/types/processing_fee.py
index d80dba0b..611c13a3 100644
--- a/src/square/types/processing_fee.py
+++ b/src/square/types/processing_fee.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class ProcessingFee(UncheckedBaseModel):
diff --git a/src/square/types/publish_invoice_response.py b/src/square/types/publish_invoice_response.py
index 5daa7639..655e9336 100644
--- a/src/square/types/publish_invoice_response.py
+++ b/src/square/types/publish_invoice_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .invoice import Invoice
 
 
 class PublishInvoiceResponse(UncheckedBaseModel):
diff --git a/src/square/types/publish_scheduled_shift_response.py b/src/square/types/publish_scheduled_shift_response.py
index 01dfdd04..8ef96d33 100644
--- a/src/square/types/publish_scheduled_shift_response.py
+++ b/src/square/types/publish_scheduled_shift_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .scheduled_shift import ScheduledShift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .scheduled_shift import ScheduledShift
 
 
 class PublishScheduledShiftResponse(UncheckedBaseModel):
diff --git a/src/square/types/qr_code_options.py b/src/square/types/qr_code_options.py
index dafd496e..563871cc 100644
--- a/src/square/types/qr_code_options.py
+++ b/src/square/types/qr_code_options.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class QrCodeOptions(UncheckedBaseModel):
diff --git a/src/square/types/quick_pay.py b/src/square/types/quick_pay.py
index 30848383..5fd63b19 100644
--- a/src/square/types/quick_pay.py
+++ b/src/square/types/quick_pay.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class QuickPay(UncheckedBaseModel):
diff --git a/src/square/types/range.py b/src/square/types/range.py
index fb2ed0c0..255ce500 100644
--- a/src/square/types/range.py
+++ b/src/square/types/range.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class Range(UncheckedBaseModel):
diff --git a/src/square/types/receipt_options.py b/src/square/types/receipt_options.py
index 2d9b6389..9d2297a7 100644
--- a/src/square/types/receipt_options.py
+++ b/src/square/types/receipt_options.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class ReceiptOptions(UncheckedBaseModel):
diff --git a/src/square/types/redeem_loyalty_reward_response.py b/src/square/types/redeem_loyalty_reward_response.py
index 93d60562..1a14280c 100644
--- a/src/square/types/redeem_loyalty_reward_response.py
+++ b/src/square/types/redeem_loyalty_reward_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_event import LoyaltyEvent
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_event import LoyaltyEvent
 
 
 class RedeemLoyaltyRewardResponse(UncheckedBaseModel):
diff --git a/src/square/types/refund.py b/src/square/types/refund.py
index 67ddcd48..b1c67432 100644
--- a/src/square/types/refund.py
+++ b/src/square/types/refund.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .additional_recipient import AdditionalRecipient
 from .money import Money
 from .refund_status import RefundStatus
-from .additional_recipient import AdditionalRecipient
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Refund(UncheckedBaseModel):
diff --git a/src/square/types/refund_created_event.py b/src/square/types/refund_created_event.py
index 630a7d74..f491d1ee 100644
--- a/src/square/types/refund_created_event.py
+++ b/src/square/types/refund_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .refund_created_event_data import RefundCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .refund_created_event_data import RefundCreatedEventData
 
 
 class RefundCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/refund_created_event_data.py b/src/square/types/refund_created_event_data.py
index 81aed93b..0f0bdbcf 100644
--- a/src/square/types/refund_created_event_data.py
+++ b/src/square/types/refund_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .refund_created_event_object import RefundCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .refund_created_event_object import RefundCreatedEventObject
 
 
 class RefundCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/refund_created_event_object.py b/src/square/types/refund_created_event_object.py
index 4d841ab6..ed80cb70 100644
--- a/src/square/types/refund_created_event_object.py
+++ b/src/square/types/refund_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payment_refund import PaymentRefund
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payment_refund import PaymentRefund
 
 
 class RefundCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/refund_payment_response.py b/src/square/types/refund_payment_response.py
index b2bbd941..491b3518 100644
--- a/src/square/types/refund_payment_response.py
+++ b/src/square/types/refund_payment_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment_refund import PaymentRefund
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment_refund import PaymentRefund
 
 
 class RefundPaymentResponse(UncheckedBaseModel):
diff --git a/src/square/types/refund_updated_event.py b/src/square/types/refund_updated_event.py
index 184a232a..c2f377a9 100644
--- a/src/square/types/refund_updated_event.py
+++ b/src/square/types/refund_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .refund_updated_event_data import RefundUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .refund_updated_event_data import RefundUpdatedEventData
 
 
 class RefundUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/refund_updated_event_data.py b/src/square/types/refund_updated_event_data.py
index 2886110b..d6e1962e 100644
--- a/src/square/types/refund_updated_event_data.py
+++ b/src/square/types/refund_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .refund_updated_event_object import RefundUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .refund_updated_event_object import RefundUpdatedEventObject
 
 
 class RefundUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/refund_updated_event_object.py b/src/square/types/refund_updated_event_object.py
index f52b0ac1..2b3499b5 100644
--- a/src/square/types/refund_updated_event_object.py
+++ b/src/square/types/refund_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .payment_refund import PaymentRefund
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .payment_refund import PaymentRefund
 
 
 class RefundUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/register_domain_response.py b/src/square/types/register_domain_response.py
index 665f01de..2ed831f4 100644
--- a/src/square/types/register_domain_response.py
+++ b/src/square/types/register_domain_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .register_domain_response_status import RegisterDomainResponseStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .register_domain_response_status import RegisterDomainResponseStatus
 
 
 class RegisterDomainResponse(UncheckedBaseModel):
diff --git a/src/square/types/remove_group_from_customer_response.py b/src/square/types/remove_group_from_customer_response.py
index 573269e1..fbaf140e 100644
--- a/src/square/types/remove_group_from_customer_response.py
+++ b/src/square/types/remove_group_from_customer_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class RemoveGroupFromCustomerResponse(UncheckedBaseModel):
diff --git a/src/square/types/resume_subscription_response.py b/src/square/types/resume_subscription_response.py
index 6c16a406..e9f65e94 100644
--- a/src/square/types/resume_subscription_response.py
+++ b/src/square/types/resume_subscription_response.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 from .subscription import Subscription
 from .subscription_action import SubscriptionAction
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class ResumeSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_booking_custom_attribute_definition_response.py b/src/square/types/retrieve_booking_custom_attribute_definition_response.py
index 2a29bff1..33b225ed 100644
--- a/src/square/types/retrieve_booking_custom_attribute_definition_response.py
+++ b/src/square/types/retrieve_booking_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class RetrieveBookingCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_booking_custom_attribute_response.py b/src/square/types/retrieve_booking_custom_attribute_response.py
index 789c2da7..f22deff5 100644
--- a/src/square/types/retrieve_booking_custom_attribute_response.py
+++ b/src/square/types/retrieve_booking_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class RetrieveBookingCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_job_response.py b/src/square/types/retrieve_job_response.py
index 653b8d1c..62ce4252 100644
--- a/src/square/types/retrieve_job_response.py
+++ b/src/square/types/retrieve_job_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .job import Job
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .job import Job
 
 
 class RetrieveJobResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_location_booking_profile_response.py b/src/square/types/retrieve_location_booking_profile_response.py
index 06b327cd..5d100846 100644
--- a/src/square/types/retrieve_location_booking_profile_response.py
+++ b/src/square/types/retrieve_location_booking_profile_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .location_booking_profile import LocationBookingProfile
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .location_booking_profile import LocationBookingProfile
 
 
 class RetrieveLocationBookingProfileResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_location_custom_attribute_definition_response.py b/src/square/types/retrieve_location_custom_attribute_definition_response.py
index b877ec2f..73bc8bcf 100644
--- a/src/square/types/retrieve_location_custom_attribute_definition_response.py
+++ b/src/square/types/retrieve_location_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class RetrieveLocationCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_location_custom_attribute_response.py b/src/square/types/retrieve_location_custom_attribute_response.py
index 017d6191..0bc149d2 100644
--- a/src/square/types/retrieve_location_custom_attribute_response.py
+++ b/src/square/types/retrieve_location_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class RetrieveLocationCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_location_settings_response.py b/src/square/types/retrieve_location_settings_response.py
index 27d70176..ee467a57 100644
--- a/src/square/types/retrieve_location_settings_response.py
+++ b/src/square/types/retrieve_location_settings_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .checkout_location_settings import CheckoutLocationSettings
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .checkout_location_settings import CheckoutLocationSettings
+from .error import Error
 
 
 class RetrieveLocationSettingsResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_merchant_custom_attribute_definition_response.py b/src/square/types/retrieve_merchant_custom_attribute_definition_response.py
index 3e55a525..12cc6468 100644
--- a/src/square/types/retrieve_merchant_custom_attribute_definition_response.py
+++ b/src/square/types/retrieve_merchant_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class RetrieveMerchantCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_merchant_custom_attribute_response.py b/src/square/types/retrieve_merchant_custom_attribute_response.py
index ef44cec8..92bf2585 100644
--- a/src/square/types/retrieve_merchant_custom_attribute_response.py
+++ b/src/square/types/retrieve_merchant_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class RetrieveMerchantCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_merchant_settings_response.py b/src/square/types/retrieve_merchant_settings_response.py
index 8128faab..d651c1a0 100644
--- a/src/square/types/retrieve_merchant_settings_response.py
+++ b/src/square/types/retrieve_merchant_settings_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .checkout_merchant_settings import CheckoutMerchantSettings
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .checkout_merchant_settings import CheckoutMerchantSettings
+from .error import Error
 
 
 class RetrieveMerchantSettingsResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_order_custom_attribute_definition_response.py b/src/square/types/retrieve_order_custom_attribute_definition_response.py
index 058f8bc4..8690e34b 100644
--- a/src/square/types/retrieve_order_custom_attribute_definition_response.py
+++ b/src/square/types/retrieve_order_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class RetrieveOrderCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_order_custom_attribute_response.py b/src/square/types/retrieve_order_custom_attribute_response.py
index 65e111db..482c2fbb 100644
--- a/src/square/types/retrieve_order_custom_attribute_response.py
+++ b/src/square/types/retrieve_order_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class RetrieveOrderCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_scheduled_shift_response.py b/src/square/types/retrieve_scheduled_shift_response.py
index af04b22d..46b49a28 100644
--- a/src/square/types/retrieve_scheduled_shift_response.py
+++ b/src/square/types/retrieve_scheduled_shift_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .scheduled_shift import ScheduledShift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .scheduled_shift import ScheduledShift
 
 
 class RetrieveScheduledShiftResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_timecard_response.py b/src/square/types/retrieve_timecard_response.py
index f9491bf7..7acfa5fd 100644
--- a/src/square/types/retrieve_timecard_response.py
+++ b/src/square/types/retrieve_timecard_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .timecard import Timecard
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .timecard import Timecard
 
 
 class RetrieveTimecardResponse(UncheckedBaseModel):
diff --git a/src/square/types/retrieve_token_status_response.py b/src/square/types/retrieve_token_status_response.py
index 6f723947..1bdc92b4 100644
--- a/src/square/types/retrieve_token_status_response.py
+++ b/src/square/types/retrieve_token_status_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class RetrieveTokenStatusResponse(UncheckedBaseModel):
diff --git a/src/square/types/revoke_token_response.py b/src/square/types/revoke_token_response.py
index 736eb37a..84b07a15 100644
--- a/src/square/types/revoke_token_response.py
+++ b/src/square/types/revoke_token_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class RevokeTokenResponse(UncheckedBaseModel):
diff --git a/src/square/types/risk_evaluation.py b/src/square/types/risk_evaluation.py
index 53301ef7..0aae9651 100644
--- a/src/square/types/risk_evaluation.py
+++ b/src/square/types/risk_evaluation.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .risk_evaluation_risk_level import RiskEvaluationRiskLevel
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .risk_evaluation_risk_level import RiskEvaluationRiskLevel
 
 
 class RiskEvaluation(UncheckedBaseModel):
diff --git a/src/square/types/save_card_options.py b/src/square/types/save_card_options.py
index 477320bb..e4c0e5c7 100644
--- a/src/square/types/save_card_options.py
+++ b/src/square/types/save_card_options.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class SaveCardOptions(UncheckedBaseModel):
diff --git a/src/square/types/scheduled_shift.py b/src/square/types/scheduled_shift.py
index f5df0727..b7a53661 100644
--- a/src/square/types/scheduled_shift.py
+++ b/src/square/types/scheduled_shift.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .scheduled_shift_details import ScheduledShiftDetails
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .scheduled_shift_details import ScheduledShiftDetails
 
 
 class ScheduledShift(UncheckedBaseModel):
diff --git a/src/square/types/scheduled_shift_details.py b/src/square/types/scheduled_shift_details.py
index 24d19b63..a7983f98 100644
--- a/src/square/types/scheduled_shift_details.py
+++ b/src/square/types/scheduled_shift_details.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class ScheduledShiftDetails(UncheckedBaseModel):
diff --git a/src/square/types/scheduled_shift_filter.py b/src/square/types/scheduled_shift_filter.py
index f1319355..964db084 100644
--- a/src/square/types/scheduled_shift_filter.py
+++ b/src/square/types/scheduled_shift_filter.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .time_range import TimeRange
-from .scheduled_shift_workday import ScheduledShiftWorkday
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .scheduled_shift_filter_assignment_status import ScheduledShiftFilterAssignmentStatus
 from .scheduled_shift_filter_scheduled_shift_status import ScheduledShiftFilterScheduledShiftStatus
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .scheduled_shift_workday import ScheduledShiftWorkday
+from .time_range import TimeRange
 
 
 class ScheduledShiftFilter(UncheckedBaseModel):
diff --git a/src/square/types/scheduled_shift_query.py b/src/square/types/scheduled_shift_query.py
index 6c0f0166..ebf8ede1 100644
--- a/src/square/types/scheduled_shift_query.py
+++ b/src/square/types/scheduled_shift_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .scheduled_shift_filter import ScheduledShiftFilter
+
 import pydantic
-from .scheduled_shift_sort import ScheduledShiftSort
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .scheduled_shift_filter import ScheduledShiftFilter
+from .scheduled_shift_sort import ScheduledShiftSort
 
 
 class ScheduledShiftQuery(UncheckedBaseModel):
diff --git a/src/square/types/scheduled_shift_sort.py b/src/square/types/scheduled_shift_sort.py
index a4cd8c9c..0fce7b00 100644
--- a/src/square/types/scheduled_shift_sort.py
+++ b/src/square/types/scheduled_shift_sort.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .scheduled_shift_sort_field import ScheduledShiftSortField
+
 import pydantic
-from .sort_order import SortOrder
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .scheduled_shift_sort_field import ScheduledShiftSortField
+from .sort_order import SortOrder
 
 
 class ScheduledShiftSort(UncheckedBaseModel):
diff --git a/src/square/types/scheduled_shift_workday.py b/src/square/types/scheduled_shift_workday.py
index d5ef0dff..cb6c67df 100644
--- a/src/square/types/scheduled_shift_workday.py
+++ b/src/square/types/scheduled_shift_workday.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .date_range import DateRange
+
 import pydantic
-from .scheduled_shift_workday_matcher import ScheduledShiftWorkdayMatcher
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .date_range import DateRange
+from .scheduled_shift_workday_matcher import ScheduledShiftWorkdayMatcher
 
 
 class ScheduledShiftWorkday(UncheckedBaseModel):
diff --git a/src/square/types/search_availability_filter.py b/src/square/types/search_availability_filter.py
index 6e7ef5ab..a5199b03 100644
--- a/src/square/types/search_availability_filter.py
+++ b/src/square/types/search_availability_filter.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .time_range import TimeRange
-import pydantic
 import typing
-from .segment_filter import SegmentFilter
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .segment_filter import SegmentFilter
+from .time_range import TimeRange
 
 
 class SearchAvailabilityFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_availability_query.py b/src/square/types/search_availability_query.py
index 04cb8413..687927ff 100644
--- a/src/square/types/search_availability_query.py
+++ b/src/square/types/search_availability_query.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .search_availability_filter import SearchAvailabilityFilter
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .search_availability_filter import SearchAvailabilityFilter
 
 
 class SearchAvailabilityQuery(UncheckedBaseModel):
diff --git a/src/square/types/search_availability_response.py b/src/square/types/search_availability_response.py
index 241920f1..1caf0388 100644
--- a/src/square/types/search_availability_response.py
+++ b/src/square/types/search_availability_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .availability import Availability
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .availability import Availability
+from .error import Error
 
 
 class SearchAvailabilityResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_catalog_items_response.py b/src/square/types/search_catalog_items_response.py
index e69f2893..c751e262 100644
--- a/src/square/types/search_catalog_items_response.py
+++ b/src/square/types/search_catalog_items_response.py
@@ -1,21 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
-from .catalog_object import CatalogObject
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class SearchCatalogItemsResponse(UncheckedBaseModel):
@@ -28,7 +20,7 @@ class SearchCatalogItemsResponse(UncheckedBaseModel):
     Any errors that occurred during the request.
     """
 
-    items: typing.Optional[typing.List[CatalogObject]] = pydantic.Field(default=None)
+    items: typing.Optional[typing.List["CatalogObject"]] = pydantic.Field(default=None)
     """
     Returned items matching the specified query expressions.
     """
@@ -51,3 +43,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(SearchCatalogItemsResponse)
diff --git a/src/square/types/search_catalog_objects_response.py b/src/square/types/search_catalog_objects_response.py
index 909afd50..147f1392 100644
--- a/src/square/types/search_catalog_objects_response.py
+++ b/src/square/types/search_catalog_objects_response.py
@@ -1,21 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
-from .catalog_object import CatalogObject
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class SearchCatalogObjectsResponse(UncheckedBaseModel):
@@ -30,12 +22,12 @@ class SearchCatalogObjectsResponse(UncheckedBaseModel):
     See [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination) for more information.
     """
 
-    objects: typing.Optional[typing.List[CatalogObject]] = pydantic.Field(default=None)
+    objects: typing.Optional[typing.List["CatalogObject"]] = pydantic.Field(default=None)
     """
     The CatalogObjects returned.
     """
 
-    related_objects: typing.Optional[typing.List[CatalogObject]] = pydantic.Field(default=None)
+    related_objects: typing.Optional[typing.List["CatalogObject"]] = pydantic.Field(default=None)
     """
     A list of CatalogObjects referenced by the objects in the `objects` field.
     """
@@ -54,3 +46,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(SearchCatalogObjectsResponse)
diff --git a/src/square/types/search_customers_response.py b/src/square/types/search_customers_response.py
index 519220a1..62cb756a 100644
--- a/src/square/types/search_customers_response.py
+++ b/src/square/types/search_customers_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer import Customer
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer import Customer
+from .error import Error
 
 
 class SearchCustomersResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_events_filter.py b/src/square/types/search_events_filter.py
index 92ed7fa2..df8abc0a 100644
--- a/src/square/types/search_events_filter.py
+++ b/src/square/types/search_events_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .time_range import TimeRange
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .time_range import TimeRange
 
 
 class SearchEventsFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_events_query.py b/src/square/types/search_events_query.py
index f0ef217e..e5d2714a 100644
--- a/src/square/types/search_events_query.py
+++ b/src/square/types/search_events_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .search_events_filter import SearchEventsFilter
+
 import pydantic
-from .search_events_sort import SearchEventsSort
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .search_events_filter import SearchEventsFilter
+from .search_events_sort import SearchEventsSort
 
 
 class SearchEventsQuery(UncheckedBaseModel):
diff --git a/src/square/types/search_events_response.py b/src/square/types/search_events_response.py
index 87b7ba17..60de5720 100644
--- a/src/square/types/search_events_response.py
+++ b/src/square/types/search_events_response.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 from .event import Event
 from .event_metadata import EventMetadata
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class SearchEventsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_events_sort.py b/src/square/types/search_events_sort.py
index 80fa5d0e..c19d2a6f 100644
--- a/src/square/types/search_events_sort.py
+++ b/src/square/types/search_events_sort.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .search_events_sort_field import SearchEventsSortField
+
 import pydantic
-from .sort_order import SortOrder
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .search_events_sort_field import SearchEventsSortField
+from .sort_order import SortOrder
 
 
 class SearchEventsSort(UncheckedBaseModel):
diff --git a/src/square/types/search_invoices_response.py b/src/square/types/search_invoices_response.py
index 3127f917..f1667c80 100644
--- a/src/square/types/search_invoices_response.py
+++ b/src/square/types/search_invoices_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .invoice import Invoice
 
 
 class SearchInvoicesResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_loyalty_accounts_request_loyalty_account_query.py b/src/square/types/search_loyalty_accounts_request_loyalty_account_query.py
index a36c9133..8569862e 100644
--- a/src/square/types/search_loyalty_accounts_request_loyalty_account_query.py
+++ b/src/square/types/search_loyalty_accounts_request_loyalty_account_query.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .loyalty_account_mapping import LoyaltyAccountMapping
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_account_mapping import LoyaltyAccountMapping
 
 
 class SearchLoyaltyAccountsRequestLoyaltyAccountQuery(UncheckedBaseModel):
diff --git a/src/square/types/search_loyalty_accounts_response.py b/src/square/types/search_loyalty_accounts_response.py
index 222bc75c..ec5c12b8 100644
--- a/src/square/types/search_loyalty_accounts_response.py
+++ b/src/square/types/search_loyalty_accounts_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_account import LoyaltyAccount
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_account import LoyaltyAccount
 
 
 class SearchLoyaltyAccountsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_loyalty_events_response.py b/src/square/types/search_loyalty_events_response.py
index 9895c498..8d829383 100644
--- a/src/square/types/search_loyalty_events_response.py
+++ b/src/square/types/search_loyalty_events_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_event import LoyaltyEvent
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_event import LoyaltyEvent
 
 
 class SearchLoyaltyEventsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_loyalty_rewards_request_loyalty_reward_query.py b/src/square/types/search_loyalty_rewards_request_loyalty_reward_query.py
index bbc13d78..9511036d 100644
--- a/src/square/types/search_loyalty_rewards_request_loyalty_reward_query.py
+++ b/src/square/types/search_loyalty_rewards_request_loyalty_reward_query.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .loyalty_reward_status import LoyaltyRewardStatus
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .loyalty_reward_status import LoyaltyRewardStatus
 
 
 class SearchLoyaltyRewardsRequestLoyaltyRewardQuery(UncheckedBaseModel):
diff --git a/src/square/types/search_loyalty_rewards_response.py b/src/square/types/search_loyalty_rewards_response.py
index 37908f2c..4b99eb31 100644
--- a/src/square/types/search_loyalty_rewards_response.py
+++ b/src/square/types/search_loyalty_rewards_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .loyalty_reward import LoyaltyReward
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .loyalty_reward import LoyaltyReward
 
 
 class SearchLoyaltyRewardsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_orders_customer_filter.py b/src/square/types/search_orders_customer_filter.py
index df8c0b74..5517c7ae 100644
--- a/src/square/types/search_orders_customer_filter.py
+++ b/src/square/types/search_orders_customer_filter.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class SearchOrdersCustomerFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_orders_date_time_filter.py b/src/square/types/search_orders_date_time_filter.py
index 1e95a76b..69006eb1 100644
--- a/src/square/types/search_orders_date_time_filter.py
+++ b/src/square/types/search_orders_date_time_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .time_range import TimeRange
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .time_range import TimeRange
 
 
 class SearchOrdersDateTimeFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_orders_filter.py b/src/square/types/search_orders_filter.py
index d0be0905..d7a50ab7 100644
--- a/src/square/types/search_orders_filter.py
+++ b/src/square/types/search_orders_filter.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .search_orders_state_filter import SearchOrdersStateFilter
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .search_orders_customer_filter import SearchOrdersCustomerFilter
 from .search_orders_date_time_filter import SearchOrdersDateTimeFilter
 from .search_orders_fulfillment_filter import SearchOrdersFulfillmentFilter
 from .search_orders_source_filter import SearchOrdersSourceFilter
-from .search_orders_customer_filter import SearchOrdersCustomerFilter
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .search_orders_state_filter import SearchOrdersStateFilter
 
 
 class SearchOrdersFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_orders_fulfillment_filter.py b/src/square/types/search_orders_fulfillment_filter.py
index 0a32a574..c0bff795 100644
--- a/src/square/types/search_orders_fulfillment_filter.py
+++ b/src/square/types/search_orders_fulfillment_filter.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .fulfillment_type import FulfillmentType
+
 import pydantic
-from .fulfillment_state import FulfillmentState
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .fulfillment_state import FulfillmentState
+from .fulfillment_type import FulfillmentType
 
 
 class SearchOrdersFulfillmentFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_orders_query.py b/src/square/types/search_orders_query.py
index cc15d8a6..d1c46564 100644
--- a/src/square/types/search_orders_query.py
+++ b/src/square/types/search_orders_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .search_orders_filter import SearchOrdersFilter
+
 import pydantic
-from .search_orders_sort import SearchOrdersSort
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .search_orders_filter import SearchOrdersFilter
+from .search_orders_sort import SearchOrdersSort
 
 
 class SearchOrdersQuery(UncheckedBaseModel):
diff --git a/src/square/types/search_orders_response.py b/src/square/types/search_orders_response.py
index 66fa1e98..6ed1bed1 100644
--- a/src/square/types/search_orders_response.py
+++ b/src/square/types/search_orders_response.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order_entry import OrderEntry
+
 import pydantic
-from .order import Order
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .order import Order
+from .order_entry import OrderEntry
 
 
 class SearchOrdersResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_orders_sort.py b/src/square/types/search_orders_sort.py
index fdaf7df6..7aeef304 100644
--- a/src/square/types/search_orders_sort.py
+++ b/src/square/types/search_orders_sort.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import typing
+
+import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
 from ..core.unchecked_base_model import UncheckedBaseModel
 from .search_orders_sort_field import SearchOrdersSortField
-import pydantic
-import typing
 from .sort_order import SortOrder
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class SearchOrdersSort(UncheckedBaseModel):
diff --git a/src/square/types/search_orders_source_filter.py b/src/square/types/search_orders_source_filter.py
index 988cb9ea..4dd471bf 100644
--- a/src/square/types/search_orders_source_filter.py
+++ b/src/square/types/search_orders_source_filter.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class SearchOrdersSourceFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_orders_state_filter.py b/src/square/types/search_orders_state_filter.py
index 54d00fe1..ed764aa5 100644
--- a/src/square/types/search_orders_state_filter.py
+++ b/src/square/types/search_orders_state_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order_state import OrderState
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .order_state import OrderState
 
 
 class SearchOrdersStateFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_scheduled_shifts_response.py b/src/square/types/search_scheduled_shifts_response.py
index 7f0cbca4..ae173696 100644
--- a/src/square/types/search_scheduled_shifts_response.py
+++ b/src/square/types/search_scheduled_shifts_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .scheduled_shift import ScheduledShift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .scheduled_shift import ScheduledShift
 
 
 class SearchScheduledShiftsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_shifts_response.py b/src/square/types/search_shifts_response.py
index 19297f4e..5ad9c840 100644
--- a/src/square/types/search_shifts_response.py
+++ b/src/square/types/search_shifts_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .shift import Shift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .shift import Shift
 
 
 class SearchShiftsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_subscriptions_filter.py b/src/square/types/search_subscriptions_filter.py
index 6c940d24..e166c156 100644
--- a/src/square/types/search_subscriptions_filter.py
+++ b/src/square/types/search_subscriptions_filter.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class SearchSubscriptionsFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_subscriptions_query.py b/src/square/types/search_subscriptions_query.py
index 3259d346..7cabaa68 100644
--- a/src/square/types/search_subscriptions_query.py
+++ b/src/square/types/search_subscriptions_query.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .search_subscriptions_filter import SearchSubscriptionsFilter
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .search_subscriptions_filter import SearchSubscriptionsFilter
 
 
 class SearchSubscriptionsQuery(UncheckedBaseModel):
diff --git a/src/square/types/search_subscriptions_response.py b/src/square/types/search_subscriptions_response.py
index 75082d3e..725134ff 100644
--- a/src/square/types/search_subscriptions_response.py
+++ b/src/square/types/search_subscriptions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .subscription import Subscription
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .subscription import Subscription
 
 
 class SearchSubscriptionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_team_members_filter.py b/src/square/types/search_team_members_filter.py
index e4430519..be85906a 100644
--- a/src/square/types/search_team_members_filter.py
+++ b/src/square/types/search_team_members_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .team_member_status import TeamMemberStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member_status import TeamMemberStatus
 
 
 class SearchTeamMembersFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_team_members_query.py b/src/square/types/search_team_members_query.py
index 5730e497..f74d92bf 100644
--- a/src/square/types/search_team_members_query.py
+++ b/src/square/types/search_team_members_query.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .search_team_members_filter import SearchTeamMembersFilter
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .search_team_members_filter import SearchTeamMembersFilter
 
 
 class SearchTeamMembersQuery(UncheckedBaseModel):
diff --git a/src/square/types/search_team_members_response.py b/src/square/types/search_team_members_response.py
index ea46d869..c59d62ee 100644
--- a/src/square/types/search_team_members_response.py
+++ b/src/square/types/search_team_members_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member import TeamMember
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .team_member import TeamMember
 
 
 class SearchTeamMembersResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_terminal_actions_response.py b/src/square/types/search_terminal_actions_response.py
index ef15fe65..97efa277 100644
--- a/src/square/types/search_terminal_actions_response.py
+++ b/src/square/types/search_terminal_actions_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_action import TerminalAction
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_action import TerminalAction
 
 
 class SearchTerminalActionsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_terminal_checkouts_response.py b/src/square/types/search_terminal_checkouts_response.py
index 78fe0f61..19077baa 100644
--- a/src/square/types/search_terminal_checkouts_response.py
+++ b/src/square/types/search_terminal_checkouts_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_checkout import TerminalCheckout
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_checkout import TerminalCheckout
 
 
 class SearchTerminalCheckoutsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_terminal_refunds_response.py b/src/square/types/search_terminal_refunds_response.py
index bb3114e7..7d3d6d21 100644
--- a/src/square/types/search_terminal_refunds_response.py
+++ b/src/square/types/search_terminal_refunds_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .terminal_refund import TerminalRefund
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .terminal_refund import TerminalRefund
 
 
 class SearchTerminalRefundsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_timecards_response.py b/src/square/types/search_timecards_response.py
index af79bc9c..3f34141c 100644
--- a/src/square/types/search_timecards_response.py
+++ b/src/square/types/search_timecards_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .timecard import Timecard
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .timecard import Timecard
 
 
 class SearchTimecardsResponse(UncheckedBaseModel):
diff --git a/src/square/types/search_vendors_request_filter.py b/src/square/types/search_vendors_request_filter.py
index c14d02cb..99752ffc 100644
--- a/src/square/types/search_vendors_request_filter.py
+++ b/src/square/types/search_vendors_request_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .vendor_status import VendorStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .vendor_status import VendorStatus
 
 
 class SearchVendorsRequestFilter(UncheckedBaseModel):
diff --git a/src/square/types/search_vendors_request_sort.py b/src/square/types/search_vendors_request_sort.py
index 1d9ba70e..e272eb50 100644
--- a/src/square/types/search_vendors_request_sort.py
+++ b/src/square/types/search_vendors_request_sort.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .search_vendors_request_sort_field import SearchVendorsRequestSortField
+
 import pydantic
-from .sort_order import SortOrder
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .search_vendors_request_sort_field import SearchVendorsRequestSortField
+from .sort_order import SortOrder
 
 
 class SearchVendorsRequestSort(UncheckedBaseModel):
diff --git a/src/square/types/search_vendors_response.py b/src/square/types/search_vendors_response.py
index cbc9b7e3..af0d5c83 100644
--- a/src/square/types/search_vendors_response.py
+++ b/src/square/types/search_vendors_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .vendor import Vendor
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .vendor import Vendor
 
 
 class SearchVendorsResponse(UncheckedBaseModel):
diff --git a/src/square/types/segment_filter.py b/src/square/types/segment_filter.py
index e76e357e..f4de1af3 100644
--- a/src/square/types/segment_filter.py
+++ b/src/square/types/segment_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .filter_value import FilterValue
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .filter_value import FilterValue
 
 
 class SegmentFilter(UncheckedBaseModel):
diff --git a/src/square/types/select_option.py b/src/square/types/select_option.py
index 75f52bbc..a4a8bad3 100644
--- a/src/square/types/select_option.py
+++ b/src/square/types/select_option.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class SelectOption(UncheckedBaseModel):
diff --git a/src/square/types/select_options.py b/src/square/types/select_options.py
index 27ba583a..2ab14535 100644
--- a/src/square/types/select_options.py
+++ b/src/square/types/select_options.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .select_option import SelectOption
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .select_option import SelectOption
 
 
 class SelectOptions(UncheckedBaseModel):
diff --git a/src/square/types/shift.py b/src/square/types/shift.py
index d11dd1d3..c510d03e 100644
--- a/src/square/types/shift.py
+++ b/src/square/types/shift.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .shift_wage import ShiftWage
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .break_ import Break
-from .shift_status import ShiftStatus
 from .money import Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .shift_status import ShiftStatus
+from .shift_wage import ShiftWage
 
 
 class Shift(UncheckedBaseModel):
diff --git a/src/square/types/shift_filter.py b/src/square/types/shift_filter.py
index 2d482e62..1126f97a 100644
--- a/src/square/types/shift_filter.py
+++ b/src/square/types/shift_filter.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .shift_filter_status import ShiftFilterStatus
-from .time_range import TimeRange
 from .shift_workday import ShiftWorkday
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .time_range import TimeRange
 
 
 class ShiftFilter(UncheckedBaseModel):
diff --git a/src/square/types/shift_query.py b/src/square/types/shift_query.py
index 4a15e652..de2c7730 100644
--- a/src/square/types/shift_query.py
+++ b/src/square/types/shift_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .shift_filter import ShiftFilter
+
 import pydantic
-from .shift_sort import ShiftSort
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .shift_filter import ShiftFilter
+from .shift_sort import ShiftSort
 
 
 class ShiftQuery(UncheckedBaseModel):
diff --git a/src/square/types/shift_sort.py b/src/square/types/shift_sort.py
index 98a7fece..39c5eadc 100644
--- a/src/square/types/shift_sort.py
+++ b/src/square/types/shift_sort.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .shift_sort_field import ShiftSortField
+
 import pydantic
-from .sort_order import SortOrder
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .shift_sort_field import ShiftSortField
+from .sort_order import SortOrder
 
 
 class ShiftSort(UncheckedBaseModel):
diff --git a/src/square/types/shift_wage.py b/src/square/types/shift_wage.py
index f93a2ad7..bda2d11d 100644
--- a/src/square/types/shift_wage.py
+++ b/src/square/types/shift_wage.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class ShiftWage(UncheckedBaseModel):
diff --git a/src/square/types/shift_workday.py b/src/square/types/shift_workday.py
index 23d6607c..ddc1944d 100644
--- a/src/square/types/shift_workday.py
+++ b/src/square/types/shift_workday.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .date_range import DateRange
+
 import pydantic
-from .shift_workday_matcher import ShiftWorkdayMatcher
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .date_range import DateRange
+from .shift_workday_matcher import ShiftWorkdayMatcher
 
 
 class ShiftWorkday(UncheckedBaseModel):
diff --git a/src/square/types/shipping_fee.py b/src/square/types/shipping_fee.py
index dbea2e82..b5ef4d4c 100644
--- a/src/square/types/shipping_fee.py
+++ b/src/square/types/shipping_fee.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class ShippingFee(UncheckedBaseModel):
diff --git a/src/square/types/signature_image.py b/src/square/types/signature_image.py
index e40d38e4..6d3afcec 100644
--- a/src/square/types/signature_image.py
+++ b/src/square/types/signature_image.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class SignatureImage(UncheckedBaseModel):
diff --git a/src/square/types/signature_options.py b/src/square/types/signature_options.py
index 3e982b41..9428f479 100644
--- a/src/square/types/signature_options.py
+++ b/src/square/types/signature_options.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
 import typing
-from .signature_image import SignatureImage
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .signature_image import SignatureImage
 
 
 class SignatureOptions(UncheckedBaseModel):
diff --git a/src/square/types/site.py b/src/square/types/site.py
index 15ae6850..d846ac34 100644
--- a/src/square/types/site.py
+++ b/src/square/types/site.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class Site(UncheckedBaseModel):
diff --git a/src/square/types/snippet.py b/src/square/types/snippet.py
index c48ead3c..c6531f94 100644
--- a/src/square/types/snippet.py
+++ b/src/square/types/snippet.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class Snippet(UncheckedBaseModel):
diff --git a/src/square/types/source_application.py b/src/square/types/source_application.py
index 7b798b9a..43d6322b 100644
--- a/src/square/types/source_application.py
+++ b/src/square/types/source_application.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .product import Product
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .product import Product
 
 
 class SourceApplication(UncheckedBaseModel):
diff --git a/src/square/types/square_account_details.py b/src/square/types/square_account_details.py
index 0575c421..6df86514 100644
--- a/src/square/types/square_account_details.py
+++ b/src/square/types/square_account_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class SquareAccountDetails(UncheckedBaseModel):
diff --git a/src/square/types/standard_unit_description.py b/src/square/types/standard_unit_description.py
index 39b4d1b8..2fec3e0c 100644
--- a/src/square/types/standard_unit_description.py
+++ b/src/square/types/standard_unit_description.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .measurement_unit import MeasurementUnit
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .measurement_unit import MeasurementUnit
 
 
 class StandardUnitDescription(UncheckedBaseModel):
diff --git a/src/square/types/standard_unit_description_group.py b/src/square/types/standard_unit_description_group.py
index f978bce1..40753dd4 100644
--- a/src/square/types/standard_unit_description_group.py
+++ b/src/square/types/standard_unit_description_group.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .standard_unit_description import StandardUnitDescription
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .standard_unit_description import StandardUnitDescription
 
 
 class StandardUnitDescriptionGroup(UncheckedBaseModel):
diff --git a/src/square/types/submit_evidence_response.py b/src/square/types/submit_evidence_response.py
index dd429c51..ff8b906d 100644
--- a/src/square/types/submit_evidence_response.py
+++ b/src/square/types/submit_evidence_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .dispute import Dispute
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .dispute import Dispute
+from .error import Error
 
 
 class SubmitEvidenceResponse(UncheckedBaseModel):
diff --git a/src/square/types/subscription.py b/src/square/types/subscription.py
index 61656697..623bbb00 100644
--- a/src/square/types/subscription.py
+++ b/src/square/types/subscription.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .subscription_status import SubscriptionStatus
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .money import Money
-from .subscription_source import SubscriptionSource
-from .subscription_action import SubscriptionAction
 from .phase import Phase
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .subscription_action import SubscriptionAction
+from .subscription_source import SubscriptionSource
+from .subscription_status import SubscriptionStatus
 
 
 class Subscription(UncheckedBaseModel):
diff --git a/src/square/types/subscription_action.py b/src/square/types/subscription_action.py
index f42c31cb..67fe750b 100644
--- a/src/square/types/subscription_action.py
+++ b/src/square/types/subscription_action.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .subscription_action_type import SubscriptionActionType
-from .phase import Phase
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .phase import Phase
+from .subscription_action_type import SubscriptionActionType
 
 
 class SubscriptionAction(UncheckedBaseModel):
diff --git a/src/square/types/subscription_created_event.py b/src/square/types/subscription_created_event.py
index cfcbc959..bb129258 100644
--- a/src/square/types/subscription_created_event.py
+++ b/src/square/types/subscription_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .subscription_created_event_data import SubscriptionCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .subscription_created_event_data import SubscriptionCreatedEventData
 
 
 class SubscriptionCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/subscription_created_event_data.py b/src/square/types/subscription_created_event_data.py
index 34bad482..b0c3dead 100644
--- a/src/square/types/subscription_created_event_data.py
+++ b/src/square/types/subscription_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .subscription_created_event_object import SubscriptionCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .subscription_created_event_object import SubscriptionCreatedEventObject
 
 
 class SubscriptionCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/subscription_created_event_object.py b/src/square/types/subscription_created_event_object.py
index 23854c27..9f11d483 100644
--- a/src/square/types/subscription_created_event_object.py
+++ b/src/square/types/subscription_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .subscription import Subscription
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .subscription import Subscription
 
 
 class SubscriptionCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/subscription_event.py b/src/square/types/subscription_event.py
index acd2affd..4c9d079b 100644
--- a/src/square/types/subscription_event.py
+++ b/src/square/types/subscription_event.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-import pydantic
-from .subscription_event_subscription_event_type import SubscriptionEventSubscriptionEventType
 import typing
-from .subscription_event_info import SubscriptionEventInfo
-from .phase import Phase
+
+import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .phase import Phase
+from .subscription_event_info import SubscriptionEventInfo
+from .subscription_event_subscription_event_type import SubscriptionEventSubscriptionEventType
 
 
 class SubscriptionEvent(UncheckedBaseModel):
diff --git a/src/square/types/subscription_event_info.py b/src/square/types/subscription_event_info.py
index cf5a5080..edb3de01 100644
--- a/src/square/types/subscription_event_info.py
+++ b/src/square/types/subscription_event_info.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .subscription_event_info_code import SubscriptionEventInfoCode
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .subscription_event_info_code import SubscriptionEventInfoCode
 
 
 class SubscriptionEventInfo(UncheckedBaseModel):
diff --git a/src/square/types/subscription_phase.py b/src/square/types/subscription_phase.py
index b713f4a3..b25287d6 100644
--- a/src/square/types/subscription_phase.py
+++ b/src/square/types/subscription_phase.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .subscription_cadence import SubscriptionCadence
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .money import Money
+from .subscription_cadence import SubscriptionCadence
 from .subscription_pricing import SubscriptionPricing
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class SubscriptionPhase(UncheckedBaseModel):
diff --git a/src/square/types/subscription_pricing.py b/src/square/types/subscription_pricing.py
index 55d436e5..cbcc5f41 100644
--- a/src/square/types/subscription_pricing.py
+++ b/src/square/types/subscription_pricing.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .subscription_pricing_type import SubscriptionPricingType
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
+from .subscription_pricing_type import SubscriptionPricingType
 
 
 class SubscriptionPricing(UncheckedBaseModel):
diff --git a/src/square/types/subscription_source.py b/src/square/types/subscription_source.py
index 7150d22c..e9f89474 100644
--- a/src/square/types/subscription_source.py
+++ b/src/square/types/subscription_source.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class SubscriptionSource(UncheckedBaseModel):
diff --git a/src/square/types/subscription_test_result.py b/src/square/types/subscription_test_result.py
index 1ecfa6d0..cd82b2a1 100644
--- a/src/square/types/subscription_test_result.py
+++ b/src/square/types/subscription_test_result.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class SubscriptionTestResult(UncheckedBaseModel):
diff --git a/src/square/types/subscription_updated_event.py b/src/square/types/subscription_updated_event.py
index f09b7f5e..927d6a25 100644
--- a/src/square/types/subscription_updated_event.py
+++ b/src/square/types/subscription_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .subscription_updated_event_data import SubscriptionUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .subscription_updated_event_data import SubscriptionUpdatedEventData
 
 
 class SubscriptionUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/subscription_updated_event_data.py b/src/square/types/subscription_updated_event_data.py
index 81075540..868d9b7d 100644
--- a/src/square/types/subscription_updated_event_data.py
+++ b/src/square/types/subscription_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .subscription_updated_event_object import SubscriptionUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .subscription_updated_event_object import SubscriptionUpdatedEventObject
 
 
 class SubscriptionUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/subscription_updated_event_object.py b/src/square/types/subscription_updated_event_object.py
index f0bb4c76..99d715cd 100644
--- a/src/square/types/subscription_updated_event_object.py
+++ b/src/square/types/subscription_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .subscription import Subscription
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .subscription import Subscription
 
 
 class SubscriptionUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/swap_plan_response.py b/src/square/types/swap_plan_response.py
index 3a16d053..f459dc62 100644
--- a/src/square/types/swap_plan_response.py
+++ b/src/square/types/swap_plan_response.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 from .subscription import Subscription
 from .subscription_action import SubscriptionAction
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class SwapPlanResponse(UncheckedBaseModel):
diff --git a/src/square/types/tax_ids.py b/src/square/types/tax_ids.py
index b85cd296..fc6a5a58 100644
--- a/src/square/types/tax_ids.py
+++ b/src/square/types/tax_ids.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class TaxIds(UncheckedBaseModel):
diff --git a/src/square/types/team_member.py b/src/square/types/team_member.py
index ba9dfccc..52d5054f 100644
--- a/src/square/types/team_member.py
+++ b/src/square/types/team_member.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .team_member_status import TeamMemberStatus
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .team_member_assigned_locations import TeamMemberAssignedLocations
+from .team_member_status import TeamMemberStatus
 from .wage_setting import WageSetting
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class TeamMember(UncheckedBaseModel):
diff --git a/src/square/types/team_member_assigned_locations.py b/src/square/types/team_member_assigned_locations.py
index 9bff9be6..b99dd87d 100644
--- a/src/square/types/team_member_assigned_locations.py
+++ b/src/square/types/team_member_assigned_locations.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member_assigned_locations_assignment_type import TeamMemberAssignedLocationsAssignmentType
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member_assigned_locations_assignment_type import TeamMemberAssignedLocationsAssignmentType
 
 
 class TeamMemberAssignedLocations(UncheckedBaseModel):
diff --git a/src/square/types/team_member_booking_profile.py b/src/square/types/team_member_booking_profile.py
index 0e987d84..e276c001 100644
--- a/src/square/types/team_member_booking_profile.py
+++ b/src/square/types/team_member_booking_profile.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class TeamMemberBookingProfile(UncheckedBaseModel):
diff --git a/src/square/types/team_member_created_event.py b/src/square/types/team_member_created_event.py
index 09e8a244..c2c3c7a4 100644
--- a/src/square/types/team_member_created_event.py
+++ b/src/square/types/team_member_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .team_member_created_event_data import TeamMemberCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member_created_event_data import TeamMemberCreatedEventData
 
 
 class TeamMemberCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/team_member_created_event_data.py b/src/square/types/team_member_created_event_data.py
index 8ba29bda..8255ebed 100644
--- a/src/square/types/team_member_created_event_data.py
+++ b/src/square/types/team_member_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .team_member_created_event_object import TeamMemberCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member_created_event_object import TeamMemberCreatedEventObject
 
 
 class TeamMemberCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/team_member_created_event_object.py b/src/square/types/team_member_created_event_object.py
index 3c9bceab..10c23a3b 100644
--- a/src/square/types/team_member_created_event_object.py
+++ b/src/square/types/team_member_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member import TeamMember
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member import TeamMember
 
 
 class TeamMemberCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/team_member_updated_event.py b/src/square/types/team_member_updated_event.py
index a60ab946..c1ced542 100644
--- a/src/square/types/team_member_updated_event.py
+++ b/src/square/types/team_member_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .team_member_updated_event_data import TeamMemberUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member_updated_event_data import TeamMemberUpdatedEventData
 
 
 class TeamMemberUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/team_member_updated_event_data.py b/src/square/types/team_member_updated_event_data.py
index edb7bc17..0992f618 100644
--- a/src/square/types/team_member_updated_event_data.py
+++ b/src/square/types/team_member_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .team_member_updated_event_object import TeamMemberUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member_updated_event_object import TeamMemberUpdatedEventObject
 
 
 class TeamMemberUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/team_member_updated_event_object.py b/src/square/types/team_member_updated_event_object.py
index 3a53f7b6..42cb4955 100644
--- a/src/square/types/team_member_updated_event_object.py
+++ b/src/square/types/team_member_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member import TeamMember
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member import TeamMember
 
 
 class TeamMemberUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/team_member_wage.py b/src/square/types/team_member_wage.py
index bcdca03f..f90e7c2c 100644
--- a/src/square/types/team_member_wage.py
+++ b/src/square/types/team_member_wage.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class TeamMemberWage(UncheckedBaseModel):
diff --git a/src/square/types/team_member_wage_setting_updated_event.py b/src/square/types/team_member_wage_setting_updated_event.py
index 6951a30a..5588869e 100644
--- a/src/square/types/team_member_wage_setting_updated_event.py
+++ b/src/square/types/team_member_wage_setting_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .team_member_wage_setting_updated_event_data import TeamMemberWageSettingUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member_wage_setting_updated_event_data import TeamMemberWageSettingUpdatedEventData
 
 
 class TeamMemberWageSettingUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/team_member_wage_setting_updated_event_data.py b/src/square/types/team_member_wage_setting_updated_event_data.py
index f81b7898..43daf7c5 100644
--- a/src/square/types/team_member_wage_setting_updated_event_data.py
+++ b/src/square/types/team_member_wage_setting_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .team_member_wage_setting_updated_event_object import TeamMemberWageSettingUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member_wage_setting_updated_event_object import TeamMemberWageSettingUpdatedEventObject
 
 
 class TeamMemberWageSettingUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/team_member_wage_setting_updated_event_object.py b/src/square/types/team_member_wage_setting_updated_event_object.py
index 648ef3bf..af41e735 100644
--- a/src/square/types/team_member_wage_setting_updated_event_object.py
+++ b/src/square/types/team_member_wage_setting_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .wage_setting import WageSetting
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .wage_setting import WageSetting
 
 
 class TeamMemberWageSettingUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/tender.py b/src/square/types/tender.py
index 633bb34d..a1f8e8e2 100644
--- a/src/square/types/tender.py
+++ b/src/square/types/tender.py
@@ -1,17 +1,18 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .additional_recipient import AdditionalRecipient
 from .money import Money
-from .tender_type import TenderType
-from .tender_card_details import TenderCardDetails
-from .tender_cash_details import TenderCashDetails
 from .tender_bank_account_details import TenderBankAccountDetails
 from .tender_buy_now_pay_later_details import TenderBuyNowPayLaterDetails
+from .tender_card_details import TenderCardDetails
+from .tender_cash_details import TenderCashDetails
 from .tender_square_account_details import TenderSquareAccountDetails
-from .additional_recipient import AdditionalRecipient
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .tender_type import TenderType
 
 
 class Tender(UncheckedBaseModel):
diff --git a/src/square/types/tender_bank_account_details.py b/src/square/types/tender_bank_account_details.py
index 3eca5c09..5b7aa424 100644
--- a/src/square/types/tender_bank_account_details.py
+++ b/src/square/types/tender_bank_account_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .tender_bank_account_details_status import TenderBankAccountDetailsStatus
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .tender_bank_account_details_status import TenderBankAccountDetailsStatus
 
 
 class TenderBankAccountDetails(UncheckedBaseModel):
diff --git a/src/square/types/tender_buy_now_pay_later_details.py b/src/square/types/tender_buy_now_pay_later_details.py
index 5def3410..bdc35650 100644
--- a/src/square/types/tender_buy_now_pay_later_details.py
+++ b/src/square/types/tender_buy_now_pay_later_details.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .tender_buy_now_pay_later_details_brand import TenderBuyNowPayLaterDetailsBrand
+
 import pydantic
-from .tender_buy_now_pay_later_details_status import TenderBuyNowPayLaterDetailsStatus
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .tender_buy_now_pay_later_details_brand import TenderBuyNowPayLaterDetailsBrand
+from .tender_buy_now_pay_later_details_status import TenderBuyNowPayLaterDetailsStatus
 
 
 class TenderBuyNowPayLaterDetails(UncheckedBaseModel):
diff --git a/src/square/types/tender_card_details.py b/src/square/types/tender_card_details.py
index 44534777..d544f761 100644
--- a/src/square/types/tender_card_details.py
+++ b/src/square/types/tender_card_details.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .tender_card_details_status import TenderCardDetailsStatus
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .card import Card
 from .tender_card_details_entry_method import TenderCardDetailsEntryMethod
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .tender_card_details_status import TenderCardDetailsStatus
 
 
 class TenderCardDetails(UncheckedBaseModel):
diff --git a/src/square/types/tender_cash_details.py b/src/square/types/tender_cash_details.py
index 6ce866ad..06589de2 100644
--- a/src/square/types/tender_cash_details.py
+++ b/src/square/types/tender_cash_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .money import Money
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class TenderCashDetails(UncheckedBaseModel):
diff --git a/src/square/types/tender_square_account_details.py b/src/square/types/tender_square_account_details.py
index 801f6bec..1a9cd7f9 100644
--- a/src/square/types/tender_square_account_details.py
+++ b/src/square/types/tender_square_account_details.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .tender_square_account_details_status import TenderSquareAccountDetailsStatus
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .tender_square_account_details_status import TenderSquareAccountDetailsStatus
 
 
 class TenderSquareAccountDetails(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action.py b/src/square/types/terminal_action.py
index 02b08174..428417dd 100644
--- a/src/square/types/terminal_action.py
+++ b/src/square/types/terminal_action.py
@@ -1,19 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .action_cancel_reason import ActionCancelReason
-from .terminal_action_action_type import TerminalActionActionType
-from .qr_code_options import QrCodeOptions
-from .save_card_options import SaveCardOptions
-from .signature_options import SignatureOptions
 from .confirmation_options import ConfirmationOptions
-from .receipt_options import ReceiptOptions
 from .data_collection_options import DataCollectionOptions
-from .select_options import SelectOptions
 from .device_metadata import DeviceMetadata
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .qr_code_options import QrCodeOptions
+from .receipt_options import ReceiptOptions
+from .save_card_options import SaveCardOptions
+from .select_options import SelectOptions
+from .signature_options import SignatureOptions
+from .terminal_action_action_type import TerminalActionActionType
 
 
 class TerminalAction(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action_created_event.py b/src/square/types/terminal_action_created_event.py
index 3bca1ea0..121e01db 100644
--- a/src/square/types/terminal_action_created_event.py
+++ b/src/square/types/terminal_action_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_action_created_event_data import TerminalActionCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_action_created_event_data import TerminalActionCreatedEventData
 
 
 class TerminalActionCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action_created_event_data.py b/src/square/types/terminal_action_created_event_data.py
index 5b0ca05c..c82760b7 100644
--- a/src/square/types/terminal_action_created_event_data.py
+++ b/src/square/types/terminal_action_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_action_created_event_object import TerminalActionCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_action_created_event_object import TerminalActionCreatedEventObject
 
 
 class TerminalActionCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action_created_event_object.py b/src/square/types/terminal_action_created_event_object.py
index 1f1e1d07..acb9eeb0 100644
--- a/src/square/types/terminal_action_created_event_object.py
+++ b/src/square/types/terminal_action_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .terminal_action import TerminalAction
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_action import TerminalAction
 
 
 class TerminalActionCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action_query.py b/src/square/types/terminal_action_query.py
index 9bafe4a4..2de9c807 100644
--- a/src/square/types/terminal_action_query.py
+++ b/src/square/types/terminal_action_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .terminal_action_query_filter import TerminalActionQueryFilter
+
 import pydantic
-from .terminal_action_query_sort import TerminalActionQuerySort
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_action_query_filter import TerminalActionQueryFilter
+from .terminal_action_query_sort import TerminalActionQuerySort
 
 
 class TerminalActionQuery(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action_query_filter.py b/src/square/types/terminal_action_query_filter.py
index 44558065..7b3941d4 100644
--- a/src/square/types/terminal_action_query_filter.py
+++ b/src/square/types/terminal_action_query_filter.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .time_range import TimeRange
-from .terminal_action_action_type import TerminalActionActionType
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_action_action_type import TerminalActionActionType
+from .time_range import TimeRange
 
 
 class TerminalActionQueryFilter(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action_query_sort.py b/src/square/types/terminal_action_query_sort.py
index 7637b769..53d01e60 100644
--- a/src/square/types/terminal_action_query_sort.py
+++ b/src/square/types/terminal_action_query_sort.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .sort_order import SortOrder
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .sort_order import SortOrder
 
 
 class TerminalActionQuerySort(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action_updated_event.py b/src/square/types/terminal_action_updated_event.py
index 7d141c63..3d0efd10 100644
--- a/src/square/types/terminal_action_updated_event.py
+++ b/src/square/types/terminal_action_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_action_updated_event_data import TerminalActionUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_action_updated_event_data import TerminalActionUpdatedEventData
 
 
 class TerminalActionUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action_updated_event_data.py b/src/square/types/terminal_action_updated_event_data.py
index 24c34337..8cfe0ca7 100644
--- a/src/square/types/terminal_action_updated_event_data.py
+++ b/src/square/types/terminal_action_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_action_updated_event_object import TerminalActionUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_action_updated_event_object import TerminalActionUpdatedEventObject
 
 
 class TerminalActionUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/terminal_action_updated_event_object.py b/src/square/types/terminal_action_updated_event_object.py
index 2d1de458..12f97a9b 100644
--- a/src/square/types/terminal_action_updated_event_object.py
+++ b/src/square/types/terminal_action_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .terminal_action import TerminalAction
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_action import TerminalAction
 
 
 class TerminalActionUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout.py b/src/square/types/terminal_checkout.py
index 4ff3d092..9ab4312b 100644
--- a/src/square/types/terminal_checkout.py
+++ b/src/square/types/terminal_checkout.py
@@ -1,14 +1,15 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
-from .payment_options import PaymentOptions
-from .device_checkout_options import DeviceCheckoutOptions
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .action_cancel_reason import ActionCancelReason
 from .checkout_options_payment_type import CheckoutOptionsPaymentType
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .device_checkout_options import DeviceCheckoutOptions
+from .money import Money
+from .payment_options import PaymentOptions
 
 
 class TerminalCheckout(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout_created_event.py b/src/square/types/terminal_checkout_created_event.py
index dc028dcf..072a3790 100644
--- a/src/square/types/terminal_checkout_created_event.py
+++ b/src/square/types/terminal_checkout_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_checkout_created_event_data import TerminalCheckoutCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_checkout_created_event_data import TerminalCheckoutCreatedEventData
 
 
 class TerminalCheckoutCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout_created_event_data.py b/src/square/types/terminal_checkout_created_event_data.py
index 3a4be1dc..d4aa4de6 100644
--- a/src/square/types/terminal_checkout_created_event_data.py
+++ b/src/square/types/terminal_checkout_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_checkout_created_event_object import TerminalCheckoutCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_checkout_created_event_object import TerminalCheckoutCreatedEventObject
 
 
 class TerminalCheckoutCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout_created_event_object.py b/src/square/types/terminal_checkout_created_event_object.py
index 5f0325fe..00da1e00 100644
--- a/src/square/types/terminal_checkout_created_event_object.py
+++ b/src/square/types/terminal_checkout_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .terminal_checkout import TerminalCheckout
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_checkout import TerminalCheckout
 
 
 class TerminalCheckoutCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout_query.py b/src/square/types/terminal_checkout_query.py
index 21f39bd0..0407a249 100644
--- a/src/square/types/terminal_checkout_query.py
+++ b/src/square/types/terminal_checkout_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .terminal_checkout_query_filter import TerminalCheckoutQueryFilter
+
 import pydantic
-from .terminal_checkout_query_sort import TerminalCheckoutQuerySort
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_checkout_query_filter import TerminalCheckoutQueryFilter
+from .terminal_checkout_query_sort import TerminalCheckoutQuerySort
 
 
 class TerminalCheckoutQuery(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout_query_filter.py b/src/square/types/terminal_checkout_query_filter.py
index 9debdd7e..cad30585 100644
--- a/src/square/types/terminal_checkout_query_filter.py
+++ b/src/square/types/terminal_checkout_query_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .time_range import TimeRange
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .time_range import TimeRange
 
 
 class TerminalCheckoutQueryFilter(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout_query_sort.py b/src/square/types/terminal_checkout_query_sort.py
index 57c0b784..ce364d11 100644
--- a/src/square/types/terminal_checkout_query_sort.py
+++ b/src/square/types/terminal_checkout_query_sort.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .sort_order import SortOrder
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .sort_order import SortOrder
 
 
 class TerminalCheckoutQuerySort(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout_updated_event.py b/src/square/types/terminal_checkout_updated_event.py
index d4ed7460..bdaa80ba 100644
--- a/src/square/types/terminal_checkout_updated_event.py
+++ b/src/square/types/terminal_checkout_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_checkout_updated_event_data import TerminalCheckoutUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_checkout_updated_event_data import TerminalCheckoutUpdatedEventData
 
 
 class TerminalCheckoutUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout_updated_event_data.py b/src/square/types/terminal_checkout_updated_event_data.py
index 2020eae2..15c5c766 100644
--- a/src/square/types/terminal_checkout_updated_event_data.py
+++ b/src/square/types/terminal_checkout_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_checkout_updated_event_object import TerminalCheckoutUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_checkout_updated_event_object import TerminalCheckoutUpdatedEventObject
 
 
 class TerminalCheckoutUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/terminal_checkout_updated_event_object.py b/src/square/types/terminal_checkout_updated_event_object.py
index ad4e42dd..dcb38b2d 100644
--- a/src/square/types/terminal_checkout_updated_event_object.py
+++ b/src/square/types/terminal_checkout_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .terminal_checkout import TerminalCheckout
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_checkout import TerminalCheckout
 
 
 class TerminalCheckoutUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund.py b/src/square/types/terminal_refund.py
index 05dbdcd2..7c30e1a7 100644
--- a/src/square/types/terminal_refund.py
+++ b/src/square/types/terminal_refund.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
-from .action_cancel_reason import ActionCancelReason
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .action_cancel_reason import ActionCancelReason
+from .money import Money
 
 
 class TerminalRefund(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund_created_event.py b/src/square/types/terminal_refund_created_event.py
index 21d63001..d3a046a5 100644
--- a/src/square/types/terminal_refund_created_event.py
+++ b/src/square/types/terminal_refund_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_refund_created_event_data import TerminalRefundCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_refund_created_event_data import TerminalRefundCreatedEventData
 
 
 class TerminalRefundCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund_created_event_data.py b/src/square/types/terminal_refund_created_event_data.py
index 6b4e06b7..a0b2bd3d 100644
--- a/src/square/types/terminal_refund_created_event_data.py
+++ b/src/square/types/terminal_refund_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_refund_created_event_object import TerminalRefundCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_refund_created_event_object import TerminalRefundCreatedEventObject
 
 
 class TerminalRefundCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund_created_event_object.py b/src/square/types/terminal_refund_created_event_object.py
index 7ca7e1d0..0ecf984c 100644
--- a/src/square/types/terminal_refund_created_event_object.py
+++ b/src/square/types/terminal_refund_created_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .terminal_refund import TerminalRefund
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_refund import TerminalRefund
 
 
 class TerminalRefundCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund_query.py b/src/square/types/terminal_refund_query.py
index 5de00d39..0d6e0a33 100644
--- a/src/square/types/terminal_refund_query.py
+++ b/src/square/types/terminal_refund_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .terminal_refund_query_filter import TerminalRefundQueryFilter
+
 import pydantic
-from .terminal_refund_query_sort import TerminalRefundQuerySort
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_refund_query_filter import TerminalRefundQueryFilter
+from .terminal_refund_query_sort import TerminalRefundQuerySort
 
 
 class TerminalRefundQuery(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund_query_filter.py b/src/square/types/terminal_refund_query_filter.py
index ca8cd910..36a96588 100644
--- a/src/square/types/terminal_refund_query_filter.py
+++ b/src/square/types/terminal_refund_query_filter.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .time_range import TimeRange
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .time_range import TimeRange
 
 
 class TerminalRefundQueryFilter(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund_query_sort.py b/src/square/types/terminal_refund_query_sort.py
index b5d2ee09..d1df5e3d 100644
--- a/src/square/types/terminal_refund_query_sort.py
+++ b/src/square/types/terminal_refund_query_sort.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class TerminalRefundQuerySort(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund_updated_event.py b/src/square/types/terminal_refund_updated_event.py
index cbeef557..a12bfa44 100644
--- a/src/square/types/terminal_refund_updated_event.py
+++ b/src/square/types/terminal_refund_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_refund_updated_event_data import TerminalRefundUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_refund_updated_event_data import TerminalRefundUpdatedEventData
 
 
 class TerminalRefundUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund_updated_event_data.py b/src/square/types/terminal_refund_updated_event_data.py
index fea89107..0fa96666 100644
--- a/src/square/types/terminal_refund_updated_event_data.py
+++ b/src/square/types/terminal_refund_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .terminal_refund_updated_event_object import TerminalRefundUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_refund_updated_event_object import TerminalRefundUpdatedEventObject
 
 
 class TerminalRefundUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/terminal_refund_updated_event_object.py b/src/square/types/terminal_refund_updated_event_object.py
index becc346b..5710cc4e 100644
--- a/src/square/types/terminal_refund_updated_event_object.py
+++ b/src/square/types/terminal_refund_updated_event_object.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .terminal_refund import TerminalRefund
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .terminal_refund import TerminalRefund
 
 
 class TerminalRefundUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/test_webhook_subscription_response.py b/src/square/types/test_webhook_subscription_response.py
index 78bed135..8443a290 100644
--- a/src/square/types/test_webhook_subscription_response.py
+++ b/src/square/types/test_webhook_subscription_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .subscription_test_result import SubscriptionTestResult
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .subscription_test_result import SubscriptionTestResult
 
 
 class TestWebhookSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/time_range.py b/src/square/types/time_range.py
index 0c475dc8..2f50a984 100644
--- a/src/square/types/time_range.py
+++ b/src/square/types/time_range.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class TimeRange(UncheckedBaseModel):
diff --git a/src/square/types/timecard.py b/src/square/types/timecard.py
index 403b0fef..74b9ab6f 100644
--- a/src/square/types/timecard.py
+++ b/src/square/types/timecard.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .timecard_wage import TimecardWage
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .break_ import Break
-from .timecard_status import TimecardStatus
 from .money import Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .timecard_status import TimecardStatus
+from .timecard_wage import TimecardWage
 
 
 class Timecard(UncheckedBaseModel):
diff --git a/src/square/types/timecard_filter.py b/src/square/types/timecard_filter.py
index e09e1999..dffeff91 100644
--- a/src/square/types/timecard_filter.py
+++ b/src/square/types/timecard_filter.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .timecard_filter_status import TimecardFilterStatus
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .time_range import TimeRange
+from .timecard_filter_status import TimecardFilterStatus
 from .timecard_workday import TimecardWorkday
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class TimecardFilter(UncheckedBaseModel):
diff --git a/src/square/types/timecard_query.py b/src/square/types/timecard_query.py
index 52be4db0..5fd791ce 100644
--- a/src/square/types/timecard_query.py
+++ b/src/square/types/timecard_query.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .timecard_filter import TimecardFilter
+
 import pydantic
-from .timecard_sort import TimecardSort
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .timecard_filter import TimecardFilter
+from .timecard_sort import TimecardSort
 
 
 class TimecardQuery(UncheckedBaseModel):
diff --git a/src/square/types/timecard_sort.py b/src/square/types/timecard_sort.py
index f78e9ff4..1c234c67 100644
--- a/src/square/types/timecard_sort.py
+++ b/src/square/types/timecard_sort.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .timecard_sort_field import TimecardSortField
+
 import pydantic
-from .sort_order import SortOrder
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .sort_order import SortOrder
+from .timecard_sort_field import TimecardSortField
 
 
 class TimecardSort(UncheckedBaseModel):
diff --git a/src/square/types/timecard_wage.py b/src/square/types/timecard_wage.py
index 0490688a..77bf904d 100644
--- a/src/square/types/timecard_wage.py
+++ b/src/square/types/timecard_wage.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .money import Money
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .money import Money
 
 
 class TimecardWage(UncheckedBaseModel):
diff --git a/src/square/types/timecard_workday.py b/src/square/types/timecard_workday.py
index 07cea638..3392c904 100644
--- a/src/square/types/timecard_workday.py
+++ b/src/square/types/timecard_workday.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .date_range import DateRange
+
 import pydantic
-from .timecard_workday_matcher import TimecardWorkdayMatcher
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .date_range import DateRange
+from .timecard_workday_matcher import TimecardWorkdayMatcher
 
 
 class TimecardWorkday(UncheckedBaseModel):
diff --git a/src/square/types/tip_settings.py b/src/square/types/tip_settings.py
index 32d81742..ceea9585 100644
--- a/src/square/types/tip_settings.py
+++ b/src/square/types/tip_settings.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class TipSettings(UncheckedBaseModel):
diff --git a/src/square/types/transaction.py b/src/square/types/transaction.py
index f9151bba..3085a5cb 100644
--- a/src/square/types/transaction.py
+++ b/src/square/types/transaction.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .tender import Tender
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .address import Address
 from .refund import Refund
+from .tender import Tender
 from .transaction_product import TransactionProduct
-from .address import Address
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Transaction(UncheckedBaseModel):
diff --git a/src/square/types/unlink_customer_from_gift_card_response.py b/src/square/types/unlink_customer_from_gift_card_response.py
index ea438824..0a3a4d69 100644
--- a/src/square/types/unlink_customer_from_gift_card_response.py
+++ b/src/square/types/unlink_customer_from_gift_card_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .gift_card import GiftCard
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .gift_card import GiftCard
 
 
 class UnlinkCustomerFromGiftCardResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_booking_custom_attribute_definition_response.py b/src/square/types/update_booking_custom_attribute_definition_response.py
index e3f86f90..a2cf16e0 100644
--- a/src/square/types/update_booking_custom_attribute_definition_response.py
+++ b/src/square/types/update_booking_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class UpdateBookingCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_booking_response.py b/src/square/types/update_booking_response.py
index 358b4ce8..781964fd 100644
--- a/src/square/types/update_booking_response.py
+++ b/src/square/types/update_booking_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .booking import Booking
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .booking import Booking
+from .error import Error
 
 
 class UpdateBookingResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_break_type_response.py b/src/square/types/update_break_type_response.py
index b4343f00..9bbf9ebe 100644
--- a/src/square/types/update_break_type_response.py
+++ b/src/square/types/update_break_type_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .break_type import BreakType
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .break_type import BreakType
+from .error import Error
 
 
 class UpdateBreakTypeResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_catalog_image_request.py b/src/square/types/update_catalog_image_request.py
index f7065c8e..5b25edd6 100644
--- a/src/square/types/update_catalog_image_request.py
+++ b/src/square/types/update_catalog_image_request.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
+import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
-import typing
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class UpdateCatalogImageRequest(UncheckedBaseModel):
diff --git a/src/square/types/update_catalog_image_response.py b/src/square/types/update_catalog_image_response.py
index be333701..cd4b1b3a 100644
--- a/src/square/types/update_catalog_image_response.py
+++ b/src/square/types/update_catalog_image_response.py
@@ -1,21 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
-from .catalog_object import CatalogObject
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class UpdateCatalogImageResponse(UncheckedBaseModel):
@@ -24,7 +16,7 @@ class UpdateCatalogImageResponse(UncheckedBaseModel):
     Any errors that occurred during the request.
     """
 
-    image: typing.Optional[CatalogObject] = pydantic.Field(default=None)
+    image: typing.Optional["CatalogObject"] = pydantic.Field(default=None)
     """
     The newly updated `CatalogImage` including a Square-generated
     URL for the encapsulated image file.
@@ -38,3 +30,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(UpdateCatalogImageResponse)
diff --git a/src/square/types/update_customer_custom_attribute_definition_response.py b/src/square/types/update_customer_custom_attribute_definition_response.py
index b8db8ec6..a0d678b4 100644
--- a/src/square/types/update_customer_custom_attribute_definition_response.py
+++ b/src/square/types/update_customer_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class UpdateCustomerCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_customer_group_response.py b/src/square/types/update_customer_group_response.py
index c112bb8f..6abc2678 100644
--- a/src/square/types/update_customer_group_response.py
+++ b/src/square/types/update_customer_group_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer_group import CustomerGroup
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer_group import CustomerGroup
+from .error import Error
 
 
 class UpdateCustomerGroupResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_customer_response.py b/src/square/types/update_customer_response.py
index 15163056..f894b19e 100644
--- a/src/square/types/update_customer_response.py
+++ b/src/square/types/update_customer_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .customer import Customer
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .customer import Customer
+from .error import Error
 
 
 class UpdateCustomerResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_invoice_response.py b/src/square/types/update_invoice_response.py
index fdc87474..1a3d6d27 100644
--- a/src/square/types/update_invoice_response.py
+++ b/src/square/types/update_invoice_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .invoice import Invoice
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .invoice import Invoice
 
 
 class UpdateInvoiceResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_item_modifier_lists_response.py b/src/square/types/update_item_modifier_lists_response.py
index a88b6b08..df256188 100644
--- a/src/square/types/update_item_modifier_lists_response.py
+++ b/src/square/types/update_item_modifier_lists_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class UpdateItemModifierListsResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_item_taxes_response.py b/src/square/types/update_item_taxes_response.py
index 96c7c729..1630227f 100644
--- a/src/square/types/update_item_taxes_response.py
+++ b/src/square/types/update_item_taxes_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class UpdateItemTaxesResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_job_response.py b/src/square/types/update_job_response.py
index f68f1046..75e299f5 100644
--- a/src/square/types/update_job_response.py
+++ b/src/square/types/update_job_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .job import Job
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .job import Job
 
 
 class UpdateJobResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_location_custom_attribute_definition_response.py b/src/square/types/update_location_custom_attribute_definition_response.py
index 047b8af3..f08f9005 100644
--- a/src/square/types/update_location_custom_attribute_definition_response.py
+++ b/src/square/types/update_location_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class UpdateLocationCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_location_response.py b/src/square/types/update_location_response.py
index e841ec2e..0c5e7f44 100644
--- a/src/square/types/update_location_response.py
+++ b/src/square/types/update_location_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .location import Location
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .location import Location
 
 
 class UpdateLocationResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_location_settings_response.py b/src/square/types/update_location_settings_response.py
index 6b6efa16..a37dc787 100644
--- a/src/square/types/update_location_settings_response.py
+++ b/src/square/types/update_location_settings_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .checkout_location_settings import CheckoutLocationSettings
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .checkout_location_settings import CheckoutLocationSettings
+from .error import Error
 
 
 class UpdateLocationSettingsResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_merchant_custom_attribute_definition_response.py b/src/square/types/update_merchant_custom_attribute_definition_response.py
index db2b924c..174630c7 100644
--- a/src/square/types/update_merchant_custom_attribute_definition_response.py
+++ b/src/square/types/update_merchant_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class UpdateMerchantCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_merchant_settings_response.py b/src/square/types/update_merchant_settings_response.py
index 30e2bc90..31971d81 100644
--- a/src/square/types/update_merchant_settings_response.py
+++ b/src/square/types/update_merchant_settings_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .checkout_merchant_settings import CheckoutMerchantSettings
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .checkout_merchant_settings import CheckoutMerchantSettings
+from .error import Error
 
 
 class UpdateMerchantSettingsResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_order_custom_attribute_definition_response.py b/src/square/types/update_order_custom_attribute_definition_response.py
index 0b01f719..b84de324 100644
--- a/src/square/types/update_order_custom_attribute_definition_response.py
+++ b/src/square/types/update_order_custom_attribute_definition_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute_definition import CustomAttributeDefinition
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute_definition import CustomAttributeDefinition
+from .error import Error
 
 
 class UpdateOrderCustomAttributeDefinitionResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_order_response.py b/src/square/types/update_order_response.py
index 2e8e72d7..66461c39 100644
--- a/src/square/types/update_order_response.py
+++ b/src/square/types/update_order_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .order import Order
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .order import Order
 
 
 class UpdateOrderResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_payment_link_response.py b/src/square/types/update_payment_link_response.py
index cb85cbf8..7f3b3ef0 100644
--- a/src/square/types/update_payment_link_response.py
+++ b/src/square/types/update_payment_link_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment_link import PaymentLink
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment_link import PaymentLink
 
 
 class UpdatePaymentLinkResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_payment_response.py b/src/square/types/update_payment_response.py
index 8f4cce62..0a3ffb0e 100644
--- a/src/square/types/update_payment_response.py
+++ b/src/square/types/update_payment_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .payment import Payment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .payment import Payment
 
 
 class UpdatePaymentResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_scheduled_shift_response.py b/src/square/types/update_scheduled_shift_response.py
index 61f5f2c9..3767cde7 100644
--- a/src/square/types/update_scheduled_shift_response.py
+++ b/src/square/types/update_scheduled_shift_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .scheduled_shift import ScheduledShift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .scheduled_shift import ScheduledShift
 
 
 class UpdateScheduledShiftResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_shift_response.py b/src/square/types/update_shift_response.py
index 706356fd..77cb7903 100644
--- a/src/square/types/update_shift_response.py
+++ b/src/square/types/update_shift_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .shift import Shift
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .shift import Shift
 
 
 class UpdateShiftResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_subscription_response.py b/src/square/types/update_subscription_response.py
index a641bc9b..ce0604a5 100644
--- a/src/square/types/update_subscription_response.py
+++ b/src/square/types/update_subscription_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .subscription import Subscription
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .subscription import Subscription
 
 
 class UpdateSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_team_member_request.py b/src/square/types/update_team_member_request.py
index 5fde7795..9a1ce566 100644
--- a/src/square/types/update_team_member_request.py
+++ b/src/square/types/update_team_member_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member import TeamMember
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .team_member import TeamMember
 
 
 class UpdateTeamMemberRequest(UncheckedBaseModel):
diff --git a/src/square/types/update_team_member_response.py b/src/square/types/update_team_member_response.py
index 47a21d55..0af78489 100644
--- a/src/square/types/update_team_member_response.py
+++ b/src/square/types/update_team_member_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .team_member import TeamMember
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .team_member import TeamMember
 
 
 class UpdateTeamMemberResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_timecard_response.py b/src/square/types/update_timecard_response.py
index 08428265..83d6c73e 100644
--- a/src/square/types/update_timecard_response.py
+++ b/src/square/types/update_timecard_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .timecard import Timecard
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .timecard import Timecard
 
 
 class UpdateTimecardResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_vendor_request.py b/src/square/types/update_vendor_request.py
index 11ab8c91..4d4dcde0 100644
--- a/src/square/types/update_vendor_request.py
+++ b/src/square/types/update_vendor_request.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .vendor import Vendor
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .vendor import Vendor
 
 
 class UpdateVendorRequest(UncheckedBaseModel):
diff --git a/src/square/types/update_vendor_response.py b/src/square/types/update_vendor_response.py
index ec88f014..89873e6f 100644
--- a/src/square/types/update_vendor_response.py
+++ b/src/square/types/update_vendor_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .vendor import Vendor
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .vendor import Vendor
 
 
 class UpdateVendorResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_wage_setting_response.py b/src/square/types/update_wage_setting_response.py
index daf2a67a..7ffcb822 100644
--- a/src/square/types/update_wage_setting_response.py
+++ b/src/square/types/update_wage_setting_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .wage_setting import WageSetting
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .wage_setting import WageSetting
 
 
 class UpdateWageSettingResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_webhook_subscription_response.py b/src/square/types/update_webhook_subscription_response.py
index 19ed439c..09de73e2 100644
--- a/src/square/types/update_webhook_subscription_response.py
+++ b/src/square/types/update_webhook_subscription_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .webhook_subscription import WebhookSubscription
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .webhook_subscription import WebhookSubscription
 
 
 class UpdateWebhookSubscriptionResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_webhook_subscription_signature_key_response.py b/src/square/types/update_webhook_subscription_signature_key_response.py
index a991ab89..4965ff7f 100644
--- a/src/square/types/update_webhook_subscription_signature_key_response.py
+++ b/src/square/types/update_webhook_subscription_signature_key_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class UpdateWebhookSubscriptionSignatureKeyResponse(UncheckedBaseModel):
diff --git a/src/square/types/update_workweek_config_response.py b/src/square/types/update_workweek_config_response.py
index 26b1ef6e..b5c22959 100644
--- a/src/square/types/update_workweek_config_response.py
+++ b/src/square/types/update_workweek_config_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .workweek_config import WorkweekConfig
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .workweek_config import WorkweekConfig
 
 
 class UpdateWorkweekConfigResponse(UncheckedBaseModel):
diff --git a/src/square/types/upsert_booking_custom_attribute_response.py b/src/square/types/upsert_booking_custom_attribute_response.py
index 4f28c387..72f5ce5c 100644
--- a/src/square/types/upsert_booking_custom_attribute_response.py
+++ b/src/square/types/upsert_booking_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class UpsertBookingCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/upsert_catalog_object_response.py b/src/square/types/upsert_catalog_object_response.py
index 16cbf9c9..e0c6fb8d 100644
--- a/src/square/types/upsert_catalog_object_response.py
+++ b/src/square/types/upsert_catalog_object_response.py
@@ -1,22 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
-from .catalog_category import CatalogCategory
-from .catalog_item import CatalogItem
-from .catalog_item_option import CatalogItemOption
-from .catalog_modifier_list import CatalogModifierList
-from .catalog_object_category import CatalogObjectCategory
-from .catalog_object_item import CatalogObjectItem
-from .catalog_object_item_option import CatalogObjectItemOption
-from .catalog_object_modifier_list import CatalogObjectModifierList
-from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan
-from .catalog_subscription_plan import CatalogSubscriptionPlan
+from __future__ import annotations
+
 import typing
-from .error import Error
+
 import pydantic
-from .catalog_object import CatalogObject
+from ..core.pydantic_utilities import IS_PYDANTIC_V2, update_forward_refs
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .catalog_id_mapping import CatalogIdMapping
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .error import Error
 
 
 class UpsertCatalogObjectResponse(UncheckedBaseModel):
@@ -25,7 +17,7 @@ class UpsertCatalogObjectResponse(UncheckedBaseModel):
     Any errors that occurred during the request.
     """
 
-    catalog_object: typing.Optional[CatalogObject] = pydantic.Field(default=None)
+    catalog_object: typing.Optional["CatalogObject"] = pydantic.Field(default=None)
     """
     The successfully created or updated CatalogObject.
     """
@@ -43,3 +35,18 @@ class Config:
             frozen = True
             smart_union = True
             extra = pydantic.Extra.allow
+
+
+from .catalog_category import CatalogCategory  # noqa: E402, F401, I001
+from .catalog_item import CatalogItem  # noqa: E402, F401, I001
+from .catalog_item_option import CatalogItemOption  # noqa: E402, F401, I001
+from .catalog_modifier_list import CatalogModifierList  # noqa: E402, F401, I001
+from .catalog_object_category import CatalogObjectCategory  # noqa: E402, F401, I001
+from .catalog_object_item import CatalogObjectItem  # noqa: E402, F401, I001
+from .catalog_object_item_option import CatalogObjectItemOption  # noqa: E402, F401, I001
+from .catalog_object_modifier_list import CatalogObjectModifierList  # noqa: E402, F401, I001
+from .catalog_object_subscription_plan import CatalogObjectSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_subscription_plan import CatalogSubscriptionPlan  # noqa: E402, F401, I001
+from .catalog_object import CatalogObject  # noqa: E402, F401, I001
+
+update_forward_refs(UpsertCatalogObjectResponse)
diff --git a/src/square/types/upsert_customer_custom_attribute_response.py b/src/square/types/upsert_customer_custom_attribute_response.py
index bc2cdbee..e5bed92a 100644
--- a/src/square/types/upsert_customer_custom_attribute_response.py
+++ b/src/square/types/upsert_customer_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class UpsertCustomerCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/upsert_location_custom_attribute_response.py b/src/square/types/upsert_location_custom_attribute_response.py
index 5d3f1f3a..665752a2 100644
--- a/src/square/types/upsert_location_custom_attribute_response.py
+++ b/src/square/types/upsert_location_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class UpsertLocationCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/upsert_merchant_custom_attribute_response.py b/src/square/types/upsert_merchant_custom_attribute_response.py
index 1049406d..2754a6a1 100644
--- a/src/square/types/upsert_merchant_custom_attribute_response.py
+++ b/src/square/types/upsert_merchant_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class UpsertMerchantCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/upsert_order_custom_attribute_response.py b/src/square/types/upsert_order_custom_attribute_response.py
index 1f6dbf15..ded81590 100644
--- a/src/square/types/upsert_order_custom_attribute_response.py
+++ b/src/square/types/upsert_order_custom_attribute_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .custom_attribute import CustomAttribute
+
 import pydantic
-from .error import Error
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .custom_attribute import CustomAttribute
+from .error import Error
 
 
 class UpsertOrderCustomAttributeResponse(UncheckedBaseModel):
diff --git a/src/square/types/upsert_snippet_response.py b/src/square/types/upsert_snippet_response.py
index ef081467..eee955d8 100644
--- a/src/square/types/upsert_snippet_response.py
+++ b/src/square/types/upsert_snippet_response.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .snippet import Snippet
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
+from .snippet import Snippet
 
 
 class UpsertSnippetResponse(UncheckedBaseModel):
diff --git a/src/square/types/v1money.py b/src/square/types/v1money.py
index 19def97c..7aed356a 100644
--- a/src/square/types/v1money.py
+++ b/src/square/types/v1money.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .currency import Currency
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .currency import Currency
 
 
 class V1Money(UncheckedBaseModel):
diff --git a/src/square/types/v1order.py b/src/square/types/v1order.py
index 4247f4d8..6cbbab09 100644
--- a/src/square/types/v1order.py
+++ b/src/square/types/v1order.py
@@ -1,15 +1,16 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
-from .v1order_state import V1OrderState
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .address import Address
+from .error import Error
 from .v1money import V1Money
-from .v1tender import V1Tender
 from .v1order_history_entry import V1OrderHistoryEntry
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .v1order_state import V1OrderState
+from .v1tender import V1Tender
 
 
 class V1Order(UncheckedBaseModel):
diff --git a/src/square/types/v1order_history_entry.py b/src/square/types/v1order_history_entry.py
index c0b60462..d14d9f22 100644
--- a/src/square/types/v1order_history_entry.py
+++ b/src/square/types/v1order_history_entry.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .v1order_history_entry_action import V1OrderHistoryEntryAction
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .v1order_history_entry_action import V1OrderHistoryEntryAction
 
 
 class V1OrderHistoryEntry(UncheckedBaseModel):
diff --git a/src/square/types/v1tender.py b/src/square/types/v1tender.py
index de11fd69..62732ec1 100644
--- a/src/square/types/v1tender.py
+++ b/src/square/types/v1tender.py
@@ -1,13 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .v1tender_type import V1TenderType
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .v1money import V1Money
 from .v1tender_card_brand import V1TenderCardBrand
 from .v1tender_entry_method import V1TenderEntryMethod
-from .v1money import V1Money
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from .v1tender_type import V1TenderType
 
 
 class V1Tender(UncheckedBaseModel):
diff --git a/src/square/types/vendor.py b/src/square/types/vendor.py
index 13dfe71c..d36736fd 100644
--- a/src/square/types/vendor.py
+++ b/src/square/types/vendor.py
@@ -1,12 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
+from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 from .address import Address
 from .vendor_contact import VendorContact
 from .vendor_status import VendorStatus
-from ..core.pydantic_utilities import IS_PYDANTIC_V2
 
 
 class Vendor(UncheckedBaseModel):
diff --git a/src/square/types/vendor_contact.py b/src/square/types/vendor_contact.py
index 1ba85a35..59fbf12a 100644
--- a/src/square/types/vendor_contact.py
+++ b/src/square/types/vendor_contact.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class VendorContact(UncheckedBaseModel):
diff --git a/src/square/types/vendor_created_event.py b/src/square/types/vendor_created_event.py
index 0e6c394f..c8954e1d 100644
--- a/src/square/types/vendor_created_event.py
+++ b/src/square/types/vendor_created_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .vendor_created_event_data import VendorCreatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .vendor_created_event_data import VendorCreatedEventData
 
 
 class VendorCreatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/vendor_created_event_data.py b/src/square/types/vendor_created_event_data.py
index ac5fc2d9..02e877ca 100644
--- a/src/square/types/vendor_created_event_data.py
+++ b/src/square/types/vendor_created_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .vendor_created_event_object import VendorCreatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .vendor_created_event_object import VendorCreatedEventObject
 
 
 class VendorCreatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/vendor_created_event_object.py b/src/square/types/vendor_created_event_object.py
index 4d54070d..4246ce5d 100644
--- a/src/square/types/vendor_created_event_object.py
+++ b/src/square/types/vendor_created_event_object.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .vendor_created_event_object_operation import VendorCreatedEventObjectOperation
+
 import pydantic
-from .vendor import Vendor
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .vendor import Vendor
+from .vendor_created_event_object_operation import VendorCreatedEventObjectOperation
 
 
 class VendorCreatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/vendor_updated_event.py b/src/square/types/vendor_updated_event.py
index e3e00f96..0445eaaf 100644
--- a/src/square/types/vendor_updated_event.py
+++ b/src/square/types/vendor_updated_event.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .vendor_updated_event_data import VendorUpdatedEventData
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .vendor_updated_event_data import VendorUpdatedEventData
 
 
 class VendorUpdatedEvent(UncheckedBaseModel):
diff --git a/src/square/types/vendor_updated_event_data.py b/src/square/types/vendor_updated_event_data.py
index 2ed1f340..76cfa95d 100644
--- a/src/square/types/vendor_updated_event_data.py
+++ b/src/square/types/vendor_updated_event_data.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .vendor_updated_event_object import VendorUpdatedEventObject
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .vendor_updated_event_object import VendorUpdatedEventObject
 
 
 class VendorUpdatedEventData(UncheckedBaseModel):
diff --git a/src/square/types/vendor_updated_event_object.py b/src/square/types/vendor_updated_event_object.py
index 52e8d9bf..4fa355b3 100644
--- a/src/square/types/vendor_updated_event_object.py
+++ b/src/square/types/vendor_updated_event_object.py
@@ -1,11 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .vendor_updated_event_object_operation import VendorUpdatedEventObjectOperation
+
 import pydantic
-from .vendor import Vendor
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .vendor import Vendor
+from .vendor_updated_event_object_operation import VendorUpdatedEventObjectOperation
 
 
 class VendorUpdatedEventObject(UncheckedBaseModel):
diff --git a/src/square/types/void_transaction_response.py b/src/square/types/void_transaction_response.py
index 7882dedb..8c12f32e 100644
--- a/src/square/types/void_transaction_response.py
+++ b/src/square/types/void_transaction_response.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
-from .error import Error
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .error import Error
 
 
 class VoidTransactionResponse(UncheckedBaseModel):
diff --git a/src/square/types/wage_setting.py b/src/square/types/wage_setting.py
index bc778b18..3ab91671 100644
--- a/src/square/types/wage_setting.py
+++ b/src/square/types/wage_setting.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .job_assignment import JobAssignment
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .job_assignment import JobAssignment
 
 
 class WageSetting(UncheckedBaseModel):
diff --git a/src/square/types/webhook_subscription.py b/src/square/types/webhook_subscription.py
index 547b5223..1bfb5791 100644
--- a/src/square/types/webhook_subscription.py
+++ b/src/square/types/webhook_subscription.py
@@ -1,9 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
 
 
 class WebhookSubscription(UncheckedBaseModel):
diff --git a/src/square/types/workweek_config.py b/src/square/types/workweek_config.py
index b55081c3..17bda221 100644
--- a/src/square/types/workweek_config.py
+++ b/src/square/types/workweek_config.py
@@ -1,10 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.unchecked_base_model import UncheckedBaseModel
 import typing
+
 import pydantic
-from .weekday import Weekday
 from ..core.pydantic_utilities import IS_PYDANTIC_V2
+from ..core.unchecked_base_model import UncheckedBaseModel
+from .weekday import Weekday
 
 
 class WorkweekConfig(UncheckedBaseModel):
diff --git a/src/square/v1transactions/__init__.py b/src/square/v1transactions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/v1transactions/__init__.py
+++ b/src/square/v1transactions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/v1transactions/client.py b/src/square/v1transactions/client.py
index aef97e70..e1f8218f 100644
--- a/src/square/v1transactions/client.py
+++ b/src/square/v1transactions/client.py
@@ -1,14 +1,13 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawV1TransactionsClient
-from ..types.sort_order import SortOrder
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
+from ..types.sort_order import SortOrder
 from ..types.v1order import V1Order
 from ..types.v1update_order_request_action import V1UpdateOrderRequestAction
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawV1TransactionsClient
+from .raw_client import AsyncRawV1TransactionsClient, RawV1TransactionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -75,10 +74,10 @@ def v1list_orders(
             location_id="location_id",
         )
         """
-        response = self._raw_client.v1list_orders(
+        _response = self._raw_client.v1list_orders(
             location_id, order=order, limit=limit, batch_token=batch_token, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def v1retrieve_order(
         self, location_id: str, order_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -114,8 +113,8 @@ def v1retrieve_order(
             order_id="order_id",
         )
         """
-        response = self._raw_client.v1retrieve_order(location_id, order_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.v1retrieve_order(location_id, order_id, request_options=request_options)
+        return _response.data
 
     def v1update_order(
         self,
@@ -177,7 +176,7 @@ def v1update_order(
             action="COMPLETE",
         )
         """
-        response = self._raw_client.v1update_order(
+        _response = self._raw_client.v1update_order(
             location_id,
             order_id,
             action=action,
@@ -187,7 +186,7 @@ def v1update_order(
             canceled_note=canceled_note,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
 
 
 class AsyncV1TransactionsClient:
@@ -259,10 +258,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.v1list_orders(
+        _response = await self._raw_client.v1list_orders(
             location_id, order=order, limit=limit, batch_token=batch_token, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def v1retrieve_order(
         self, location_id: str, order_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -306,8 +305,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.v1retrieve_order(location_id, order_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.v1retrieve_order(location_id, order_id, request_options=request_options)
+        return _response.data
 
     async def v1update_order(
         self,
@@ -377,7 +376,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.v1update_order(
+        _response = await self._raw_client.v1update_order(
             location_id,
             order_id,
             action=action,
@@ -387,4 +386,4 @@ async def main() -> None:
             canceled_note=canceled_note,
             request_options=request_options,
         )
-        return response.data
+        return _response.data
diff --git a/src/square/v1transactions/raw_client.py b/src/square/v1transactions/raw_client.py
index 19cb25a6..5ed5246c 100644
--- a/src/square/v1transactions/raw_client.py
+++ b/src/square/v1transactions/raw_client.py
@@ -1,18 +1,17 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..types.sort_order import SortOrder
-from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.v1order import V1Order
-from ..core.jsonable_encoder import jsonable_encoder
-from ..core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
+from ..core.request_options import RequestOptions
+from ..core.unchecked_base_model import construct_type
+from ..types.sort_order import SortOrder
+from ..types.v1order import V1Order
 from ..types.v1update_order_request_action import V1UpdateOrderRequestAction
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -79,8 +78,8 @@ def v1list_orders(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def v1retrieve_order(
         self, location_id: str, order_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -121,8 +120,8 @@ def v1retrieve_order(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def v1update_order(
         self,
@@ -199,8 +198,8 @@ def v1update_order(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawV1TransactionsClient:
@@ -264,8 +263,8 @@ async def v1list_orders(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def v1retrieve_order(
         self, location_id: str, order_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -306,8 +305,8 @@ async def v1retrieve_order(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def v1update_order(
         self,
@@ -384,5 +383,5 @@ async def v1update_order(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/vendors/__init__.py b/src/square/vendors/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/vendors/__init__.py
+++ b/src/square/vendors/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/vendors/client.py b/src/square/vendors/client.py
index 17f82302..288d6041 100644
--- a/src/square/vendors/client.py
+++ b/src/square/vendors/client.py
@@ -1,22 +1,21 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawVendorsClient
-from ..requests.vendor import VendorParams
+
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ..core.request_options import RequestOptions
+from ..requests.search_vendors_request_filter import SearchVendorsRequestFilterParams
+from ..requests.search_vendors_request_sort import SearchVendorsRequestSortParams
+from ..requests.update_vendor_request import UpdateVendorRequestParams
+from ..requests.vendor import VendorParams
 from ..types.batch_create_vendors_response import BatchCreateVendorsResponse
 from ..types.batch_get_vendors_response import BatchGetVendorsResponse
-from ..requests.update_vendor_request import UpdateVendorRequestParams
 from ..types.batch_update_vendors_response import BatchUpdateVendorsResponse
 from ..types.create_vendor_response import CreateVendorResponse
-from ..requests.search_vendors_request_filter import SearchVendorsRequestFilterParams
-from ..requests.search_vendors_request_sort import SearchVendorsRequestSortParams
-from ..types.search_vendors_response import SearchVendorsResponse
 from ..types.get_vendor_response import GetVendorResponse
+from ..types.search_vendors_response import SearchVendorsResponse
 from ..types.update_vendor_response import UpdateVendorResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawVendorsClient
+from .raw_client import AsyncRawVendorsClient, RawVendorsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -89,8 +88,8 @@ def batch_create(
             },
         )
         """
-        response = self._raw_client.batch_create(vendors=vendors, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_create(vendors=vendors, request_options=request_options)
+        return _response.data
 
     def batch_get(
         self,
@@ -125,8 +124,8 @@ def batch_get(
             vendor_ids=["INV_V_JDKYHBWT1D4F8MFH63DBMEN8Y4"],
         )
         """
-        response = self._raw_client.batch_get(vendor_ids=vendor_ids, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_get(vendor_ids=vendor_ids, request_options=request_options)
+        return _response.data
 
     def batch_update(
         self,
@@ -165,8 +164,8 @@ def batch_update(
             },
         )
         """
-        response = self._raw_client.batch_update(vendors=vendors, request_options=request_options)
-        return response.data
+        _response = self._raw_client.batch_update(vendors=vendors, request_options=request_options)
+        return _response.data
 
     def create(
         self,
@@ -230,10 +229,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             idempotency_key=idempotency_key, vendor=vendor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def search(
         self,
@@ -277,8 +276,8 @@ def search(
         )
         client.vendors.search()
         """
-        response = self._raw_client.search(filter=filter, sort=sort, cursor=cursor, request_options=request_options)
-        return response.data
+        _response = self._raw_client.search(filter=filter, sort=sort, cursor=cursor, request_options=request_options)
+        return _response.data
 
     def get(self, vendor_id: str, *, request_options: typing.Optional[RequestOptions] = None) -> GetVendorResponse:
         """
@@ -308,8 +307,8 @@ def get(self, vendor_id: str, *, request_options: typing.Optional[RequestOptions
             vendor_id="vendor_id",
         )
         """
-        response = self._raw_client.get(vendor_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(vendor_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -364,10 +363,10 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(
+        _response = self._raw_client.update(
             vendor_id, vendor=vendor, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
 
 class AsyncVendorsClient:
@@ -445,8 +444,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_create(vendors=vendors, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_create(vendors=vendors, request_options=request_options)
+        return _response.data
 
     async def batch_get(
         self,
@@ -489,8 +488,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_get(vendor_ids=vendor_ids, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_get(vendor_ids=vendor_ids, request_options=request_options)
+        return _response.data
 
     async def batch_update(
         self,
@@ -537,8 +536,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.batch_update(vendors=vendors, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.batch_update(vendors=vendors, request_options=request_options)
+        return _response.data
 
     async def create(
         self,
@@ -610,10 +609,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             idempotency_key=idempotency_key, vendor=vendor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def search(
         self,
@@ -665,10 +664,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.search(
+        _response = await self._raw_client.search(
             filter=filter, sort=sort, cursor=cursor, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, vendor_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -708,8 +707,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(vendor_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(vendor_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -772,7 +771,7 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             vendor_id, vendor=vendor, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
diff --git a/src/square/vendors/raw_client.py b/src/square/vendors/raw_client.py
index b220f201..a3187be4 100644
--- a/src/square/vendors/raw_client.py
+++ b/src/square/vendors/raw_client.py
@@ -1,27 +1,26 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ..core.client_wrapper import SyncClientWrapper
-from ..requests.vendor import VendorParams
+from json.decoder import JSONDecodeError
+
+from ..core.api_error import ApiError
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ..core.http_response import AsyncHttpResponse, HttpResponse
+from ..core.jsonable_encoder import jsonable_encoder
 from ..core.request_options import RequestOptions
-from ..core.http_response import HttpResponse
-from ..types.batch_create_vendors_response import BatchCreateVendorsResponse
 from ..core.serialization import convert_and_respect_annotation_metadata
 from ..core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ..core.api_error import ApiError
-from ..types.batch_get_vendors_response import BatchGetVendorsResponse
+from ..requests.search_vendors_request_filter import SearchVendorsRequestFilterParams
+from ..requests.search_vendors_request_sort import SearchVendorsRequestSortParams
 from ..requests.update_vendor_request import UpdateVendorRequestParams
+from ..requests.vendor import VendorParams
+from ..types.batch_create_vendors_response import BatchCreateVendorsResponse
+from ..types.batch_get_vendors_response import BatchGetVendorsResponse
 from ..types.batch_update_vendors_response import BatchUpdateVendorsResponse
 from ..types.create_vendor_response import CreateVendorResponse
-from ..requests.search_vendors_request_filter import SearchVendorsRequestFilterParams
-from ..requests.search_vendors_request_sort import SearchVendorsRequestSortParams
-from ..types.search_vendors_response import SearchVendorsResponse
 from ..types.get_vendor_response import GetVendorResponse
-from ..core.jsonable_encoder import jsonable_encoder
+from ..types.search_vendors_response import SearchVendorsResponse
 from ..types.update_vendor_response import UpdateVendorResponse
-from ..core.client_wrapper import AsyncClientWrapper
-from ..core.http_response import AsyncHttpResponse
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -76,8 +75,8 @@ def batch_create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_get(
         self,
@@ -125,8 +124,8 @@ def batch_get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def batch_update(
         self,
@@ -177,8 +176,8 @@ def batch_update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def create(
         self,
@@ -237,8 +236,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def search(
         self,
@@ -303,8 +302,8 @@ def search(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, vendor_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -342,8 +341,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -389,6 +388,9 @@ def update(
                     object_=vendor, annotation=VendorParams, direction="write"
                 ),
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -404,8 +406,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawVendorsClient:
@@ -457,8 +459,8 @@ async def batch_create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_get(
         self,
@@ -506,8 +508,8 @@ async def batch_get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def batch_update(
         self,
@@ -558,8 +560,8 @@ async def batch_update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def create(
         self,
@@ -618,8 +620,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def search(
         self,
@@ -684,8 +686,8 @@ async def search(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, vendor_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -723,8 +725,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -770,6 +772,9 @@ async def update(
                     object_=vendor, annotation=VendorParams, direction="write"
                 ),
             },
+            headers={
+                "content-type": "application/json",
+            },
             request_options=request_options,
             omit=OMIT,
         )
@@ -785,5 +790,5 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/webhooks/__init__.py b/src/square/webhooks/__init__.py
index d9d0e844..46a5c175 100644
--- a/src/square/webhooks/__init__.py
+++ b/src/square/webhooks/__init__.py
@@ -1,5 +1,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
 from . import event_types, subscriptions
 
 __all__ = ["event_types", "subscriptions"]
diff --git a/src/square/webhooks/client.py b/src/square/webhooks/client.py
index 8f633628..36f91997 100644
--- a/src/square/webhooks/client.py
+++ b/src/square/webhooks/client.py
@@ -1,13 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from .raw_client import RawWebhooksClient
-from .event_types.client import EventTypesClient
-from .subscriptions.client import SubscriptionsClient
-from ..core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawWebhooksClient
-from .event_types.client import AsyncEventTypesClient
-from .subscriptions.client import AsyncSubscriptionsClient
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from .event_types.client import AsyncEventTypesClient, EventTypesClient
+from .raw_client import AsyncRawWebhooksClient, RawWebhooksClient
+from .subscriptions.client import AsyncSubscriptionsClient, SubscriptionsClient
 
 
 class WebhooksClient:
diff --git a/src/square/webhooks/event_types/__init__.py b/src/square/webhooks/event_types/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/webhooks/event_types/__init__.py
+++ b/src/square/webhooks/event_types/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/webhooks/event_types/client.py b/src/square/webhooks/event_types/client.py
index 525ee669..d28fee11 100644
--- a/src/square/webhooks/event_types/client.py
+++ b/src/square/webhooks/event_types/client.py
@@ -1,12 +1,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawEventTypesClient
 import typing
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from ...core.request_options import RequestOptions
 from ...types.list_webhook_event_types_response import ListWebhookEventTypesResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawEventTypesClient
+from .raw_client import AsyncRawEventTypesClient, RawEventTypesClient
 
 
 class EventTypesClient:
@@ -52,8 +51,8 @@ def list(
         )
         client.webhooks.event_types.list()
         """
-        response = self._raw_client.list(api_version=api_version, request_options=request_options)
-        return response.data
+        _response = self._raw_client.list(api_version=api_version, request_options=request_options)
+        return _response.data
 
 
 class AsyncEventTypesClient:
@@ -107,5 +106,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.list(api_version=api_version, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.list(api_version=api_version, request_options=request_options)
+        return _response.data
diff --git a/src/square/webhooks/event_types/raw_client.py b/src/square/webhooks/event_types/raw_client.py
index b837ed34..91faa77f 100644
--- a/src/square/webhooks/event_types/raw_client.py
+++ b/src/square/webhooks/event_types/raw_client.py
@@ -1,15 +1,14 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ...core.client_wrapper import SyncClientWrapper
 import typing
-from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.list_webhook_event_types_response import ListWebhookEventTypesResponse
-from ...core.unchecked_base_model import construct_type
 from json.decoder import JSONDecodeError
+
 from ...core.api_error import ApiError
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.request_options import RequestOptions
+from ...core.unchecked_base_model import construct_type
+from ...types.list_webhook_event_types_response import ListWebhookEventTypesResponse
 
 
 class RawEventTypesClient:
@@ -55,8 +54,8 @@ def list(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawEventTypesClient:
@@ -102,5 +101,5 @@ async def list(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/src/square/webhooks/raw_client.py b/src/square/webhooks/raw_client.py
index 0a57a3ef..74782346 100644
--- a/src/square/webhooks/raw_client.py
+++ b/src/square/webhooks/raw_client.py
@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from ..core.client_wrapper import SyncClientWrapper
-from ..core.client_wrapper import AsyncClientWrapper
+from ..core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 
 
 class RawWebhooksClient:
diff --git a/src/square/webhooks/subscriptions/__init__.py b/src/square/webhooks/subscriptions/__init__.py
index f3ea2659..5cde0202 100644
--- a/src/square/webhooks/subscriptions/__init__.py
+++ b/src/square/webhooks/subscriptions/__init__.py
@@ -1,2 +1,4 @@
 # This file was auto-generated by Fern from our API Definition.
 
+# isort: skip_file
+
diff --git a/src/square/webhooks/subscriptions/client.py b/src/square/webhooks/subscriptions/client.py
index 11525ebb..eb3e4174 100644
--- a/src/square/webhooks/subscriptions/client.py
+++ b/src/square/webhooks/subscriptions/client.py
@@ -1,26 +1,20 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from .raw_client import RawSubscriptionsClient
-from ...types.sort_order import SortOrder
+
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.pagination import AsyncPager, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.pagination import SyncPager
-from ...types.webhook_subscription import WebhookSubscription
-from ...types.list_webhook_subscriptions_response import ListWebhookSubscriptionsResponse
-from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
 from ...requests.webhook_subscription import WebhookSubscriptionParams
 from ...types.create_webhook_subscription_response import CreateWebhookSubscriptionResponse
+from ...types.delete_webhook_subscription_response import DeleteWebhookSubscriptionResponse
 from ...types.get_webhook_subscription_response import GetWebhookSubscriptionResponse
+from ...types.sort_order import SortOrder
+from ...types.test_webhook_subscription_response import TestWebhookSubscriptionResponse
 from ...types.update_webhook_subscription_response import UpdateWebhookSubscriptionResponse
-from ...types.delete_webhook_subscription_response import DeleteWebhookSubscriptionResponse
 from ...types.update_webhook_subscription_signature_key_response import UpdateWebhookSubscriptionSignatureKeyResponse
-from ...types.test_webhook_subscription_response import TestWebhookSubscriptionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from .raw_client import AsyncRawSubscriptionsClient
-from ...core.pagination import AsyncPager
+from ...types.webhook_subscription import WebhookSubscription
+from .raw_client import AsyncRawSubscriptionsClient, RawSubscriptionsClient
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -98,41 +92,13 @@ def list(
         for page in response.iter_pages():
             yield page
         """
-        _response = self._raw_client._client_wrapper.httpx_client.request(
-            "v2/webhooks/subscriptions",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "include_disabled": include_disabled,
-                "sort_order": sort_order,
-                "limit": limit,
-            },
+        return self._raw_client.list(
+            cursor=cursor,
+            include_disabled=include_disabled,
+            sort_order=sort_order,
+            limit=limit,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListWebhookSubscriptionsResponse,
-                    construct_type(
-                        type_=ListWebhookSubscriptionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    include_disabled=include_disabled,
-                    sort_order=sort_order,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.subscriptions
-                return SyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     def create(
         self,
@@ -177,10 +143,10 @@ def create(
             },
         )
         """
-        response = self._raw_client.create(
+        _response = self._raw_client.create(
             subscription=subscription, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def get(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -212,8 +178,8 @@ def get(
             subscription_id="subscription_id",
         )
         """
-        response = self._raw_client.get(subscription_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.get(subscription_id, request_options=request_options)
+        return _response.data
 
     def update(
         self,
@@ -256,8 +222,8 @@ def update(
             },
         )
         """
-        response = self._raw_client.update(subscription_id, subscription=subscription, request_options=request_options)
-        return response.data
+        _response = self._raw_client.update(subscription_id, subscription=subscription, request_options=request_options)
+        return _response.data
 
     def delete(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -289,8 +255,8 @@ def delete(
             subscription_id="subscription_id",
         )
         """
-        response = self._raw_client.delete(subscription_id, request_options=request_options)
-        return response.data
+        _response = self._raw_client.delete(subscription_id, request_options=request_options)
+        return _response.data
 
     def update_signature_key(
         self,
@@ -330,10 +296,10 @@ def update_signature_key(
             idempotency_key="ed80ae6b-0654-473b-bbab-a39aee89a60d",
         )
         """
-        response = self._raw_client.update_signature_key(
+        _response = self._raw_client.update_signature_key(
             subscription_id, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     def test(
         self,
@@ -374,8 +340,8 @@ def test(
             event_type="payment.created",
         )
         """
-        response = self._raw_client.test(subscription_id, event_type=event_type, request_options=request_options)
-        return response.data
+        _response = self._raw_client.test(subscription_id, event_type=event_type, request_options=request_options)
+        return _response.data
 
 
 class AsyncSubscriptionsClient:
@@ -451,6 +417,7 @@ async def main() -> None:
             response = await client.webhooks.subscriptions.list()
             async for item in response:
                 yield item
+
             # alternatively, you can paginate page-by-page
             async for page in response.iter_pages():
                 yield page
@@ -458,41 +425,13 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        _response = await self._raw_client._client_wrapper.httpx_client.request(
-            "v2/webhooks/subscriptions",
-            method="GET",
-            params={
-                "cursor": cursor,
-                "include_disabled": include_disabled,
-                "sort_order": sort_order,
-                "limit": limit,
-            },
+        return await self._raw_client.list(
+            cursor=cursor,
+            include_disabled=include_disabled,
+            sort_order=sort_order,
+            limit=limit,
             request_options=request_options,
         )
-        try:
-            if 200 <= _response.status_code < 300:
-                _parsed_response = typing.cast(
-                    ListWebhookSubscriptionsResponse,
-                    construct_type(
-                        type_=ListWebhookSubscriptionsResponse,  # type: ignore
-                        object_=_response.json(),
-                    ),
-                )
-                _parsed_next = _parsed_response.cursor
-                _has_next = _parsed_next is not None and _parsed_next != ""
-                _get_next = lambda: self.list(
-                    cursor=_parsed_next,
-                    include_disabled=include_disabled,
-                    sort_order=sort_order,
-                    limit=limit,
-                    request_options=request_options,
-                )
-                _items = _parsed_response.subscriptions
-                return AsyncPager(has_next=_has_next, items=_items, get_next=_get_next)
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
 
     async def create(
         self,
@@ -545,10 +484,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.create(
+        _response = await self._raw_client.create(
             subscription=subscription, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def get(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -588,8 +527,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.get(subscription_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.get(subscription_id, request_options=request_options)
+        return _response.data
 
     async def update(
         self,
@@ -640,10 +579,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update(
+        _response = await self._raw_client.update(
             subscription_id, subscription=subscription, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def delete(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -683,8 +622,8 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.delete(subscription_id, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.delete(subscription_id, request_options=request_options)
+        return _response.data
 
     async def update_signature_key(
         self,
@@ -732,10 +671,10 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.update_signature_key(
+        _response = await self._raw_client.update_signature_key(
             subscription_id, idempotency_key=idempotency_key, request_options=request_options
         )
-        return response.data
+        return _response.data
 
     async def test(
         self,
@@ -784,5 +723,5 @@ async def main() -> None:
 
         asyncio.run(main())
         """
-        response = await self._raw_client.test(subscription_id, event_type=event_type, request_options=request_options)
-        return response.data
+        _response = await self._raw_client.test(subscription_id, event_type=event_type, request_options=request_options)
+        return _response.data
diff --git a/src/square/webhooks/subscriptions/raw_client.py b/src/square/webhooks/subscriptions/raw_client.py
index 628f448e..9a30e2b0 100644
--- a/src/square/webhooks/subscriptions/raw_client.py
+++ b/src/square/webhooks/subscriptions/raw_client.py
@@ -1,23 +1,26 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
-from ...core.client_wrapper import SyncClientWrapper
-from ...requests.webhook_subscription import WebhookSubscriptionParams
+from json.decoder import JSONDecodeError
+
+from ...core.api_error import ApiError
+from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from ...core.http_response import AsyncHttpResponse, HttpResponse
+from ...core.jsonable_encoder import jsonable_encoder
+from ...core.pagination import AsyncPager, BaseHttpResponse, SyncPager
 from ...core.request_options import RequestOptions
-from ...core.http_response import HttpResponse
-from ...types.create_webhook_subscription_response import CreateWebhookSubscriptionResponse
 from ...core.serialization import convert_and_respect_annotation_metadata
 from ...core.unchecked_base_model import construct_type
-from json.decoder import JSONDecodeError
-from ...core.api_error import ApiError
+from ...requests.webhook_subscription import WebhookSubscriptionParams
+from ...types.create_webhook_subscription_response import CreateWebhookSubscriptionResponse
+from ...types.delete_webhook_subscription_response import DeleteWebhookSubscriptionResponse
 from ...types.get_webhook_subscription_response import GetWebhookSubscriptionResponse
-from ...core.jsonable_encoder import jsonable_encoder
+from ...types.list_webhook_subscriptions_response import ListWebhookSubscriptionsResponse
+from ...types.sort_order import SortOrder
+from ...types.test_webhook_subscription_response import TestWebhookSubscriptionResponse
 from ...types.update_webhook_subscription_response import UpdateWebhookSubscriptionResponse
-from ...types.delete_webhook_subscription_response import DeleteWebhookSubscriptionResponse
 from ...types.update_webhook_subscription_signature_key_response import UpdateWebhookSubscriptionSignatureKeyResponse
-from ...types.test_webhook_subscription_response import TestWebhookSubscriptionResponse
-from ...core.client_wrapper import AsyncClientWrapper
-from ...core.http_response import AsyncHttpResponse
+from ...types.webhook_subscription import WebhookSubscription
 
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
@@ -27,6 +30,87 @@ class RawSubscriptionsClient:
     def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        include_disabled: typing.Optional[bool] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> SyncPager[WebhookSubscription]:
+        """
+        Lists all webhook subscriptions owned by your application.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for your original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        include_disabled : typing.Optional[bool]
+            Includes disabled [Subscription](entity:WebhookSubscription)s.
+            By default, all enabled [Subscription](entity:WebhookSubscription)s are returned.
+
+        sort_order : typing.Optional[SortOrder]
+            Sorts the returned list by when the [Subscription](entity:WebhookSubscription) was created with the specified order.
+            This field defaults to ASC.
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+            It is possible to receive fewer results than the specified limit on a given page.
+            The default value of 100 is also the maximum allowed value.
+
+            Default: 100
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        SyncPager[WebhookSubscription]
+            Success
+        """
+        _response = self._client_wrapper.httpx_client.request(
+            "v2/webhooks/subscriptions",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "include_disabled": include_disabled,
+                "sort_order": sort_order,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListWebhookSubscriptionsResponse,
+                    construct_type(
+                        type_=ListWebhookSubscriptionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.subscriptions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+                _get_next = lambda: self.list(
+                    cursor=_parsed_next,
+                    include_disabled=include_disabled,
+                    sort_order=sort_order,
+                    limit=limit,
+                    request_options=request_options,
+                )
+                return SyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     def create(
         self,
         *,
@@ -80,8 +164,8 @@ def create(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def get(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -119,8 +203,8 @@ def get(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update(
         self,
@@ -174,8 +258,8 @@ def update(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def delete(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -213,8 +297,8 @@ def delete(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def update_signature_key(
         self,
@@ -266,8 +350,8 @@ def update_signature_key(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     def test(
         self,
@@ -320,14 +404,98 @@ def test(
                 return HttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
 
 class AsyncRawSubscriptionsClient:
     def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
+    async def list(
+        self,
+        *,
+        cursor: typing.Optional[str] = None,
+        include_disabled: typing.Optional[bool] = None,
+        sort_order: typing.Optional[SortOrder] = None,
+        limit: typing.Optional[int] = None,
+        request_options: typing.Optional[RequestOptions] = None,
+    ) -> AsyncPager[WebhookSubscription]:
+        """
+        Lists all webhook subscriptions owned by your application.
+
+        Parameters
+        ----------
+        cursor : typing.Optional[str]
+            A pagination cursor returned by a previous call to this endpoint.
+            Provide this to retrieve the next set of results for your original query.
+
+            For more information, see [Pagination](https://developer.squareup.com/docs/build-basics/common-api-patterns/pagination).
+
+        include_disabled : typing.Optional[bool]
+            Includes disabled [Subscription](entity:WebhookSubscription)s.
+            By default, all enabled [Subscription](entity:WebhookSubscription)s are returned.
+
+        sort_order : typing.Optional[SortOrder]
+            Sorts the returned list by when the [Subscription](entity:WebhookSubscription) was created with the specified order.
+            This field defaults to ASC.
+
+        limit : typing.Optional[int]
+            The maximum number of results to be returned in a single page.
+            It is possible to receive fewer results than the specified limit on a given page.
+            The default value of 100 is also the maximum allowed value.
+
+            Default: 100
+
+        request_options : typing.Optional[RequestOptions]
+            Request-specific configuration.
+
+        Returns
+        -------
+        AsyncPager[WebhookSubscription]
+            Success
+        """
+        _response = await self._client_wrapper.httpx_client.request(
+            "v2/webhooks/subscriptions",
+            method="GET",
+            params={
+                "cursor": cursor,
+                "include_disabled": include_disabled,
+                "sort_order": sort_order,
+                "limit": limit,
+            },
+            request_options=request_options,
+        )
+        try:
+            if 200 <= _response.status_code < 300:
+                _parsed_response = typing.cast(
+                    ListWebhookSubscriptionsResponse,
+                    construct_type(
+                        type_=ListWebhookSubscriptionsResponse,  # type: ignore
+                        object_=_response.json(),
+                    ),
+                )
+                _items = _parsed_response.subscriptions
+                _parsed_next = _parsed_response.cursor
+                _has_next = _parsed_next is not None and _parsed_next != ""
+
+                async def _get_next():
+                    return await self.list(
+                        cursor=_parsed_next,
+                        include_disabled=include_disabled,
+                        sort_order=sort_order,
+                        limit=limit,
+                        request_options=request_options,
+                    )
+
+                return AsyncPager(
+                    has_next=_has_next, items=_items, get_next=_get_next, response=BaseHttpResponse(response=_response)
+                )
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
+
     async def create(
         self,
         *,
@@ -381,8 +549,8 @@ async def create(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def get(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -420,8 +588,8 @@ async def get(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update(
         self,
@@ -475,8 +643,8 @@ async def update(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def delete(
         self, subscription_id: str, *, request_options: typing.Optional[RequestOptions] = None
@@ -514,8 +682,8 @@ async def delete(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def update_signature_key(
         self,
@@ -567,8 +735,8 @@ async def update_signature_key(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
 
     async def test(
         self,
@@ -621,5 +789,5 @@ async def test(
                 return AsyncHttpResponse(response=_response, data=_data)
             _response_json = _response.json()
         except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
+            raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response.text)
+        raise ApiError(status_code=_response.status_code, headers=dict(_response.headers), body=_response_json)
diff --git a/tests/custom/test_client.py b/tests/custom/test_client.py
index 73f811f5..ab04ce63 100644
--- a/tests/custom/test_client.py
+++ b/tests/custom/test_client.py
@@ -4,4 +4,4 @@
 # Get started with writing tests with pytest at https://docs.pytest.org
 @pytest.mark.skip(reason="Unimplemented")
 def test_client() -> None:
-    assert True == True
+    assert True
diff --git a/tests/utils/assets/models/__init__.py b/tests/utils/assets/models/__init__.py
index 3a1c852e..2cf01263 100644
--- a/tests/utils/assets/models/__init__.py
+++ b/tests/utils/assets/models/__init__.py
@@ -5,7 +5,7 @@
 from .circle import CircleParams
 from .object_with_defaults import ObjectWithDefaultsParams
 from .object_with_optional_field import ObjectWithOptionalFieldParams
-from .shape import ShapeParams, Shape_CircleParams, Shape_SquareParams
+from .shape import Shape_CircleParams, Shape_SquareParams, ShapeParams
 from .square import SquareParams
 from .undiscriminated_shape import UndiscriminatedShapeParams
 
diff --git a/tests/utils/assets/models/circle.py b/tests/utils/assets/models/circle.py
index c2b8a6ec..2557fdc9 100644
--- a/tests/utils/assets/models/circle.py
+++ b/tests/utils/assets/models/circle.py
@@ -3,7 +3,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
+
 from square.core.serialization import FieldMetadata
 
 
diff --git a/tests/utils/assets/models/object_with_defaults.py b/tests/utils/assets/models/object_with_defaults.py
index ef14f7b2..a977b1d2 100644
--- a/tests/utils/assets/models/object_with_defaults.py
+++ b/tests/utils/assets/models/object_with_defaults.py
@@ -3,7 +3,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
 
 
 class ObjectWithDefaultsParams(typing_extensions.TypedDict):
diff --git a/tests/utils/assets/models/object_with_optional_field.py b/tests/utils/assets/models/object_with_optional_field.py
index f05e8a97..54a8d7bd 100644
--- a/tests/utils/assets/models/object_with_optional_field.py
+++ b/tests/utils/assets/models/object_with_optional_field.py
@@ -2,16 +2,17 @@
 
 # This file was auto-generated by Fern from our API Definition.
 
-import typing_extensions
-import typing
-import typing_extensions
-from square.core.serialization import FieldMetadata
 import datetime as dt
+import typing
 import uuid
+
+import typing_extensions
 from .color import Color
 from .shape import ShapeParams
 from .undiscriminated_shape import UndiscriminatedShapeParams
 
+from square.core.serialization import FieldMetadata
+
 
 class ObjectWithOptionalFieldParams(typing_extensions.TypedDict):
     literal: typing.Literal["lit_one"]
diff --git a/tests/utils/assets/models/shape.py b/tests/utils/assets/models/shape.py
index b286b6c8..b5195609 100644
--- a/tests/utils/assets/models/shape.py
+++ b/tests/utils/assets/models/shape.py
@@ -3,9 +3,11 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from __future__ import annotations
-import typing_extensions
-import typing_extensions
+
 import typing
+
+import typing_extensions
+
 from square.core.serialization import FieldMetadata
 
 
diff --git a/tests/utils/assets/models/square.py b/tests/utils/assets/models/square.py
index 36ca42e8..dac450bb 100644
--- a/tests/utils/assets/models/square.py
+++ b/tests/utils/assets/models/square.py
@@ -3,7 +3,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing_extensions
-import typing_extensions
+
 from square.core.serialization import FieldMetadata
 
 
diff --git a/tests/utils/assets/models/undiscriminated_shape.py b/tests/utils/assets/models/undiscriminated_shape.py
index 68876a23..99f12b30 100644
--- a/tests/utils/assets/models/undiscriminated_shape.py
+++ b/tests/utils/assets/models/undiscriminated_shape.py
@@ -3,6 +3,7 @@
 # This file was auto-generated by Fern from our API Definition.
 
 import typing
+
 from .circle import CircleParams
 from .square import SquareParams
 
diff --git a/tests/utils/test_query_encoding.py b/tests/utils/test_query_encoding.py
index 5a1e8bc8..ad7b0ba0 100644
--- a/tests/utils/test_query_encoding.py
+++ b/tests/utils/test_query_encoding.py
@@ -34,4 +34,4 @@ def test_query_encoding_deep_object_arrays() -> None:
 
 def test_encode_query_with_none() -> None:
     encoded = encode_query(None)
-    assert encoded == None
+    assert encoded is None
diff --git a/tests/utils/test_serialization.py b/tests/utils/test_serialization.py
index 26772f31..928ebfb7 100644
--- a/tests/utils/test_serialization.py
+++ b/tests/utils/test_serialization.py
@@ -1,10 +1,10 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from typing import List, Any
+from typing import Any, List
 
-from square.core.serialization import convert_and_respect_annotation_metadata
-from .assets.models import ShapeParams, ObjectWithOptionalFieldParams
+from .assets.models import ObjectWithOptionalFieldParams, ShapeParams
 
+from square.core.serialization import convert_and_respect_annotation_metadata
 
 UNION_TEST: ShapeParams = {"radius_measurement": 1.0, "shape_type": "circle", "id": "1"}
 UNION_TEST_CONVERTED = {"shapeType": "circle", "radiusMeasurement": 1.0, "id": "1"}

From 2b2e185d2eeb5d67258fb9d31f52a9db9dbf1152 Mon Sep 17 00:00:00 2001
From: Fern Support <126544928+fern-support@users.noreply.github.com>
Date: Mon, 11 Aug 2025 14:32:07 -0400
Subject: [PATCH 2/2] add headers to api error (#168)

Co-authored-by: jsklan <jsklan.development@gmail.com>
---
 src/square/core/api_error.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/square/core/api_error.py b/src/square/core/api_error.py
index 59664655..426f851e 100644
--- a/src/square/core/api_error.py
+++ b/src/square/core/api_error.py
@@ -17,8 +17,15 @@ class ApiError(Exception):
     status_code: Optional[int]
     body: Any
     errors: List[Error]
-
-    def __init__(self, *, status_code: Optional[int] = None, body: Any = None):
+    headers: Optional[Dict[str, str]]
+
+    def __init__(
+        self,
+        *,
+        headers: Optional[Dict[str, str]] = None,
+        status_code: Optional[int] = None,
+        body: Any = None,
+    ) -> None:
         """
         Initialize an ApiError.
 
@@ -30,6 +37,7 @@ def __init__(self, *, status_code: Optional[int] = None, body: Any = None):
         self.status_code = status_code
         self.body = body
         self.errors = self._parse_errors(body)
+        self.headers = headers
 
         super().__init__(self._build_message(message, status_code, body))
 
@@ -120,4 +128,4 @@ def _parse_error(self, data: Optional[Dict[str, Any]] = None) -> Error:
         )
 
     def __str__(self) -> str:
-        return f"status_code: {self.status_code}, body: {self.body}"
+        return f"headers: {self.headers}, status_code: {self.status_code}, body: {self.body}"