luo 0.1.17 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2721c5f83c0322dbd49ed200ee05740604e9398483d64eb4f8845f4bed0e58ce
-  data.tar.gz: 91f9f1c00f36ac96b51aabbe78a308bdc6da83b9580dda0dae1686ccc69b03e0
+  metadata.gz: 8704c313023d8ec033957282a0585bdbeeb51d9f76a7fe5415b48dbfff412c75
+  data.tar.gz: 847d8309389a0f8de711bb674014b45942c64a3719a027009a309a7ca741ef63
 SHA512:
-  metadata.gz: 26b489a296e9b51a5f21af4a2358f6e3d2fb1a4fc9a9b5a9ead115da9db0dc88e2c6badc7770266b778cf21e9ac9631ed26bd82bbeee629e49248da1cefb3de2
-  data.tar.gz: 2b7c099a3321deb860e40c146dda2a6c5c2ef718e4c843448f01b18bb009de9c7f582175cd42c1cc43991ea1f81fd721ce1bb0d4433529c32ae6b03021b1a039
+  metadata.gz: 240f45ee887a39ed426da4288ac259b4666a714dfa9c725417ba2b7ffe877f8bce2f58205c93847d64babcec8f59f8c2ea571a14c2a6736bc7731b9620bec788
+  data.tar.gz: d6fd03c0f45a0e406ff4861d4aef98d669fede266960620da40886f3c25fd95ba1d97cf80b9a00a95018e1e9cffec2cd9b50f8b0296c8858fe5d5be945cfcf58

data/Dockerfile

@@ -1,7 +1,7 @@
-FROM ruby:3.2.2-alpine
+FROM ruby:3.2.2
 
 # Install  docker/buildx-bin
-COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
+#COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
 
 # Set the working directory to /luo
 WORKDIR /luo
@@ -12,12 +12,25 @@ COPY Gemfile Gemfile.lock luo.gemspec ./
 # Required in luo.gemspec
 COPY lib/luo/version.rb /luo/lib/luo/version.rb
 
-# Install system dependencies
-RUN apk add --no-cache --update build-base git docker openrc openssh-client-default \
-    && rc-update add docker boot \
-    && gem install bundler --version=2.4.3 \
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    build-essential gcc \
+    && gem install bundler --version=2.4.6 \
     && bundle install
 
+## install python and jupyterlab
+# Install Python and JupyterLab
+RUN apt-get install -y --no-install-recommends \
+     python3 python3-pip python3-dev  && \
+     pip3 install --no-cache-dir jupyterlab && \
+     pip3 install jupyterlab-language-pack-zh-CN
+
+RUN gem install pry
+RUN gem install iruby
+RUN iruby register --force
+
+# Expose the JupyterLab port
+EXPOSE 8888
+
 # Copy the rest of our application code into the container.
 # We do this after bundle install, to avoid having to run bundle
 # everytime we do small fixes in the source code.
@@ -27,8 +40,7 @@ COPY . .
 RUN gem build luo.gemspec && \
     gem install ./luo-*.gem --no-document
 
-RUN git config --global --add safe.directory /workdir
-
 WORKDIR /workdir
+RUN rm -rf /luo
 
 ENTRYPOINT ["luo"]

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    luo (0.1.17)
+    luo (0.1.19)
       dotenv (~> 2.8, >= 2.8.1)
       dry-cli (~> 1.0)
       dry-configurable (~> 1.0, >= 1.0.1)

data/docker-compose.yml

@@ -0,0 +1,6 @@
+services:
+  luo:
+    build: .
+    command: r
+    ports:
+      - 8888:8888

data/init.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require "bundler/setup"
+Bundler.require
+
+require 'luo'
+include Luo
+
+Loader.push_dir(File.join(__dir__, 'agents'))
+Loader.setup
+
+begin
+  IRuby::Kernel.instance.switch_backend!(:pry)
+rescue => e
+  #
+end

data/lib/luo/cli.rb

@@ -37,7 +37,7 @@ module Luo
         desc "Run Luo"
 
         def call(*)
-          exec "ruby app.rb"
+          exec "jupyter lab --ip=0.0.0.0 --port=8888 --no-browser --allow-root"
         end
       end
 

data/lib/luo/init_project.rb

@@ -14,6 +14,7 @@ module Luo
         gemfile = <<-GEMFILE.gsub(/^ */, '')
         source 'https://rubygems.org'
         gem 'luo', '~> #{version}'
+        gem 'iruby'
         GEMFILE
         File.open('Gemfile', 'w') do |file|
           file.puts(gemfile)
@@ -40,6 +41,7 @@ module Luo
       copy_file('env', '.env')
       copy_file('time_agent.rb', 'agents/time_agent.rb')
       copy_file('weather_agent.rb', 'agents/weather_agent.rb')
+      copy_file('luo.ipynb', 'luo.ipynb')
       copy_file("test.yml", "test.yml")
     end
 

data/lib/luo/projects/init.rb

@@ -7,4 +7,10 @@ require 'luo'
 include Luo
 
 Loader.push_dir(File.join(__dir__, 'agents'))
-Loader.setup
+Loader.setup
+
+begin
+  IRuby::Kernel.instance.switch_backend!(:pry)
+rescue => e
+  #
+end

data/lib/luo/projects/luo.ipynb

