schematichq 1.4.0 → 1.4.2

data/lib/schematic/credits/client.rb

@@ -187,6 +187,44 @@ module Schematic
         end
       end
 
+      # @param request_options [Hash]
+      # @param params [Hash]
+      # @option request_options [String] :base_url
+      # @option request_options [Hash{String => Object}] :additional_headers
+      # @option request_options [Hash{String => Object}] :additional_query_parameters
+      # @option request_options [Hash{String => Object}] :additional_body_parameters
+      # @option request_options [Integer] :timeout_in_seconds
+      # @option params [String] :company_id
+      #
+      # @return [Schematic::Credits::Types::ListCompanyCreditBalancesResponse]
+      def list_company_credit_balances(request_options: {}, **params)
+        params = Schematic::Internal::Types::Utils.normalize_keys(params)
+        query_param_names = %i[company_id]
+        query_params = {}
+        query_params["company_id"] = params[:company_id] if params.key?(:company_id)
+        params.except(*query_param_names)
+
+        request = Schematic::Internal::JSON::Request.new(
+          base_url: request_options[:base_url],
+          method: "GET",
+          path: "billing/credits/balance",
+          query: query_params,
+          request_options: request_options
+        )
+        begin
+          response = @client.send(request)
+        rescue Net::HTTPRequestTimeout
+          raise Schematic::Errors::TimeoutError
+        end
+        code = response.code.to_i
+        if code.between?(200, 299)
+          Schematic::Credits::Types::ListCompanyCreditBalancesResponse.load(response.body)
+        else
+          error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
+          raise error_class.new(response.body, code: code)
+        end
+      end
+
       # @param request_options [Hash]
       # @param params [Hash]
       # @option request_options [String] :base_url
@@ -825,19 +863,21 @@ module Schematic
       # @option params [String, nil] :plan_id
       # @option params [String, nil] :plan_ids
       # @option params [String, nil] :plan_version_id
+      # @option params [String, nil] :plan_version_ids
       # @option params [Integer, nil] :limit
       # @option params [Integer, nil] :offset
       #
       # @return [Schematic::Credits::Types::ListBillingPlanCreditGrantsResponse]
       def list_billing_plan_credit_grants(request_options: {}, **params)
         params = Schematic::Internal::Types::Utils.normalize_keys(params)
-        query_param_names = %i[credit_id ids plan_id plan_ids plan_version_id limit offset]
+        query_param_names = %i[credit_id ids plan_id plan_ids plan_version_id plan_version_ids limit offset]
         query_params = {}
         query_params["credit_id"] = params[:credit_id] if params.key?(:credit_id)
         query_params["ids"] = params[:ids] if params.key?(:ids)
         query_params["plan_id"] = params[:plan_id] if params.key?(:plan_id)
         query_params["plan_ids"] = params[:plan_ids] if params.key?(:plan_ids)
         query_params["plan_version_id"] = params[:plan_version_id] if params.key?(:plan_version_id)
+        query_params["plan_version_ids"] = params[:plan_version_ids] if params.key?(:plan_version_ids)
         query_params["limit"] = params[:limit] if params.key?(:limit)
         query_params["offset"] = params[:offset] if params.key?(:offset)
         params.except(*query_param_names)
@@ -1011,19 +1051,21 @@ module Schematic
       # @option params [String, nil] :plan_id
       # @option params [String, nil] :plan_ids
       # @option params [String, nil] :plan_version_id
+      # @option params [String, nil] :plan_version_ids
       # @option params [Integer, nil] :limit
       # @option params [Integer, nil] :offset
       #
       # @return [Schematic::Credits::Types::CountBillingPlanCreditGrantsResponse]
       def count_billing_plan_credit_grants(request_options: {}, **params)
         params = Schematic::Internal::Types::Utils.normalize_keys(params)
-        query_param_names = %i[credit_id ids plan_id plan_ids plan_version_id limit offset]
+        query_param_names = %i[credit_id ids plan_id plan_ids plan_version_id plan_version_ids limit offset]
         query_params = {}
         query_params["credit_id"] = params[:credit_id] if params.key?(:credit_id)
         query_params["ids"] = params[:ids] if params.key?(:ids)
         query_params["plan_id"] = params[:plan_id] if params.key?(:plan_id)
         query_params["plan_ids"] = params[:plan_ids] if params.key?(:plan_ids)
         query_params["plan_version_id"] = params[:plan_version_id] if params.key?(:plan_version_id)
