better_prompt 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b0275e59070ddcb50314443ed257f616af962ab8e7e328ee78ff337ef106b37
-  data.tar.gz: 6e2a503dfa2399a1ddf25276647edf7a85422b723aeaf444c01832869d504e8b
+  metadata.gz: 13515348dbaad3c336ec4c5f86df8e7ac0262b2168917cddfcd5c81fe2ee6772
+  data.tar.gz: dc9fd7012b8b8ba0cc3f23bed6b3d6f10fc69374e4e429fc549ef71ea081ed8b
 SHA512:
-  metadata.gz: e14e38212b0ac9b0840647f37acac1f61602e9a5152bce1dff23be3c2836bb658fb5a4c50434be1d1d9a22c9aaecfe0e16ab4f71467ebc35772996679c852117
-  data.tar.gz: 2614387d896abbfe25104ed50e38c2752fc363d3a876d47368c6f7ea4afb55bc5677f5f56a7a819df9721f61a52db453e83346a887d096648bc4965ec7e6a858
+  metadata.gz: 50d86011d7817e5195e4be18f9c6ba973faba7608f18c28f0e1cdfa5dd983c26ca118b29f9579f4c790481bddb335c8c6a29600edd2a9edef223fc0bbfd53d73
+  data.tar.gz: a528bf0cd9e2f582f87ee20e9106c45a43fec4fed3f6eb625c684ed47e0ea21f5839e632af1e8eb7a657756b98399a6ddfa6e5cc9380fde2cbbadff1b8d86a9d

data/lib/better_prompt/components/prompt_list.rb

@@ -2,7 +2,7 @@ module BetterPrompt
   module Component
     class PromptList
       def self.build
-        layout = RubyRich::Layout.new(name: "prompt_list",  ratio: 4)
+        layout = RubyRich::Layout.new(name: "prompt_list", ratio: 4)
         draw_view(layout)
         register_event_listener(layout)
         return layout
@@ -11,41 +11,51 @@ module BetterPrompt
       def self.draw_view(layout)
         layout.update_content(RubyRich::Panel.new(
           "",
-          title: "提示词列表  (Shift+2)"
+          title: "提示词列表  (Shift+2)",
         ))
       end
 
       def self.update_title(prompt)
-        result = BetterPrompt.engine.call_worker(:summarize, {text: prompt[:prompt_content]})
-        prompt[:prompt_title] = result.strip
+        result = BetterPrompt.engine.call_worker(:short_title, { text: prompt[:prompt_content] })
+        prompt[:prompt_title] = result.dig("choices", 0, "message", "content")
         prompt.save
-        return result.strip
+        return prompt[:prompt_title]
       end
 
-      def self.update_prompt_list(live, template_name)
+      def self.update_prompt_list(live, template_name, page_num = 1, pos = 0)
+        @template_name = template_name
+        @current_page = page_num
         prompt_list = live.find_panel("prompt_list")
-        @prompt_list = BetterPrompt::ORM::Prompt.where(:prompt_template_name=>template_name).all
-        @page_count = (@prompt_list.size / 9.0).ceil
-        prompt_list.content = generate_content()
+        prompt_list.border_style = :red
+        per_page = 9
+        ds = BetterPrompt::ORM::Prompt.where(:prompt_template_name => template_name)
+        total_count = ds.count
+        @page_count = (total_count / per_page.to_f).ceil
+        page_num = [page_num.to_i, 1].max
+        offset = (page_num - 1) * per_page
+        @prompt_list = ds
+          .limit(per_page)
+          .offset(offset)
+          .all
+        prompt_list.content = generate_content(pos)
+        prompt_list.border_style = :green
       end
 
-      def self.generate_content(pos=0, page_num=1)
+      def self.generate_content(pos)
         i = 0
-        @current_page = page_num
-        start_pos = (page_num - 1) * 9
-        end_pos = start_pos + 9
         prompt_list_str = ""
+        count = @prompt_list.size
         @prompt_list.each do |prompt|
           i += 1
           title = prompt.prompt_title
