smart_prompt 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a10421c03b8707b2ff6d7cf40a5e58eee621b62a177c7ab3d10c2b5e75b767
-  data.tar.gz: 4f43968f0b7cf8e9dab3ce5959f2a837729b335b0a1fcc533852339f130b7e43
+  metadata.gz: ab0d62158bbd98af9d2f57d9708426cceb95c2d3b2797abc0094de3caf96adf8
+  data.tar.gz: d2a50c4ede575eb70caeda1893b60412b04afdec665690b8fd2d4d0f3bdd410e
 SHA512:
-  metadata.gz: e0fd7f1e1995821f53135e01f92c3d3cdf1296405fec138c588ff23450c9be452d81b8a3dd42fb1e9fdf73748a1cc0119fe09285bac281eb035c2bec4742987c
-  data.tar.gz: 45e702684683ff912f149a2ae2f7eb94f0f4efa183f991923db8858223a1c721e975821972f7183fcb958e902168a65b22d5ea14f84be6cea87a434ced74e447
+  metadata.gz: 6d61c7f8db100a715b16a8bd08ef27bf49f3e38127d68cb37a5fc55c3d5ee781e505d8c4acbc6ac98206bd2aeb22bcdd4dc6d749ed65293fecb5abbc361ffac9
+  data.tar.gz: 7f8ff17971d9979a95400bb1e4497737fab2c503d69a1c415a0003ff514400b55ade390d0f007a146e43569978b98e29f5e308091d74e25cd8b405689b73b136

data/lib/smart_prompt/conversation.rb

@@ -1,7 +1,10 @@
 require 'yaml'
+require 'retriable'
+require "numo/narray"
 
 module SmartPrompt
   class Conversation
+    include APIHandler
     attr_reader :messages, :last_response, :config_file
 
     def initialize(engine)
@@ -26,12 +29,17 @@ module SmartPrompt
     end
 
     def prompt(template_name, params = {})
-      template_name = template_name.to_s
-      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 }
-      self
+      if template_name.class == Symbol
+        template_name = template_name.to_s
+        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 }
+        self
+      else
+        @messages << { role: 'user', content: template_name }
+        self
+      end
     end
 
     def sys_msg(message)
@@ -47,5 +55,43 @@ module SmartPrompt
       @messages << { role: 'system', content: @sys_msg }
       @last_response
     end
+
+    def safe_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
+      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])      
+        norm = Math.sqrt((x * x).sum)
+        return (x / norm).to_a
+      else
+        return x.concat([0] * (x.length - length))
+      end
+    end
+
+    def embeddings(length)
+      Retriable.retriable(RETRY_OPTIONS) do
+        raise ConfigurationError, "No LLM selected" if @current_llm.nil?
+        text = ""
+        @messages.each do |msg|
+          if msg[:role]=="user"
+            text = msg[:content]
+          end
+        end
+        @last_response = @current_llm.embeddings(text, @model_name)
+        @messages=[]
+        @messages << { role: 'system', content: @sys_msg }
+        normalize(@last_response, length)
+      end
+    end
   end
 end

data/lib/smart_prompt/engine.rb

@@ -11,26 +11,39 @@ module SmartPrompt
       end
 
       def load_config(config_file)