+        query_params["plan_version_ids"] = params[:plan_version_ids] if params.key?(:plan_version_ids)
         query_params["limit"] = params[:limit] if params.key?(:limit)
         query_params["offset"] = params[:offset] if params.key?(:offset)
         params.except(*query_param_names)

data/lib/schematic/credits/types/count_billing_plan_credit_grants_params.rb

@@ -12,6 +12,7 @@ module Schematic
         field :plan_id, -> { String }, optional: true, nullable: false
         field :plan_ids, -> { Internal::Types::Array[String] }, optional: true, nullable: false
         field :plan_version_id, -> { String }, optional: true, nullable: false
+        field :plan_version_ids, -> { Internal::Types::Array[String] }, optional: true, nullable: false
       end
     end
   end

data/lib/schematic/credits/types/count_billing_plan_credit_grants_request.rb

@@ -9,6 +9,7 @@ module Schematic
         field :plan_id, -> { String }, optional: true, nullable: false
         field :plan_ids, -> { String }, optional: true, nullable: false
         field :plan_version_id, -> { String }, optional: true, nullable: false
+        field :plan_version_ids, -> { String }, optional: true, nullable: false
         field :limit, -> { Integer }, optional: true, nullable: false
         field :offset, -> { Integer }, optional: true, nullable: false
       end

data/lib/schematic/credits/types/list_billing_plan_credit_grants_params.rb

@@ -12,6 +12,7 @@ module Schematic
         field :plan_id, -> { String }, optional: true, nullable: false
         field :plan_ids, -> { Internal::Types::Array[String] }, optional: true, nullable: false
         field :plan_version_id, -> { String }, optional: true, nullable: false
+        field :plan_version_ids, -> { Internal::Types::Array[String] }, optional: true, nullable: false
       end
     end
   end

data/lib/schematic/credits/types/list_billing_plan_credit_grants_request.rb

@@ -9,6 +9,7 @@ module Schematic
         field :plan_id, -> { String }, optional: true, nullable: false
         field :plan_ids, -> { String }, optional: true, nullable: false
         field :plan_version_id, -> { String }, optional: true, nullable: false
+        field :plan_version_ids, -> { String }, optional: true, nullable: false
         field :limit, -> { Integer }, optional: true, nullable: false
         field :offset, -> { Integer }, optional: true, nullable: false
       end

data/lib/schematic/credits/types/list_company_credit_balances_params.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Schematic
+  module Credits
+    module Types
+      # Input parameters
+      class ListCompanyCreditBalancesParams < Internal::Types::Model
+        field :company_id, -> { String }, optional: true, nullable: false
+      end
+    end
+  end
+end

data/lib/schematic/credits/types/list_company_credit_balances_request.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Schematic
+  module Credits
+    module Types
+      class ListCompanyCreditBalancesRequest < Internal::Types::Model
+        field :company_id, -> { String }, optional: false, nullable: false
+      end
+    end
+  end
+end

data/lib/schematic/credits/types/list_company_credit_balances_response.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Schematic
+  module Credits
+    module Types
+      class ListCompanyCreditBalancesResponse < Internal::Types::Model
+        field :data, -> { Internal::Types::Array[Schematic::Types::CompanyCreditBalanceResponseData] }, optional: false, nullable: false
+        field :params, -> { Schematic::Credits::Types::ListCompanyCreditBalancesParams }, optional: false, nullable: false
+      end
+    end
+  end
+end

data/lib/schematic/datastream/client.rb

@@ -295,6 +295,7 @@ module Schematic
       def handle_message(message)
         entity_type = message[:entity_type] || message["entity_type"]
         message_type = message[:message_type] || message["message_type"]
+        entity_id = message[:entity_id] || message["entity_id"]
         data = message[:data] || message["data"]
 
         @logger.debug("Processing DataStream message: EntityType=#{entity_type}, MessageType=#{message_type}")
@@ -305,9 +306,9 @@ module Schematic
         when ENTITY_TYPE_FLAG
           handle_flag_message(data, message_type)
         when ENTITY_TYPE_COMPANY, ENTITY_TYPE_COMPANIES
-          handle_company_message(data, message_type)
+          handle_company_message(data, message_type, entity_id)
         when ENTITY_TYPE_USER, ENTITY_TYPE_USERS
-          handle_user_message(data, message_type)
+          handle_user_message(data, message_type, entity_id)
         else
           if message[:error] || message["error"]
             handle_error_message(message)
