smart_prompt 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 844d04d23e32f35f10feb9da06389b78f81d9f7616316cc04f0e8987e5bd6bae
-  data.tar.gz: 364703fc100dfad5a3180deb89fcb49d5aafe9686bc4bbe0f900c99a8d1fee1d
+  metadata.gz: 671745a347fa5443d42ce018a0c00870f5c1c13771060d1facea3ecf6cff41d6
+  data.tar.gz: 5a2f1177a1ed5de38daee6422586841c8358c869cd3e9fc71d4b67078a5438e1
 SHA512:
-  metadata.gz: 503ade825af0875584fe49d31fba389b482ff60ae7d8deb0c657d778bc6a0be0a037e65efc95dd66bf88c52ae08508248c851828e2185ad231c0ebd78886e564
-  data.tar.gz: 07370b6a99cd6f4146c06a3b4de88d0fd0abcfce144b4e4c333cbdd39383fc601ba1f5fed536a4a05601262d643fa12ff57c9d7cb8cbb46389fa46f96644bbc2
+  metadata.gz: 9fed26cf6880bf7b9bb2e71c2e4013c66a25b9b542bc88e5727025eef57731d5024dc3a01d548ed3d76f404646835666540dc7ea056477f8abd9cc2b28bddeeb
+  data.tar.gz: 1ac2f3ed8fc1b664a623888193d82fe114ef8a8a8f43b6dd8600875132d617af624ccca6d0c6f10814759ae881e51c2351ba6f4bba3b09f89b426381da470fb7

data/lib/smart_prompt/conversation.rb

@@ -1,5 +1,5 @@
-require 'yaml'
-require 'retriable'
+require "yaml"
+require "retriable"
 require "numo/narray"
 
 module SmartPrompt
@@ -7,7 +7,7 @@ module SmartPrompt
     include APIHandler
     attr_reader :messages, :last_response, :config_file
 
-    def initialize(engine)
+    def initialize(engine, tools = nil)
       SmartPrompt.logger.info "Create Conversation"
       @messages = []
       @engine = engine
@@ -16,6 +16,7 @@ module SmartPrompt
       @templates = engine.templates
       @current_adapter = engine.current_adapter
       @last_response = nil
+      @tools = tools
     end
 
     def use(llm_name)
@@ -38,46 +39,49 @@ module SmartPrompt
         SmartPrompt.logger.info "Use template #{template_name}"
         raise "Template #{template_name} not found" unless @templates.key?(template_name)
         content = @templates[template_name].render(params)
-        @messages << { role: 'user', content: content }
+        @messages << { role: "user", content: content }
         self
       else
-        @messages << { role: 'user', content: template_name }
+        @messages << { role: "user", content: template_name }
         self
       end
     end
 
     def sys_msg(message)
       @sys_msg = message
-      @messages << { role: 'system', content: message }
+      @messages << { role: "system", content: message }
       self
     end
 
     def send_msg_once
       raise "No LLM selected" if @current_llm.nil?
       @last_response = @current_llm.send_request(@messages, @model_name, @temperature)
-      @messages=[]
-      @messages << { role: 'system', content: @sys_msg }
+      @messages = []
+      @messages << { role: "system", content: @sys_msg }
       @last_response
     end
 
     def send_msg
       Retriable.retriable(RETRY_OPTIONS) do
         raise ConfigurationError, "No LLM selected" if @current_llm.nil?
-        @last_response = @current_llm.send_request(@messages, @model_name, @temperature)
-        @messages=[]
-        @messages << { role: 'system', content: @sys_msg }
+        @last_response = @current_llm.send_request(@messages, @model_name, @temperature, @tools, nil)
+        if @last_response == ""
+          @last_response = @current_llm.last_response
+        end
+        @messages = []
+        @messages << { role: "system", content: @sys_msg }
         @last_response
       end
-    rescue => e      
+    rescue => e
       return "Failed to call LLM after #{MAX_RETRIES} attempts: #{e.message}"
     end
 
     def send_msg_by_stream(&proc)
       Retriable.retriable(RETRY_OPTIONS) do
         raise ConfigurationError, "No LLM selected" if @current_llm.nil?
