fastpixapi 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a790776f18a63ddb3276df17af9a07b0c461501c2201917c636e5730390f23c4
-  data.tar.gz: f943cb2c84ff2d2dae2a5507b76d87ed3f40a80ccee85c8c2752051dfbbce109
+  metadata.gz: b6ae3027c5f37f777cf9a979ddd36123a1bb1e93e0ff5f2a9b70a4d27928e73c
+  data.tar.gz: c097e0cfb9dc6c84144740416b8a7bdc7e476ca55dab42714ca19db73d7d91bc
 SHA512:
-  metadata.gz: 9d109a83796f163a35f8ec7b9024ea4f8c1a0ca0344fba82092aa5cf0e8e4c5419e09ad093afb0c5e584c42ae0f7aa262896b0b24fa8a5f8d0bca8c394d46ec4
-  data.tar.gz: 81703c836ec11f2080602016f2604cc0e36c7d26481646fb7a903673654672f587262262f7aff7b8ba091f3f76d2740cfb132a095fcd33e6d2fec81ef2ce9834
+  metadata.gz: 070f775ab0edfac491bb4667b3b94f4f031e67fc460435ab227e9821c389a7a49ab4a913c8b97a60069849d2e61f13dbf3e2d54c3ea40759aaf296ab02d44131
+  data.tar.gz: dd6640b41c25a8dd2df43f4790b3506f1b35b285362073343bc856bed854de6347304b6edb7e5a5f119eb0666ac22c7427b486c2b50a949e76b6b403ce1d07aa

data/lib/crystalline/metadata_fields.rb

@@ -48,6 +48,7 @@ module Crystalline
           begin
             value = JSON.parse(value)
           rescue TypeError, JSON::ParserError
+            # Not valid JSON; keep the original value unchanged.
           end
           # rubocop:enable Lint/SuppressedException
           return value
@@ -84,54 +85,61 @@ module Crystalline
           # If field is nilable, and the value is not in the dict, just move to the next field
           next if value.nil?
 
-          if Crystalline::Utils.arr? field_type
-            inner_type = Crystalline::Utils.arr_of(field_type)
-            unmarshalled_array = value.map { |f| unmarshal_single(inner_type, f, format_metadata) }
-            to_build[key] = unmarshalled_array
-          elsif Crystalline::Utils.hash? field_type
-            val_type = Crystalline::Utils.hash_of(field_type)
-
-            # rubocop:disable Style/HashTransformValues
-            unmarshalled_hash = value.map { |k, v| [k, unmarshal_single(val_type, v, format_metadata)] }.to_h
-            # rubocop:enable Style/HashTransformValues
-            to_build[key] = unmarshalled_hash
-          elsif Crystalline::Utils.union? field_type
-            discriminator = field.metadata.fetch(:discriminator, nil)
-            discriminator_mapping = field.metadata.fetch(:discriminator_mapping, nil)
-            if !discriminator.nil?
-              discriminator_value = value.fetch(discriminator)
-              if !discriminator_mapping.nil?
-                # Use explicit mapping from discriminator value to type
-                type_to_deserialize = discriminator_mapping[discriminator_value]
-              else
-                # Fallback: try to match discriminator value against type name
-                type_to_deserialize = Crystalline::Utils.get_union_types(field_type).find { |t| t.name.split('::').last == discriminator_value }
-              end
-              to_build[key] = Crystalline.unmarshal_json(value, type_to_deserialize)
+          result = unmarshal_field_value(field, field_type, value, format_metadata)
+          to_build[key] = result unless result.equal?(UNRESOLVED_UNION)
+        end
+        new(**to_build)
+      end
+
+      # Sentinel returned when a union value cannot be resolved to any member type,
+      # so the caller can leave the field unset (instead of assigning nil).
+      UNRESOLVED_UNION = Object.new
+
+      # Dispatches unmarshalling of a single field value based on its declared type.
+      def unmarshal_field_value(field, field_type, value, format_metadata)
+        if Crystalline::Utils.arr? field_type
+          inner_type = Crystalline::Utils.arr_of(field_type)
+          value.map { |f| unmarshal_single(inner_type, f, format_metadata) }
+        elsif Crystalline::Utils.hash? field_type
+          val_type = Crystalline::Utils.hash_of(field_type)
+          # rubocop:disable Style/HashTransformValues
+          value.map { |k, v| [k, unmarshal_single(val_type, v, format_metadata)] }.to_h
+          # rubocop:enable Style/HashTransformValues
+        elsif Crystalline::Utils.union? field_type
+          unmarshal_union(field, field_type, value)
+        elsif field_type.instance_of?(Class) && field_type.include?(::Crystalline::MetadataFields)
+          Crystalline.unmarshal_json(value, field_type)
+        else
+          unmarshal_single(field_type, value, format_metadata)
+        end
+      end
+
+      # Resolves a union-typed value, using a discriminator when present and otherwise
+      # trying each candidate type in turn. Returns UNRESOLVED_UNION if none match.
+      def unmarshal_union(field, field_type, value)
+        discriminator = field.metadata.fetch(:discriminator, nil)
+        unless discriminator.nil?
+          discriminator_mapping = field.metadata.fetch(:discriminator_mapping, nil)
+          discriminator_value = value.fetch(discriminator)
+          type_to_deserialize =
+            if discriminator_mapping.nil?
+              # Fallback: try to match discriminator value against type name
+              Crystalline::Utils.get_union_types(field_type).find { |t| t.name.split('::').last == discriminator_value }
             else
-              union_types = Crystalline::Utils.get_union_types(field_type)
-              union_types = union_types.sort_by { |klass| Crystalline.non_nilable_attr_count(klass) }
-
-              union_types.each do |union_type|
-                begin
-                  to_build[key] = Crystalline.unmarshal_json(value, union_type)
-                rescue TypeError
-                  next
-                rescue NoMethodError
-                  next
-                rescue KeyError
-                  next
-                end
-                break
-              end
+              # Use explicit mapping from discriminator value to type
+              discriminator_mapping[discriminator_value]
             end
-          elsif field_type.instance_of?(Class) && field_type.include?(::Crystalline::MetadataFields)
-            to_build[key] = Crystalline.unmarshal_json(value, field_type)
-          else
-            to_build[key] = unmarshal_single(field_type, value, format_metadata)
-          end
+          return Crystalline.unmarshal_json(value, type_to_deserialize)
         end
-        new(**to_build)
+
+        union_types = Crystalline::Utils.get_union_types(field_type)
+        union_types = union_types.sort_by { |klass| Crystalline.non_nilable_attr_count(klass) }
+        union_types.each do |union_type|
+          return Crystalline.unmarshal_json(value, union_type)
+        rescue TypeError, NoMethodError, KeyError
+          next
+        end
+        UNRESOLVED_UNION
       end
     end
 
@@ -150,9 +158,9 @@ module Crystalline
     end
 
     def field(field_name)
-      fields.each do |f|
-        return f if f.name == field_name
-      end
+      # `|| fields` preserves the original each-loop behaviour of returning the
+      # full fields list when no field matches.
+      fields.find { |f| f.name == field_name } || fields
     end
 
     def marshal_single(field)

data/lib/crystalline/types.rb

@@ -54,14 +54,14 @@ module Crystalline
     end
 
     module ClassMethods
-      def enums(&blk)
+      def enums(&_blk)
         @mapping = {}
 
         yield
         constants(false).each do |const_name|
           instance = const_get(const_name, false)
           unless instance.is_a? self
-            raise 'Enum constants must be instances of the Enum class (e.g. `Foo = new`)'
+            raise ArgumentError, 'Enum constants must be instances of the Enum class (e.g. `Foo = new`)'
           end
           @mapping[instance.serialize] = instance
         end