@@ -335,7 +336,7 @@ module Schematic
           keys_to_keep << versioned_key
         end
 
-        @flag_cache.delete_missing(keys_to_keep) if @flag_cache.respond_to?(:delete_missing)
+        @flag_cache.delete_missing(keys_to_keep, scope: "flags:") if @flag_cache.respond_to?(:delete_missing)
 
         @logger.debug("Cached #{data.size} flags from DataStream")
 
@@ -357,25 +358,28 @@ module Schematic
         end
       end
 
-      def handle_company_message(data, message_type)
-        id = data[:id] || data["id"]
-
+      def handle_company_message(data, message_type, entity_id = nil)
         case message_type
         when MESSAGE_TYPE_DELETE
-          @company_cache.delete_entity(data) if id
+          delete_id = data[:id] || data["id"] if data.is_a?(Hash)
+          @company_cache.delete_entity(data) if delete_id
         when MESSAGE_TYPE_PARTIAL
-          if id
-            existing = @company_cache.get_by_id(id)
+          # Cache lookup uses envelope entity_id; data is the wrapped partial
+          # payload (e.g. {"credit_balances": {...}}), with no top-level id.
+          if entity_id
+            existing = @company_cache.get_by_id(entity_id)
             if existing
               merged = Merge.partial_company(existing, data)
               @company_cache.cache_entity(merged, ttl: @cache_ttl)
             else
-              @logger.warn("Cache miss for partial company '#{id}', caching as new")
-              @company_cache.cache_entity(data, ttl: @cache_ttl)
+              @logger.warn("Cache miss for partial company '#{entity_id}', skipping")
             end
+          else
+            @logger.warn("Partial company message missing entity_id")
           end
         when MESSAGE_TYPE_FULL
-          @company_cache.cache_entity(data, ttl: @cache_ttl) if id
+          full_id = data[:id] || data["id"] if data.is_a?(Hash)
+          @company_cache.cache_entity(data, ttl: @cache_ttl) if full_id
         end
 
         notify_pending(:company, data)
@@ -383,25 +387,28 @@ module Schematic
         @logger.error("Failed to process company message: #{e.message}")
       end
 
-      def handle_user_message(data, message_type)
-        id = data[:id] || data["id"]
-
+      def handle_user_message(data, message_type, entity_id = nil)
         case message_type
         when MESSAGE_TYPE_DELETE
-          @user_cache.delete_entity(data) if id
+          delete_id = data[:id] || data["id"] if data.is_a?(Hash)
+          @user_cache.delete_entity(data) if delete_id
         when MESSAGE_TYPE_PARTIAL
-          if id
-            existing = @user_cache.get_by_id(id)
+          # Cache lookup uses envelope entity_id; data is the wrapped partial
+          # payload with no top-level id.
+          if entity_id
+            existing = @user_cache.get_by_id(entity_id)
             if existing
               merged = Merge.partial_user(existing, data)
               @user_cache.cache_entity(merged, ttl: @cache_ttl)
             else
-              @logger.warn("Cache miss for partial user '#{id}', caching as new")
-              @user_cache.cache_entity(data, ttl: @cache_ttl)
+              @logger.warn("Cache miss for partial user '#{entity_id}', skipping")
             end
+          else
+            @logger.warn("Partial user message missing entity_id")
           end
         when MESSAGE_TYPE_FULL
-          @user_cache.cache_entity(data, ttl: @cache_ttl) if id
+          full_id = data[:id] || data["id"] if data.is_a?(Hash)
+          @user_cache.cache_entity(data, ttl: @cache_ttl) if full_id
         end
 
         notify_pending(:user, data)

data/lib/schematic/datastream/websocket_client.rb

@@ -6,6 +6,8 @@ require "uri"
 require "json"
 require "websocket"
 
+require_relative "../version"
+
 module Schematic
   module DataStream
     WRITE_WAIT = 10       # seconds
@@ -27,6 +29,14 @@ module Schematic
     MESSAGE_TYPE_DELETE = "delete"
     MESSAGE_TYPE_ERROR = "error"
 
+    # Headers attached to the WebSocket handshake so the backend can distinguish
+    # direct-SDK connections from the schematic-datastream-replicator and
+    # correlate either to a specific release. Mode is always "direct" here —
+    # replicator mode in this SDK doesn't open a WebSocket at all.
+    CLIENT_NAME = "schematic-ruby"
+    DATASTREAM_MODE_DIRECT = "direct"
+    UNKNOWN_VERSION = "unknown"
+
     class WebSocketClient
       attr_reader :url, :connected, :ready
 