-        @config_file = config_file
-        @config = YAML.load_file(config_file)
-        if @config['logger_file']
-          SmartPrompt.logger = Logger.new(@config['logger_file'])
-        end
-        SmartPrompt.logger.info "Loading configuration from file: #{config_file}"
-        @config['adapters'].each do |adapter_name, adapter_class|
-          adapter_class = SmartPrompt.const_get(adapter_class)
-          @adapters[adapter_name] = adapter_class
-        end
-        @config['llms'].each do |llm_name,llm_config|
-          adapter_class = @adapters[llm_config['adapter']]
-          @llms[llm_name]=adapter_class.new(llm_config)
-        end
-        @current_llm = @config['default_llm'] if @config['default_llm']
-        Dir.glob(File.join(@config['template_path'], '*.erb')).each do |file|
-          template_name = file.gsub(@config['template_path']+"/","").gsub("\.erb","")
-          @templates[template_name] = PromptTemplate.new(file)
-        end
-        load_workers
+        begin
+          @config_file = config_file
+          @config = YAML.load_file(config_file)
+          if @config['logger_file']
+            SmartPrompt.logger = Logger.new(@config['logger_file'])
+          end
+          SmartPrompt.logger.info "Loading configuration from file: #{config_file}"
+          @config['adapters'].each do |adapter_name, adapter_class|
+            adapter_class = SmartPrompt.const_get(adapter_class)
+            @adapters[adapter_name] = adapter_class
+          end
+          @config['llms'].each do |llm_name,llm_config|
+            adapter_class = @adapters[llm_config['adapter']]
+            @llms[llm_name]=adapter_class.new(llm_config)
+          end
+          @current_llm = @config['default_llm'] if @config['default_llm']
+          Dir.glob(File.join(@config['template_path'], '*.erb')).each do |file|
+            template_name = file.gsub(@config['template_path']+"/","").gsub("\.erb","")
+            @templates[template_name] = PromptTemplate.new(file)
+          end
+          load_workers          
+        rescue Psych::SyntaxError => ex
+          SmartPrompt.logger.error "YAML syntax error in config file: #{ex.message}"
+          raise ConfigurationError, "Invalid YAML syntax in config file: #{ex.message}"
+        rescue Errno::ENOENT => ex
+          SmartPrompt.logger.error "Config file not found: #{ex.message}"
+          raise ConfigurationError, "Config file not found: #{ex.message}"
+        rescue StandardError => ex
+          SmartPrompt.logger.error "Error loading configuration: #{ex.message}"
+          raise ConfigurationError, "Error loading configuration: #{ex.message}"
+        ensure
+          SmartPrompt.logger.info "Configuration loaded successfully"          
+        end        
       end
 
       def load_workers
@@ -38,6 +51,15 @@ module SmartPrompt
           require(file)
         end
       end
+
+      def check_worker(worker_name)
+        if SmartPrompt::Worker.workers[worker_name]
+          return true
+        else
+          SmartPrompt.logger.warn "Invalid worker: #{worker_name}"
+          return false
+        end
+      end
         
       def call_worker(worker_name, params = {})
         SmartPrompt.logger.info "Calling worker: #{worker_name} with params: #{params}"

data/lib/smart_prompt/llamacpp_adapter.rb

@@ -0,0 +1,68 @@
+require 'openai'
+
+module SmartPrompt
+  class LlamacppAdapter < LLMAdapter
+    def initialize(config)
+      super
+      begin
+        @client = OpenAI::Client.new(
+            uri_base: @config['url']
+          )
+      rescue OpenAI::ConfigurationError => e
+        SmartPrompt.logger.error "Failed to initialize Llamacpp client: #{e.message}"
+        raise LLMAPIError, "Invalid Llamacpp configuration: #{e.message}"
+      rescue OpenAI::AuthenticationError => e
+        SmartPrompt.logger.error "Failed to initialize Llamacpp client: #{e.message}"
+        raise LLMAPIError, "Llamacpp authentication failed: #{e.message}"
+      rescue SocketError => e
+        SmartPrompt.logger.error "Failed to initialize Llamacpp client: #{e.message}"
+        raise LLMAPIError, "Network error: Unable to connect to Llamacpp API"
+      rescue => e
+        SmartPrompt.logger.error "Failed to initialize Llamacpp client: #{e.message}"
+        raise Error, "Unexpected error initializing Llamacpp client: #{e.message}"
+      ensure
+        SmartPrompt.logger.info "Successful creation an Llamacpp client."        
+      end
+    end
+
+    def send_request(messages, model=nil)
+      SmartPrompt.logger.info "LlamacppAdapter: Sending request to Llamacpp"
+      begin
+      response = @client.chat(
+        parameters: {
+          messages: messages,
+          temperature: @config['temperature'] || 0.7
+        }
+      )
+      rescue OpenAI::APIError => e
+        SmartPrompt.logger.error "Llamacpp API error: #{e.message}"
+        raise LLMAPIError, "Llamacpp API error: #{e.message}"
+      rescue OpenAI::APIConnectionError => e
+        SmartPrompt.logger.error "Connection error: Unable to reach Llamacpp API"
+        raise LLMAPIError, "Connection error: Unable to reach Llamacpp API"
+      rescue OpenAI::APITimeoutError => e
+        SmartPrompt.logger.error "Request to Llamacpp API timed out"
+        raise LLMAPIError, "Request to Llamacpp API timed out"
+      rescue OpenAI::InvalidRequestError => e
+        SmartPrompt.logger.error "Invalid request to Llamacpp API: #{e.message}"
+        raise LLMAPIError, "Invalid request to Llamacpp API: #{e.message}"
+      rescue OpenAI::AuthenticationError => e
+        SmartPrompt.logger.error "Authentication error with Llamacpp API: #{e.message}"
+        raise LLMAPIError, "Authentication error with Llamacpp API: #{e.message}"
+      rescue OpenAI::RateLimitError => e
+        SmartPrompt.logger.error "Rate limit exceeded for Llamacpp API"
+        raise LLMAPIError, "Rate limit exceeded for Llamacpp API"
+      rescue JSON::ParserError => e
+        SmartPrompt.logger.error "Failed to parse Llamacpp API response"
+        raise LLMAPIError, "Failed to parse Llamacpp API response"
+      rescue => e
+        SmartPrompt.logger.error "Unexpected error during Llamacpp request: #{e.message}"
+        raise Error, "Unexpected error during Llamacpp request: #{e.message}"
+      ensure
+        SmartPrompt.logger.info "Successful send a message"
+      end
+      SmartPrompt.logger.info "LlamacppAdapter: Received response from Llamacpp"
+      response.dig("choices", 0, "message", "content")
+    end
+  end
+end  

