smart_prompt 0.1.9 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dce823cedfccc6a2288e6a37b2a91571d4bc784d26440d11503697c43d5558de
-  data.tar.gz: b8f4cbb2104d640f423f727afcb38962a7cfa663887ada0d32ec3a61d2ce513c
+  metadata.gz: 671745a347fa5443d42ce018a0c00870f5c1c13771060d1facea3ecf6cff41d6
+  data.tar.gz: 5a2f1177a1ed5de38daee6422586841c8358c869cd3e9fc71d4b67078a5438e1
 SHA512:
-  metadata.gz: 70c6bd8c45f433cbc4a60bd4d3964f694b836178ff09a84873aeaedc62cc9064e5c4d043d45b7f864d95b5f60f3a8eb6571230abb9c45385a8525014417493db
-  data.tar.gz: 43eca2651ae52dab6e8ca1fff67acbc1099e3adc839c8035111148aae45b3bdcaf64f8b1f5daed8e45c4b2962449eef86c19a16d7e69fe59f874af2e4b66b4d1
+  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,43 +39,57 @@ 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
+    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 safe_send_msg
+    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)
-        @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
       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, @tools, proc)
+        @messages = []
+        @messages << { role: "system", content: @sys_msg }
+      end
+    rescue => e
+      return "Failed to call LLM after #{MAX_RETRIES} attempts: #{e.message}"
+    end
+
     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
@@ -87,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/engine.rb

@@ -10,11 +10,18 @@ module SmartPrompt
         SmartPrompt.logger.info "Started create the SmartPrompt engine."
       end
 
+      def create_dir(filename)
+        path = File::path(filename).to_s
+        parent_dir = File::dirname(path) 
+        Dir.mkdir(parent_dir, 0755) unless File.directory?(parent_dir)
+      end
+
       def load_config(config_file)
         begin
           @config_file = config_file
           @config = YAML.load_file(config_file)
           if @config['logger_file']
+            create_dir(@config['logger_file'])
             SmartPrompt.logger = Logger.new(@config['logger_file'])
           end
           SmartPrompt.logger.info "Loading configuration from file: #{config_file}"
@@ -60,11 +67,10 @@ module SmartPrompt
           return false
         end
       end
-        
+      
       def call_worker(worker_name, params = {})
         SmartPrompt.logger.info "Calling worker: #{worker_name} with params: #{params}"
-        worker = get_worker(worker_name)
-        
+        worker = get_worker(worker_name)        
         begin
           result = worker.execute(params)
           SmartPrompt.logger.info "Worker #{worker_name} executed successfully"
@@ -75,12 +81,23 @@ module SmartPrompt
           raise
         end
       end
-  
-      private
-  
+
+      def call_worker_by_stream(worker_name, params = {}, &proc)
+        SmartPrompt.logger.info "Calling worker: #{worker_name} with params: #{params}"
+        worker = get_worker(worker_name)        
+        begin
+          worker.execute_by_stream(params, &proc)
+          SmartPrompt.logger.info "Worker #{worker_name} executed(stream) successfully"          
+        rescue => e
+          SmartPrompt.logger.error "Error executing worker #{worker_name}: #{e.message}"
+          SmartPrompt.logger.debug e.backtrace.join("\n")
+          raise
+        end
+      end
+    private
       def get_worker(worker_name)
         SmartPrompt.logger.info "Creating worker instance for: #{worker_name}"
         Worker.new(worker_name, self)
       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

@@ -13,7 +13,7 @@ module SmartPrompt
           access_token: api_key,
           uri_base: @config['url'],
           request_timeout: 240
-        )        
+        )
       rescue OpenAI::ConfigurationError => e
         SmartPrompt.logger.error "Failed to initialize OpenAI client: #{e.message}"
         raise LLMAPIError, "Invalid OpenAI configuration: #{e.message}"
@@ -31,22 +31,27 @@ module SmartPrompt
       end
     end
 
-    def send_request(messages, model=nil, send_request=0.7)
+    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
       else
-        model_name = @config['model']        
+        model_name = @config['model']
       end
       SmartPrompt.logger.info "OpenAIAdapter: Using model #{model_name}"
       begin
-        response = @client.chat(
-          parameters: {
-            model: model_name,
-            messages: messages,
-            temperature: @config['temperature'] || send_request
-          }
-        )
+        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}"
@@ -63,7 +68,10 @@ module SmartPrompt
         SmartPrompt.logger.info "Successful send a message"
       end
       SmartPrompt.logger.info "OpenAIAdapter: Received response from OpenAI"
-      response.dig("choices", 0, "message", "content")
+      if proc == nil
+        @last_response = response
+        return response.dig("choices", 0, "message", "content")
+      end
     end
 
     def embeddings(text, model)

data/lib/smart_prompt/version.rb

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

data/lib/smart_prompt/worker.rb

@@ -11,11 +11,17 @@ 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, params[:tools])
+      context = WorkerContext.new(conversation, params, @engine, proc)
+      context.instance_eval(&@code)
+    end
+
     class << self
       def workers
         @workers ||= {}
@@ -28,15 +34,24 @@ module SmartPrompt
   end
 
   class WorkerContext
