scout-ai 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1e939ad5a06a271bd6379845c3c3f119c2191dcbe250482b622d83cc03c5a27a
-  data.tar.gz: '009d4893f3a473f48149db3bed025ebd8d2603295a525f99a86c07437dd1340d'
+  metadata.gz: f6c4a5eda08ca50c1353e6b36d41bc0b5c8ac1c6a58d40b48f23f005c8566c84
+  data.tar.gz: e61823c2c1344aaab60ed78504db4edbfa3776442436da2e58399619407159f0
 SHA512:
-  metadata.gz: ae56ea4a63d69ae58ceaeb4dcf76196c25c1a75a68590ae36031d088181c213bbbc2ace780229e9923f3260ec0e330fbc6f7b6844201804e5daa460c865c11fb
-  data.tar.gz: 28803032d0d2666384f0dcbbbb809544e11649a460bd331807fa94df13bb9c7d391d6622cb91599dc9ad155775d0b14b8835203ac87b0fbfbce6d22aabc878d4
+  metadata.gz: 75a8092ba29b8d75a141c0abff7d519e91f140e56b0220ba4a59512fcc9172aa13b9b068face217f418ec2afc3ef4f0377dac4e0d124b6399bc033b9d2a0bf6f
+  data.tar.gz: 1aac91f51c220a78c5f1a4d3aa77a7ccf07d7a8929f20a869ec702e67deff7d43a18d8c19913005b99dace1666a73715ee0fa9cafbfacccfb78f2ed60493482d

data/.vimproject

