smart_prompt 0.5.0 → 0.5.1

data/lib/smart_prompt/engine.rb

@@ -1,12 +1,13 @@
 module SmartPrompt
   class Engine
-    attr_reader :config_file, :config, :adapters, :current_adapter, :llms, :templates
+    attr_reader :config_file, :config, :adapters, :current_adapter, :llms, :models, :templates
     attr_reader :stream_response, :history_manager
 
     def initialize(config_file)
       @config_file = config_file
       @adapters = {}
       @llms = {}
+      @models = {}
       @templates = {}
       @current_workers = {}
       @history_messages = []
@@ -65,10 +66,7 @@ module SmartPrompt
           SmartPrompt.logger = Logger.new(@config["logger_file"])
         end
         SmartPrompt.logger.info "Loading configuration from file: #{config_file}"
-        if @config["better_prompt_db"]
-          require "better_prompt"
-          BetterPrompt.setup(db_path: @config["better_prompt_db"])
-        end
+        @models = @config["models"] || {}
         @config["adapters"].each do |adapter_name, adapter_class|
           adapter_class = SmartPrompt.const_get(adapter_class)
           @adapters[adapter_name] = adapter_class
@@ -134,15 +132,12 @@ module SmartPrompt
         if result.class == String
           recive_message = {
             "role": "assistant",
-            "content": result,
+            "content": sanitize_history_content(result),
           }
         elsif result.class == Array
           recive_message = nil
         else
-          recive_message = {
-            "role": result.dig("choices", 0, "message", "role"),
-            "content": result.dig("choices", 0, "message", "content").to_s + result.dig("choices", 0, "message", "tool_calls").to_s,
-          }
+          recive_message = assistant_history_message(result)
         end
         worker.conversation.add_message(recive_message) if recive_message
         SmartPrompt.logger.info "Worker result is: #{result}"
@@ -196,6 +191,21 @@ module SmartPrompt
 
     private
 
+    def assistant_history_message(result)
+      message = result.dig("choices", 0, "message") || {}
+      history_message = {
+        "role": message["role"] || "assistant",
+        "content": sanitize_history_content(message["content"].to_s),
+      }
+      tool_calls = message["tool_calls"]
+      history_message["tool_calls"] = tool_calls if tool_calls && !tool_calls.empty?
+      history_message
+    end
+
+    def sanitize_history_content(content)
+      content.to_s.gsub(/<\|channel\>thought\n.*?<channel\|>/m, "")
+    end
+
     # Recursively convert hash keys from strings to symbols
     def symbolize_keys(hash)
       return hash unless hash.is_a?(Hash)

data/lib/smart_prompt/openai_adapter.rb

@@ -31,7 +31,19 @@ module SmartPrompt
       end
     end
 
-    def send_request(messages, model = nil, temperature = 0.7, tools = nil, proc = nil)
+    REQUEST_PARAMETER_KEYS = %w[
+      max_tokens
+      max_completion_tokens
+      top_p
+      top_k
+      response_format
+      tool_choice
+      parallel_tool_calls
+      seed
+      stop
+    ].freeze
+
+    def send_request(messages, model = nil, temperature = 0.7, tools = nil, proc = nil, request_options = {})
       SmartPrompt.logger.info "OpenAIAdapter: Sending request to OpenAI"
       temperature = 0.7 if temperature == nil
       if model
@@ -46,6 +58,8 @@ module SmartPrompt
           messages: messages,
           temperature: @config["temperature"] || temperature,
         }
+        parameters.merge!(configured_request_parameters)
+        parameters.merge!(request_options || {})
         if proc
           parameters[:stream] = proc
         end
@@ -99,5 +113,15 @@ module SmartPrompt
       end
       return response.dig("data", 0, "embedding")
     end
+
+    private
+
+    def configured_request_parameters
+      REQUEST_PARAMETER_KEYS.each_with_object({}) do |key, parameters|
+        next unless @config.key?(key)
+
+        parameters[key.to_sym] = @config[key]
+      end
+    end
   end
 end

data/lib/smart_prompt/version.rb

@@ -1,3 +1,3 @@
 module SmartPrompt
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/smart_prompt/worker.rb

@@ -11,8 +11,11 @@ module SmartPrompt
     end
 
     def execute(params = {})
-      # Generate default session ID if using history and no session_id provided
-      session_id = params[:session_id] || "default"
+      # Generate default session ID if using history and no session_id provided.
+      # (Do NOT default to a literal "default" here — that would make every
+      # history-using worker share one session and leave the worker-name branch
+      # below as dead code, breaking per-worker session isolation.)
+      session_id = params[:session_id]
       if params[:with_history] && !session_id && @engine.history_manager
         session_id = "worker_#{@name}_#{Time.now.to_i}"
         SmartPrompt.logger.info "Generated default session ID: #{session_id}"

data/lib/smart_prompt.rb

@@ -16,6 +16,7 @@ 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/anthropic_adapter', __FILE__)
 require File.expand_path('../smart_prompt/llamacpp_adapter', __FILE__)
 require File.expand_path('../smart_prompt/anthropic_adapter', __FILE__)
 require File.expand_path('../smart_prompt/sensenova_adapter', __FILE__)
@@ -55,4 +56,4 @@ module SmartPrompt
       log.progname = self.name
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_prompt
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - zhuang biaowei
@@ -29,42 +29,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.1.0
+        version: 8.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 8.1.0
+        version: 8.3.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: 2.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
-- !ruby/object:Gem::Dependency
-  name: base64
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 2.19.4
 - !ruby/object:Gem::Dependency
   name: safe_ruby
   requirement: !ruby/object:Gem::Requirement
@@ -108,19 +94,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.9.2.1
 - !ruby/object:Gem::Dependency
-  name: better_prompt
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: tiktoken_ruby
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +121,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.0.6
+- !ruby/object:Gem::Dependency
+  name: anthropic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.14'
 description: SmartPrompt provides a flexible DSL for managing prompts, interacting
   with multiple LLMs, and creating composable task workers.
 email:
@@ -153,6 +153,17 @@ files:
 - config/multimodal_config.yml
 - config/sensenova_config.yml
 - config/zhipu_config.yml
+- docs/ANTHROPIC_EXAMPLES.md
+- docs/CONVERSATION_INTEGRATION_SUMMARY.md
+- docs/HISTORY_EXAMPLES_README.md
+- docs/HISTORY_MANAGEMENT_GUIDE.md
+- docs/MONITORING_GUIDE.md
+- docs/MULTIMODAL_README.md
+- docs/RELEVANCE_BASED_STRATEGY_IMPLEMENTATION.md
+- docs/STT_README.md
+- docs/TTS_README.md
+- docs/VIDEO_GENERATION_README.md
+- docs/delete_files_list.md
 - examples/anthropic_basic_chat.rb
 - examples/anthropic_example.rb
 - examples/anthropic_multimodal.rb