-        @current_llm.send_request(@messages, @model_name, @temperature, proc) 
-        @messages=[]
-        @messages << { role: 'system', content: @sys_msg }
+        @current_llm.send_request(@messages, @model_name, @temperature, @tools, proc)
+        @messages = []
+        @messages << { role: "system", content: @sys_msg }
       end
     rescue => e
       return "Failed to call LLM after #{MAX_RETRIES} attempts: #{e.message}"
@@ -85,7 +89,7 @@ module SmartPrompt
 
     def normalize(x, length)
       if x.length > length
-        x = Numo::NArray.cast(x[0..length-1])      
+        x = Numo::NArray.cast(x[0..length - 1])
         norm = Math.sqrt((x * x).sum)
         return (x / norm).to_a
       else
@@ -98,15 +102,15 @@ module SmartPrompt
         raise ConfigurationError, "No LLM selected" if @current_llm.nil?
         text = ""
         @messages.each do |msg|
-          if msg[:role]=="user"
+          if msg[:role] == "user"
             text = msg[:content]
           end
         end
         @last_response = @current_llm.embeddings(text, @model_name)
-        @messages=[]
-        @messages << { role: 'system', content: @sys_msg }
+        @messages = []
+        @messages << { role: "system", content: @sys_msg }
         normalize(@last_response, length)
       end
     end
   end
-end
+end

data/lib/smart_prompt/llm_adapter.rb

@@ -4,6 +4,7 @@ require 'uri'
 
 module SmartPrompt
   class LLMAdapter
+    attr_accessor :last_response
     def initialize(config)
       SmartPrompt.logger.info "Start create the SmartPrompt LLMAdapter."
       @config = config

data/lib/smart_prompt/openai_adapter.rb

@@ -31,7 +31,7 @@ module SmartPrompt
       end
     end
 
-    def send_request(messages, model=nil, temperature=0.7, proc)
+    def send_request(messages, model=nil, temperature=0.7, tools=nil, proc=nil)
       SmartPrompt.logger.info "OpenAIAdapter: Sending request to OpenAI"
       if model
         model_name = model
@@ -40,24 +40,18 @@ module SmartPrompt
       end
       SmartPrompt.logger.info "OpenAIAdapter: Using model #{model_name}"
       begin
-        if proc == nil
-          response = @client.chat(
-            parameters: {
-              model: model_name,
-              messages: messages,
-              temperature: @config['temperature'] || temperature
-            }
-          )
-        else
-          @client.chat(
-            parameters: {
-              model: model_name,
-              messages: messages,
-              temperature: @config['temperature'] || temperature,
-              stream: proc
-            }
-          )
+        parameters = {
+          model: model_name,
+          messages: messages,
+          temperature: @config['temperature'] || temperature
+        }
+        if proc
+          parameters[:stream]=proc
+        end
+        if tools
+          parameters[:tools]=tools
         end
+        response = @client.chat(parameters: parameters)
       rescue OpenAI::Error => e
         SmartPrompt.logger.error "OpenAI API error: #{e.message}"
         raise LLMAPIError, "OpenAI API error: #{e.message}"
@@ -75,6 +69,7 @@ module SmartPrompt
       end
       SmartPrompt.logger.info "OpenAIAdapter: Received response from OpenAI"
       if proc == nil
+        @last_response = response
         return response.dig("choices", 0, "message", "content")
       end
     end

data/lib/smart_prompt/version.rb

@@ -1,3 +1,3 @@
 module SmartPrompt
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/lib/smart_prompt/worker.rb

@@ -11,13 +11,13 @@ module SmartPrompt
     end
 
     def execute(params = {})
-      conversation = Conversation.new(@engine)
+      conversation = Conversation.new(@engine, params[:tools])
       context = WorkerContext.new(conversation, params, @engine)
       context.instance_eval(&@code)
     end
 
     def execute_by_stream(params = {}, &proc)      
-      conversation = Conversation.new(@engine)
+      conversation = Conversation.new(@engine, params[:tools])
       context = WorkerContext.new(conversation, params, @engine, proc)
       context.instance_eval(&@code)
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: smart_prompt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - zhuang biaowei
 bindir: exe
 cert_chain: []
-date: 2025-03-10 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml