metronome-sdk 0.1.0.pre.alpha.2 → 0.1.0.pre.alpha.3

data/lib/metronome_sdk/models/v1/alert_archive_response.rb

@@ -7,11 +7,22 @@ module MetronomeSDK
       class AlertArchiveResponse < MetronomeSDK::Internal::Type::BaseModel
         # @!attribute data
         #
-        #   @return [MetronomeSDK::ID]
-        required :data, -> { MetronomeSDK::ID }
+        #   @return [MetronomeSDK::Models::V1::AlertArchiveResponse::Data]
+        required :data, -> { MetronomeSDK::Models::V1::AlertArchiveResponse::Data }
 
         # @!method initialize(data:)
-        #   @param data [MetronomeSDK::ID]
+        #   @param data [MetronomeSDK::Models::V1::AlertArchiveResponse::Data]
+
+        # @see MetronomeSDK::Models::V1::AlertArchiveResponse#data
+        class Data < MetronomeSDK::Internal::Type::BaseModel
+          # @!attribute id
+          #
+          #   @return [String]
+          required :id, String
+
+          # @!method initialize(id:)
+          #   @param id [String]
+        end
       end
     end
   end

data/lib/metronome_sdk/models/v1/alert_create_params.rb

@@ -11,7 +11,7 @@ module MetronomeSDK
         # @!attribute alert_type
         #   Type of the alert
         #
-        #   @return [Symbol, MetronomeSDK::V1::AlertCreateParams::AlertType]
+        #   @return [Symbol, MetronomeSDK::Models::V1::AlertCreateParams::AlertType]
         required :alert_type, enum: -> { MetronomeSDK::V1::AlertCreateParams::AlertType }
 
         # @!attribute name
@@ -51,7 +51,7 @@ module MetronomeSDK
         #   A list of custom field filters for alert types that support advanced filtering.
         #   Only present for contract invoices.
         #