-    def initialize(conversation, params, engine)
+    def initialize(conversation, params, engine, proc=nil)
       @conversation = conversation
       @params = params
       @engine = engine
+      @proc = proc
     end
 
     def method_missing(method, *args, &block)
       if @conversation.respond_to?(method)
-        @conversation.send(method, *args, &block)
+        if method==:send_msg
+          if @proc==nil
+            @conversation.send_msg
+          else
+            @conversation.send_msg_by_stream(&@proc)
+          end
+        else
+          @conversation.send(method, *args, &block)
+        end
       else
         super
       end
@@ -50,9 +65,18 @@ module SmartPrompt
       @params
     end
 
+    def proc
+      @proc
+    end
+
     def call_worker(worker_name, params = {})
       worker = Worker.new(worker_name, @engine)
       worker.execute(params)
     end
+
+    def call_worker_by_stream(worker_name, params = {}, proc)
+      worker = Worker.new(worker_name, @engine)
+      worker.execute_by_stream(params, proc)
+    end
   end
 end

data/lib/smart_prompt.rb

@@ -5,7 +5,6 @@ require File.expand_path('../smart_prompt/conversation', __FILE__)
 require File.expand_path('../smart_prompt/llm_adapter', __FILE__)
 require File.expand_path('../smart_prompt/openai_adapter', __FILE__)
 require File.expand_path('../smart_prompt/llamacpp_adapter', __FILE__)
-require File.expand_path('../smart_prompt/ollama_adapter', __FILE__)
 require File.expand_path('../smart_prompt/prompt_template', __FILE__)
 require File.expand_path('../smart_prompt/worker', __FILE__)
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: smart_prompt
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.2
 platform: ruby
 authors:
 - zhuang biaowei
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -112,7 +112,6 @@ files:
 - lib/smart_prompt/engine.rb
 - lib/smart_prompt/llamacpp_adapter.rb
 - lib/smart_prompt/llm_adapter.rb
-- lib/smart_prompt/ollama_adapter.rb
 - lib/smart_prompt/openai_adapter.rb
 - lib/smart_prompt/prompt_template.rb
 - lib/smart_prompt/version.rb
@@ -139,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 3.6.4
 specification_version: 4
 summary: A smart prompt management and LLM interaction gem
 test_files: []

data/lib/smart_prompt/ollama_adapter.rb

@@ -1,79 +0,0 @@
-require 'ollama-ai'
-
-module SmartPrompt
-  class OllamaAdapter < LLMAdapter
-    def initialize(config)
-      super
-      begin
-        @client = Ollama.new(credentials: { address: @config['url'] })
-      rescue Ollama::Errors => e
-        SmartPrompt.logger.error "Failed to initialize Ollama client: #{e.message}"
-        raise LLMAPIError, "Invalid Ollama configuration: #{e.message}"
-      rescue SocketError => e
-        SmartPrompt.logger.error "Failed to initialize Ollama client: #{e.message}"
-        raise LLMAPIError, "Network error: Unable to connect to Ollama API"
-      rescue => e
-        SmartPrompt.logger.error "Failed to initialize Ollama client: #{e.message}"
-        raise Error, "Unexpected error initializing Ollama client: #{e.message}"
-      ensure
-        SmartPrompt.logger.info "Successful creation an Ollama client."
-      end
-    end
-
-    def send_request(messages, model=nil)
-      SmartPrompt.logger.info "OllamaAdapter: Sending request to Ollama"
-      if model
-        model_name = model
-      else
-        model_name = @config['model']        
-      end
-      SmartPrompt.logger.info "OllamaAdapter: Using model #{model_name}"
-      begin
-        response = @client.generate(
-            {
-            model: model_name,
-            prompt: messages.to_s,
-            stream: false
-            }
-        )
-      rescue Ollama::Errors => e
-        SmartPrompt.logger.error "Ollama API error: #{e.message}"
-        raise LLMAPIError, "Ollama API error: #{e.message}"      
-      rescue JSON::ParserError => e
-        SmartPrompt.logger.error "Failed to parse Ollama API response"
-        raise LLMAPIError, "Failed to parse Ollama API response"
-      rescue => e
-        SmartPrompt.logger.error "Unexpected error during Ollama request: #{e.message}"
-        raise Error, "Unexpected error during Ollama request: #{e.message}"
-      ensure
-        SmartPrompt.logger.info "Successful send a message"
-      end
-      SmartPrompt.logger.info "OllamaAdapter: Received response from Ollama"
-      return response.dig(0,"response")
-    end
-
-    def embeddings(text, model)
-      SmartPrompt.logger.info "OllamaAdapter: get embeddings from Ollama"
-      if model
-        model_name = model
-      else
-        model_name = @config['model']        
-      end
-      SmartPrompt.logger.info "OllamaAdapter: Using model #{model_name}"
-      begin
-        response = @client.embeddings(
-            {
-              model: model_name,
-              prompt: text.to_s
-            }
-        )
-      rescue => e
-        SmartPrompt.logger.error "Unexpected error during Ollama request: #{e.message}"
-        raise Error, "Unexpected error during Ollama request: #{e.message}"
-      ensure
-        SmartPrompt.logger.info "Successful send a message"
-      end
-      return response.dig(0,"embedding")
-    end
-  end
-end