dub 0.2.2.pre.alpha.97 → 0.2.2

data/lib/open_api_sdk/utils/utils.rb

@@ -1,4 +1,4 @@
-# Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+# Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT.
 
 # typed: true
 # frozen_string_literal: true
@@ -6,11 +6,16 @@
 require 'date'
 require 'sorbet-runtime'
 require 'base64'
+require_relative './metadata_fields'
 
 module OpenApiSDK
   module Utils
     extend T::Sig
 
+    class FieldAugmented
+      include MetadataFields
+    end
+
     sig { params(val: Object, primitives: T::Boolean).returns(Object) }
     def self.val_to_string(val, primitives: true)
       if val.is_a? T::Enum
@@ -24,7 +29,7 @@ module OpenApiSDK
       end
     end
 
-    sig { params(headers_params: ::Crystalline::FieldAugmented, gbls: T.nilable(T::Hash[Symbol, T::Hash[Symbol, T::Hash[Symbol, Object]]])).returns(T::Hash[Symbol, String]) }
+    sig { params(headers_params: FieldAugmented, gbls: T.nilable(T::Hash[Symbol, T::Hash[Symbol, T::Hash[Symbol, Object]]])).returns(T::Hash[Symbol, String]) }
     def self.get_headers(headers_params, gbls = nil)
       return {} if headers_params.nil?
 
@@ -90,7 +95,7 @@ module OpenApiSDK
 
     sig do
       params(field_name: String, explode: T::Boolean, obj: Object, delimiter: String,
-             get_field_name_lambda: T.proc.params(obj_field: ::Crystalline::MetadataFields::Field).returns(String))
+             get_field_name_lambda: T.proc.params(obj_field: MetadataFields::Field).returns(String))
         .returns(T::Hash[Symbol, T::Array[String]])
     end
     def self._populate_form(field_name, explode, obj, delimiter, &get_field_name_lambda)
@@ -210,7 +215,7 @@ module OpenApiSDK
       params = {}
 
       serialization = metadata.fetch(:serialization, '')
-      params[metadata.fetch(:field_name, field_name)] = obj.to_json if serialization == 'json'
+      params[metadata.fetch(:field_name, field_name)] = obj.marshal_json if serialization == 'json'
 
       params
     end
@@ -231,7 +236,7 @@ module OpenApiSDK
       _populate_form(field_name, metadata.fetch(:explode, true), obj, delimiter, &get_query_param_field_name)
     end
 
-    sig { params(clazz: Class, query_params: ::Crystalline::FieldAugmented, gbls: T.nilable(T::Hash[Symbol, T::Hash[Symbol, T::Hash[Symbol, Object]]])).returns(T::Hash[Symbol, T::Array[String]]) }
+    sig { params(clazz: Class, query_params: FieldAugmented, gbls: T.nilable(T::Hash[Symbol, T::Hash[Symbol, T::Hash[Symbol, Object]]])).returns(T::Hash[Symbol, T::Array[String]]) }
     def self.get_query_params(clazz, query_params, gbls = nil)
       params = {}
       param_fields = clazz.fields
@@ -275,7 +280,7 @@ module OpenApiSDK
       params
     end
 
-    sig { params(clazz: Class, server_url: String, path: String, path_params: ::Crystalline::FieldAugmented, gbls: T.nilable(T::Hash[Symbol, T::Hash[Symbol, T::Hash[Symbol, Object]]])).returns(String) }
+    sig { params(clazz: Class, server_url: String, path: String, path_params: FieldAugmented, gbls: T.nilable(T::Hash[Symbol, T::Hash[Symbol, T::Hash[Symbol, Object]]])).returns(String) }
     def self.generate_url(clazz, server_url, path, path_params, gbls = nil)
       clazz.fields.each do |f|
         param_metadata = f.metadata[:path_param]
@@ -351,18 +356,9 @@ module OpenApiSDK
       server_url.delete_suffix('/') + path
     end
 
