intelligence 1.0.0.beta01 → 1.0.0.beta03

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 02df79612b47068ee3792e78566e94160741db46f22c5ff8a97947a09872fe5f
-  data.tar.gz: e2bf793c4bf2feb17798e0a59bdc2272cdac9e95b9cd2c31b386d973601bfcdf
+  metadata.gz: 77033342b73065a73acde0156a288f66fb0ef7413a939292d23886b353397fd3
+  data.tar.gz: 6a8c7131991c0af60d9e30c000048ae9cb7e562e7c7dbb9ca519febe486d8491
 SHA512:
-  metadata.gz: 12bf185efa0bbd063699fc25cd33ada8729a6a95fda62ec4535319dc88b92764fb43677421cfb714f02aa766ec3e52740f018241f1632f0ea938c08543f0e62b
-  data.tar.gz: 221871ceb024b137d2e77810ea4ef840bbe161248a72dd69c8d184af4ce176664993dbb6d3d36bc91bbb89b3c2ed8515a2692f681d7e82894c147d83e7e2bda3
+  metadata.gz: 65050bd8d219f8348a0fe6c5b6cbc951a8de190572c01ecdc7e947aa2fa207f4fb65ae0e6afc2658ecf1fbe50ca0fd5b58c5fcf2651cc416fb9e6aeff73c97df
+  data.tar.gz: 17ef75ad141fc8f25f0a62a32c1b677785340b0bd15c8f907c455a10b5d7e35532728e7f36cb62b3ccb3ebe0c835b8facd6777832dda955bb09aabae1802975b

data/lib/intelligence/adapters/generic/chat_request_methods.rb

@@ -104,7 +104,7 @@ module Intelligence
 
         tools_attributes = chat_request_tools_attributes( conversation[ :tools ] )
         result[ :tools ] = tools_attributes if tools_attributes && tools_attributes.length > 0
-
+        
         JSON.generate( result )
       end 
 

data/lib/intelligence/adapters/google/chat_request_methods.rb

@@ -57,7 +57,7 @@ module Intelligence
       def chat_request_body( conversation, options = {} )
         options = @options.merge( build_options( options ) )
 
-        gc = options[ :generationConfig ]
+        gc = options[ :generationConfig ]&.dup || {}
         # discard properties not part of the google generationConfig schema
         gc.delete( :model )
         gc.delete( :stream )

data/lib/intelligence/adapters/x_ai.rb