@@ -154,7 +164,7 @@ module Schematic
       def perform_handshake
         @handshake = WebSocket::Handshake::Client.new(
           url: @url,
-          headers: { "X-Schematic-Api-Key" => @api_key }
+          headers: handshake_headers
         )
 
         @socket.write(@handshake.to_s)
@@ -310,6 +320,27 @@ module Schematic
         )
         @write_mutex.synchronize { @socket&.write(frame.to_s) }
       end
+
+      # Headers attached to the WebSocket handshake. The mode/client headers let
+      # the backend tell direct-SDK connections apart from the
+      # schematic-datastream-replicator and correlate them to a release.
+      def handshake_headers
+        {
+          "X-Schematic-Api-Key" => @api_key,
+          "X-Schematic-Datastream-Mode" => DATASTREAM_MODE_DIRECT,
+          "X-Schematic-Client" => CLIENT_NAME,
+          "X-Schematic-Client-Version" => sdk_version
+        }
+      end
+
+      # Resolves the SDK version reported in handshake headers. Schematic::VERSION
+      # is stamped into the Fern-generated lib/schematic/version.rb on each release;
+      # fall back to "unknown" if the constant is missing (e.g. a partial checkout).
+      def sdk_version
+        return Schematic::VERSION if defined?(Schematic::VERSION) && !Schematic::VERSION.to_s.empty?
+
+        UNKNOWN_VERSION
+      end
     end
   end
 end

data/lib/schematic/entitlements/client.rb

@@ -350,6 +350,7 @@ module Schematic
       # @option params [Hash[String, String], nil] :company_keys
       # @option params [String, nil] :feature_ids
       # @option params [Boolean, nil] :include_usage_aggregation
+      # @option params [Schematic::Types::BillingProviderType, nil] :managed_by
       # @option params [String, nil] :q
       # @option params [Boolean, nil] :without_negative_entitlements
       # @option params [Integer, nil] :limit
@@ -358,12 +359,13 @@ module Schematic
       # @return [Schematic::Entitlements::Types::ListFeatureUsageResponse]
       def list_feature_usage(request_options: {}, **params)
         params = Schematic::Internal::Types::Utils.normalize_keys(params)
-        query_param_names = %i[company_id company_keys feature_ids include_usage_aggregation q without_negative_entitlements limit offset]
+        query_param_names = %i[company_id company_keys feature_ids include_usage_aggregation managed_by q without_negative_entitlements limit offset]
         query_params = {}
         query_params["company_id"] = params[:company_id] if params.key?(:company_id)
         query_params["company_keys"] = params[:company_keys] if params.key?(:company_keys)
         query_params["feature_ids"] = params[:feature_ids] if params.key?(:feature_ids)
         query_params["include_usage_aggregation"] = params[:include_usage_aggregation] if params.key?(:include_usage_aggregation)
+        query_params["managed_by"] = params[:managed_by] if params.key?(:managed_by)
         query_params["q"] = params[:q] if params.key?(:q)
         query_params["without_negative_entitlements"] = params[:without_negative_entitlements] if params.key?(:without_negative_entitlements)
         query_params["limit"] = params[:limit] if params.key?(:limit)
@@ -448,6 +450,7 @@ module Schematic
       # @option params [Hash[String, String], nil] :company_keys
       # @option params [String, nil] :feature_ids
       # @option params [Boolean, nil] :include_usage_aggregation
+      # @option params [Schematic::Types::BillingProviderType, nil] :managed_by
       # @option params [String, nil] :q
       # @option params [Boolean, nil] :without_negative_entitlements
       # @option params [Integer, nil] :limit
@@ -456,12 +459,13 @@ module Schematic
       # @return [Schematic::Entitlements::Types::CountFeatureUsageResponse]
       def count_feature_usage(request_options: {}, **params)
         params = Schematic::Internal::Types::Utils.normalize_keys(params)