-    sig { params(status: Integer).returns(T::Boolean) }
-    def self.error_status?(status)
-      status_major = status / 100
-      return true if status_major == 4
-      return true if status_major == 5
-
-      false
-    end
-
     sig { params(content_type: String, pattern: String).returns(T::Boolean) }
     def self.match_content_type(content_type, pattern)
-      return true if content_type == pattern || ['*', '*/*'].include?(pattern)
+      return true if content_type == pattern || pattern == '*' || pattern == '*/*'
 
       pieces = content_type.split(';')
       pieces.each do |piece|
@@ -374,7 +370,6 @@ module OpenApiSDK
 
     sig { params(req: Faraday::Request, security: Object).void }
     def self.configure_request_security(req, security)
-      return if security.nil?
       sec_fields = security.fields
       sec_fields.each do |sec_field|
         value = security.send(sec_field.name)
@@ -468,7 +463,7 @@ module OpenApiSDK
       end
     end
 
-    sig { params(req: Faraday::Request, scheme: ::Crystalline::FieldAugmented).void }
+    sig { params(req: Faraday::Request, scheme: FieldAugmented).void }
     def self._parse_basic_auth_scheme(req, scheme)
       username, password = ''
 
@@ -564,7 +559,7 @@ module OpenApiSDK
         .returns([String, Object, T.nilable(T::Array[T::Array[Object]])])
     end
     def self.serialize_content_type(field_name, media_type, request)
-      return media_type, ::Crystalline.marshal_json_complex(request), nil if media_type.match('(application|text)\/.*?\+*json.*')
+      return media_type, marshal_json_complex(request), nil if media_type.match('(application|text)\/.*?\+*json.*')
       return serialize_multipart_form(media_type, request) if media_type.match('multipart\/.*')
       return media_type, serialize_form_data(field_name, request), nil if media_type.match('application\/x-www-form-urlencoded.*')
       return media_type, request, nil if request.is_a?(String) || request.is_a?(Array)
@@ -572,7 +567,7 @@ module OpenApiSDK
       raise StandardError, "invalid request body type #{type(request)} for mediaType {metadata['media_type']}"
     end
 
-    sig { params(field: ::Crystalline::MetadataFields::Field, data_class: ::Crystalline::FieldAugmented).returns(Object) }
+    sig { params(field: MetadataFields::Field, data_class: FieldAugmented).returns(Object) }
     def self.parse_field(field, data_class)
       field_metadata = field.metadata[:metadata_string]
       return nil if field_metadata.nil?
@@ -583,7 +578,7 @@ module OpenApiSDK
       field_value
     end
 
-    sig { params(media_type: String, request: ::Crystalline::FieldAugmented).returns([String, Object, T::Array[T::Array[Object]]]) }
+    sig { params(media_type: String, request: FieldAugmented).returns([String, Object, T::Array[T::Array[Object]]]) }
     def self.serialize_multipart_form(media_type, request)
       form = []
       request_fields = request.fields
@@ -598,7 +593,7 @@ module OpenApiSDK
           file_fields = val.fields
 
           file_name = ''
-          field_name = field_metadata[:field_name]
+          field_name = ''
           content = nil
 
           file_fields.each do |file_field|
@@ -608,16 +603,17 @@ module OpenApiSDK
             if file_metadata[:content] == true
               content = val.send(file_field.name)
             else
+              field_name = file_metadata.fetch(:field_name, file_field.name)
               file_name = val.send(file_field.name)
             end
           end
-          raise StandardError, 'invalid multipart/form-data file' if file_name == '' || content == nil?
+          raise StandardError, 'invalid multipart/form-data file' if field_name == '' || file_name == '' || content == nil?
 
           form.append([field_name, [file_name, content]])
         elsif field_metadata[:json] == true
           to_append = [
             field_metadata.fetch(:field_name, field.name), [
-              nil, ::Crystalline.marshal_json_complex(val), 'application/json'
+              nil, marshal_json_complex(val), 'application/json'
             ]
           ]
           form.append(to_append)
