smart_prompt 0.1.8 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab0d62158bbd98af9d2f57d9708426cceb95c2d3b2797abc0094de3caf96adf8
-  data.tar.gz: d2a50c4ede575eb70caeda1893b60412b04afdec665690b8fd2d4d0f3bdd410e
+  metadata.gz: 844d04d23e32f35f10feb9da06389b78f81d9f7616316cc04f0e8987e5bd6bae
+  data.tar.gz: 364703fc100dfad5a3180deb89fcb49d5aafe9686bc4bbe0f900c99a8d1fee1d
 SHA512:
-  metadata.gz: 6d61c7f8db100a715b16a8bd08ef27bf49f3e38127d68cb37a5fc55c3d5ee781e505d8c4acbc6ac98206bd2aeb22bcdd4dc6d749ed65293fecb5abbc361ffac9
-  data.tar.gz: 7f8ff17971d9979a95400bb1e4497737fab2c503d69a1c415a0003ff514400b55ade390d0f007a146e43569978b98e29f5e308091d74e25cd8b405689b73b136
+  metadata.gz: 503ade825af0875584fe49d31fba389b482ff60ae7d8deb0c657d778bc6a0be0a037e65efc95dd66bf88c52ae08508248c851828e2185ad231c0ebd78886e564
+  data.tar.gz: 07370b6a99cd6f4146c06a3b4de88d0fd0abcfce144b4e4c333cbdd39383fc601ba1f5fed536a4a05601262d643fa12ff57c9d7cb8cbb46389fa46f96644bbc2

data/lib/smart_prompt/api_handler.rb

@@ -0,0 +1,17 @@
+module SmartPrompt
+    module APIHandler
+        MAX_RETRIES = 3
+        RETRY_OPTIONS = {
+          tries: MAX_RETRIES,
+          base_interval: 1,
+          max_interval: 10,
+          rand_factor: 0.5,
+          on: [
+            Errno::ECONNRESET,
+            Errno::ECONNABORTED,
+            Errno::EPIPE,
+            Errno::ETIMEDOUT
+          ]
+        }
+    end
+end

data/lib/smart_prompt/conversation.rb

@@ -28,6 +28,10 @@ module SmartPrompt
       @model_name = model_name
     end
 
+    def temperature(temperature)
+      @temperature = temperature
+    end
+
     def prompt(template_name, params = {})
       if template_name.class == Symbol
         template_name = template_name.to_s
@@ -48,22 +52,33 @@ module SmartPrompt
       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)
+      @last_response = @current_llm.send_request(@messages, @model_name, @temperature)
       @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)
+        @last_response = @current_llm.send_request(@messages, @model_name, @temperature)
         @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, proc) 
+        @messages=[]
+        @messages << { role: 'system', content: @sys_msg }
+      end
     rescue => e
       return "Failed to call LLM after #{MAX_RETRIES} attempts: #{e.message}"
     end

data/lib/smart_prompt/db_adapter.rb

@@ -0,0 +1,45 @@
+require "sequel"
+require "json"
+
+module SmartPrompt
+  class DBAdapter
+    attr_reader :db, :tables
+    def initialize(config)
+      db_uri = config[:database]
+      @db = Sequel.connect(db_uri)
+      @tables = {}
+      @db.tables.each do |table_name|
+        define_table(table_name)
+      end
+    end
+
+    def define_table(table_name, class_name=table_name.to_s.capitalize)
+      class_define = <<-EOT
+        class #{class_name} < Sequel::Model(:#{table_name})
+        end
+      EOT
+      eval(class_define)
+      @tables[table_name] = eval(class_name)
+    end
+
+    def get_table_schema(table_name)
+      @tables[table_name].db_schema
+    end
+
+    def get_table_schema_str(table_name)
+      JSON.pretty_generate(get_table_schema(table_name))
+    end
+
+    def get_db_schema
+      schema = {}
+      @db.tables.each do |table_name|
+        schema[table_name] = get_table_schema(table_name)
+      end
+      schema
+    end
+
+    def get_db_schema_str
+      JSON.pretty_generate(get_db_schema)
+    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/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,33 @@ module SmartPrompt
       end
     end
 
-    def send_request(messages, model=nil)
+    def send_request(messages, model=nil, temperature=0.7, proc)
       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'] || 0.7
-          }
-        )
+        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
+            }
+          )
+        end
       rescue OpenAI::Error => e
         SmartPrompt.logger.error "OpenAI API error: #{e.message}"
         raise LLMAPIError, "OpenAI API error: #{e.message}"
@@ -63,7 +74,9 @@ 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
+        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.8"
+  VERSION = "0.2.1"
 end

data/lib/smart_prompt/worker.rb

@@ -16,6 +16,12 @@ module SmartPrompt
       context.instance_eval(&@code)
     end
 
+    def execute_by_stream(params = {}, &proc)      
+      conversation = Conversation.new(@engine)
+      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,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: smart_prompt
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.1
 platform: ruby
 authors:
 - zhuang biaowei
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-11-28 00:00:00.000000000 Z
+date: 2025-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -39,19 +38,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 7.1.0
 - !ruby/object:Gem::Dependency
-  name: ollama-ai
+  name: ollama-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -107,11 +106,12 @@ files:
 - README.md
 - Rakefile
 - lib/smart_prompt.rb
+- lib/smart_prompt/api_handler.rb
 - lib/smart_prompt/conversation.rb
+- lib/smart_prompt/db_adapter.rb
 - 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
@@ -124,7 +124,6 @@ metadata:
   homepage_uri: https://github.com/zhuangbiaowei/smart_prompt
   source_code_uri: https://github.com/zhuangbiaowei/smart_prompt
   changelog_uri: https://github.com/zhuangbiaowei/smart_prompt/blob/master/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -139,8 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.23
-signing_key: 
+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