@@ -0,0 +1,167 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "ac60deeb-0d75-478e-823a-dfe39e73aa72",
+   "metadata": {},
+   "source": [
+    "欢迎使用luo实验室"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "785fea13-bdfb-4bc6-80e7-1c53d8ca2f84",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "true"
+      ]
+     },
+     "execution_count": 1,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "# 初始化运行环境\n",
+    "require_relative \"init\"\n",
+    "require 'pry'\n",
+    "IRuby::Kernel.instance.switch_backend!(:pry)"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 2,
+   "id": "87d49a44-a485-4331-b982-6a9143490771",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "Luo::XinghuoFinalAgent"
+      ]
+     },
+     "execution_count": 2,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "class Runner < XinghuoAgentRunner\n",
+    "  register WeatherAgent\n",
+    "  register TimeAgent\n",
+    "  register XinghuoFinalAgent\n",
+    "end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "id": "3b2b57cf-332e-4f4e-8b54-ee35950a0501",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       ":input"
+      ]
+     },
+     "execution_count": 4,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "$runner = Runner.new\n",
+    "\n",
+    "def input(text)\n",
+    "  context = $runner.call(text)\n",
+    "  Helpers.print_md <<~MD\n",
+    "  ## Input:\n",
+    "  #{text}\n",
+    "\n",
+    "  ## Response:\n",
+    "  #{context.response}\n",
+    "\n",
+    "  ## Final Result:\n",
+    "  #{context.final_result}\n",
+    "\n",
+    "  ## History:\n",
+    "  ```ruby\n",
+    "  #{context.histories.to_a}\n",
+    "  ```\n",
+    "    MD\n",
+    "    puts \"\\n\\n\\n\"\n",
+    "end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 5,
+   "id": "3add85ed-2b49-4a5b-b625-eaf915825050",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [
+    {
+     "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",
+      "\n",
+      "\n",
+      "\n"
+     ]
+    }
+   ],
+   "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",
+   "language": "ruby",
+   "name": "ruby"
+  },
+  "language_info": {
+   "file_extension": ".rb",
+   "mimetype": "application/x-ruby",
+   "name": "ruby",
+   "version": "3.2.2"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

data/lib/luo/version.rb

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

data/luo

@@ -1,19 +1,14 @@
 #!/bin/bash
 
-# 性能低
-#if [ -z "$(ls -A $PWD/bundle_gems)" ]; then
-#  echo "copy bundle gems"
-#  docker run --rm -v "$PWD/bundle_gems:/usr/local/bundle_1" ghcr.io/mjason/luo:latest e "cp -r /usr/local/bundle/* /usr/local/bundle_1/"
-#fi
-#
-#docker run --rm -it \
-#  -v "$PWD:/workdir" \
-#  -v "$PWD/bundle_gems:/usr/local/bundle/" \
-#  ghcr.io/mjason/luo:latest \
-#  "$@"
+if [[ $1 == "update" ]]; then
+  echo "Pulling the latest Docker image..."
+  docker pull ghcr.io/mjason/luo:latest
+fi
+
+echo "Running the Docker container..."
 
-# 性能高
 docker run --rm -it \
+  -p 8888:8888 \
   -v "$PWD:/workdir" \
   ghcr.io/mjason/luo:latest \
-  "$@"
+  "$@"

data/luo.ipynb

@@ -0,0 +1,84 @@
+{
+ "cells": [
+  {
+   "cell_type": "markdown",
+   "id": "ac60deeb-0d75-478e-823a-dfe39e73aa72",
+   "metadata": {},
+   "source": [
+    "欢迎使用luo实验室"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 1,
+   "id": "785fea13-bdfb-4bc6-80e7-1c53d8ca2f84",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "true"
+      ]
+     },
+     "execution_count": 1,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "# 初始化运行环境\n",
+    "require_relative \"init\""
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 6,
+   "id": "87d49a44-a485-4331-b982-6a9143490771",
+   "metadata": {
+    "tags": []
+   },
+   "outputs": [
+    {
+     "data": {
+      "text/plain": [
+       "Luo::XinghuoFinalAgent"
+      ]
+     },
+     "execution_count": 6,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "class Runner < XinghuoAgentRunner\n",
+    "  register WeatherAgent\n",
+    "  register TimeAgent\n",
+    "  register XinghuoFinalAgent\n",
+    "end"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "3b2b57cf-332e-4f4e-8b54-ee35950a0501",
+   "metadata": {},
+   "outputs": [],
+   "source": []
+  }
+ ],
+ "metadata": {
+  "kernelspec": {
+   "display_name": "Ruby 3.2.1",
+   "language": "ruby",
+   "name": "ruby"
+  },
+  "language_info": {
+   "file_extension": ".rb",
+   "mimetype": "application/x-ruby",
+   "name": "ruby",
+   "version": "3.2.1"
+  }
+ },
+ "nbformat": 4,
+ "nbformat_minor": 5
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: luo
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.20
 platform: ruby
 authors:
 - MJ
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-11 00:00:00.000000000 Z
+date: 2023-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: zeitwerk
@@ -187,7 +187,9 @@ files:
 - README.md
 - README.zh.md
 - Rakefile
+- docker-compose.yml
 - exe/luo
+- init.rb
 - lib/luo.rb
 - lib/luo/agent.rb
 - lib/luo/agent_runner_base.rb
@@ -206,6 +208,7 @@ files:
 - lib/luo/projects/application.rb
 - lib/luo/projects/env
 - lib/luo/projects/init.rb
+- lib/luo/projects/luo.ipynb
 - lib/luo/projects/prompts/agent_input.md.erb
 - lib/luo/projects/prompts/agent_system.md.erb
 - lib/luo/projects/prompts/agent_tool_input.md.erb
@@ -229,6 +232,7 @@ files:
 - lib/luo/xinghuo_agent_runner.rb
 - luo
 - luo.gemspec
+- luo.ipynb
 - sig/luo.rbs
 - sig/luo/agent.rbs
 - sig/luo/agent_runner_base.rbs