@@ -8,6 +8,7 @@ scout-ai=$PWD filter="*.rb *.rake Rakefile *.rdoc *.R *.sh *.js *.haml *.sass *.
  chats=chats filter="*"{
   agent_doc
 
+  tool_oeu
 
   multi_agent.rb
 

data/VERSION

@@ -1 +1 @@
-1.1.7
+1.1.8

data/lib/scout/llm/backends/openwebui.rb

@@ -1,21 +1,22 @@
 require 'openai'
 require 'rest-client'
 require_relative '../chat'
+require_relative 'openai'
 
 module LLM
   module OpenWebUI
 
     def self.rest(method, base_url, key, action, options = {})
       url = File.join(base_url, action.to_s)
-      headers = {"Authorization" => "Bearer #{key}", "Content-Type" => "application/json"}
+      headers = IndiferentHash.setup({"Authorization" => "Bearer #{key}", "Content-Type" => "application/json"})
       response = case method.to_sym
                  when :post
                    #RestClient.send(method, url, options, {content_type: "application/json", accept: "application/json", Authorization: "Bearer #{key}"})
-                   iii [url, options, headers]
                    RestClient.post(url, options.to_json, headers)
                  else
                    RestClient.send(method, url, {content_type: "application/json", accept: "application/json", "Authorization" => "Bearer #{key}"})
                  end
+
       JSON.parse(response.body)
     end
 
@@ -23,9 +24,9 @@ module LLM
 
       url, key, model, log_errors = IndiferentHash.process_options options, :url, :key, :model, :log_errors
 
-      url ||= Scout::Config.get(:url, :openai_ask, :ask, :openai, env: 'OPENWEBUI_URL', default: "http://localhost:3000/api")
-      key ||= LLM.get_url_config(:key, url, :openai_ask, :ask, :openai, env: 'OPENWEBUI_KEY')
-      model ||= LLM.get_url_config(:model, url, :openai_ask, :ask, :openai, env: 'OPENWEBUI_MODEL')
+      url ||= Scout::Config.get(:url, :openwebui_ask, :ask, :openwebui, env: 'OPENWEBUI_URL', default: "http://localhost:3000/api")
+      key ||= LLM.get_url_config(:key, url, :openwebui_ask, :ask, :openwebui, env: 'OPENWEBUI_KEY')
+      model ||= LLM.get_url_config(:model, url, :openwebui_ask, :ask, :openwebui, env: 'OPENWEBUI_MODEL')
 
       role = IndiferentHash.process_options options, :role
       messages = LLM.messages(question, role)
@@ -56,5 +57,79 @@ module LLM
 
       message.dig("content")
     end
+
+  def self.ask(question, options = {}, &block)
+    original_options = options.dup
+
+    messages = LLM.chat(question)
+    options = options.merge LLM.options messages
+
+    client, url, key, model, log_errors, return_messages, format, tool_choice_next, previous_response_id, tools, = IndiferentHash.process_options options,
+      :client, :url, :key, :model, :log_errors, :return_messages, :format, :tool_choice_next, :previous_response_id, :tools,
+      log_errors: true, tool_choice_next: :none
+
+    if client.nil?
+      url ||= Scout::Config.get(:url, :openwebui_ask, :ask, :openwebui, env: 'OPENWEBUI_URL', default: "http://localhost:3000/api")
+      key ||= LLM.get_url_config(:key, url, :openwebui_ask, :ask, :openwebui, env: 'OPENWEBUI_KEY')
+    end
+
+    if model.nil?
+      url ||= Scout::Config.get(:url, :openai_ask, :ask, :openai, env: 'OPENAI_URL')
+      model ||= LLM.get_url_config(:model, url, :openai_ask, :ask, :openai, env: 'OPENAI_MODEL', default: "gpt-4.1")
+    end
+
+    case format
+    when Hash
+      options[:response_format] = format
+    when 'json', 'json_object', :json, :json_object
+      options[:response_format] = {type: 'json_object'}
+    else
+      options[:response_format] = {type: format}
+    end if format
+
+    parameters = options.merge(model: model)
+
+    # Process tools
+
+    case tools
+    when Array
+      tools = tools.inject({}) do |acc,definition|
+        IndiferentHash.setup definition
+        name = definition.dig('name') || definition.dig('function', 'name')
+        acc.merge(name => definition)
+      end
+    when nil
+      tools = {}
+    end
+
+    tools.merge!(LLM.tools messages)
+    tools.merge!(LLM.associations messages)
+
+    if tools.any?
+      parameters[:tools] = LLM.tool_definitions_to_openai tools
+    end
+
+    messages = LLM::OpenAI.process_input messages
+
+    Log.debug "Calling openai #{url}: #{Log.fingerprint(parameters.except(:tools))}}"
+    Log.high "Tools: #{Log.fingerprint tools.keys}}" if tools
+
+    parameters[:messages] = LLM.tools_to_openai messages
+
+    response = LLM::OpenAI.process_response self.rest(:post, url, key, "chat/completions" , parameters), tools, &block
+
+    res = if response.last[:role] == 'function_call_output' 
+            response + self.ask(messages + response, original_options.merge(tool_choice: tool_choice_next, return_messages: true, tools: tools ), &block)
+          else
+            response
+          end
+
+    if return_messages
+      res
+    else
+      res.last['content']
+    end
+  end
+
   end
 end

data/scout-ai.gemspec

@@ -2,11 +2,11 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: scout-ai 1.1.7 ruby lib
+# stub: scout-ai 1.1.8 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "scout-ai".freeze
-  s.version = "1.1.7".freeze
+  s.version = "1.1.8".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]

data/test/scout/llm/backends/test_openwebui.rb

@@ -13,7 +13,8 @@ user: write a script that sorts files in a directory
 user: write a script that sorts files in a directory 
     EOF
 
-    ppp LLM::OpenWebUI.ask prompt, model: 'mistral:latest', url: "http://gepeto.bsc.es/api"
+    #ppp LLM::OpenWebUI.ask prompt, model: 'ALIA-40b-instruct-2512-Q8_0:latest', url: "https://gepeto.bsc.es/api"
+    ppp LLM::OpenWebUI.ask prompt, model: 'qwen3-vl:30b', url: "https://gepeto.bsc.es/api"
   end
 
   def _test_tool

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout-ai
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Miguel Vazquez