intelligence 1.0.0.beta03 → 1.0.0.beta04

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77033342b73065a73acde0156a288f66fb0ef7413a939292d23886b353397fd3
-  data.tar.gz: 6a8c7131991c0af60d9e30c000048ae9cb7e562e7c7dbb9ca519febe486d8491
+  metadata.gz: df9c6c9d4ecd7c8adde5eb20067ceef7f9f88ab5602c862b50635039fad13e81
+  data.tar.gz: 4af029c32fba747acd6a1fff0daa3e6de6ab049e20240e9dfbcbf4b5c454a867
 SHA512:
-  metadata.gz: 65050bd8d219f8348a0fe6c5b6cbc951a8de190572c01ecdc7e947aa2fa207f4fb65ae0e6afc2658ecf1fbe50ca0fd5b58c5fcf2651cc416fb9e6aeff73c97df
-  data.tar.gz: 17ef75ad141fc8f25f0a62a32c1b677785340b0bd15c8f907c455a10b5d7e35532728e7f36cb62b3ccb3ebe0c835b8facd6777832dda955bb09aabae1802975b
+  metadata.gz: 7cfdef5d95d37a78f73ad283565f74e706fdcff384c224ff9a92012ee0888179f536f93d34580fd49ee0663800da3066d6174231a5536e917cabde04b1c72ae8
+  data.tar.gz: 54b476462cf87767cc7b10c95bdc6e149a1b1b4de59ef1795c70761813594d971e8d6690aeeee22756caf8fce8d107edfd97d78b07b7c9db4c2ee7f2981b0ad4

data/README.md

@@ -405,9 +405,6 @@ conversation = Intelligence::Conversation.build do
     content text: "You can help users check weather conditions."
   end
   
-  # Add the tool to the conversation
-  tools << weather_tool
-  
   message do
     role :user
     content text: "What's the weather like in Paris, France?"
@@ -415,7 +412,7 @@ conversation = Intelligence::Conversation.build do
 end
 
 request = Intelligence::ChatRequest.new( adapter: adapter )
-response = request.chat( conversation )
+response = request.chat( conversation, tools: [ weather_tool ] )
 
 # Handle tool calls in the response
 if response.success?

data/lib/intelligence/adapter/base.rb

@@ -21,6 +21,20 @@ module Intelligence
         self.class.builder.build( options )
       end
 
+      def merge_options( options, other_options )
+        merged_options = options.dup
+
+        other_options.each do | key, value |
+          if merged_options[ key].is_a?( Hash ) && value.is_a?( Hash )
+            merged_options[ key ] = merge_options( merged_options[ key ], value )
+          else
+            merged_options[ key ] = value
+          end
+        end
+
+        merged_options
+      end
+
     end
   end
 end

data/lib/intelligence/adapters/anthropic/adapter.rb

@@ -28,11 +28,23 @@ module Intelligence
           stop_sequences  String, array: true
 
           # anthropic specific properties for anthropic generative text endpoints
-          tool_choice     do 
-            type          String  
+          tool            array: true, as: :tools, &Tool.schema 
+          # anthropic tool choice configuration; note that there is no 'none' option so if 
+          # tools are provided :auto will be the default
+          #
+          # `tool_choice :any` 
+          # or 
+          # ```
+          # tool_choice :tool do 
+          #   function :my_tool 
+          # end  
+          # ```
+          tool_choice     arguments: :type do 
+            type          Symbol, in: [ :any, :auto, :tool ]  
             # the name parameter should only be set if type = 'tool'
             name          String
           end
+          
           metadata do
             user_id       String
           end 

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

@@ -9,7 +9,7 @@ module Intelligence
       end
 
       def chat_request_headers( options = nil )
-        options = @options.merge( build_options( options ) )
+        options = merge_options( @options, build_options( options ) )
         result = {}
 
         key = options[ :key ] 
@@ -27,7 +27,9 @@ module Intelligence
       end
 
       def chat_request_body( conversation, options = nil )