@@ -662,7 +658,7 @@ module OpenApiSDK
     end
 
     sig do
-      params(field_name: Symbol, data: T.any(::Crystalline::FieldAugmented, T::Hash[Symbol, String]))
+      params(field_name: Symbol, data: T.any(FieldAugmented, T::Hash[Symbol, String]))
         .returns(T::Hash[Symbol, Object])
     end
     def self.serialize_form_data(field_name, data)
@@ -687,7 +683,7 @@ module OpenApiSDK
           field_name = metadata.fetch(:field_name, field.name)
 
           if metadata[:json]
-            form[field_name] = ::Crystalline.marshal_json_complex(val)
+            form[field_name] = marshal_json_complex(val)
           else
             if metadata.fetch(:style, 'form') == 'form'
               form = form.merge(
@@ -734,5 +730,43 @@ module OpenApiSDK
       value
     end
 
+    sig { params(complex: Object).returns(Object) }
+    def self.marshal_json_complex(complex)
+      if complex.is_a? Array
+        complex.map { |v| Utils.marshal_json_complex(v) }.to_json
+      elsif complex.is_a? Hash
+        complex.transform_values { |v| Utils.marshal_json_complex(v) }.to_json
+      elsif complex.respond_to? :marshal_json
+        complex.marshal_json
+      else
+        complex.to_json
+      end
+    end
+
+    sig { params(data: Object, type: Object).returns(Object) }
+    def self.unmarshal_complex(data, type)
+      begin
+        value = unmarshal_json(JSON.parse(data), type)
+      rescue TypeError, JSON::ParserError
+        value = unmarshal_json(data, type)
+      end
+      value
+    end
+
+    sig { params(data: Object, type: Object).returns(Object) }
+    def self.unmarshal_json(data, type)
+      if T.simplifiable? type
+        type = T.simplify_type type
+      end
+      if type.respond_to? :unmarshal_json
+        type.unmarshal_json(data)
+      elsif T.arr? type
+        data.map { |v| Utils.unmarshal_complex(v, T.arr_of(type)) }
+      elsif T.hash? type
+        data.transform_values { |v| Utils.unmarshal_complex(v, T.hash_of(type)) }
+      else
+        data
+      end
+    end
   end
 end

data/lib/open_api_sdk/workspaces.rb

@@ -1,14 +1,11 @@
-# Code generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+# Code generated by Speakeasy (https://speakeasyapi.dev). DO NOT EDIT.
 
 # typed: true
 # frozen_string_literal: true
 
 require 'faraday'
 require 'faraday/multipart'
-require 'faraday/retry'
 require 'sorbet-runtime'
-require_relative 'sdk_hooks/hooks'
-require_relative 'utils/retries'
 
 module OpenApiSDK
   extend T::Sig
@@ -22,8 +19,8 @@ module OpenApiSDK
     end
 
 
-    sig { params(request: T.nilable(::OpenApiSDK::Operations::GetWorkspaceRequest), timeout_ms: T.nilable(Integer)).returns(::OpenApiSDK::Operations::GetWorkspaceResponse) }
-    def get(request, timeout_ms = nil)
+    sig { params(request: T.nilable(::OpenApiSDK::Operations::GetWorkspaceRequest)).returns(::OpenApiSDK::Operations::GetWorkspaceResponse) }
+    def get(request)
       # get - Retrieve a workspace
       # Retrieve a workspace for the authenticated user.
       url, params = @sdk_configuration.get_server_details
@@ -38,60 +35,9 @@ module OpenApiSDK
       headers['Accept'] = 'application/json'
       headers['user-agent'] = @sdk_configuration.user_agent
 
-      security = !@sdk_configuration.nil? && !@sdk_configuration.security_source.nil? ? @sdk_configuration.security_source.call : nil
-
-      timeout = (timeout_ms.to_f / 1000) unless timeout_ms.nil?
-      timeout ||= @sdk_configuration.timeout
-
-      connection = @sdk_configuration.client
-
-      hook_ctx = SDKHooks::HookContext.new(
-        base_url: base_url,
-        oauth2_scopes: nil,
-        operation_id: 'getWorkspace',
-        security_source: @sdk_configuration.security_source
-      )
-
-      error = T.let(nil, T.nilable(StandardError))
-      r = T.let(nil, T.nilable(Faraday::Response))
-      
-      begin
-        r = connection.get(url) do |req|
-          req.headers.merge!(headers)
-          req.options.timeout = timeout unless timeout.nil?
-          Utils.configure_request_security(req, security)
-
-          @sdk_configuration.hooks.before_request(
-            hook_ctx: SDKHooks::BeforeRequestHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            request: req
-          )
-        end
-      rescue StandardError => e
-        error = e
-      ensure
-        if r.nil? || Utils.error_status?(r.status)
-          r = @sdk_configuration.hooks.after_error(
-            error: error,
-            hook_ctx: SDKHooks::AfterErrorHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: r
-          )
-        else
-          r = @sdk_configuration.hooks.after_success(
-            hook_ctx: SDKHooks::AfterSuccessHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: r
-          )
-        end
-        
-        if r.nil?
-          raise error if !error.nil?
-          raise 'no response'
-        end
+      r = @sdk_configuration.client.get(url) do |req|
+        req.headers = headers
+        Utils.configure_request_security(req, @sdk_configuration.security) if !@sdk_configuration.nil? && !@sdk_configuration.security.nil?
       end
 
       content_type = r.headers.fetch('Content-Type', 'application/octet-stream')
@@ -101,62 +47,61 @@ module OpenApiSDK
       )
       if r.status == 200
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::WorkspaceSchema)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::WorkspaceSchema)
           res.workspace_schema = out
         end
       elsif r.status == 400
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::BadRequest)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::BadRequest)
           res.bad_request = out
         end
       elsif r.status == 401
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::Unauthorized)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::Unauthorized)
           res.unauthorized = out
         end
       elsif r.status == 403
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::Forbidden)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::Forbidden)
           res.forbidden = out
         end
       elsif r.status == 404
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::NotFound)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::NotFound)
           res.not_found = out
         end
       elsif r.status == 409
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::Conflict)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::Conflict)
           res.conflict = out
         end
       elsif r.status == 410
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::InviteExpired)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::InviteExpired)
           res.invite_expired = out
         end
       elsif r.status == 422
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::UnprocessableEntity)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::UnprocessableEntity)
           res.unprocessable_entity = out
         end
       elsif r.status == 429
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::RateLimitExceeded)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::RateLimitExceeded)
           res.rate_limit_exceeded = out
         end
       elsif r.status == 500
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::InternalServerError)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::InternalServerError)
           res.internal_server_error = out
         end
       end
