smart_prompt 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18a10421c03b8707b2ff6d7cf40a5e58eee621b62a177c7ab3d10c2b5e75b767
-  data.tar.gz: 4f43968f0b7cf8e9dab3ce5959f2a837729b335b0a1fcc533852339f130b7e43
+  metadata.gz: 3bf70c6e843930ff7e1a03c9dd8bfc97b3d097786f84613aab65863e1e43a624
+  data.tar.gz: e9ee9d99378453d90e2ac25b88248f3226f241074c7f80e8bf35104279f05202
 SHA512:
-  metadata.gz: e0fd7f1e1995821f53135e01f92c3d3cdf1296405fec138c588ff23450c9be452d81b8a3dd42fb1e9fdf73748a1cc0119fe09285bac281eb035c2bec4742987c
-  data.tar.gz: 45e702684683ff912f149a2ae2f7eb94f0f4efa183f991923db8858223a1c721e975821972f7183fcb958e902168a65b22d5ea14f84be6cea87a434ced74e447
+  metadata.gz: 02fbfcdb0ae2292994404219eaa2f1218d54de132ceab061ca4466603186cdc9db5826b7e6e1fcfaa8a37f2527f42c3f863154dfd4cfe94b5b7df58969183285
+  data.tar.gz: b0034a25a0fa4bc6c197beee4635528c3b4887f36a4c8981ebb9894b7c5db61a245a0ff823f6ce171d629ddc65a61a960a172d4235d319d7220050225b7a8a48

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

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,64 @@
+require 'ollama-ai'
+
+module SmartPrompt
+  class OllamaAdapter < LLMAdapter
+    def initialize(config)
+      super
+      begin
+        @client = Ollama.new(credentials: { address: @config['url'] })
+      rescue Ollama::Error => 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::Error => e
+        SmartPrompt.logger.error "Ollama API error: #{e.message}"
+        raise LLMAPIError, "Ollama API error: #{e.message}"
+      rescue Ollama::ConnectionError => e
+        SmartPrompt.logger.error "Connection error: Unable to reach Ollama API"
+        raise LLMAPIError, "Connection error: Unable to reach Ollama API"
+      rescue Ollama::TimeoutError => e
+        SmartPrompt.logger.error "Request to Ollama API timed out"
+        raise LLMAPIError, "Request to Ollama API timed out"
+      rescue Ollama::InvalidRequestError => e
+        SmartPrompt.logger.error "Invalid request to Ollama API: #{e.message}"
+        raise LLMAPIError, "Invalid request to Ollama API: #{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[0]["response"]
+    end
+  end
+end

data/lib/smart_prompt/openai_adapter.rb

@@ -0,0 +1,81 @@
+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::AuthenticationError => 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::APIError => e
+        SmartPrompt.logger.error "OpenAI API error: #{e.message}"
+        raise LLMAPIError, "OpenAI API error: #{e.message}"
+      rescue OpenAI::APIConnectionError => e
+        SmartPrompt.logger.error "Connection error: Unable to reach OpenAI API"
+        raise LLMAPIError, "Connection error: Unable to reach OpenAI API"
+      rescue OpenAI::APITimeoutError => e
+        SmartPrompt.logger.error "Request to OpenAI API timed out"
+        raise LLMAPIError, "Request to OpenAI API timed out"
+      rescue OpenAI::InvalidRequestError => e
+        SmartPrompt.logger.error "Invalid request to OpenAI API: #{e.message}"
+        raise LLMAPIError, "Invalid request to OpenAI API: #{e.message}"
+      rescue OpenAI::AuthenticationError => e
+        SmartPrompt.logger.error "Authentication error with OpenAI API: #{e.message}"
+        raise LLMAPIError, "Authentication error with OpenAI API: #{e.message}"
+      rescue OpenAI::RateLimitError => e
+        SmartPrompt.logger.error "Rate limit exceeded for OpenAI API"
+        raise LLMAPIError, "Rate limit exceeded for OpenAI API"
+      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
+  end
+end

data/lib/smart_prompt/version.rb

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

data/lib/smart_prompt.rb

@@ -2,11 +2,18 @@ require File.expand_path('../smart_prompt/version', __FILE__)
 require File.expand_path('../smart_prompt/engine', __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.7
 platform: ruby
 authors:
 - zhuang biaowei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-08 00:00:00.000000000 Z
+date: 2024-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml
@@ -95,7 +95,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 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.18
+rubygems_version: 3.5.22
 signing_key: 
 specification_version: 4
 summary: A smart prompt management and LLM interaction gem