data/lib/smart_prompt/llm_adapter.rb

@@ -1,8 +1,6 @@
 require 'net/http'
 require 'json'
 require 'uri'
-require 'openai'
-require 'ollama-ai'
 
 module SmartPrompt
   class LLMAdapter
@@ -17,86 +15,6 @@ module SmartPrompt
     end
   end
 
-  class OpenAIAdapter < LLMAdapter
-    def initialize(config)
-      super
-      api_key = @config['api_key']
-      if api_key.is_a?(String) && api_key.start_with?('ENV[') && api_key.end_with?(']')
-        api_key = eval(api_key)
-      end      
-      @client = OpenAI::Client.new(
-        access_token: api_key,
-        uri_base: @config['url'],
-        request_timeout: 240
-      )
-    end
-
-    def send_request(messages, model=nil)
-      SmartPrompt.logger.info "OpenAIAdapter: Sending request to OpenAI"
-      if model
-        model_name = model
-      else
-        model_name = @config['model']        
-      end
-      SmartPrompt.logger.info "OpenAIAdapter: Using model #{model_name}"
-      response = @client.chat(
-        parameters: {
-          model: model_name,
-          messages: messages,
-          temperature: @config['temperature'] || 0.7
-        }
-      )
-      SmartPrompt.logger.info "OpenAIAdapter: Received response from OpenAI"
-      response.dig("choices", 0, "message", "content")
-    end
-  end
-
-  class LlamacppAdapter < LLMAdapter
-    def initialize(config)
-      super
-      @client = OpenAI::Client.new(
-        uri_base: @config['url']
-      )
-    end
-    def send_request(messages, model=nil)
-      SmartPrompt.logger.info "LlamacppAdapter: Sending request to Llamacpp"
-      response = @client.chat(
-        parameters: {
-          messages: messages,
-          temperature: @config['temperature'] || 0.7
-        }
-      )
-      SmartPrompt.logger.info "LlamacppAdapter: Received response from Llamacpp"
-      response.dig("choices", 0, "message", "content")
-    end
-  end
-
-  class OllamaAdapter < LLMAdapter
-    def initialize(config)
-      super
-      @client = Ollama.new(credentials: { address: @config['url'] })
-    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}"
-      response = @client.generate(
-        {
-          model: model_name,
-          prompt: messages.to_s,
-          stream: false
-        }
-      )
-      SmartPrompt.logger.info "OllamaAdapter: Received response from Ollama"
-      return response[0]["response"]
-    end
-  end
-
   class MockAdapter < LLMAdapter
     def send_request(messages)
       puts "Mock adapter received #{messages.length} messages"

data/lib/smart_prompt/ollama_adapter.rb