-        options = @options.merge( build_options( options ) )
+        tools = options.delete( :tools ) || []
+
+        options = merge_options( @options, build_options( options ) )
         result = options[ :chat_options ]&.compact || {}
 
         system_message = to_anthropic_system_message( conversation[ :system_message ] )
@@ -122,7 +124,9 @@ module Intelligence
 
         end
         
-        tools_attributes = chat_request_tools_attributes( conversation[ :tools ] )
+        tools_attributes = chat_request_tools_attributes( 
+          ( result[ :tools ] || [] ).concat( tools ) 
+        )
         result[ :tools ] = tools_attributes if tools_attributes && tools_attributes.length > 0
 
         JSON.generate( result )

data/lib/intelligence/adapters/cerebras.rb

@@ -21,6 +21,7 @@ module Intelligence
           stream          [ TrueClass, FalseClass ]
           temperature     Float
           top_p           Float
+          tool            array: true, as: :tools, &Tool.schema 
           tool_choice do 
             type          String 
             mame          String

data/lib/intelligence/adapters/deepseek.rb

@@ -0,0 +1,44 @@
+require_relative 'generic/adapter'
+
+module Intelligence
+  module Deepseek
+    class Adapter < Generic::Adapter
+      
+      chat_request_uri 'https://api.deepseek.com/v1/chat/completions'
+
+      schema do 
+        key                   String
+        chat_options do 
+          frequency_penalty   Float 
+          logprobs            [ TrueClass, FalseClass ]
+          max_tokens          Integer
+          model               String
+          presence_penalty    Float, in: [ -2..2 ]
+          response_format do 
+            # 'text' and 'json_object' are the only supported types; you must also instruct 
+            # the model to output json
+            type              Symbol, in: [ :text, :json_object ]
+          end
+          stop                String, array: true
+          stream              [ TrueClass, FalseClass ]
+          stream_options do
+            include_usage     [ TrueClass, FalseClass ]
+          end
+          temperature         Float, in: [ 0..2 ]
+          tool                array: true, as: :tools, &Tool.schema 
+          tool_choice do 
+            # one of 'auto', 'none' or 'function'
+            type              Symbol, in: [ :auto, :none, :required ]
+            # the function parameters is required if you specify a type of 'function' 
+            function do 
+              name            String 
+            end
+          end
+          top_logprobs        Integer
+          top_p               Float
+        end
+      end
+
+    end
+  end
+end

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

@@ -21,7 +21,7 @@ module Intelligence
       end
 
       def chat_request_headers( options = nil )
-        options = @options.merge( build_options( options ) )
+        options = merge_options( @options, build_options( options ) )
         result = {}
 
         key = options[ :key ]
@@ -36,7 +36,9 @@ module Intelligence
       end
 
       def chat_request_body( conversation, options = nil )
-        options = @options.merge( build_options( options ) )
+        tools = options.delete( :tools ) || []
+
+        options = merge_options( @options, build_options( options ) )
         
         result = options[ :chat_options ]
         result[ :messages ] = []
@@ -102,7 +104,9 @@ module Intelligence
           end 
         end 
 
-        tools_attributes = chat_request_tools_attributes( conversation[ :tools ] )
+        tools_attributes = chat_request_tools_attributes( 
+          ( result[ :tools ] || [] ).concat( tools ) 
+        )
         result[ :tools ] = tools_attributes if tools_attributes && tools_attributes.length > 0
         
         JSON.generate( result )

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

@@ -10,7 +10,7 @@ module Intelligence
         # normalized properties for all endpoints
         key               String  
 
-        chat_options      as: :generationConfig do
+        chat_options                  as: :generationConfig do
 
           # normalized properties for google generative text endpoint
           model           String
@@ -35,20 +35,8 @@ module Intelligence
           response_mime_type String,  as: :responseMimeType
           response_schema             as: :responseSchema
 
-          # google tools setup 
-          tools                       do 
-            google_search             as: :google_search_retrieval do 
-              dynamic_retrieval       as: :dynamic_retrieval_config, default: {} do 
-                mode                  String, default: 'MODE_DYNAMIC'
-                threshold             Float, as: :dynamic_threshold, in: 0..1, default: 0.3
-              end
-            end
-            
-            code_execution            do 
-            end
-          end 
-
           # google specific tool configuration
+          tool                        array: true, as: :tools, &Tool.schema 
           tool_configuration          as: :tool_config do
             function_calling          as: :function_calling_config do 
               mode                    Symbol, in: [ :auto, :any, :none ]
@@ -56,6 +44,25 @@ module Intelligence
             end
           end 
 
+          # build-in tools are called 'abilities' in Intelligence so as not to conflic with the
+          # caller defined tools  
+          abilities do 
+            # this appears to be a ( now ) legacy argument and is no longer supported
+            # with the 2.0 models
+            google_search_retrieval do 
+              dynamic_retrieval       as: :dynamic_retrieval_config, default: {} do 
+                mode      String,     default: 'MODE_DYNAMIC'
+                threshold Float,      as: :dynamic_threshold, in: 0..1, default: 0.3
+              end
+            end
+
+            # this argument and is only supported with the 2.0 or later models
+            google_search do 
+            end 
+
+            code_execution do 
+            end
+          end 
 
         end
 

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

@@ -27,7 +27,7 @@ module Intelligence
       ]
 
       def chat_request_uri( options )
-        options = @options.merge( build_options( options ) )
+        options = merge_options( @options, build_options( options ) )
 
         key = options[ :key ] 
         gc = options[ :generationConfig ] || {}
@@ -55,27 +55,22 @@ module Intelligence
       end
 
       def chat_request_body( conversation, options = {} )
-        options = @options.merge( build_options( options ) )
+        tools = options.delete( :tools ) || []
+        options = merge_options( @options, build_options( options ) )
 
         gc = options[ :generationConfig ]&.dup || {}
         # discard properties not part of the google generationConfig schema
         gc.delete( :model )
         gc.delete( :stream )
 
-        # googlify tools 
-        tools = gc.delete( :tools )
-        if tools&.any?
-          tools = tools.then do | tools_object |
-            tools_array ||= []
-            tools_object.each { | key, value | tools_array << { key => value } } 
-            tools_array
-          end 
-        end 
-        tool_functions = to_google_tools( conversation[ :tools ] )
+        # googlify tools
+        tools_object = gc.delete( :abilities )
+        tool_functions = to_google_tools( ( gc.delete( :tools ) || [] ).concat( tools ) )
+
         if tool_functions&.any?
-          tools ||= {}
-          tools[ :function_declarations ] ||= []
-          tools[ :function_declarations ].concat( tool_functions )
+          tools_object ||= {}
+          tools_object[ :function_declarations ] ||= []
+          tools_object[ :function_declarations ].concat( tool_functions )
         end 
 
         # googlify tool configuration 
@@ -86,7 +81,7 @@ module Intelligence
 
         result = {}
         result[ :generationConfig ] = gc
-        result[ :tools ] = tools if tools 
+        result[ :tools ] = tools_object if tools_object 
         result[ :tool_config ] = tool_config if tools && tool_config
 
         # construct the system prompt in the form of the google schema

data/lib/intelligence/adapters/groq.rb

@@ -30,6 +30,7 @@ module Intelligence
             include_usage     [ TrueClass, FalseClass ]
           end
           temperature         Float
+          tool                array: true, as: :tools, &Tool.schema 
           tool_choice do 
             # one of 'auto', 'none' or 'function'
             type              Symbol, in: [ :auto, :none, :function ]

data/lib/intelligence/adapters/mistral.rb

@@ -22,6 +22,8 @@ module Intelligence
           response_format do 
             type              String 
           end
+
+          tool                array: true, as: :tools, &Tool.schema 
           tool_choice do 
             type              String 
             function do 

data/lib/intelligence/adapters/open_ai/adapter.rb

@@ -8,11 +8,11 @@ module Intelligence
       schema do 
 
         # normalized properties for all endpoints
-        key               String
+        key                         String
         
         # openai properties for all endpoints