-        #   @return [Array<MetronomeSDK::V1::AlertCreateParams::CustomFieldFilter>, nil]
+        #   @return [Array<MetronomeSDK::Models::V1::AlertCreateParams::CustomFieldFilter>, nil]
         optional :custom_field_filters,
                  -> {
                    MetronomeSDK::Internal::Type::ArrayOf[MetronomeSDK::V1::AlertCreateParams::CustomFieldFilter]
@@ -59,7 +59,7 @@ module MetronomeSDK
 
         # @!attribute customer_id
         #   If provided, will create this alert for this specific customer. To create an
-        #   alert for all customers, do not specify `customer_id` or `plan_id`.
+        #   alert for all customers, do not specify a `customer_id`.
         #
         #   @return [String, nil]
         optional :customer_id, String
@@ -76,7 +76,7 @@ module MetronomeSDK
         #   Scopes alert evaluation to a specific presentation group key on individual line
         #   items. Only present for spend alerts.
         #
-        #   @return [MetronomeSDK::V1::AlertCreateParams::GroupKeyFilter, nil]
+        #   @return [MetronomeSDK::Models::V1::AlertCreateParams::GroupKeyFilter, nil]
         optional :group_key_filter, -> { MetronomeSDK::V1::AlertCreateParams::GroupKeyFilter }
 
         # @!attribute invoice_types_filter
@@ -88,7 +88,7 @@ module MetronomeSDK
 
         # @!attribute plan_id
         #   If provided, will create this alert for this specific plan. To create an alert
-        #   for all customers, do not specify `customer_id` or `plan_id`.
+        #   for all customers, do not specify a `plan_id`.
         #
         #   @return [String, nil]
         optional :plan_id, String
@@ -105,7 +105,7 @@ module MetronomeSDK
         #   Some parameter documentations has been truncated, see
         #   {MetronomeSDK::Models::V1::AlertCreateParams} for more details.
         #
-        #   @param alert_type [Symbol, MetronomeSDK::V1::AlertCreateParams::AlertType] Type of the alert
+        #   @param alert_type [Symbol, MetronomeSDK::Models::V1::AlertCreateParams::AlertType] Type of the alert
         #
         #   @param name [String] Name of the alert
         #
@@ -117,13 +117,13 @@ module MetronomeSDK
         #
         #   @param credit_type_id [String]
         #
-        #   @param custom_field_filters [Array<MetronomeSDK::V1::AlertCreateParams::CustomFieldFilter>] A list of custom field filters for alert types that support advanced filtering.
+        #   @param custom_field_filters [Array<MetronomeSDK::Models::V1::AlertCreateParams::CustomFieldFilter>] A list of custom field filters for alert types that support advanced filtering.
         #
         #   @param customer_id [String] If provided, will create this alert for this specific customer. To create an ale
         #
         #   @param evaluate_on_create [Boolean] If true, the alert will evaluate immediately on customers that already meet the
         #
-        #   @param group_key_filter [MetronomeSDK::V1::AlertCreateParams::GroupKeyFilter] Scopes alert evaluation to a specific presentation group key on individual line
+        #   @param group_key_filter [MetronomeSDK::Models::V1::AlertCreateParams::GroupKeyFilter] Scopes alert evaluation to a specific presentation group key on individual line
         #
         #   @param invoice_types_filter [Array<String>] Only supported for invoice_total_reached alerts. A list of invoice types to eval
         #
@@ -161,7 +161,7 @@ module MetronomeSDK
         class CustomFieldFilter < MetronomeSDK::Internal::Type::BaseModel
           # @!attribute entity
           #
-          #   @return [Symbol, MetronomeSDK::V1::AlertCreateParams::CustomFieldFilter::Entity]
+          #   @return [Symbol, MetronomeSDK::Models::V1::AlertCreateParams::CustomFieldFilter::Entity]
           required :entity, enum: -> { MetronomeSDK::V1::AlertCreateParams::CustomFieldFilter::Entity }
 
           # @!attribute key
@@ -175,11 +175,11 @@ module MetronomeSDK
           required :value, String
 
           # @!method initialize(entity:, key:, value:)
-          #   @param entity [Symbol, MetronomeSDK::V1::AlertCreateParams::CustomFieldFilter::Entity]
+          #   @param entity [Symbol, MetronomeSDK::Models::V1::AlertCreateParams::CustomFieldFilter::Entity]
           #   @param key [String]
           #   @param value [String]
 
-          # @see MetronomeSDK::V1::AlertCreateParams::CustomFieldFilter#entity
+          # @see MetronomeSDK::Models::V1::AlertCreateParams::CustomFieldFilter#entity
           module Entity
             extend MetronomeSDK::Internal::Type::Enum
 

data/lib/metronome_sdk/models/v1/alert_create_response.rb

@@ -7,11 +7,22 @@ module MetronomeSDK
       class AlertCreateResponse < MetronomeSDK::Internal::Type::BaseModel
         # @!attribute data
         #
-        #   @return [MetronomeSDK::ID]
-        required :data, -> { MetronomeSDK::ID }
+        #   @return [MetronomeSDK::Models::V1::AlertCreateResponse::Data]
+        required :data, -> { MetronomeSDK::Models::V1::AlertCreateResponse::Data }
 
         # @!method initialize(data:)
-        #   @param data [MetronomeSDK::ID]
+        #   @param data [MetronomeSDK::Models::V1::AlertCreateResponse::Data]
+
+        # @see MetronomeSDK::Models::V1::AlertCreateResponse#data
+        class Data < MetronomeSDK::Internal::Type::BaseModel
+          # @!attribute id
+          #
+          #   @return [String]
+          required :id, String
+
+          # @!method initialize(id:)
+          #   @param id [String]
+        end
       end
     end
   end

data/lib/metronome_sdk/models/v1/audit_log_list_params.rb

@@ -43,7 +43,7 @@ module MetronomeSDK
         # @!attribute sort
         #   Sort order by timestamp, e.g. date_asc or date_desc. Defaults to date_asc.
         #
-        #   @return [Symbol, MetronomeSDK::V1::AuditLogListParams::Sort, nil]
+        #   @return [Symbol, MetronomeSDK::Models::V1::AuditLogListParams::Sort, nil]
         optional :sort, enum: -> { MetronomeSDK::V1::AuditLogListParams::Sort }
 
         # @!attribute starting_on
@@ -67,7 +67,7 @@ module MetronomeSDK
         #
         #   @param resource_type [String] Optional parameter that can be used to filter which audit logs are returned. If
         #
-        #   @param sort [Symbol, MetronomeSDK::V1::AuditLogListParams::Sort] Sort order by timestamp, e.g. date_asc or date_desc. Defaults to date_asc.
+        #   @param sort [Symbol, MetronomeSDK::Models::V1::AuditLogListParams::Sort] Sort order by timestamp, e.g. date_asc or date_desc. Defaults to date_asc.
         #
         #   @param starting_on [Time] RFC 3339 timestamp of the earliest audit log to return. Cannot be used with 'nex
         #

data/lib/metronome_sdk/models/v1/billable_metric_archive_params.rb

@@ -4,11 +4,17 @@ module MetronomeSDK
   module Models
     module V1
       # @see MetronomeSDK::Resources::V1::BillableMetrics#archive
-      class BillableMetricArchiveParams < MetronomeSDK::Models::ID
+      class BillableMetricArchiveParams < MetronomeSDK::Internal::Type::BaseModel
         extend MetronomeSDK::Internal::Type::RequestParameters::Converter
         include MetronomeSDK::Internal::Type::RequestParameters
 
-        # @!method initialize(request_options: {})
+        # @!attribute id
+        #
+        #   @return [String]
+        required :id, String
+
+        # @!method initialize(id:, request_options: {})
+        #   @param id [String]
         #   @param request_options [MetronomeSDK::RequestOptions, Hash{Symbol=>Object}]
       end
     end

data/lib/metronome_sdk/models/v1/billable_metric_archive_response.rb

@@ -7,11 +7,22 @@ module MetronomeSDK
       class BillableMetricArchiveResponse < MetronomeSDK::Internal::Type::BaseModel
         # @!attribute data
         #
-        #   @return [MetronomeSDK::ID]
-        required :data, -> { MetronomeSDK::ID }
+        #   @return [MetronomeSDK::Models::V1::BillableMetricArchiveResponse::Data]
+        required :data, -> { MetronomeSDK::Models::V1::BillableMetricArchiveResponse::Data }
 
         # @!method initialize(data:)
-        #   @param data [MetronomeSDK::ID]
+        #   @param data [MetronomeSDK::Models::V1::BillableMetricArchiveResponse::Data]
+
+        # @see MetronomeSDK::Models::V1::BillableMetricArchiveResponse#data
+        class Data < MetronomeSDK::Internal::Type::BaseModel
+          # @!attribute id
+          #
+          #   @return [String]
+          required :id, String
+
+          # @!method initialize(id:)
+          #   @param id [String]
+        end
       end
     end
   end

data/lib/metronome_sdk/models/v1/billable_metric_create_params.rb

@@ -24,7 +24,7 @@ module MetronomeSDK
         # @!attribute aggregation_type
         #   Specifies the type of aggregation performed on matching events.
         #
-        #   @return [Symbol, MetronomeSDK::V1::BillableMetricCreateParams::AggregationType, nil]
+        #   @return [Symbol, MetronomeSDK::Models::V1::BillableMetricCreateParams::AggregationType, nil]
         optional :aggregation_type, enum: -> { MetronomeSDK::V1::BillableMetricCreateParams::AggregationType }
 
         # @!attribute custom_fields
@@ -36,8 +36,8 @@ module MetronomeSDK
         # @!attribute event_type_filter
         #   An optional filtering rule to match the 'event_type' property of an event.
         #
-        #   @return [MetronomeSDK::EventTypeFilter, nil]
-        optional :event_type_filter, -> { MetronomeSDK::EventTypeFilter }
+        #   @return [MetronomeSDK::Models::V1::BillableMetricCreateParams::EventTypeFilter, nil]
+        optional :event_type_filter, -> { MetronomeSDK::V1::BillableMetricCreateParams::EventTypeFilter }
 
         # @!attribute group_keys
         #   Property names that are used to group usage costs on an invoice. Each entry
@@ -52,8 +52,11 @@ module MetronomeSDK
         #   rule on an event property. All rules must pass for the event to match the
         #   billable metric.
         #
-        #   @return [Array<MetronomeSDK::PropertyFilter>, nil]
-        optional :property_filters, -> { MetronomeSDK::Internal::Type::ArrayOf[MetronomeSDK::PropertyFilter] }
+        #   @return [Array<MetronomeSDK::Models::V1::BillableMetricCreateParams::PropertyFilter>, nil]
+        optional :property_filters,
+                 -> {
+                   MetronomeSDK::Internal::Type::ArrayOf[MetronomeSDK::V1::BillableMetricCreateParams::PropertyFilter]
+                 }
 
         # @!attribute sql
         #   The SQL query associated with the billable metric. This field is mutually
@@ -72,15 +75,15 @@ module MetronomeSDK
         #
         #   @param aggregation_key [String] Specifies the type of aggregation performed on matching events. Required if `sql
         #
-        #   @param aggregation_type [Symbol, MetronomeSDK::V1::BillableMetricCreateParams::AggregationType] Specifies the type of aggregation performed on matching events.
+        #   @param aggregation_type [Symbol, MetronomeSDK::Models::V1::BillableMetricCreateParams::AggregationType] Specifies the type of aggregation performed on matching events.
         #
         #   @param custom_fields [Hash{Symbol=>String}] Custom fields to attach to the billable metric.
         #
-        #   @param event_type_filter [MetronomeSDK::EventTypeFilter] An optional filtering rule to match the 'event_type' property of an event.
+        #   @param event_type_filter [MetronomeSDK::Models::V1::BillableMetricCreateParams::EventTypeFilter] An optional filtering rule to match the 'event_type' property of an event.
         #
         #   @param group_keys [Array<Array<String>>] Property names that are used to group usage costs on an invoice. Each entry repr
         #
-        #   @param property_filters [Array<MetronomeSDK::PropertyFilter>] A list of filters to match events to this billable metric. Each filter defines a
+        #   @param property_filters [Array<MetronomeSDK::Models::V1::BillableMetricCreateParams::PropertyFilter>] A list of filters to match events to this billable metric. Each filter defines a
         #
         #   @param sql [String] The SQL query associated with the billable metric. This field is mutually exclus
         #
@@ -99,6 +102,83 @@ module MetronomeSDK
           # @!method self.values
           #   @return [Array<Symbol>]
         end
+
+        class EventTypeFilter < MetronomeSDK::Internal::Type::BaseModel
+          # @!attribute in_values
+          #   A list of event types that are explicitly included in the billable metric. If
+          #   specified, only events of these types will match the billable metric. Must be
+          #   non-empty if present.
+          #
+          #   @return [Array<String>, nil]
+          optional :in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+          # @!attribute not_in_values
+          #   A list of event types that are explicitly excluded from the billable metric. If
+          #   specified, events of these types will not match the billable metric. Must be
+          #   non-empty if present.
+          #
+          #   @return [Array<String>, nil]
+          optional :not_in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+          # @!method initialize(in_values: nil, not_in_values: nil)
+          #   Some parameter documentations has been truncated, see
+          #   {MetronomeSDK::Models::V1::BillableMetricCreateParams::EventTypeFilter} for more
+          #   details.
+          #
+          #   An optional filtering rule to match the 'event_type' property of an event.
+          #
+          #   @param in_values [Array<String>] A list of event types that are explicitly included in the billable metric. If sp
+          #
+          #   @param not_in_values [Array<String>] A list of event types that are explicitly excluded from the billable metric. If
+        end
+
+        class PropertyFilter < MetronomeSDK::Internal::Type::BaseModel
+          # @!attribute name
+          #   The name of the event property.
+          #
+          #   @return [String]
+          required :name, String
+
+          # @!attribute exists
+          #   Determines whether the property must exist in the event. If true, only events
+          #   with this property will pass the filter. If false, only events without this
+          #   property will pass the filter. If null or omitted, the existence of the property
+          #   is optional.
+          #
+          #   @return [Boolean, nil]
+          optional :exists, MetronomeSDK::Internal::Type::Boolean
+
+          # @!attribute in_values
+          #   Specifies the allowed values for the property to match an event. An event will
+          #   pass the filter only if its property value is included in this list. If
+          #   undefined, all property values will pass the filter. Must be non-empty if
+          #   present.
+          #
+          #   @return [Array<String>, nil]
+          optional :in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+          # @!attribute not_in_values
+          #   Specifies the values that prevent an event from matching the filter. An event
+          #   will not pass the filter if its property value is included in this list. If null
+          #   or empty, all property values will pass the filter. Must be non-empty if
+          #   present.
+          #
+          #   @return [Array<String>, nil]
+          optional :not_in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+          # @!method initialize(name:, exists: nil, in_values: nil, not_in_values: nil)
+          #   Some parameter documentations has been truncated, see
+          #   {MetronomeSDK::Models::V1::BillableMetricCreateParams::PropertyFilter} for more
+          #   details.
+          #
+          #   @param name [String] The name of the event property.
+          #
+          #   @param exists [Boolean] Determines whether the property must exist in the event. If true, only events wi
+          #
+          #   @param in_values [Array<String>] Specifies the allowed values for the property to match an event. An event will p
+          #
+          #   @param not_in_values [Array<String>] Specifies the values that prevent an event from matching the filter. An event wi
+        end
       end
     end
   end

data/lib/metronome_sdk/models/v1/billable_metric_create_response.rb

@@ -7,11 +7,22 @@ module MetronomeSDK
       class BillableMetricCreateResponse < MetronomeSDK::Internal::Type::BaseModel
         # @!attribute data
         #
-        #   @return [MetronomeSDK::ID]
-        required :data, -> { MetronomeSDK::ID }
+        #   @return [MetronomeSDK::Models::V1::BillableMetricCreateResponse::Data]
+        required :data, -> { MetronomeSDK::Models::V1::BillableMetricCreateResponse::Data }
 
         # @!method initialize(data:)
-        #   @param data [MetronomeSDK::ID]
+        #   @param data [MetronomeSDK::Models::V1::BillableMetricCreateResponse::Data]
+
+        # @see MetronomeSDK::Models::V1::BillableMetricCreateResponse#data
+        class Data < MetronomeSDK::Internal::Type::BaseModel
+          # @!attribute id
+          #
+          #   @return [String]
+          required :id, String
+
+          # @!method initialize(id:)
+          #   @param id [String]
+        end
       end
     end
   end

data/lib/metronome_sdk/models/v1/billable_metric_list_response.rb

@@ -47,8 +47,8 @@ module MetronomeSDK
         # @!attribute event_type_filter
         #   An optional filtering rule to match the 'event_type' property of an event.
         #
-        #   @return [MetronomeSDK::EventTypeFilter, nil]
-        optional :event_type_filter, -> { MetronomeSDK::EventTypeFilter }
+        #   @return [MetronomeSDK::Models::V1::BillableMetricListResponse::EventTypeFilter, nil]
+        optional :event_type_filter, -> { MetronomeSDK::Models::V1::BillableMetricListResponse::EventTypeFilter }
 
         # @!attribute group_keys
         #   Property names that are used to group usage costs on an invoice. Each entry
@@ -63,8 +63,9 @@ module MetronomeSDK
         #   rule on an event property. All rules must pass for the event to match the
         #   billable metric.
         #
-        #   @return [Array<MetronomeSDK::PropertyFilter>, nil]
-        optional :property_filters, -> { MetronomeSDK::Internal::Type::ArrayOf[MetronomeSDK::PropertyFilter] }
+        #   @return [Array<MetronomeSDK::Models::V1::BillableMetricListResponse::PropertyFilter>, nil]
+        optional :property_filters,
+                 -> { MetronomeSDK::Internal::Type::ArrayOf[MetronomeSDK::Models::V1::BillableMetricListResponse::PropertyFilter] }
 
         # @!attribute sql
         #   The SQL query associated with the billable metric
@@ -88,11 +89,11 @@ module MetronomeSDK
         #
         #   @param custom_fields [Hash{Symbol=>String}]
         #
-        #   @param event_type_filter [MetronomeSDK::EventTypeFilter] An optional filtering rule to match the 'event_type' property of an event.
+        #   @param event_type_filter [MetronomeSDK::Models::V1::BillableMetricListResponse::EventTypeFilter] An optional filtering rule to match the 'event_type' property of an event.
         #
         #   @param group_keys [Array<Array<String>>] Property names that are used to group usage costs on an invoice. Each entry repr
         #
-        #   @param property_filters [Array<MetronomeSDK::PropertyFilter>] A list of filters to match events to this billable metric. Each filter defines a
+        #   @param property_filters [Array<MetronomeSDK::Models::V1::BillableMetricListResponse::PropertyFilter>] A list of filters to match events to this billable metric. Each filter defines a
         #
         #   @param sql [String] The SQL query associated with the billable metric
 
@@ -111,6 +112,84 @@ module MetronomeSDK
           # @!method self.values
           #   @return [Array<Symbol>]
         end
+
+        # @see MetronomeSDK::Models::V1::BillableMetricListResponse#event_type_filter
+        class EventTypeFilter < MetronomeSDK::Internal::Type::BaseModel
+          # @!attribute in_values
+          #   A list of event types that are explicitly included in the billable metric. If
+          #   specified, only events of these types will match the billable metric. Must be
+          #   non-empty if present.
+          #
+          #   @return [Array<String>, nil]
+          optional :in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+          # @!attribute not_in_values
+          #   A list of event types that are explicitly excluded from the billable metric. If
+          #   specified, events of these types will not match the billable metric. Must be
+          #   non-empty if present.
+          #
+          #   @return [Array<String>, nil]
+          optional :not_in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+          # @!method initialize(in_values: nil, not_in_values: nil)
+          #   Some parameter documentations has been truncated, see
+          #   {MetronomeSDK::Models::V1::BillableMetricListResponse::EventTypeFilter} for more
+          #   details.
+          #
+          #   An optional filtering rule to match the 'event_type' property of an event.
+          #
+          #   @param in_values [Array<String>] A list of event types that are explicitly included in the billable metric. If sp
+          #
+          #   @param not_in_values [Array<String>] A list of event types that are explicitly excluded from the billable metric. If
+        end
+
+        class PropertyFilter < MetronomeSDK::Internal::Type::BaseModel
+          # @!attribute name
+          #   The name of the event property.
+          #
+          #   @return [String]
+          required :name, String
+
+          # @!attribute exists
+          #   Determines whether the property must exist in the event. If true, only events
+          #   with this property will pass the filter. If false, only events without this
+          #   property will pass the filter. If null or omitted, the existence of the property
+          #   is optional.
+          #
+          #   @return [Boolean, nil]
+          optional :exists, MetronomeSDK::Internal::Type::Boolean
+
+          # @!attribute in_values
+          #   Specifies the allowed values for the property to match an event. An event will
+          #   pass the filter only if its property value is included in this list. If
+          #   undefined, all property values will pass the filter. Must be non-empty if
+          #   present.
+          #
+          #   @return [Array<String>, nil]
+          optional :in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+          # @!attribute not_in_values
+          #   Specifies the values that prevent an event from matching the filter. An event
+          #   will not pass the filter if its property value is included in this list. If null
+          #   or empty, all property values will pass the filter. Must be non-empty if
+          #   present.
+          #
+          #   @return [Array<String>, nil]
+          optional :not_in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+          # @!method initialize(name:, exists: nil, in_values: nil, not_in_values: nil)
+          #   Some parameter documentations has been truncated, see
+          #   {MetronomeSDK::Models::V1::BillableMetricListResponse::PropertyFilter} for more
+          #   details.
+          #
+          #   @param name [String] The name of the event property.
+          #
+          #   @param exists [Boolean] Determines whether the property must exist in the event. If true, only events wi
+          #
+          #   @param in_values [Array<String>] Specifies the allowed values for the property to match an event. An event will p
+          #
+          #   @param not_in_values [Array<String>] Specifies the values that prevent an event from matching the filter. An event wi
+        end
       end
     end
   end

data/lib/metronome_sdk/models/v1/billable_metric_retrieve_response.rb

@@ -57,8 +57,9 @@ module MetronomeSDK
           # @!attribute event_type_filter
           #   An optional filtering rule to match the 'event_type' property of an event.
           #
-          #   @return [MetronomeSDK::EventTypeFilter, nil]
-          optional :event_type_filter, -> { MetronomeSDK::EventTypeFilter }
+          #   @return [MetronomeSDK::Models::V1::BillableMetricRetrieveResponse::Data::EventTypeFilter, nil]
+          optional :event_type_filter,
+                   -> { MetronomeSDK::Models::V1::BillableMetricRetrieveResponse::Data::EventTypeFilter }
 
           # @!attribute group_keys
           #   Property names that are used to group usage costs on an invoice. Each entry
@@ -73,11 +74,9 @@ module MetronomeSDK
           #   rule on an event property. All rules must pass for the event to match the
           #   billable metric.
           #
-          #   @return [Array<MetronomeSDK::PropertyFilter>, nil]
+          #   @return [Array<MetronomeSDK::Models::V1::BillableMetricRetrieveResponse::Data::PropertyFilter>, nil]
           optional :property_filters,
-                   -> {
-                     MetronomeSDK::Internal::Type::ArrayOf[MetronomeSDK::PropertyFilter]
-                   }
+                   -> { MetronomeSDK::Internal::Type::ArrayOf[MetronomeSDK::Models::V1::BillableMetricRetrieveResponse::Data::PropertyFilter] }
 
           # @!attribute sql
           #   The SQL query associated with the billable metric
@@ -102,11 +101,11 @@ module MetronomeSDK
           #
           #   @param custom_fields [Hash{Symbol=>String}]
           #
-          #   @param event_type_filter [MetronomeSDK::EventTypeFilter] An optional filtering rule to match the 'event_type' property of an event.
+          #   @param event_type_filter [MetronomeSDK::Models::V1::BillableMetricRetrieveResponse::Data::EventTypeFilter] An optional filtering rule to match the 'event_type' property of an event.
           #
           #   @param group_keys [Array<Array<String>>] Property names that are used to group usage costs on an invoice. Each entry repr
           #
-          #   @param property_filters [Array<MetronomeSDK::PropertyFilter>] A list of filters to match events to this billable metric. Each filter defines a
+          #   @param property_filters [Array<MetronomeSDK::Models::V1::BillableMetricRetrieveResponse::Data::PropertyFilter>] A list of filters to match events to this billable metric. Each filter defines a
           #
           #   @param sql [String] The SQL query associated with the billable metric
 
@@ -125,6 +124,84 @@ module MetronomeSDK
             # @!method self.values
             #   @return [Array<Symbol>]
           end
+
+          # @see MetronomeSDK::Models::V1::BillableMetricRetrieveResponse::Data#event_type_filter
+          class EventTypeFilter < MetronomeSDK::Internal::Type::BaseModel
+            # @!attribute in_values
+            #   A list of event types that are explicitly included in the billable metric. If
+            #   specified, only events of these types will match the billable metric. Must be
+            #   non-empty if present.
+            #
+            #   @return [Array<String>, nil]
+            optional :in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+            # @!attribute not_in_values
+            #   A list of event types that are explicitly excluded from the billable metric. If
+            #   specified, events of these types will not match the billable metric. Must be
+            #   non-empty if present.
+            #
+            #   @return [Array<String>, nil]
+            optional :not_in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+            # @!method initialize(in_values: nil, not_in_values: nil)
+            #   Some parameter documentations has been truncated, see
+            #   {MetronomeSDK::Models::V1::BillableMetricRetrieveResponse::Data::EventTypeFilter}
+            #   for more details.
+            #
+            #   An optional filtering rule to match the 'event_type' property of an event.
+            #
+            #   @param in_values [Array<String>] A list of event types that are explicitly included in the billable metric. If sp
+            #
+            #   @param not_in_values [Array<String>] A list of event types that are explicitly excluded from the billable metric. If
+          end
+
+          class PropertyFilter < MetronomeSDK::Internal::Type::BaseModel
+            # @!attribute name
+            #   The name of the event property.
+            #
+            #   @return [String]
+            required :name, String
+
+            # @!attribute exists
+            #   Determines whether the property must exist in the event. If true, only events
+            #   with this property will pass the filter. If false, only events without this
+            #   property will pass the filter. If null or omitted, the existence of the property
+            #   is optional.
+            #
+            #   @return [Boolean, nil]
+            optional :exists, MetronomeSDK::Internal::Type::Boolean
+
+            # @!attribute in_values
+            #   Specifies the allowed values for the property to match an event. An event will
+            #   pass the filter only if its property value is included in this list. If
+            #   undefined, all property values will pass the filter. Must be non-empty if
+            #   present.
+            #
+            #   @return [Array<String>, nil]
+            optional :in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+            # @!attribute not_in_values
+            #   Specifies the values that prevent an event from matching the filter. An event
+            #   will not pass the filter if its property value is included in this list. If null
+            #   or empty, all property values will pass the filter. Must be non-empty if
+            #   present.
+            #
+            #   @return [Array<String>, nil]
+            optional :not_in_values, MetronomeSDK::Internal::Type::ArrayOf[String]
+
+            # @!method initialize(name:, exists: nil, in_values: nil, not_in_values: nil)
+            #   Some parameter documentations has been truncated, see
+            #   {MetronomeSDK::Models::V1::BillableMetricRetrieveResponse::Data::PropertyFilter}
+            #   for more details.
+            #
+            #   @param name [String] The name of the event property.
+            #
+            #   @param exists [Boolean] Determines whether the property must exist in the event. If true, only events wi
+            #
+            #   @param in_values [Array<String>] Specifies the allowed values for the property to match an event. An event will p
+            #
+            #   @param not_in_values [Array<String>] Specifies the values that prevent an event from matching the filter. An event wi
+          end
         end
       end
     end