-        query_param_names = %i[company_id company_keys feature_ids include_usage_aggregation q without_negative_entitlements limit offset]
+        query_param_names = %i[company_id company_keys feature_ids include_usage_aggregation managed_by q without_negative_entitlements limit offset]
         query_params = {}
         query_params["company_id"] = params[:company_id] if params.key?(:company_id)
         query_params["company_keys"] = params[:company_keys] if params.key?(:company_keys)
         query_params["feature_ids"] = params[:feature_ids] if params.key?(:feature_ids)
         query_params["include_usage_aggregation"] = params[:include_usage_aggregation] if params.key?(:include_usage_aggregation)
+        query_params["managed_by"] = params[:managed_by] if params.key?(:managed_by)
         query_params["q"] = params[:q] if params.key?(:q)
         query_params["without_negative_entitlements"] = params[:without_negative_entitlements] if params.key?(:without_negative_entitlements)
         query_params["limit"] = params[:limit] if params.key?(:limit)
@@ -768,6 +772,38 @@ module Schematic
         end
       end
 
+      # @param request_options [Hash]
+      # @param params [Schematic::Entitlements::Types::CreateBillingLinkedPlanEntitlementRequestBody]
+      # @option request_options [String] :base_url
+      # @option request_options [Hash{String => Object}] :additional_headers
+      # @option request_options [Hash{String => Object}] :additional_query_parameters
+      # @option request_options [Hash{String => Object}] :additional_body_parameters
+      # @option request_options [Integer] :timeout_in_seconds
+      #
+      # @return [Schematic::Entitlements::Types::UpsertPlanEntitlementForBillingProductResponse]
+      def upsert_plan_entitlement_for_billing_product(request_options: {}, **params)
+        params = Schematic::Internal::Types::Utils.normalize_keys(params)
+        request = Schematic::Internal::JSON::Request.new(
+          base_url: request_options[:base_url],
+          method: "POST",
+          path: "plan-entitlements/billing-linked",
+          body: Schematic::Entitlements::Types::CreateBillingLinkedPlanEntitlementRequestBody.new(params).to_h,
+          request_options: request_options
+        )
+        begin
+          response = @client.send(request)
+        rescue Net::HTTPRequestTimeout
+          raise Schematic::Errors::TimeoutError
+        end
+        code = response.code.to_i
+        if code.between?(200, 299)
+          Schematic::Entitlements::Types::UpsertPlanEntitlementForBillingProductResponse.load(response.body)
+        else
+          error_class = Schematic::Errors::ResponseError.subclass_for_code(code)
+          raise error_class.new(response.body, code: code)
+        end
+      end
+
       # @param request_options [Hash]
       # @param params [Hash]
       # @option request_options [String] :base_url

data/lib/schematic/entitlements/types/count_feature_usage_params.rb

@@ -10,6 +10,7 @@ module Schematic
         field :feature_ids, -> { Internal::Types::Array[String] }, optional: true, nullable: false
         field :include_usage_aggregation, -> { Internal::Types::Boolean }, optional: true, nullable: false
         field :limit, -> { Integer }, optional: true, nullable: false
+        field :managed_by, -> { Schematic::Types::BillingProviderType }, optional: true, nullable: false
         field :offset, -> { Integer }, optional: true, nullable: false
         field :q, -> { String }, optional: true, nullable: false
         field :without_negative_entitlements, -> { Internal::Types::Boolean }, optional: true, nullable: false

data/lib/schematic/entitlements/types/count_feature_usage_request.rb

@@ -8,6 +8,7 @@ module Schematic
         field :company_keys, -> { Internal::Types::Hash[String, String] }, optional: true, nullable: false
         field :feature_ids, -> { String }, optional: true, nullable: false
         field :include_usage_aggregation, -> { Internal::Types::Boolean }, optional: true, nullable: false
+        field :managed_by, -> { Schematic::Types::BillingProviderType }, optional: true, nullable: false
         field :q, -> { String }, optional: true, nullable: false
         field :without_negative_entitlements, -> { Internal::Types::Boolean }, optional: true, nullable: false
         field :limit, -> { Integer }, optional: true, nullable: false

data/lib/schematic/entitlements/types/create_billing_linked_plan_entitlement_request_body.rb