-        organization      String 
-        project           String 
+        organization                String 
+        project                     String 
         
         # properties for generative text endpoints
         chat_options do 
@@ -53,15 +53,8 @@ module Intelligence
           end
           user 
           
-          # open ai tool configuration; this allows you to enable build in tools ( currently 
-          # that's just 'code_interpreter' )
-          # 
-          # tool :code_interpreter 
-          # 
-          #tool                      array: true, as: :tools, arguments: :type 
-          #  type                    Symbol 
-          #end 
-
+          # open ai tools
+          tool                      array: true, as: :tools, &Tool.schema 
           # open ai tool choice configuration 
           #
           # `tool_choice :none` 

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

@@ -11,7 +11,7 @@ module Intelligence
       end
 
       def chat_request_headers( options = {} )
-        options = @options.merge( build_options( options )  )
+        options = merge_options( @options, build_options( options ) )
         result = {}
 
         key = options[ :key ] 
@@ -30,7 +30,10 @@ module Intelligence
       end
 
       def chat_request_body( conversation, options = {} )
-        options = @options.merge( build_options( options )  )
+
+        tools = options.delete( :tools ) || []
+
+        options = merge_options( @options, build_options( options ) )
         result = options[ :chat_options ]&.compact || {}
         result[ :messages ] = []
 
@@ -120,7 +123,9 @@ module Intelligence
 
         end
  
-        tools_attributes = chat_request_tools_attributes( conversation[ :tools ] )
+        tools_attributes = chat_request_tools_attributes( 
+          ( result[ :tools ] || [] ).concat( tools ) 
+        )
         result[ :tools ] = tools_attributes if tools_attributes && tools_attributes.length > 0
        
         JSON.generate( result )

data/lib/intelligence/adapters/together_ai.rb

@@ -21,6 +21,24 @@ module Intelligence
           frequency_penalty       Float
           presence_penalty        Float
           repetition_penalty      Float
+
+          # together ai tools
+          tool                    array: true, as: :tools, &Tool.schema 
+          # together ai tool choice configuration 
+          #
+          # `tool_choice :auto` 
+          # or 
+          # ```
+          # tool_choice :function do 
+          #   function :my_function 
+          # end  
+          # ```
+          tool_choice             arguments: :type do 
+            type                  Symbol, in: [ :none, :auto, :function ]
+            function              arguments: :name do 
+              name                Symbol 
+            end 
+          end
           user                    String
         end
       end

data/lib/intelligence/adapters/x_ai.rb

@@ -23,9 +23,13 @@ module Intelligence
           stream                  [ TrueClass, FalseClass ]
           stream_options 
           temperature             Float, in: 0..2
+
+          tool                    array: true, as: :tools, &Tool.schema 
           tool_choice 
+
           top_logprobs            Integer, in: 0..20
           top_p                   Float 
+          
           user                    String 
         end
       end

data/lib/intelligence/chat_request.rb

@@ -75,21 +75,23 @@ module Intelligence
     # === arguments 
     # * +conversation+ - an instance of +Intelligence::Conversation+ or String; this encapsulates 
     #                    the content to be sent to the LLM
-    # * +options+      - a Hash with options; these options overide any of the configuration 
-    #                    options used to configure the adapter; you can, for example, pass 
-    #                    +{ chat_options: { max_tokens: 1024 }+ to limit the response to 1024 
-    #                    tokens.
-    def chat( conversation, options = {} )
+    # * +options+      - one or more Hashes with options; these options overide any of the 
+    #                    configuration options used to configure the adapter; you can, for 
+    #                    example, pass +{ chat_options: { max_tokens: 1024 }+ to limit the 
+    #                    response to 1024 tokens.
+    def chat( conversation, *options )
 
       conversation = build_quick_conversation( conversation ) if conversation.is_a?( String )
+      options = options.compact.reduce( {} ) { | accumulator, o | accumulator.merge( o ) }
       options = @options.merge( options )
 
+      # conversation and tools are presented as simple Hashes to the adapter
+      conversation = conversation.to_h
+      options[ :tools ] = options[ :tools ].to_a.map!( &:to_h ) if options[ :tools ]
+
       uri = @adapter.chat_request_uri( options )
       headers = @adapter.chat_request_headers( @options.merge( options ) )
-      payload = @adapter.chat_request_body( 
-        conversation.to_h, 
-        options 
-      )
+      payload = @adapter.chat_request_body( conversation, options )
 
       result_callback = nil 
       response = @connection.post( uri ) do | request |
@@ -100,6 +102,7 @@ module Intelligence
       end
 
       result = nil 
+
       if response.success?  
         chat_result_attributes = @adapter.chat_result_attributes( response )
         result = ChatResult.new( chat_result_attributes )
@@ -113,14 +116,19 @@ module Intelligence
     
     end
 
-    def stream( conversation, options = {} )
+    def stream( conversation, *options )
 
       conversation = build_quick_conversation( conversation ) if conversation.is_a?( String )
+      options = options.compact.reduce( {} ) { | accumulator, o | accumulator.merge( o ) }
       options = @options.merge( options )
+      
+      # conversation and tools are presented as simple Hashes to the adapter
+      conversation = conversation.to_h
+      options[ :tools ] = options[ :tools ].to_a.map!( &:to_h ) if options[ :tools ]
 
       uri = @adapter.chat_request_uri( options )
       headers = @adapter.chat_request_headers( @options.merge( options ) )
-      payload = @adapter.chat_request_body( conversation.to_h, options )
+      payload = @adapter.chat_request_body( conversation, options )
 
       context = nil
       response = @connection.post( uri ) do | request |

data/lib/intelligence/conversation.rb

@@ -11,12 +11,10 @@ module Intelligence
 
     attr_reader   :system_message
     attr_reader   :messages
-    attr_reader   :tools
 
     def initialize( attributes = nil )
  
       @messages = []
-      @tools = []
       if attributes
         if attributes[ :system_message ]&.any? 
           system_message = Message.new( 
@@ -41,10 +39,6 @@ module Intelligence
       !@messages.empty?
     end
 
-    def has_tools?
-      !@tools.empty?
-    end
-
     def system_message=( message )
       raise ArgumentError, "The system message must be a Intelligence::Message." \
         unless message.is_a?( Intelligence::Message )
@@ -60,16 +54,10 @@ module Intelligence
 
     alias :<< :append_message
 
-    def append_tool( *tools )
-      @tools.concat( tools.flatten )
-      self 
-    end
-
     def to_h
       result = {}
       result[ :system_message ] = @system_message.to_h if @system_message
       result[ :messages ] = @messages.map { | m | m.to_h } 
-      result[ :tools ] = @tools.map { | t | t.to_h } 
       result
     end
 

data/lib/intelligence/message_content/tool_result.rb

@@ -26,6 +26,7 @@ module Intelligence
           tool_result:      tool_result 
         }.compact
       end
+      
     end 
 
   end

data/lib/intelligence/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: intelligence
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta03
+  version: 1.0.0.beta04
 platform: ruby
 authors:
 - Kristoph Cichocki-Romanov
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-12 00:00:00.000000000 Z
+date: 2025-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -135,6 +134,7 @@ files:
 - lib/intelligence/adapters/anthropic/chat_request_methods.rb
 - lib/intelligence/adapters/anthropic/chat_response_methods.rb
 - lib/intelligence/adapters/cerebras.rb
+- lib/intelligence/adapters/deepseek.rb
 - lib/intelligence/adapters/generic.rb
 - lib/intelligence/adapters/generic/adapter.rb
 - lib/intelligence/adapters/generic/chat_request_methods.rb
@@ -180,7 +180,6 @@ licenses:
 metadata:
   source_code_uri: https://github.com/EndlessInternational/intelligence
   bug_tracker_uri: https://github.com/EndlessInternational/intelligence/issues
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -195,8 +194,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.19
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: A Ruby gem for seamlessly and uniformly interacting with large languge and
   vision model (LLM)  API's served by numerous services, including those of OpenAI,