@@ -71,7 +71,7 @@ module Crystalline
         if @mapping.include? val
           @mapping[val]
         else
-          raise "Invalid value for enum: #{val}"
+          raise ArgumentError, "Invalid value for enum: #{val}"
         end
       end
     end

data/lib/crystalline.rb

@@ -3,11 +3,10 @@
 # typed: false
 # frozen_string_literal: true
 
-module Crystalline
-  autoload :MetadataFields, 'crystalline/metadata_fields'
-end
-
-
 require_relative 'crystalline/utils'
 require_relative 'crystalline/module'
 require_relative 'crystalline/types'
+
+module Crystalline
+  autoload :MetadataFields, 'crystalline/metadata_fields'
+end

data/lib/fastpix_client/dimensions.rb

@@ -14,15 +14,48 @@ module FastpixClient
   extend T::Sig
   class Dimensions
     extend T::Sig
-    
+
+    CONTENT_TYPE_JSON = 'application/json'
+    UNKNOWN_CONTENT_TYPE_ERROR = 'Unknown content type received'
+    API_ERROR_OCCURRED = 'API error occurred'
+
     # Operations involving dimensions
 
     sig { params(sdk_config: SDKConfiguration).void }
     def initialize(sdk_config)
       @sdk_configuration = sdk_config
-      
+
     end
 
+    # Applies the SDK after-request hooks and ensures a usable response is present.
+    sig { params(http_response: T.nilable(Faraday::Response), error: T.nilable(StandardError), hook_ctx: SDKHooks::HookContext).returns(Faraday::Response) }
+    def apply_after_request_hooks(http_response, error, hook_ctx)
+      if http_response.nil? || Utils.error_status?(http_response.status)
+        http_response = @sdk_configuration.hooks.after_error(
+          error: error,
+          hook_ctx: SDKHooks::AfterErrorHookContext.new(
+            hook_ctx: hook_ctx
+          ),
+          response: http_response
+        )
+      else
+        http_response = @sdk_configuration.hooks.after_success(
+          hook_ctx: SDKHooks::AfterSuccessHookContext.new(
+            hook_ctx: hook_ctx
+          ),
+          response: http_response
+        )
+      end
+
+      if http_response.nil?
+        raise error unless error.nil?
+        raise ::FastpixClient::Models::Errors::EmptyResponseError, 'no response'
+      end
+
+      http_response
+    end
+    private :apply_after_request_hooks
+
     sig { params(base_url: String, url_variables: T.nilable(T::Hash[Symbol, T.any(String, T::Enum)])).returns(String) }
     def get_url(base_url:, url_variables: nil)
       sd_base_url, sd_options = @sdk_configuration.get_server_details
@@ -53,7 +86,7 @@ module FastpixClient
       url = "#{base_url}/data/dimensions"
       headers = {}
       headers = T.cast(headers, T::Hash[String, String])
-      headers['Accept'] = 'application/json'
+      headers['Accept'] = CONTENT_TYPE_JSON
       headers['user-agent'] = @sdk_configuration.user_agent
 
       security = @sdk_configuration.security_source&.call
@@ -92,32 +125,12 @@ module FastpixClient
       rescue StandardError => e
         error = e
       ensure
-        if http_response.nil? || Utils.error_status?(http_response.status)
-          http_response = @sdk_configuration.hooks.after_error(
-            error: error,
-            hook_ctx: SDKHooks::AfterErrorHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        else
-          http_response = @sdk_configuration.hooks.after_success(
-            hook_ctx: SDKHooks::AfterSuccessHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        end
-        
-        if http_response.nil?
-          raise error if !error.nil?
-          raise 'no response'
-        end
+        http_response = apply_after_request_hooks(http_response, error, hook_ctx)
       end
       
       content_type = http_response.headers.fetch('Content-Type', 'application/octet-stream')
       if Utils.match_status_code(http_response.status, ['200'])
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx
@@ -135,14 +148,14 @@ module FastpixClient
 
           return response
         else
-          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
+          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), UNKNOWN_CONTENT_TYPE_ERROR
         end
       elsif Utils.match_status_code(http_response.status, ['4XX'])
-        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'API error occurred'
+        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), API_ERROR_OCCURRED
       elsif Utils.match_status_code(http_response.status, ['5XX'])