-          if title==nil
+          if title == nil
             title = update_title(prompt)
           end
           title_width = title.chars.sum { |c| Unicode::DisplayWidth.of(c) }
-          if title_width>22
+          if title_width > 22
             new_title = ""
             title.chars.each do |c|
-              if (new_title+c).chars.sum { |c| Unicode::DisplayWidth.of(c) }>22
+              if (new_title + c).chars.sum { |c| Unicode::DisplayWidth.of(c) } > 22
                 new_title += ".."
                 break
               else
@@ -54,23 +64,23 @@ module BetterPrompt
             end
             title = new_title
           end
-          if i > start_pos && i <= end_pos            
-            if i-start_pos==pos
-              prompt_list_str += RubyRich::AnsiCode.color(:blue)+ "#{i-start_pos} #{title}\n" + RubyRich::AnsiCode.reset
+          if i > 0 && i <= count
+            if i == pos
+              prompt_list_str += RubyRich::AnsiCode.color(:blue) + "#{i} #{title}\n" + RubyRich::AnsiCode.reset
             else
-              prompt_list_str += RubyRich::AnsiCode.color(:blue)+ "#{i-start_pos}" + RubyRich::AnsiCode.reset + " #{title}\n"
+              prompt_list_str += RubyRich::AnsiCode.color(:blue) + "#{i}" + RubyRich::AnsiCode.reset + " #{title}\n"
             end
           end
         end
-        if start_pos>0 or i > end_pos
+        if i > count
           prompt_list_str += " \n" * (25 - prompt_list_str.split("\n").size)
         end
-        if start_pos>0
+        if @current_page > 1
           prompt_list_str += " " * 11 + "←" + " " * 2
         else
-          prompt_list_str += " " * 14          
+          prompt_list_str += " " * 14
         end
-        if i > end_pos
+        if @current_page < @page_count
           prompt_list_str += " " * 2 + "→"
         end
         return prompt_list_str
@@ -81,8 +91,8 @@ module BetterPrompt
           prompt_list = live.find_panel("prompt_list")
           if prompt_list.border_style == :green
             if event[:value].to_i >= 1 && event[:value].to_i <= @prompt_list.count
-              prompt_list.content = generate_content(event[:value].to_i, @current_page)
-              prompt = @prompt_list[(@current_page - 1)*9+event[:value].to_i-1]
+              update_prompt_list(live, @template_name, @current_page, event[:value].to_i)
+              prompt = @prompt_list[event[:value].to_i - 1]
               dialog = ShowPrompt.build(prompt.prompt_content, live)
               live.layout.show_dialog(dialog)
               Response.clean
@@ -93,20 +103,20 @@ module BetterPrompt
         layout.key(:right) do |event, live|
           prompt_list = live.find_panel("prompt_list")
           if prompt_list.border_style == :green
-            if @current_page<@page_count
-              prompt_list.content = generate_content(0, @current_page+1)
+            if @current_page < @page_count
+              update_prompt_list(live, @template_name, @current_page + 1)
             end
           end
         end
         layout.key(:left) do |event, live|
           prompt_list = live.find_panel("prompt_list")
           if prompt_list.border_style == :green
-            if @current_page>1              
-              prompt_list.content = generate_content(0, @current_page-1)
+            if @current_page > 1
+              update_prompt_list(live, @template_name, @current_page - 1)
             end
           end
         end
       end
     end
   end
-end
+end

data/lib/better_prompt/version.rb

@@ -1,3 +1,3 @@
 module BetterPrompt
-  VERSION = "0.2.0"
-end
+  VERSION = "0.2.2"
+end

data/lib/better_prompt.rb

@@ -141,7 +141,6 @@ module BetterPrompt
       if @engine == nil
         file_path = "./config/config.yml"
         file_path = "./config/llm_config.yml" unless File.exist?(file_path)
-        BetterPrompt.logger.info(file_path)
         @engine = SmartPrompt::Engine.new(file_path)
       end
       return @engine

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: better_prompt
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - zhuang biaowei
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.3.1
+        version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.0
 specification_version: 4
 summary: A better command line prompt utility
 test_files: []