@@ -0,0 +1,44 @@
+# frozen_string_literal: true
+
+module Schematic
+  module Entitlements
+    module Types
+      class CreateBillingLinkedPlanEntitlementRequestBody < Internal::Types::Model
+        field :billing_product_id, -> { String }, optional: true, nullable: false
+        field :billing_provider, -> { Schematic::Types::BillingProviderType }, optional: false, nullable: false
+        field :billing_threshold, -> { Integer }, optional: true, nullable: false
+        field :credit_consumption_rate, -> { Integer }, optional: true, nullable: false
+        field :currency, -> { String }, optional: true, nullable: false
+        field :currency_prices, -> { Internal::Types::Array[Schematic::Types::CurrencyPriceRequestBody] }, optional: true, nullable: false
+        field :external_resource_id, -> { String }, optional: false, nullable: false
+        field :feature_id, -> { String }, optional: false, nullable: false
+        field :metric_period, -> { Schematic::Types::MetricPeriod }, optional: true, nullable: false
+        field :metric_period_month_reset, -> { Schematic::Types::MetricPeriodMonthReset }, optional: true, nullable: false
+        field :monthly_metered_price_id, -> { String }, optional: true, nullable: false
+        field :monthly_price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
+        field :monthly_unit_price, -> { Integer }, optional: true, nullable: false
+        field :monthly_unit_price_decimal, -> { String }, optional: true, nullable: false
+        field :overage_billing_product_id, -> { String }, optional: true, nullable: false
+        field :plan_id, -> { String }, optional: false, nullable: false
+        field :plan_version_id, -> { String }, optional: true, nullable: false
+        field :price_behavior, -> { Schematic::Types::EntitlementPriceBehavior }, optional: true, nullable: false
+        field :price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
+        field :quarterly_metered_price_id, -> { String }, optional: true, nullable: false
+        field :quarterly_price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
+        field :quarterly_unit_price, -> { Integer }, optional: true, nullable: false
+        field :quarterly_unit_price_decimal, -> { String }, optional: true, nullable: false
+        field :soft_limit, -> { Integer }, optional: true, nullable: false
+        field :tier_mode, -> { Schematic::Types::BillingTiersMode }, optional: true, nullable: false
+        field :value_bool, -> { Internal::Types::Boolean }, optional: true, nullable: false
+        field :value_credit_id, -> { String }, optional: true, nullable: false
+        field :value_numeric, -> { Integer }, optional: true, nullable: false
+        field :value_trait_id, -> { String }, optional: true, nullable: false
+        field :value_type, -> { Schematic::Types::EntitlementValueType }, optional: false, nullable: false
+        field :yearly_metered_price_id, -> { String }, optional: true, nullable: false
+        field :yearly_price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
+        field :yearly_unit_price, -> { Integer }, optional: true, nullable: false
+        field :yearly_unit_price_decimal, -> { String }, optional: true, nullable: false
+      end
+    end
+  end
+end

data/lib/schematic/entitlements/types/create_company_override_request_body.rb

@@ -8,8 +8,8 @@ module Schematic
         field :credit_consumption_rate, -> { Integer }, optional: true, nullable: false
         field :expiration_date, -> { String }, optional: true, nullable: false
         field :feature_id, -> { String }, optional: false, nullable: false
-        field :metric_period, -> { Schematic::Entitlements::Types::CreateCompanyOverrideRequestBodyMetricPeriod }, optional: true, nullable: false
-        field :metric_period_month_reset, -> { Schematic::Entitlements::Types::CreateCompanyOverrideRequestBodyMetricPeriodMonthReset }, optional: true, nullable: false
+        field :metric_period, -> { Schematic::Types::MetricPeriod }, optional: true, nullable: false
+        field :metric_period_month_reset, -> { Schematic::Types::MetricPeriodMonthReset }, optional: true, nullable: false
         field :note, -> { String }, optional: true, nullable: false
         field :value_bool, -> { Internal::Types::Boolean }, optional: true, nullable: false
         field :value_credit_id, -> { String }, optional: true, nullable: false

data/lib/schematic/entitlements/types/create_plan_entitlement_request_body.rb

@@ -10,8 +10,8 @@ module Schematic
         field :currency, -> { String }, optional: true, nullable: false
         field :currency_prices, -> { Internal::Types::Array[Schematic::Types::CurrencyPriceRequestBody] }, optional: true, nullable: false
         field :feature_id, -> { String }, optional: false, nullable: false
-        field :metric_period, -> { Schematic::Entitlements::Types::CreatePlanEntitlementRequestBodyMetricPeriod }, optional: true, nullable: false
-        field :metric_period_month_reset, -> { Schematic::Entitlements::Types::CreatePlanEntitlementRequestBodyMetricPeriodMonthReset }, optional: true, nullable: false
+        field :metric_period, -> { Schematic::Types::MetricPeriod }, optional: true, nullable: false
+        field :metric_period_month_reset, -> { Schematic::Types::MetricPeriodMonthReset }, optional: true, nullable: false
         field :monthly_metered_price_id, -> { String }, optional: true, nullable: false
         field :monthly_price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
         field :monthly_unit_price, -> { Integer }, optional: true, nullable: false