-
       res
     end
 
 
-    sig { params(request: T.nilable(::OpenApiSDK::Operations::UpdateWorkspaceRequest), timeout_ms: T.nilable(Integer)).returns(::OpenApiSDK::Operations::UpdateWorkspaceResponse) }
-    def update(request, timeout_ms = nil)
+    sig { params(request: T.nilable(::OpenApiSDK::Operations::UpdateWorkspaceRequest)).returns(::OpenApiSDK::Operations::UpdateWorkspaceResponse) }
+    def update(request)
       # update - Update a workspace
       # Update a workspace by ID or slug.
       url, params = @sdk_configuration.get_server_details
@@ -170,71 +115,18 @@ module OpenApiSDK
       headers = {}
       req_content_type, data, form = Utils.serialize_request_body(request, :request_body, :json)
       headers['content-type'] = req_content_type
-
-      if form
-        body = Utils.encode_form(form)
-      elsif Utils.match_content_type(req_content_type, 'application/x-www-form-urlencoded')
-        body = URI.encode_www_form(data)
-      else
-        body = data
-      end
       headers['Accept'] = 'application/json'
       headers['user-agent'] = @sdk_configuration.user_agent
 
-      security = !@sdk_configuration.nil? && !@sdk_configuration.security_source.nil? ? @sdk_configuration.security_source.call : nil
-
-      timeout = (timeout_ms.to_f / 1000) unless timeout_ms.nil?
-      timeout ||= @sdk_configuration.timeout
-
-      connection = @sdk_configuration.client
-
-      hook_ctx = SDKHooks::HookContext.new(
-        base_url: base_url,
-        oauth2_scopes: nil,
-        operation_id: 'updateWorkspace',
-        security_source: @sdk_configuration.security_source
-      )
-
-      error = T.let(nil, T.nilable(StandardError))
-      r = T.let(nil, T.nilable(Faraday::Response))
-      
-      begin
-        r = connection.patch(url) do |req|
-          req.body = body
-          req.headers.merge!(headers)
-          req.options.timeout = timeout unless timeout.nil?
-          Utils.configure_request_security(req, security)
-
-          @sdk_configuration.hooks.before_request(
-            hook_ctx: SDKHooks::BeforeRequestHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            request: req
-          )
-        end
-      rescue StandardError => e
-        error = e
-      ensure
-        if r.nil? || Utils.error_status?(r.status)
-          r = @sdk_configuration.hooks.after_error(
-            error: error,
-            hook_ctx: SDKHooks::AfterErrorHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: r
-          )
+      r = @sdk_configuration.client.patch(url) do |req|
+        req.headers = headers
+        Utils.configure_request_security(req, @sdk_configuration.security) if !@sdk_configuration.nil? && !@sdk_configuration.security.nil?
+        if form
+          req.body = Utils.encode_form(form)
+        elsif Utils.match_content_type(req_content_type, 'application/x-www-form-urlencoded')
+          req.body = URI.encode_www_form(data)
         else