-        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'API error occurred'
+        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), API_ERROR_OCCURRED
       else
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx
@@ -160,7 +173,7 @@ module FastpixClient
 
           return response
         else
-          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
+          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), UNKNOWN_CONTENT_TYPE_ERROR
         end
       end
     end
@@ -197,7 +210,7 @@ module FastpixClient
       headers = {}
       headers = T.cast(headers, T::Hash[String, String])
       query_params = Utils.get_query_params(Models::Operations::ListFilterValuesForDimensionRequest, request, nil)
-      headers['Accept'] = 'application/json'
+      headers['Accept'] = CONTENT_TYPE_JSON
       headers['user-agent'] = @sdk_configuration.user_agent
 
       security = @sdk_configuration.security_source&.call
@@ -237,32 +250,12 @@ module FastpixClient
       rescue StandardError => e
         error = e
       ensure
-        if http_response.nil? || Utils.error_status?(http_response.status)
-          http_response = @sdk_configuration.hooks.after_error(
-            error: error,
-            hook_ctx: SDKHooks::AfterErrorHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        else
-          http_response = @sdk_configuration.hooks.after_success(
-            hook_ctx: SDKHooks::AfterSuccessHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        end
-        
-        if http_response.nil?
-          raise error if !error.nil?
-          raise 'no response'
-        end
+        http_response = apply_after_request_hooks(http_response, error, hook_ctx)
       end
       
       content_type = http_response.headers.fetch('Content-Type', 'application/octet-stream')
       if Utils.match_status_code(http_response.status, ['200'])
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx
@@ -280,14 +273,14 @@ module FastpixClient
 
           return response
         else
-          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
+          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), UNKNOWN_CONTENT_TYPE_ERROR
         end
       elsif Utils.match_status_code(http_response.status, ['4XX'])
-        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'API error occurred'
+        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), API_ERROR_OCCURRED
       elsif Utils.match_status_code(http_response.status, ['5XX'])
-        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'API error occurred'
+        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), API_ERROR_OCCURRED
       else
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx
@@ -305,7 +298,7 @@ module FastpixClient
 
           return response
         else
-          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
+          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), UNKNOWN_CONTENT_TYPE_ERROR
         end
       end
     end

data/lib/fastpix_client/drm_configurations.rb

@@ -14,6 +14,39 @@ module FastpixClient
   extend T::Sig
   class DRMConfigurations
     extend T::Sig
+
+    API_ERROR_OCCURRED = 'API error occurred'
+    CONTENT_TYPE_JSON = 'application/json'
+    UNKNOWN_CONTENT_TYPE_ERROR = 'Unknown content type received'
+
+    # Applies the SDK after-request hooks and ensures a usable response is present.
+    sig { params(http_response: T.nilable(Faraday::Response), error: T.nilable(StandardError), hook_ctx: SDKHooks::HookContext).returns(Faraday::Response) }
+    def apply_after_request_hooks(http_response, error, hook_ctx)
+      if http_response.nil? || Utils.error_status?(http_response.status)
+        http_response = @sdk_configuration.hooks.after_error(
+          error: error,
+          hook_ctx: SDKHooks::AfterErrorHookContext.new(
+            hook_ctx: hook_ctx
+          ),
+          response: http_response
+        )
+      else
+        http_response = @sdk_configuration.hooks.after_success(
+          hook_ctx: SDKHooks::AfterSuccessHookContext.new(
+            hook_ctx: hook_ctx
+          ),
+          response: http_response
+        )
+      end
+
+      if http_response.nil?
+        raise error unless error.nil?
+        raise ::FastpixClient::Models::Errors::EmptyResponseError, 'no response'
+      end
+
+      http_response
+    end
+    private :apply_after_request_hooks
     
     # Operations for DRM configuration management
 