@@ -0,0 +1,196 @@
+require_relative 'generic/adapter'
+
+module Intelligence
+  module XAi 
+
+    class Adapter < Generic::Adapter
+
+      chat_request_uri "https://api.x.ai/v1/chat/completions"
+ 
+      schema do 
+        key                       String 
+        chat_options do 
+          model                   String
+          frequency_penalty       Float, in: -2..2
+          logit_bias              Hash 
+          logprobs                [ TrueClass, FalseClass ]
+          max_tokens              Integer 
+          n                       Integer
+          presence_penalty        Float, in: -2..2
+          response_format 
+          seed                    Integer 
+          stop                    String, array: true
+          stream                  [ TrueClass, FalseClass ]
+          stream_options 
+          temperature             Float, in: 0..2
+          tool_choice 
+          top_logprobs            Integer, in: 0..20
+          top_p                   Float 
+          user                    String 
+        end
+      end
+
+      def chat_result_attributes( response )
+        return nil unless response.success?
+        response_json = JSON.parse( response.body, symbolize_names: true ) rescue nil
+        return nil if response_json.nil? || response_json[ :choices ].nil?
+
+        result = {}
+        result[ :choices ] = []
+
+        ( response_json[ :choices ] || [] ).each do | json_choice |
+          end_reason = to_end_reason( json_choice[ :finish_reason ] )
+          if ( json_message = json_choice[ :message ] )
+            result_message = { role: json_message[ :role ] }
+            if json_message[ :content ] 
+              result_message[ :contents ] = [ { type: :text, text: json_message[ :content ] } ]
+            end
+            if json_message[ :tool_calls ] && !json_message[ :tool_calls ].empty?
+              result_message[ :contents ] ||= []
+              end_reason = :tool_called if end_reason == :ended
+              json_message[ :tool_calls ].each do | json_message_tool_call |
+                result_message_tool_call_parameters = 
+                  JSON.parse( json_message_tool_call[ :function ][ :arguments ], symbolize_names: true ) \
+                    rescue json_message_tool_call[ :function ][ :arguments ]
+                result_message[ :contents ] << {
+                  type: :tool_call, 
+                  tool_call_id: json_message_tool_call[ :id ],
+                  tool_name: json_message_tool_call[ :function ][ :name ],
+                  tool_parameters: result_message_tool_call_parameters
+                }
+              end 
+            end
+          end
+          result[ :choices ].push( { end_reason: end_reason, message: result_message } )
+        end
+
+        metrics_json = response_json[ :usage ]
+        unless metrics_json.nil?
+
+          metrics = {}
+          metrics[ :input_tokens ] = metrics_json[ :prompt_tokens ] 
+          metrics[ :output_tokens ] = metrics_json[ :completion_tokens ]
+          metrics = metrics.compact
+
+          result[ :metrics ] = metrics unless metrics.empty?
+
+        end
+
+        result
+      end
+
+      def stream_result_chunk_attributes( context, chunk )
+        context ||= {}
+        buffer = context[ :buffer ] || ''
+        metrics = context[ :metrics ] || {
+          input_tokens: 0,
+          output_tokens:  0
+        }
+        choices = context[ :choices ] || Array.new( 1 , { message: {} } )
+
+        choices.each do | choice |
+          choice[ :message ][ :contents ] = choice[ :message ][ :contents ]&.map do | content |
+            { type: content[ :type ] }
+          end
+        end
+
+        buffer += chunk
+        while ( eol_index = buffer.index( "\n" ) )
+          line = buffer.slice!( 0..eol_index )        
+          line = line.strip 
+          next if line.empty? || !line.start_with?( 'data:' )
+          line = line[ 6..-1 ]
+          next if line.end_with?( '[DONE]' )
+
+          data = JSON.parse( line ) rescue nil
+          if data.is_a?( Hash )
+            data[ 'choices' ]&.each do | data_choice |
+
+              data_choice_index = data_choice[ 'index' ]
+              data_choice_delta = data_choice[ 'delta' ]
+              end_reason = to_end_reason( data_choice[ 'finish_reason' ] )
+              
+              choices.fill( { message: {} }, choices.size, data_choice_index + 1 ) \
+                if choices.size <= data_choice_index 
+              contents = choices[ data_choice_index ][ :message ][ :contents ] || []
+
+              text_content = contents.first&.[]( :type ) == :text ? contents.first : nil 
+              if data_choice_content = data_choice_delta[ 'content' ]
+                if text_content.nil?  
+                  contents.unshift( text_content = { type: :text, text: data_choice_content } )
+                else
+                  text_content[ :text ] = ( text_content[ :text ] || '' ) + data_choice_content
+                end
+              end 
+              if data_choice_tool_calls = data_choice_delta[ 'tool_calls' ]
+                end_reason = :tool_called
+                data_choice_tool_calls.each_with_index do | data_choice_tool_call, data_choice_tool_call_index |
+                  if data_choice_tool_call_function = data_choice_tool_call[ 'function' ]
+                    data_choice_tool_index = data_choice_tool_call[ 'index' ] || data_choice_tool_call_index
+                    data_choice_tool_id = data_choice_tool_call[ 'id' ]
+                    data_choice_tool_name = data_choice_tool_call_function[ 'name' ]
+                    data_choice_tool_parameters = data_choice_tool_call_function[ 'arguments' ]
+                    
+                    tool_call_content_index = ( text_content.nil? ? 0 : 1 ) + data_choice_tool_index 
+                    if tool_call_content_index >= contents.length 
+                      contents.push( { 
+                        type: :tool_call, 
+                        tool_call_id: data_choice_tool_id,
+                        tool_name: data_choice_tool_name,
+                        tool_parameters: data_choice_tool_parameters
+                      } )
+                    else 
+                      tool_call = contents[ tool_call_content_index ]
+                      tool_call[ :tool_call_id ] = ( tool_call[ :tool_call_id ] || '' ) + data_choice_tool_id \
+                        if data_choice_tool_id 
+                      tool_call[ :tool_name ] = ( tool_call[ :tool_name ] || '' ) + data_choice_tool_name \
+                        if data_choice_tool_name 
+                      tool_call[ :tool_parameters ] = ( tool_call[ :tool_parameters ] || '' ) + data_choice_tool_parameters \
+                        if data_choice_tool_parameters
+                    end 
+                  end 
+                end 
+              end
+              choices[ data_choice_index ][ :message ][ :contents ] = contents
+              choices[ data_choice_index ][ :end_reason ] ||= end_reason
+            end
+  
+            if usage = data[ 'usage' ]
+              # note: A number of providers will resend the input tokens as part of their usage 
+              #       payload.
+              metrics[ :input_tokens ] = usage[ 'prompt_tokens' ] \
+                if usage.include?( 'prompt_tokens' )
+              metrics[ :output_tokens ] += usage[ 'completion_tokens' ] \
+                if usage.include?( 'completion_tokens' )
+            end 
+
+          end
+
+        end
+
+        context[ :buffer ] = buffer 
+        context[ :metrics ] = metrics
+        context[ :choices ] = choices
+
+        [ context, choices.empty? ? nil : { choices: choices.dup } ]
+      end
+
+      def chat_result_error_attributes( response )
+        error_type, error_description = to_error_response( response.status )
+        error = error_type 
+
+        parsed_body = JSON.parse( response.body, symbolize_names: true ) rescue nil 
+        if parsed_body && parsed_body.respond_to?( :[] )
+          error = parsed_body[ :code ] || error_type 
+          error_description = parsed_body[ :error ] || error_description 
+        end 
+
+        { error_type: error_type.to_s, error: error.to_s, error_description: error_description }
+      end
+
+      alias_method :stream_result_error_attributes, :chat_result_error_attributes
+
+    end
+
+  end
+end

data/lib/intelligence/version.rb

@@ -1,3 +1,3 @@
 module Intelligence
-  VERSION = "1.0.0.beta01"
+  VERSION = "1.0.0.beta03"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: intelligence
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta01
+  version: 1.0.0.beta03
 platform: ruby
 authors:
 - Kristoph Cichocki-Romanov
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-01 00:00:00.000000000 Z
+date: 2024-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -153,6 +153,7 @@ files:
 - lib/intelligence/adapters/open_router.rb
 - lib/intelligence/adapters/samba_nova.rb
 - lib/intelligence/adapters/together_ai.rb
+- lib/intelligence/adapters/x_ai.rb
 - lib/intelligence/chat_error_result.rb
 - lib/intelligence/chat_metrics.rb
 - lib/intelligence/chat_request.rb