-          r = @sdk_configuration.hooks.after_success(
-            hook_ctx: SDKHooks::AfterSuccessHookContext.new(
-              hook_ctx: hook_ctx
-            ),
-            response: r
-          )
-        end
-        
-        if r.nil?
-          raise error if !error.nil?
-          raise 'no response'
+          req.body = data
         end
       end
 
@@ -245,56 +137,55 @@ module OpenApiSDK
       )
       if r.status == 200
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::WorkspaceSchema)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::WorkspaceSchema)
           res.workspace_schema = out
         end
       elsif r.status == 400
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::BadRequest)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::BadRequest)
           res.bad_request = out
         end
       elsif r.status == 401
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::Unauthorized)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::Unauthorized)
           res.unauthorized = out
         end
       elsif r.status == 403
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::Forbidden)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::Forbidden)
           res.forbidden = out
         end
       elsif r.status == 404
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::NotFound)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::NotFound)
           res.not_found = out
         end
       elsif r.status == 409
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::Conflict)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::Conflict)
           res.conflict = out
         end
       elsif r.status == 410
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::InviteExpired)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::InviteExpired)
           res.invite_expired = out
         end
       elsif r.status == 422
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::UnprocessableEntity)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::UnprocessableEntity)
           res.unprocessable_entity = out
         end
       elsif r.status == 429
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::RateLimitExceeded)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::RateLimitExceeded)
           res.rate_limit_exceeded = out
         end
       elsif r.status == 500
         if Utils.match_content_type(content_type, 'application/json')
-          out = Crystalline.unmarshal_json(JSON.parse(r.env.response_body), ::OpenApiSDK::Shared::InternalServerError)
+          out = Utils.unmarshal_complex(r.env.response_body, ::OpenApiSDK::Shared::InternalServerError)
           res.internal_server_error = out
         end
       end
-
       res
     end
   end