@@ -65,7 +98,7 @@ module FastpixClient
       headers = {}
       headers = T.cast(headers, T::Hash[String, String])
       query_params = Utils.get_query_params(Models::Operations::GetDrmConfigurationRequest, request, nil)
-      headers['Accept'] = 'application/json'
+      headers['Accept'] = CONTENT_TYPE_JSON
       headers['user-agent'] = @sdk_configuration.user_agent
 
       security = @sdk_configuration.security_source&.call
@@ -105,32 +138,12 @@ module FastpixClient
       rescue StandardError => e
         error = e
       ensure
-        if http_response.nil? || Utils.error_status?(http_response.status)
-          http_response = @sdk_configuration.hooks.after_error(
-            error: error,
-            hook_ctx: SDKHooks::AfterErrorHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        else
-          http_response = @sdk_configuration.hooks.after_success(
-            hook_ctx: SDKHooks::AfterSuccessHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        end
-        
-        if http_response.nil?
-          raise error if !error.nil?
-          raise 'no response'
-        end
+        http_response = apply_after_request_hooks(http_response, error, hook_ctx)
       end
       
       content_type = http_response.headers.fetch('Content-Type', 'application/octet-stream')
       if Utils.match_status_code(http_response.status, ['200'])
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx
@@ -148,14 +161,14 @@ module FastpixClient
 
           return response
         else
-          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
+          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), UNKNOWN_CONTENT_TYPE_ERROR
         end
       elsif Utils.match_status_code(http_response.status, ['4XX'])
-        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'API error occurred'
+        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), API_ERROR_OCCURRED
       elsif Utils.match_status_code(http_response.status, ['5XX'])
-        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'API error occurred'
+        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), API_ERROR_OCCURRED
       else
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx
@@ -173,7 +186,7 @@ module FastpixClient
 
           return response
         else
-          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
+          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), UNKNOWN_CONTENT_TYPE_ERROR
         end
       end
     end
@@ -204,7 +217,7 @@ module FastpixClient
       )
       headers = {}
       headers = T.cast(headers, T::Hash[String, String])
-      headers['Accept'] = 'application/json'
+      headers['Accept'] = CONTENT_TYPE_JSON
       headers['user-agent'] = @sdk_configuration.user_agent
 
       security = @sdk_configuration.security_source&.call
@@ -243,32 +256,12 @@ module FastpixClient
       rescue StandardError => e
         error = e
       ensure
-        if http_response.nil? || Utils.error_status?(http_response.status)
-          http_response = @sdk_configuration.hooks.after_error(
-            error: error,
-            hook_ctx: SDKHooks::AfterErrorHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        else
-          http_response = @sdk_configuration.hooks.after_success(
-            hook_ctx: SDKHooks::AfterSuccessHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        end
-        
-        if http_response.nil?
-          raise error if !error.nil?
-          raise 'no response'
-        end
+        http_response = apply_after_request_hooks(http_response, error, hook_ctx)
       end
       
       content_type = http_response.headers.fetch('Content-Type', 'application/octet-stream')
       if Utils.match_status_code(http_response.status, ['200'])
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx
@@ -286,14 +279,14 @@ module FastpixClient
 
           return response
         else
-          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
+          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), UNKNOWN_CONTENT_TYPE_ERROR
         end
       elsif Utils.match_status_code(http_response.status, ['4XX'])
-        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'API error occurred'
+        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), API_ERROR_OCCURRED
       elsif Utils.match_status_code(http_response.status, ['5XX'])
