smart_prompt 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 846477d8ddb503119a9233f9ce85d2094c1755be52adcfc0515b0a7209524a3d
-  data.tar.gz: 4f165cedebc54e9d8ae292e3fd03329ec04150a8e0804fcb90234b7837135e6d
+  metadata.gz: 18a10421c03b8707b2ff6d7cf40a5e58eee621b62a177c7ab3d10c2b5e75b767
+  data.tar.gz: 4f43968f0b7cf8e9dab3ce5959f2a837729b335b0a1fcc533852339f130b7e43
 SHA512:
-  metadata.gz: 7f3521861b4690b233c9b82d6f08123b9859c0fed28e40274fb4eaa014aa93b2df63121aff77451c9b1f5f93f9eeb683c5b044c94cef5e7d11a8e2151c5e97f8
-  data.tar.gz: 9c78f290101fd158403d2feb9e84312d8ffb90a22a32a57e91d96f5c287a38cfd8cb8c318817e860d7fb09bd5584310e6d397fce490deaa29ca52bafb3db7fba
+  metadata.gz: e0fd7f1e1995821f53135e01f92c3d3cdf1296405fec138c588ff23450c9be452d81b8a3dd42fb1e9fdf73748a1cc0119fe09285bac281eb035c2bec4742987c
+  data.tar.gz: 45e702684683ff912f149a2ae2f7eb94f0f4efa183f991923db8858223a1c721e975821972f7183fcb958e902168a65b22d5ea14f84be6cea87a434ced74e447

data/README.cn.md

@@ -24,90 +24,4 @@ $ gem install smart_prompt
 
 ## 用法
 