@@ -0,0 +1,79 @@
+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

data/lib/smart_prompt/openai_adapter.rb

@@ -0,0 +1,93 @@
+require 'openai'
+
+module SmartPrompt
+  class OpenAIAdapter < LLMAdapter
+    def initialize(config)
+      super
+      api_key = @config['api_key']
+      if api_key.is_a?(String) && api_key.start_with?('ENV[') && api_key.end_with?(']')
+        api_key = eval(api_key)
+      end
+      begin
+        @client = OpenAI::Client.new(
+          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}"
+      rescue OpenAI::Error => e
+        SmartPrompt.logger.error "Failed to initialize OpenAI client: #{e.message}"
+        raise LLMAPIError, "OpenAI authentication failed: #{e.message}"
+      rescue SocketError => e
+        SmartPrompt.logger.error "Failed to initialize OpenAI client: #{e.message}"
+        raise LLMAPIError, "Network error: Unable to connect to OpenAI API"
+      rescue => e
+        SmartPrompt.logger.error "Failed to initialize OpenAI client: #{e.message}"
+        raise Error, "Unexpected error initializing OpenAI client: #{e.message}"
+      ensure
+        SmartPrompt.logger.info "Successful creation an OpenAI client."
+      end
+    end
+
+    def send_request(messages, model=nil)
+      SmartPrompt.logger.info "OpenAIAdapter: Sending request to OpenAI"
+      if model
+        model_name = model
+      else
+        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
+          }
+        )
+      rescue OpenAI::Error => e
+        SmartPrompt.logger.error "OpenAI API error: #{e.message}"
+        raise LLMAPIError, "OpenAI API error: #{e.message}"
+      rescue OpenAI::MiddlewareErrors => e
+        SmartPrompt.logger.error "OpenAI HTTP Error: #{e.message}"
+        raise LLMAPIError, "OpenAI HTTP Error"
+      rescue JSON::ParserError => e
+        SmartPrompt.logger.error "Failed to parse OpenAI API response"
+        raise LLMAPIError, "Failed to parse OpenAI API response"
+      rescue => e
+        SmartPrompt.logger.error "Unexpected error during OpenAI request: #{e.message}"
+        raise Error, "Unexpected error during OpenAI request: #{e.message}"
+      ensure
+        SmartPrompt.logger.info "Successful send a message"
+      end
+      SmartPrompt.logger.info "OpenAIAdapter: Received response from OpenAI"
+      response.dig("choices", 0, "message", "content")
+    end
+
+    def embeddings(text, model)
+      SmartPrompt.logger.info "OpenAIAdapter: get embeddings from Ollama"
+      if model
+        model_name = model
+      else
+        model_name = @config['model']        
+      end
+      SmartPrompt.logger.info "OpenAIAdapter: Using model #{model_name}"
+      begin
+        response = @client.embeddings(
+            parameters: {
+              model: model_name,
+              input: 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("data", 0, "embedding")
+    end
+  end
+end

data/lib/smart_prompt/version.rb

@@ -1,3 +1,3 @@
 module SmartPrompt
-  VERSION = "0.1.6"
+  VERSION = "0.1.8"
 end

data/lib/smart_prompt.rb

@@ -1,12 +1,20 @@
 require File.expand_path('../smart_prompt/version', __FILE__)
 require File.expand_path('../smart_prompt/engine', __FILE__)
+require File.expand_path('../smart_prompt/api_handler', __FILE__)
 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__)
 
 module SmartPrompt
   class Error < StandardError; end
+  class ConfigurationError < Error; end
+  class LLMAPIError < Error; end
+  class CallWorkerError < Error; end
+
   attr_writer :logger
 
   def self.define_worker(name, &block)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_prompt
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - zhuang biaowei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2024-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.0.4
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.1.2
 description: SmartPrompt provides a flexible DSL for managing prompts, interacting
   with multiple LLMs, and creating composable task workers.
 email:
@@ -95,7 +109,10 @@ files:
 - lib/smart_prompt.rb
 - lib/smart_prompt/conversation.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
 - lib/smart_prompt/worker.rb
@@ -122,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.23
 signing_key: 
 specification_version: 4
 summary: A smart prompt management and LLM interaction gem