smart_prompt 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3bf70c6e843930ff7e1a03c9dd8bfc97b3d097786f84613aab65863e1e43a624
-  data.tar.gz: e9ee9d99378453d90e2ac25b88248f3226f241074c7f80e8bf35104279f05202
+  metadata.gz: ab0d62158bbd98af9d2f57d9708426cceb95c2d3b2797abc0094de3caf96adf8
+  data.tar.gz: d2a50c4ede575eb70caeda1893b60412b04afdec665690b8fd2d4d0f3bdd410e
 SHA512:
-  metadata.gz: 02fbfcdb0ae2292994404219eaa2f1218d54de132ceab061ca4466603186cdc9db5826b7e6e1fcfaa8a37f2527f42c3f863154dfd4cfe94b5b7df58969183285
-  data.tar.gz: b0034a25a0fa4bc6c197beee4635528c3b4887f36a4c8981ebb9894b7c5db61a245a0ff823f6ce171d629ddc65a61a960a172d4235d319d7220050225b7a8a48
+  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

@@ -51,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/ollama_adapter.rb

@@ -6,7 +6,7 @@ module SmartPrompt
       super
       begin
         @client = Ollama.new(credentials: { address: @config['url'] })
-      rescue Ollama::Error => e
+      rescue Ollama::Errors => e
         SmartPrompt.logger.error "Failed to initialize Ollama client: #{e.message}"
         raise LLMAPIError, "Invalid Ollama configuration: #{e.message}"
       rescue SocketError => e
@@ -36,18 +36,9 @@ module SmartPrompt
             stream: false
             }
         )
-      rescue Ollama::Error => e
+      rescue Ollama::Errors => 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}"
+        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"
@@ -58,7 +49,31 @@ module SmartPrompt
         SmartPrompt.logger.info "Successful send a message"
       end
       SmartPrompt.logger.info "OllamaAdapter: Received response from Ollama"
-      return response[0]["response"]
+      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

@@ -17,7 +17,7 @@ module SmartPrompt
       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
+      rescue OpenAI::Error => e
         SmartPrompt.logger.error "Failed to initialize OpenAI client: #{e.message}"
         raise LLMAPIError, "OpenAI authentication failed: #{e.message}"
       rescue SocketError => e
@@ -47,24 +47,12 @@ module SmartPrompt
             temperature: @config['temperature'] || 0.7
           }
         )
-      rescue OpenAI::APIError => e
+      rescue OpenAI::Error => 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 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"
@@ -77,5 +65,29 @@ module SmartPrompt
       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.7"
+  VERSION = "0.1.8"
 end

data/lib/smart_prompt.rb

@@ -1,5 +1,6 @@
 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__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_prompt
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - zhuang biaowei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-17 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:
@@ -125,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.22
+rubygems_version: 3.5.23
 signing_key: 
 specification_version: 4
 summary: A smart prompt management and LLM interaction gem