-以下是一些基本用法示例：
-
-### 配置文件
-
-```
-adapters:
-  openai: OpenAIAdapter
-  ollama: OllamaAdapter
-llms:
-  siliconflow:
-    adapter: openai
-    url: https://api.siliconflow.cn/v1/
-    api_key: ENV["APIKey"]
-    default_model: Qwen/Qwen2.5-7B-Instruct
-  llamacpp:
-    adapter: openai
-    url: http://localhost:8080/    
-  ollama:
-    adapter: ollama
-    url: http://localhost:11434/
-    default_model: qwen2.5
-default_llm: siliconflow
-worker_path: "./workers"
-template_path: "./templates"
-```
-
-### 基本使用
-
-```
-require 'smart_prompt'
-engine = SmartPrompt::Engine.new('./config/llm_config.yml')
-result = engine.call_worker(:daily_report, {location: "Shanghai"}) 
-puts result
-```
-
-### workers/daily_report.rb
-
-```
-SmartPrompt.define_worker :daily_report do
-    use "ollama"
-    model "gemma2"
-    system "You are a helpful report writer."
-    weather = call_worker(:weather_summary, { location: params[:location], date: "today" })
-    prompt :daily_report, { weather: weather, location: params[:location] }
-    send_msg
-end
-```
-
-### workers/weather_summary.rb
-
-```
-SmartPrompt.define_worker :weather_summary do
-  use "ollama"
-  model "gemma2"
-  sys_msg "You are a helpful weather assistant."
-  prompt :weather, { location: params[:location], date: params[:date] }
-  weather_info = send_msg
-  prompt :summarize, { text: weather_info }
-  send_msg
-end
-```
-
-### templates/daily_report.erb
-
-```
-Please create a brief daily report for <%= location %> based on the following weather information:
-
-<%= weather %>
-
-The report should include:
-1. A summary of the weather
-2. Any notable events or conditions
-3. Recommendations for residents
-```
-### templates/weather.erb
-
-```
-What's the weather like in <%= location %> <%= date %>? Please provide a brief description including temperature and general conditions.
-```
-
-### templates/summarize.erb
-
-```
-Please summarize the following text in one sentence:
-
-<%= text %>
-```
+更多示例请看项目 [SmartPromptDemo](https://github.com/zhuangbiaowei/SmartPromptDemo)

data/README.md

@@ -26,90 +26,4 @@ $ gem install smart_prompt
 
 ## Usage
 
-The following are some examples of basic usage:
-
-### llm_config.yml
-
-```
-adapters:
-  openai: OpenAIAdapter
-  ollama: OllamaAdapter
-llms:
-  siliconflow:
-    adapter: openai
-    url: https://api.siliconflow.cn/v1/
-    api_key: ENV["APIKey"]
-    default_model: Qwen/Qwen2.5-7B-Instruct
-  llamacpp:
-    adapter: openai
-    url: http://localhost:8080/    
-  ollama:
-    adapter: ollama
-    url: http://localhost:11434/
-    default_model: qwen2.5
-default_llm: siliconflow
-worker_path: "./workers"
-template_path: "./templates"
-```
-
-### Basic usage
-
-```
-require 'smart_prompt'
-engine = SmartPrompt::Engine.new('./config/llm_config.yml')
-result = engine.call_worker(:daily_report, {location: "Shanghai"}) 
-puts result
-```
-
-### workers/daily_report.rb
-
-```
-SmartPrompt.define_worker :daily_report do
-    use "ollama"
-    model "gemma2"
-    system "You are a helpful report writer."
-    weather = call_worker(:weather_summary, { location: params[:location], date: "today" })
-    prompt :daily_report, { weather: weather, location: params[:location] }
-    send_msg
-end
-```
-
-### workers/weather_summary.rb
-
-```
-SmartPrompt.define_worker :weather_summary do
-  use "ollama"
-  model "gemma2"
-  sys_msg "You are a helpful weather assistant."
-  prompt :weather, { location: params[:location], date: params[:date] }
-  weather_info = send_msg
-  prompt :summarize, { text: weather_info }
-  send_msg
-end
-```
-
-### templates/daily_report.erb
-
-```
-Please create a brief daily report for <%= location %> based on the following weather information:
-
-<%= weather %>
-
-The report should include:
-1. A summary of the weather
-2. Any notable events or conditions
-3. Recommendations for residents
-```
-### templates/weather.erb
-
-```
-What's the weather like in <%= location %> <%= date %>? Please provide a brief description including temperature and general conditions.
-```
-
-### templates/summarize.erb
-
-```
-Please summarize the following text in one sentence:
-
-<%= text %>
-```
+See project [SmartPromptDemo](https://github.com/zhuangbiaowei/SmartPromptDemo) for more examples.

data/lib/smart_prompt/conversation.rb

@@ -5,6 +5,7 @@ module SmartPrompt
     attr_reader :messages, :last_response, :config_file
 
     def initialize(engine)
+      SmartPrompt.logger.info "Create Conversation"
       @messages = []
       @engine = engine
       @adapters = engine.adapters
@@ -26,6 +27,7 @@ module SmartPrompt
 
     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 }

data/lib/smart_prompt/engine.rb

@@ -7,11 +7,16 @@ module SmartPrompt
         @llms={}
         @templates={}
         load_config(config_file)
+        SmartPrompt.logger.info "Started create the SmartPrompt engine."
       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
@@ -35,14 +40,25 @@ module SmartPrompt
       end
         
       def call_worker(worker_name, params = {})
+        SmartPrompt.logger.info "Calling worker: #{worker_name} with params: #{params}"
         worker = get_worker(worker_name)
-        worker.execute(params)
+        
+        begin
+          result = worker.execute(params)
+          SmartPrompt.logger.info "Worker #{worker_name} executed successfully"
+          result
+        rescue => e
+          SmartPrompt.logger.error "Error executing worker #{worker_name}: #{e.message}"
+          SmartPrompt.logger.debug e.backtrace.join("\n")
+          raise
+        end
       end
   
       private
   
       def get_worker(worker_name)
-        worker = Worker.new(worker_name, self)
+        SmartPrompt.logger.info "Creating worker instance for: #{worker_name}"
+        Worker.new(worker_name, self)
       end
     end
   end

data/lib/smart_prompt/llm_adapter.rb

@@ -7,10 +7,12 @@ require 'ollama-ai'
 module SmartPrompt
   class LLMAdapter
     def initialize(config)
+      SmartPrompt.logger.info "Start create the SmartPrompt LLMAdapter."
       @config = config
     end
 
     def send_request(messages)
+      SmartPrompt.logger.error "LLMAdapter: Subclasses must implement send_request"
       raise NotImplementedError, "Subclasses must implement send_request"
     end
   end
@@ -30,11 +32,13 @@ module SmartPrompt
     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,
@@ -42,6 +46,7 @@ module SmartPrompt
           temperature: @config['temperature'] || 0.7
         }
       )
+      SmartPrompt.logger.info "OpenAIAdapter: Received response from OpenAI"
       response.dig("choices", 0, "message", "content")
     end
   end
@@ -54,12 +59,14 @@ module SmartPrompt
       )
     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
@@ -71,11 +78,13 @@ module SmartPrompt
     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,
@@ -83,6 +92,7 @@ module SmartPrompt
           stream: false
         }
       )
+      SmartPrompt.logger.info "OllamaAdapter: Received response from Ollama"
       return response[0]["response"]
     end
   end

data/lib/smart_prompt/version.rb

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

data/lib/smart_prompt/worker.rb

@@ -3,6 +3,7 @@ module SmartPrompt
     attr_reader :name, :config_file
 
     def initialize(name, engine)
+      SmartPrompt.logger.info "Create worker's name is #{name}"
       @name = name
       @engine = engine
       @config = engine.config

data/lib/smart_prompt.rb

@@ -7,6 +7,7 @@ require File.expand_path('../smart_prompt/worker', __FILE__)
 
 module SmartPrompt
   class Error < StandardError; end
+  attr_writer :logger
 
   def self.define_worker(name, &block)
     Worker.define(name, &block)
@@ -16,4 +17,14 @@ module SmartPrompt
     worker = Worker.new(name, config_file)
     worker.execute(params)
   end
+
+  def self.logger=(logger)
+    @logger = logger
+  end
+  
+  def self.logger
+    @logger ||= Logger.new($stdout).tap do |log|
+      log.progname = self.name
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_prompt
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - zhuang biaowei
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yaml