luo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2357d89c3ae18e5aef8a31e53226a971d7738b121c07840bad3af6c1763f116b
-  data.tar.gz: b9bb7e8c1db63268c8cba723eb0c27cbd3bdc111fe487811204c887d5795d592
+  metadata.gz: b6fd7dfc689ad963f3f3e8c9f394242ca4aac334eccfe17ac0945397911a55b1
+  data.tar.gz: 4b0ddf9adeb237187ab8dc44c152502f1e0831b1b4ad9ea44aef880672de008f
 SHA512:
-  metadata.gz: a2efc0ca521f10ce965a0ba49f9b4265a1277c493ce54a77cdcb87dcc3501c51ac1408a7ee692cb31dee56aed4652504032a95955e20bb19f5cfa64565d286fb
-  data.tar.gz: 15e7e45e309805cd021dbc10fa58d65770859b76eb0872305d5b92bb115b9185185ebd44592a4c3f2ccfd0bbe05df46c77293469d78f70ddb4ed1bf1843ad946
+  metadata.gz: 90121e2c75de091278163ef0914cea6bb2c1d32683b3b7dec5b4a487e7a9b4fe1eb3a38f615dfceb4cde71b0727fd3e46679fa6688ddb8ef2f47b8ca278f9886
+  data.tar.gz: 75ebe8f70681cc926bfcab440b1b5d25c2c2f20dd180c66022df540f2459eab83989011e2c020208297921ff801c025e335b4036179472865653bbbb56b6a369

data/Gemfile.lock

@@ -1,13 +1,14 @@
 PATH
   remote: .
   specs:
-    luo (0.2.0)
+    luo (0.2.1)
       dotenv (~> 2.8, >= 2.8.1)
       dry-configurable (~> 1.0, >= 1.0.1)
       dry-schema (~> 1.13, >= 1.13.1)
       faraday (~> 2.7, >= 2.7.4)
       faraday-retry (~> 2.1)
       redcarpet (~> 3.6)
+      rouge (~> 4.1, >= 4.1.1)
       thor (~> 1.2, >= 1.2.2)
       tty-markdown (~> 0.7.2)
       zeitwerk (~> 2.6, >= 2.6.8)
@@ -57,7 +58,7 @@ GEM
     rake (13.0.6)
     redcarpet (3.6.0)
     rexml (3.2.5)
-    rouge (4.1.0)
+    rouge (4.1.1)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)

data/exe/luo

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "bundler/setup"
-require "luo"
+require_relative '../lib/luo'
 
 Luo::CLI::APP.start

data/lib/luo/cli/init_app.rb

@@ -7,6 +7,11 @@ module Luo
         say "Copying App...", :green
         copy_file "application.rb", "app.rb"
       end
+
+      def copy_gemfile
+        say "Copying Gemfile...", :green
+        copy_file "AppGemfile", "Gemfile"
+      end
     end
   end
 end

data/lib/luo/cli/init_notebook.rb

@@ -10,6 +10,11 @@ module Luo
         copy_file "luo.ipynb", "luo.ipynb"
       end
 
+      def copy_gemfile
+        say "Copying Gemfile...", :green
+        copy_file "NotebookGemfile", "Gemfile"
+      end
+
     end
   end
 end

data/lib/luo/helpers.rb

@@ -2,12 +2,58 @@
 
 module Luo
   module Helpers
+
+    class HTMLwithRouge < Redcarpet::Render::HTML
+
+      def block_code(code, language)
+        lexer = Rouge::Lexer.find(language) || Rouge::Lexers::PlainText
+        formatter = Rouge::Formatters::HTML.new
+        highlighted_code = formatter.format(lexer.lex(code))
+        "<pre class=\"highlight\">#{highlighted_code}</pre>"
+      end
+    end
+
     extend self
 
     def print_md(text)
       puts TTY::Markdown.parse(text)
     end
 