@@ -21,6 +21,10 @@ module Schematic
         field :plan_version_id, -> { String }, optional: true, nullable: false
         field :price_behavior, -> { Schematic::Types::EntitlementPriceBehavior }, optional: true, nullable: false
         field :price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
+        field :quarterly_metered_price_id, -> { String }, optional: true, nullable: false
+        field :quarterly_price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
+        field :quarterly_unit_price, -> { Integer }, optional: true, nullable: false
+        field :quarterly_unit_price_decimal, -> { String }, optional: true, nullable: false
         field :soft_limit, -> { Integer }, optional: true, nullable: false
         field :tier_mode, -> { Schematic::Types::BillingTiersMode }, optional: true, nullable: false
         field :value_bool, -> { Internal::Types::Boolean }, optional: true, nullable: false

data/lib/schematic/entitlements/types/list_feature_usage_params.rb

@@ -10,6 +10,7 @@ module Schematic
         field :feature_ids, -> { Internal::Types::Array[String] }, optional: true, nullable: false
         field :include_usage_aggregation, -> { Internal::Types::Boolean }, optional: true, nullable: false
         field :limit, -> { Integer }, optional: true, nullable: false
+        field :managed_by, -> { Schematic::Types::BillingProviderType }, optional: true, nullable: false
         field :offset, -> { Integer }, optional: true, nullable: false
         field :q, -> { String }, optional: true, nullable: false
         field :without_negative_entitlements, -> { Internal::Types::Boolean }, optional: true, nullable: false

data/lib/schematic/entitlements/types/list_feature_usage_request.rb

@@ -8,6 +8,7 @@ module Schematic
         field :company_keys, -> { Internal::Types::Hash[String, String] }, optional: true, nullable: false
         field :feature_ids, -> { String }, optional: true, nullable: false
         field :include_usage_aggregation, -> { Internal::Types::Boolean }, optional: true, nullable: false
+        field :managed_by, -> { Schematic::Types::BillingProviderType }, optional: true, nullable: false
         field :q, -> { String }, optional: true, nullable: false
         field :without_negative_entitlements, -> { Internal::Types::Boolean }, optional: true, nullable: false
         field :limit, -> { Integer }, optional: true, nullable: false

data/lib/schematic/entitlements/types/update_company_override_request_body.rb

@@ -7,8 +7,8 @@ module Schematic
         field :company_override_id, -> { String }, optional: false, nullable: false
         field :credit_consumption_rate, -> { Integer }, optional: true, nullable: false
         field :expiration_date, -> { String }, optional: true, nullable: false
-        field :metric_period, -> { Schematic::Entitlements::Types::UpdateCompanyOverrideRequestBodyMetricPeriod }, optional: true, nullable: false
-        field :metric_period_month_reset, -> { Schematic::Entitlements::Types::UpdateCompanyOverrideRequestBodyMetricPeriodMonthReset }, optional: true, nullable: false
+        field :metric_period, -> { Schematic::Types::MetricPeriod }, optional: true, nullable: false
+        field :metric_period_month_reset, -> { Schematic::Types::MetricPeriodMonthReset }, optional: true, nullable: false
         field :note, -> { String }, optional: true, nullable: false
         field :value_bool, -> { Internal::Types::Boolean }, optional: true, nullable: false
         field :value_credit_id, -> { String }, optional: true, nullable: false

data/lib/schematic/entitlements/types/update_plan_entitlement_request_body.rb

@@ -10,8 +10,8 @@ module Schematic
         field :credit_consumption_rate, -> { Integer }, optional: true, nullable: false
         field :currency, -> { String }, optional: true, nullable: false
         field :currency_prices, -> { Internal::Types::Array[Schematic::Types::CurrencyPriceRequestBody] }, optional: true, nullable: false
