smart_prompt 0.4.4 → 0.5.0

data/lib/smart_prompt/engine.rb

@@ -1,16 +1,16 @@
 module SmartPrompt
   class Engine
-    attr_reader :config_file, :config, :adapters, :current_adapter, :llms, :models, :templates
-    attr_reader :stream_response
+    attr_reader :config_file, :config, :adapters, :current_adapter, :llms, :templates
+    attr_reader :stream_response, :history_manager
 
     def initialize(config_file)
       @config_file = config_file
       @adapters = {}
       @llms = {}
-      @models = {}
       @templates = {}
       @current_workers = {}
       @history_messages = []
+      @history_manager = nil
       load_config(config_file)
       SmartPrompt.logger.info "Started create the SmartPrompt engine."
       @stream_proc = Proc.new do |chunk, _bytesize|
@@ -65,7 +65,10 @@ module SmartPrompt
           SmartPrompt.logger = Logger.new(@config["logger_file"])
         end
         SmartPrompt.logger.info "Loading configuration from file: #{config_file}"
-        @models = @config["models"] || {}
+        if @config["better_prompt_db"]
+          require "better_prompt"
+          BetterPrompt.setup(db_path: @config["better_prompt_db"])
+        end
         @config["adapters"].each do |adapter_name, adapter_class|
           adapter_class = SmartPrompt.const_get(adapter_class)
           @adapters[adapter_name] = adapter_class
@@ -79,6 +82,14 @@ module SmartPrompt
           template_name = file.gsub(@config["template_path"] + "/", "").gsub("\.erb", "")
           @templates[template_name] = PromptTemplate.new(file)
         end
+
+        # Initialize HistoryManager if configured
+        if @config["history"]
+          history_config = symbolize_keys(@config["history"])
+          @history_manager = HistoryManager.new(history_config)
+          SmartPrompt.logger.info "HistoryManager initialized with configuration"
+        end
+
         load_workers
       rescue Psych::SyntaxError => ex
         SmartPrompt.logger.error "YAML syntax error in config file: #{ex.message}"
@@ -123,12 +134,15 @@ module SmartPrompt
         if result.class == String
           recive_message = {
             "role": "assistant",
-            "content": sanitize_history_content(result),
+            "content": result,
           }
         elsif result.class == Array
           recive_message = nil
         else
-          recive_message = assistant_history_message(result)
+          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,
+          }
         end
         worker.conversation.add_message(recive_message) if recive_message
         SmartPrompt.logger.info "Worker result is: #{result}"
@@ -146,7 +160,8 @@ module SmartPrompt
       begin
         @origin_proc = proc
         @stream_response = {}
-        worker.execute_by_stream(params, &@stream_proc)
+        ret = worker.execute_by_stream(params, &@stream_proc)
+        @stream_response = ret if @stream_response.empty?
         SmartPrompt.logger.info "Worker #{worker_name} executed(stream) successfully"
         SmartPrompt.logger.info "Worker #{worker_name} stream response is: #{@stream_response}"
       rescue => e
@@ -166,28 +181,30 @@ module SmartPrompt
     end
 
     def history_messages
+      if @history_manager
+        SmartPrompt.logger.warn "[DEPRECATED] Engine#history_messages is deprecated. Use history_manager.get_context(session_id) instead."
+      end
       @history_messages
     end
 
     def clear_history_messages
+      if @history_manager
+        SmartPrompt.logger.warn "[DEPRECATED] Engine#clear_history_messages is deprecated. Use history_manager.clear_session(session_id) instead."
+      end
       @history_messages = []
     end
 
     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
+    # Recursively convert hash keys from strings to symbols
+    def symbolize_keys(hash)
+      return hash unless hash.is_a?(Hash)
 
-    def sanitize_history_content(content)
-      content.to_s.gsub(/<\|channel\>thought\n.*?<channel\|>/m, "")
+      hash.each_with_object({}) do |(key, value), result|
+        new_key = key.is_a?(String) ? key.to_sym : key
+        new_value = value.is_a?(Hash) ? symbolize_keys(value) : value
+        result[new_key] = new_value
+      end
     end
   end
 end