+    def display_md(text)
+      unless gem_exists?('iruby')
+        raise "Please install iruby gem first."
+      end
+
+      if gem_exists?('rouge')
+        renderer = HTMLwithRouge.new
+      else
+        renderer = Redcarpet::Render::HTML.new
+      end
+
+      markdown = Redcarpet::Markdown.new(renderer,
+                                         autolink: true,
+                                         tables: true,
+                                         strikethrough: true,
+                                         highlight: true,
+                                         prettify: true,
+                                         fenced_code_blocks: true)
+      body = markdown.render(text)
+      css = Rouge::Themes::Github.mode(:light).render(scope: '.highlight')
+      html = <<~HTML
+        <style>#{css}</style>
+        #{body}
+      HTML
+      # puts html
+      IRuby.display(IRuby.html(html))
+    end
+
+    def display_html(text)
+      unless gem_exists?('iruby')
+        raise "Please install iruby gem first."
+      end
+      IRuby.display(IRuby.html(text))
+    end
+
     def load_test(path, &block)
       data = YAML.load_file(path)
       if data.is_a?(Array)

data/lib/luo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Luo
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/lib/luo.rb

@@ -34,13 +34,13 @@ module Luo
   end
 
   def self.app_setup(&block)
-    include Luo
+    TOPLEVEL_BINDING.eval('include Luo')
     block.call(Loader) if block_given?
     Loader.setup
   end
 
   def self.notebook_setup(&block)
-    include Luo
+    TOPLEVEL_BINDING.eval('include Luo')
     block.call(Loader) if block_given?
     Loader.setup
     if Helpers.gem_exists?('pry')

data/luo.gemspec

@@ -37,10 +37,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'dry-configurable', '~> 1.0', '>= 1.0.1'
   spec.add_dependency 'tty-markdown', '~> 0.7.2'
   spec.add_dependency 'redcarpet', '~> 3.6'
+  spec.add_dependency 'rouge', '~> 4.1', '>= 4.1.1'
   spec.add_dependency 'thor', '~> 1.2', '>= 1.2.2'
 
   spec.add_development_dependency "rspec", '~> 3.12'
 
+
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html
 end

data/templates/AppGemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem 'luo', '~> 0.2.1'

data/templates/NoteBookGemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem 'luo', '~> 0.2.1'
+gem 'pry', '~> 0.14.2'
+gem 'iruby'

data/templates/luo.ipynb

@@ -17,21 +17,22 @@
    },
    "outputs": [
     {
-     "data": {
-      "text/plain": [
-       "true"
-      ]
-     },
-     "execution_count": 1,
-     "metadata": {},
-     "output_type": "execute_result"
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
+      "0.2.0\n"
+     ]
     }
    ],
    "source": [
     "# 初始化运行环境\n",
-    "require_relative \"init\"\n",
-    "require 'pry'\n",
-    "IRuby::Kernel.instance.switch_backend!(:pry)"
+    "require 'luo'\n",
+    "\n",
+    "Luo.notebook_setup do |loader|\n",
+    "  loader.push_dir(File.join(__dir__, 'agents'))\n",
+    "end\n",
+    "\n",
+    "puts Luo::VERSION"
    ]
   },
   {
@@ -63,7 +64,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 3,
    "id": "3b2b57cf-332e-4f4e-8b54-ee35950a0501",
    "metadata": {
     "tags": []
@@ -75,7 +76,7 @@
        ":input"
       ]
      },
-     "execution_count": 4,
+     "execution_count": 3,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -85,7 +86,7 @@
     "\n",
     "def input(text)\n",
     "  context = $runner.call(text)\n",
-    "  Helpers.print_md <<~MD\n",
+    "  Helpers.display_md <<~MD\n",
     "  ## Input:\n",
     "  #{text}\n",
     "\n",
@@ -96,6 +97,7 @@
     "  #{context.final_result}\n",
     "\n",
     "  ## History:\n",
+    "  \n",
     "  ```ruby\n",
     "  #{context.histories.to_a}\n",
     "  ```\n",
@@ -106,8 +108,8 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
-   "id": "3add85ed-2b49-4a5b-b625-eaf915825050",
+   "execution_count": 4,
+   "id": "4e5c17eb-1c13-4547-8a2e-d9aa886031a6",
    "metadata": {
     "tags": []
    },