-        field :metric_period, -> { Schematic::Entitlements::Types::UpdatePlanEntitlementRequestBodyMetricPeriod }, optional: true, nullable: false
-        field :metric_period_month_reset, -> { Schematic::Entitlements::Types::UpdatePlanEntitlementRequestBodyMetricPeriodMonthReset }, optional: true, nullable: false
+        field :metric_period, -> { Schematic::Types::MetricPeriod }, optional: true, nullable: false
+        field :metric_period_month_reset, -> { Schematic::Types::MetricPeriodMonthReset }, optional: true, nullable: false
         field :monthly_metered_price_id, -> { String }, optional: true, nullable: false
         field :monthly_price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
         field :monthly_unit_price, -> { Integer }, optional: true, nullable: false
@@ -19,6 +19,10 @@ module Schematic
         field :overage_billing_product_id, -> { String }, optional: true, nullable: false
         field :price_behavior, -> { Schematic::Types::EntitlementPriceBehavior }, optional: true, nullable: false
         field :price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
+        field :quarterly_metered_price_id, -> { String }, optional: true, nullable: false
+        field :quarterly_price_tiers, -> { Internal::Types::Array[Schematic::Types::CreatePriceTierRequestBody] }, optional: true, nullable: false
+        field :quarterly_unit_price, -> { Integer }, optional: true, nullable: false
+        field :quarterly_unit_price_decimal, -> { String }, optional: true, nullable: false
         field :soft_limit, -> { Integer }, optional: true, nullable: false
         field :tier_mode, -> { Schematic::Types::BillingTiersMode }, optional: true, nullable: false
         field :value_bool, -> { Internal::Types::Boolean }, optional: true, nullable: false

data/lib/schematic/entitlements/types/upsert_plan_entitlement_for_billing_product_response.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module Schematic
+  module Entitlements
+    module Types
+      class UpsertPlanEntitlementForBillingProductResponse < Internal::Types::Model
+        field :data, -> { Schematic::Types::PlanEntitlementResponseData }, optional: false, nullable: false
+        field :params, -> { Internal::Types::Hash[String, Object] }, optional: false, nullable: false
+      end
+    end
+  end
+end

data/lib/schematic/event_buffer.rb

@@ -26,6 +26,7 @@ module Schematic
       @stopped = false
       @flushing = false
       @flush_done = ConditionVariable.new
+      @stop_cv = ConditionVariable.new
 
       start_periodic_flush unless @offline
     end
@@ -77,6 +78,10 @@ module Schematic
       @mutex.synchronize do
         @stopped = true
 
+        # Wake the periodic flush thread so it sees @stopped immediately
+        # instead of sleeping out the rest of @interval.
+        @stop_cv.broadcast
+
         # Wait for any in-flight flush to complete before our final flush,
         # so we don't skip events that arrived during the in-flight batch.
         @flush_done.wait(@mutex, 30) if @flushing
@@ -92,8 +97,11 @@ module Schematic
     def start_periodic_flush
       @flush_thread = Thread.new do
         loop do
-          sleep(@interval)
-          break if @stopped
+          should_break = @mutex.synchronize do
+            @stop_cv.wait(@mutex, @interval) unless @stopped
+            @stopped
+          end
+          break if should_break
 
           begin
             flush

data/lib/schematic/events/client.rb

@@ -97,6 +97,7 @@ module Schematic
       # @option params [String, nil] :event_subtype
       # @option params [Schematic::Types::EventType, nil] :event_types
       # @option params [String, nil] :flag_id
+      # @option params [String, nil] :idempotency_key
       # @option params [String, nil] :user_id
       # @option params [Integer, nil] :limit
       # @option params [Integer, nil] :offset
@@ -104,12 +105,13 @@ module Schematic
       # @return [Schematic::Events::Types::ListEventsResponse]
       def list_events(request_options: {}, **params)
         params = Schematic::Internal::Types::Utils.normalize_keys(params)
-        query_param_names = %i[company_id event_subtype event_types flag_id user_id limit offset]
+        query_param_names = %i[company_id event_subtype event_types flag_id idempotency_key user_id limit offset]
         query_params = {}
         query_params["company_id"] = params[:company_id] if params.key?(:company_id)
         query_params["event_subtype"] = params[:event_subtype] if params.key?(:event_subtype)
         query_params["event_types"] = params[:event_types] if params.key?(:event_types)
         query_params["flag_id"] = params[:flag_id] if params.key?(:flag_id)
+        query_params["idempotency_key"] = params[:idempotency_key] if params.key?(:idempotency_key)
         query_params["user_id"] = params[:user_id] if params.key?(:user_id)
         query_params["limit"] = params[:limit] if params.key?(:limit)
         query_params["offset"] = params[:offset] if params.key?(:offset)