-        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'API error occurred'
+        raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), API_ERROR_OCCURRED
       else
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx
@@ -311,7 +304,7 @@ module FastpixClient
 
           return response
         else
-          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
+          raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), UNKNOWN_CONTENT_TYPE_ERROR
         end
       end
     end

data/lib/fastpix_client/errors.rb

@@ -14,6 +14,37 @@ module FastpixClient
   extend T::Sig
   class Errors
     extend T::Sig
+
+    CONTENT_TYPE_JSON = 'application/json'
+
+    # Applies the SDK after-request hooks and ensures a usable response is present.
+    sig { params(http_response: T.nilable(Faraday::Response), error: T.nilable(StandardError), hook_ctx: SDKHooks::HookContext).returns(Faraday::Response) }
+    def apply_after_request_hooks(http_response, error, hook_ctx)
+      if http_response.nil? || Utils.error_status?(http_response.status)
+        http_response = @sdk_configuration.hooks.after_error(
+          error: error,
+          hook_ctx: SDKHooks::AfterErrorHookContext.new(
+            hook_ctx: hook_ctx
+          ),
+          response: http_response
+        )
+      else
+        http_response = @sdk_configuration.hooks.after_success(
+          hook_ctx: SDKHooks::AfterSuccessHookContext.new(
+            hook_ctx: hook_ctx
+          ),
+          response: http_response
+        )
+      end
+
+      if http_response.nil?
+        raise error unless error.nil?
+        raise ::FastpixClient::Models::Errors::EmptyResponseError, 'no response'
+      end
+
+      http_response
+    end
+    private :apply_after_request_hooks
     
     # Operations involving errors
 
@@ -71,7 +102,7 @@ module FastpixClient
       headers = {}
       headers = T.cast(headers, T::Hash[String, String])
       query_params = Utils.get_query_params(Models::Operations::ListErrorsRequest, request, nil)
-      headers['Accept'] = 'application/json'
+      headers['Accept'] = CONTENT_TYPE_JSON
       headers['user-agent'] = @sdk_configuration.user_agent
 
       security = @sdk_configuration.security_source&.call
@@ -111,32 +142,12 @@ module FastpixClient
       rescue StandardError => e
         error = e
       ensure
-        if http_response.nil? || Utils.error_status?(http_response.status)
-          http_response = @sdk_configuration.hooks.after_error(
-            error: error,
-            hook_ctx: SDKHooks::AfterErrorHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        else
-          http_response = @sdk_configuration.hooks.after_success(
-            hook_ctx: SDKHooks::AfterSuccessHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: http_response
-          )
-        end
-        
-        if http_response.nil?
-          raise error if !error.nil?
-          raise 'no response'
-        end
+        http_response = apply_after_request_hooks(http_response, error, hook_ctx)
       end
       
       content_type = http_response.headers.fetch('Content-Type', 'application/octet-stream')
       if Utils.match_status_code(http_response.status, ['200'])
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx
@@ -161,7 +172,7 @@ module FastpixClient
       elsif Utils.match_status_code(http_response.status, ['5XX'])
         raise ::FastpixClient::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'API error occurred'
       else
-        if Utils.match_content_type(content_type, 'application/json')
+        if Utils.match_content_type(content_type, CONTENT_TYPE_JSON)
           http_response = @sdk_configuration.hooks.after_success(
             hook_ctx: SDKHooks::AfterSuccessHookContext.new(
               hook_ctx: hook_ctx

data/lib/fastpix_client/fastpixapi.rb

@@ -54,10 +54,8 @@ module FastpixClient
         # f.response :logger, nil, { headers: true, bodies: true, errors: true }
       end
       
-      if !server_url.nil?
-        if !url_params.nil?
-          server_url = Utils.template_url(server_url, url_params)
-        end
+      if !server_url.nil? && !url_params.nil?
+        server_url = Utils.template_url(server_url, url_params)
       end
 
       server_idx = 0 if server_idx.nil?