@@ -116,20 +118,151 @@
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "** call aiui weather **\n",
-      "  Input:\n",
-      "  明天的天气怎么样\n",
-      "\n",
-      "  Response:\n",
-      "  调用工具：天气查询。\n",
-      "\n",
-      "  Final Result:\n",
-      "  明天北京市全天多云，气温16℃ ~ 28℃，空气质量良，有南风微风，气候温暖。\n",
-      "\n",
-      "  History:\n",
-      "  [{:role=>\"user\", :content=>\"明天的天气怎么样\"}, {:role=>\"assistant\", \n",
-      "  :content=>\"明天北京市全天多云，气温16℃ ~ \n",
-      "  28℃，空气质量良，有南风微风，气候温暖。\"}]\n",
+      "** call aiui weather **\n"
+     ]
+    },
+    {
+     "data": {
+      "text/html": [
+       "<style>.highlight table td { padding: 5px; }\n",
+       ".highlight table pre { margin: 0; }\n",
+       ".highlight, .highlight .w {\n",
+       "  color: #24292f;\n",
+       "  background-color: #f6f8fa;\n",
+       "}\n",
+       ".highlight .k, .highlight .kd, .highlight .kn, .highlight .kp, .highlight .kr, .highlight .kt, .highlight .kv {\n",
+       "  color: #cf222e;\n",
+       "}\n",
+       ".highlight .gr {\n",
+       "  color: #f6f8fa;\n",
+       "}\n",
+       ".highlight .gd {\n",
+       "  color: #82071e;\n",
+       "  background-color: #ffebe9;\n",
+       "}\n",
+       ".highlight .nb {\n",
+       "  color: #953800;\n",
+       "}\n",
+       ".highlight .nc {\n",
+       "  color: #953800;\n",
+       "}\n",
+       ".highlight .no {\n",
+       "  color: #953800;\n",
+       "}\n",
+       ".highlight .nn {\n",
+       "  color: #953800;\n",
+       "}\n",
+       ".highlight .sr {\n",
+       "  color: #116329;\n",
+       "}\n",
+       ".highlight .na {\n",
+       "  color: #116329;\n",
+       "}\n",
+       ".highlight .nt {\n",
+       "  color: #116329;\n",
+       "}\n",
+       ".highlight .gi {\n",
+       "  color: #116329;\n",
+       "  background-color: #dafbe1;\n",
+       "}\n",
+       ".highlight .kc {\n",
+       "  color: #0550ae;\n",
+       "}\n",
+       ".highlight .l, .highlight .ld, .highlight .m, .highlight .mb, .highlight .mf, .highlight .mh, .highlight .mi, .highlight .il, .highlight .mo, .highlight .mx {\n",
+       "  color: #0550ae;\n",
+       "}\n",
+       ".highlight .sb {\n",
+       "  color: #0550ae;\n",
+       "}\n",
+       ".highlight .bp {\n",
+       "  color: #0550ae;\n",
+       "}\n",
+       ".highlight .ne {\n",
+       "  color: #0550ae;\n",
+       "}\n",
+       ".highlight .nl {\n",
+       "  color: #0550ae;\n",
+       "}\n",
+       ".highlight .py {\n",
+       "  color: #0550ae;\n",
+       "}\n",
+       ".highlight .nv, .highlight .vc, .highlight .vg, .highlight .vi, .highlight .vm {\n",
+       "  color: #0550ae;\n",
+       "}\n",
+       ".highlight .o, .highlight .ow {\n",
+       "  color: #0550ae;\n",
+       "}\n",
+       ".highlight .gh {\n",
+       "  color: #0550ae;\n",
+       "  font-weight: bold;\n",
+       "}\n",
+       ".highlight .gu {\n",
+       "  color: #0550ae;\n",
+       "  font-weight: bold;\n",
+       "}\n",
+       ".highlight .s, .highlight .sa, .highlight .sc, .highlight .dl, .highlight .sd, .highlight .s2, .highlight .se, .highlight .sh, .highlight .sx, .highlight .s1, .highlight .ss {\n",
+       "  color: #0a3069;\n",
+       "}\n",
+       ".highlight .nd {\n",
+       "  color: #8250df;\n",
+       "}\n",
+       ".highlight .nf, .highlight .fm {\n",
+       "  color: #8250df;\n",
+       "}\n",
+       ".highlight .err {\n",
+       "  color: #f6f8fa;\n",
+       "  background-color: #82071e;\n",
+       "}\n",
+       ".highlight .c, .highlight .ch, .highlight .cd, .highlight .cm, .highlight .cp, .highlight .cpf, .highlight .c1, .highlight .cs {\n",
+       "  color: #6e7781;\n",
+       "}\n",
+       ".highlight .gl {\n",
+       "  color: #6e7781;\n",
+       "}\n",
+       ".highlight .gt {\n",
+       "  color: #6e7781;\n",
+       "}\n",
+       ".highlight .ni {\n",
+       "  color: #24292f;\n",
+       "}\n",
+       ".highlight .si {\n",
+       "  color: #24292f;\n",
+       "}\n",
+       ".highlight .ge {\n",
+       "  color: #24292f;\n",
+       "  font-style: italic;\n",
+       "}\n",
+       ".highlight .gs {\n",
+       "  color: #24292f;\n",
+       "  font-weight: bold;\n",
+       "}</style>\n",
+       "<h2>Input:</h2>\n",
+       "\n",
+       "<p>明天的天气怎么样</p>\n",
+       "\n",
+       "<h2>Response:</h2>\n",
+       "\n",
+       "<p>调用工具：天气查询。</p>\n",
+       "\n",
+       "<h2>Final Result:</h2>\n",
+       "\n",
+       "<p>北京市明天全天小雨转多云，出门记得带伞，气温16℃ ~ 26℃，有南风转北风微风，气候温暖。</p>\n",
+       "\n",
+       "<h2>History:</h2>\n",
+       "<pre class=\"highlight\"><span class=\"p\">[{</span><span class=\"ss\">:role</span><span class=\"o\">=&gt;</span><span class=\"s2\">\"user\"</span><span class=\"p\">,</span> <span class=\"ss\">:content</span><span class=\"o\">=&gt;</span><span class=\"s2\">\"明天的天气怎么样\"</span><span class=\"p\">},</span> <span class=\"p\">{</span><span class=\"ss\">:role</span><span class=\"o\">=&gt;</span><span class=\"s2\">\"assistant\"</span><span class=\"p\">,</span> <span class=\"ss\">:content</span><span class=\"o\">=&gt;</span><span class=\"s2\">\"北京市明天全天小雨转多云，出门记得带伞，气温16℃ ~ 26℃，有南风转北风微风，气候温暖。\"</span><span class=\"p\">}]</span>\n",
+       "</pre>\n"
+      ],
+      "text/plain": [
+       "\"<style>.highlight table td { padding: 5px; }\\n.highlight table pre { margin: 0; }\\n.highlight, .highlight .w {\\n  color: #24292f;\\n  background-color: #f6f8fa;\\n}\\n.highlight .k, .highlight .kd, .highlight .kn, .highlight .kp, .highlight .kr, .highlight .kt, .highlight .kv {\\n  color: #cf222e;\\n}\\n.highlight .gr {\\n  color: #f6f8fa;\\n}\\n.highlight .gd {\\n  color: #82071e;\\n  background-color: #ffebe9;\\n}\\n.highlight .nb {\\n  color: #953800;\\n}\\n.highlight .nc {\\n  color: #953800;\\n}\\n.highlight .no {\\n  color: #953800;\\n}\\n.highlight .nn {\\n  color: #953800;\\n}\\n.highlight .sr {\\n  color: #116329;\\n}\\n.highlight .na {\\n  color: #116329;\\n}\\n.highlight .nt {\\n  color: #116329;\\n}\\n.highlight .gi {\\n  color: #116329;\\n  background-color: #dafbe1;\\n}\\n.highlight .kc {\\n  color: #0550ae;\\n}\\n.highlight .l, .highlight .ld, .highlight .m, .highlight .mb, .highlight .mf, .highlight .mh, .highlight .mi, .highlight .il, .highlight .mo, .highlight .mx {\\n  color: #0550ae;\\n}\\n.highlight .sb {\\n  color: #0550ae;\\n}\\n.highlight .bp {\\n  color: #0550ae;\\n}\\n.highlight .ne {\\n  color: #0550ae;\\n}\\n.highlight .nl {\\n  color: #0550ae;\\n}\\n.highlight .py {\\n  color: #0550ae;\\n}\\n.highlight .nv, .highlight .vc, .highlight .vg, .highlight .vi, .highlight .vm {\\n  color: #0550ae;\\n}\\n.highlight .o, .highlight .ow {\\n  color: #0550ae;\\n}\\n.highlight .gh {\\n  color: #0550ae;\\n  font-weight: bold;\\n}\\n.highlight .gu {\\n  color: #0550ae;\\n  font-weight: bold;\\n}\\n.highlight .s, .highlight .sa, .highlight .sc, .highlight .dl, .highlight .sd, .highlight .s2, .highlight .se, .highlight .sh, .highlight .sx, .highlight .s1, .highlight .ss {\\n  color: #0a3069;\\n}\\n.highlight .nd {\\n  color: #8250df;\\n}\\n.highlight .nf, .highlight .fm {\\n  color: #8250df;\\n}\\n.highlight .err {\\n  color: #f6f8fa;\\n  background-color: #82071e;\\n}\\n.highlight .c, .highlight .ch, .highlight .cd, .highlight .cm, .highlight .cp, .highlight .cpf, .highlight .c1, .highlight .cs {\\n  color: #6e7781;\\n}\\n.highlight .gl {\\n  color: #6e7781;\\n}\\n.highlight .gt {\\n  color: #6e7781;\\n}\\n.highlight .ni {\\n  color: #24292f;\\n}\\n.highlight .si {\\n  color: #24292f;\\n}\\n.highlight .ge {\\n  color: #24292f;\\n  font-style: italic;\\n}\\n.highlight .gs {\\n  color: #24292f;\\n  font-weight: bold;\\n}</style>\\n<h2>Input:</h2>\\n\\n<p>明天的天气怎么样</p>\\n\\n<h2>Response:</h2>\\n\\n<p>调用工具：天气查询。</p>\\n\\n<h2>Final Result:</h2>\\n\\n<p>北京市明天全天小雨转多云，出门记得带伞，气温16℃ ~ 26℃，有南风转北风微风，气候温暖。</p>\\n\\n<h2>History:</h2>\\n<pre class=\\\"highlight\\\"><span class=\\\"p\\\">[{</span><span class=\\\"ss\\\">:role</span><span class=\\\"o\\\">=&gt;</span><span class=\\\"s2\\\">\\\"user\\\"</span><span class=\\\"p\\\">,</span> <span class=\\\"ss\\\">:content</span><span class=\\\"o\\\">=&gt;</span><span class=\\\"s2\\\">\\\"明天的天气怎么样\\\"</span><span class=\\\"p\\\">},</span> <span class=\\\"p\\\">{</span><span class=\\\"ss\\\">:role</span><span class=\\\"o\\\">=&gt;</span><span class=\\\"s2\\\">\\\"assistant\\\"</span><span class=\\\"p\\\">,</span> <span class=\\\"ss\\\">:content</span><span class=\\\"o\\\">=&gt;</span><span class=\\\"s2\\\">\\\"北京市明天全天小雨转多云，出门记得带伞，气温16℃ ~ 26℃，有南风转北风微风，气候温暖。\\\"</span><span class=\\\"p\\\">}]</span>\\n</pre>\\n\""
+      ]
+     },
+     "metadata": {},
+     "output_type": "display_data"
+    },
+    {
+     "name": "stdout",
+     "output_type": "stream",
+     "text": [
       "\n",
       "\n",
       "\n"
@@ -139,19 +272,11 @@
    "source": [
     "input \"明天的天气怎么样\""
    ]
-  },
-  {
-   "cell_type": "code",
-   "execution_count": null,
-   "id": "ca165db3-1711-41c3-85eb-3f7f02d04e0a",
-   "metadata": {},
-   "outputs": [],
-   "source": []
   }
  ],
  "metadata": {
   "kernelspec": {
-   "display_name": "Ruby 3.2.2",
+   "display_name": "Ruby 3.2.1",
    "language": "ruby",
    "name": "ruby"
   },
@@ -159,7 +284,7 @@
    "file_extension": ".rb",
    "mimetype": "application/x-ruby",
    "name": "ruby",
-   "version": "3.2.2"
+   "version": "3.2.1"
   }
  },
  "nbformat": 4,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: luo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - MJ
@@ -152,6 +152,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
+- !ruby/object:Gem::Dependency
+  name: rouge
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -248,6 +268,8 @@ files:
 - sig/luo/prompt_template.rbs
 - sig/luo/prompts.rbs
 - sig/luo/xinghuo.rbs
+- templates/AppGemfile
+- templates/NoteBookGemfile
 - templates/application.rb
 - templates/env
 - templates/init.rb