luo 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b22893d8f1c95e872f24ebbaf9f40746abab52e4c39765eb44de66b54e70cbf
-  data.tar.gz: bfce4c3181de7b8ed34ab3a2dd69f8888f7187611a672ad1b9661d7f2ab5190b
+  metadata.gz: 168fa20c108843fd5b48bc0c3dd2771e3293712b3783069f93c41b60dd094cbe
+  data.tar.gz: 374e6355534cb49ece0bd5a1fd521b9dea292fc9e461e29e9c8a15301e012892
 SHA512:
-  metadata.gz: 062a4deb39d0e12f1ed6a6473c4d20fbe432da4190e5d93c6b3b420cba7999c3044a2c88549c0183a67e67223926405b03c35d9a6e30f53f628a64587a7d01e1
-  data.tar.gz: 8c8fc5ae086cd012c62b1c2cb142987a6b1ac997466a76d481f75989c3860495607ebe09269da531aa17301a55f2cd99877bca37a81e6ea11f0da5c7c28b3223
+  metadata.gz: dcbca395fbc33a663ae6e4349b7280ac7169473f0d4bd64bca1b43c72ccb871c080a3a2f6e105dbc39f7571e8b1749abae40da585e8a0aa93d59c91106828efd
+  data.tar.gz: 9ed6651fec55cf76bab4901cfa50442cb63250c78b7efd4ab584191006870d6845f70a45f2ad674393b361a7ef94c6f4096307dceec573863f6dca47e31e1b11

data/.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,9 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="RubyClassVariableUsageInspection" enabled="false" level="WARNING" enabled_by_default="false" />
+    <inspection_tool class="RubyResolve" enabled="false" level="WARNING" enabled_by_default="false">
+      <option name="warnImplicitResults" value="false" />
+    </inspection_tool>
+  </profile>
+</component>

data/.idea/luo.iml

@@ -12,13 +12,49 @@
     <orderEntry type="jdk" jdkName="ruby-3.2.1-p31" jdkType="RUBY_SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="bundler (v2.4.6, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="concurrent-ruby (v1.2.2, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="diff-lcs (v1.5.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dotenv (v2.8.1, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-cli (v1.0.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-configurable (v1.0.1, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-core (v1.0.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-inflector (v1.0.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-initializer (v3.1.1, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-logic (v1.5.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-schema (v1.13.1, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="dry-types (v1.7.1, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday (v2.7.4, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday-net_http (v3.0.2, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="faraday-retry (v2.1.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="kramdown (v2.4.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="pastel (v0.8.0, ruby-3.2.1-p31) [gem]" level="application" />
     <orderEntry type="library" scope="PROVIDED" name="rake (v13.0.6, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rexml (v3.2.5, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rouge (v4.1.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec (v3.12.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-core (v3.12.2, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-expectations (v3.12.3, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-mocks (v3.12.5, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="rspec-support (v3.12.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="strings (v0.2.1, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="strings-ansi (v0.2.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tty-color (v0.6.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tty-markdown (v0.7.2, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tty-screen (v0.8.1, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v2.4.2, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode_utils (v1.4.0, ruby-3.2.1-p31) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="zeitwerk (v2.6.8, ruby-3.2.1-p31) [gem]" level="application" />
   </component>
   <component name="RakeTasksCache">
     <option name="myRootTask">
       <RakeTaskImpl id="rake">
         <subtasks>
           <RakeTaskImpl description="Build luo-0.1.0.gem into the pkg directory" fullCommand="build" id="build" />
+          <RakeTaskImpl id="build">
+            <subtasks>
+              <RakeTaskImpl description="Generate SHA512 checksum if luo-0.1.0.gem into the checksums directory" fullCommand="build:checksum" id="checksum" />
+            </subtasks>
+          </RakeTaskImpl>
           <RakeTaskImpl description="Remove any temporary products" fullCommand="clean" id="clean" />
           <RakeTaskImpl description="Remove any generated files" fullCommand="clobber" id="clobber" />
           <RakeTaskImpl description="Build and install luo-0.1.0.gem into system gems" fullCommand="install" id="install" />
@@ -27,7 +63,7 @@
               <RakeTaskImpl description="Build and install luo-0.1.0.gem into system gems without network access" fullCommand="install:local" id="local" />
             </subtasks>
           </RakeTaskImpl>
-          <RakeTaskImpl description="Create tag v0.1.0 and build and push luo-0.1.0.gem to TODO: Set to your gem server 'https://example.com'" fullCommand="release[remote]" id="release[remote]" />
+          <RakeTaskImpl description="Create tag v0.1.0 and build and push luo-0.1.0.gem to rubygems.org" fullCommand="release[remote]" id="release[remote]" />
           <RakeTaskImpl description="" fullCommand="default" id="default" />
           <RakeTaskImpl description="" fullCommand="release" id="release" />
           <RakeTaskImpl id="release">

data/.rspec

@@ -0,0 +1 @@
+--require spec_helper

data/Gemfile.lock

@@ -1,19 +1,103 @@
 PATH
   remote: .
   specs:
-    luo (0.1.0)
+    luo (0.1.2)
+      dotenv (~> 2.8, >= 2.8.1)
+      dry-cli (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-schema (~> 1.13, >= 1.13.1)
+      faraday (~> 2.7, >= 2.7.4)
+      faraday-retry (~> 2.1)
+      tty-markdown (~> 0.7.2)
+      zeitwerk (~> 2.6, >= 2.6.8)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    concurrent-ruby (1.2.2)
+    diff-lcs (1.5.0)
+    dotenv (2.8.1)
+    dry-cli (1.0.0)
+    dry-configurable (1.0.1)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-core (1.0.0)
+      concurrent-ruby (~> 1.0)
+      zeitwerk (~> 2.6)
+    dry-inflector (1.0.0)
+    dry-initializer (3.1.1)
+    dry-logic (1.5.0)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0, < 2)
+      zeitwerk (~> 2.6)
+    dry-schema (1.13.1)
+      concurrent-ruby (~> 1.0)
+      dry-configurable (~> 1.0, >= 1.0.1)
+      dry-core (~> 1.0, < 2)
+      dry-initializer (~> 3.0)
+      dry-logic (>= 1.4, < 2)
+      dry-types (>= 1.7, < 2)
+      zeitwerk (~> 2.6)
+    dry-types (1.7.1)
+      concurrent-ruby (~> 1.0)
+      dry-core (~> 1.0)
+      dry-inflector (~> 1.0)
+      dry-logic (~> 1.4)
+      zeitwerk (~> 2.6)
+    faraday (2.7.4)
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
+    faraday-retry (2.1.0)
+      faraday (~> 2.0)
+    kramdown (2.4.0)
+      rexml
+    pastel (0.8.0)
+      tty-color (~> 0.5)
     rake (13.0.6)
+    rexml (3.2.5)
+    rouge (4.1.0)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.2)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.3)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.5)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.12.0)
+    rspec-support (3.12.0)
+    ruby2_keywords (0.0.5)
+    strings (0.2.1)
+      strings-ansi (~> 0.2)
+      unicode-display_width (>= 1.5, < 3.0)
+      unicode_utils (~> 1.4)
+    strings-ansi (0.2.0)
+    tty-color (0.6.0)
+    tty-markdown (0.7.2)
+      kramdown (>= 1.16.2, < 3.0)
+      pastel (~> 0.8)
+      rouge (>= 3.14, < 5.0)
+      strings (~> 0.2.0)
+      tty-color (~> 0.5)
+      tty-screen (~> 0.8)
+    tty-screen (0.8.1)
+    unicode-display_width (2.4.2)
+    unicode_utils (1.4.0)
+    zeitwerk (2.6.8)
 
 PLATFORMS
   arm64-darwin-22
+  ruby
+  x86_64-linux
 
 DEPENDENCIES
   luo!
   rake (~> 13.0)
+  rspec (~> 3.12)
 
 BUNDLED WITH
    2.4.6

data/README.md

@@ -29,3 +29,6 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/luo.
+
+ENV.fetch('OPENAI_HOST', 'https://api.openai.com')
+ENV.fetch('OPENAI_ACCESS_TOKEN')

data/README.zh.md

@@ -0,0 +1,9 @@
+# Luo
+是一款基于大模型的开发框架（面向产品经理），当前支持大模型提供商有: OpenAI、星火大模型。通过DSL能够快速创作并且测试大模型的效果。
+
+## 安装
+```
+gem install luo
+```
+
+## 使用

data/exe/luo

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "bundler/setup"
+require "luo"
+
+Dry::CLI.new(Luo::CLI::Commands).call

data/lib/luo/agent.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+module Luo
+  class Agent
+    attr_reader :context, :action_input, :client
+    def initialize(context: nil, action_input: nil, client: nil)
+      @context = context
+      @action_input = action_input
+      @client = client
+    end
+
+    def call
+      raise NotImplementedError, "call method must be implemented in subclass"
+    end
+
+    class << self
+      def on_call(&block)
+        define_method(:call, &block)
+      end
+
+      def on_call_with_final_result(&block)
+        define_method(:call) do
+          context.final_result = instance_eval(&block)
+          context.final_result
+        end
+      end
+
+      def self.create_parameter_method(method_name, not_provided = Object.new, &block)
+        define_method(method_name.to_sym) do |content = not_provided|
+          if content === not_provided
+            class_variable_get("@@#{method_name}")
+          else
+            content = block.call(content) if block_given?
+            class_variable_set("@@#{method_name}", content)
+          end
+        end
+      end
+
+      create_parameter_method(:agent_desc) { |content| content.gsub(/\n/, "") }
+      create_parameter_method(:agent_name) { |context| context.gsub(/[[:punct:]]/, '') }
+
+    end
+
+  end
+end

data/lib/luo/agent_runner_base.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module Luo
+  class AgentRunnerBase
+
+    include Configurable
+
+    setting :language, default: "en"
+
+    def initialize
+      on_init
+    end
+
+    def on_init
+    end
+
+    def context
+      @context ||= Luo::AgentRunnerContext.new
+    end
+
+    def reset_context
+      histories = context.histories
+      @context = Luo::AgentRunnerContext.new
+      @context.histories = histories
+      @context
+    end
+
+    def call(user_input)
+      context.user_input = user_input
+      on_request
+      on_result
+      on_run
+      after_run
+      rt = Marshal.load(Marshal.dump(context))
+      reset_context
+      rt
+    end
+
+    def on_request
+      raise NotImplementedError, "call method must be implemented in subclass"
+    end
+
+    def on_result
+      raise NotImplementedError, "call method must be implemented in subclass"
+    end
+
+    def after_run
+    end
+
+    def on_run
+      context.have_running_agents.each do |agent|
+        context.agent_results << { agent_name: agent.class.agent_name, agent_response: agent.call }
+      end
+      context.have_running_agents.clear
+    end
+
+    def add_agent(agent)
+      context.have_running_agents << agent
+    end
+
+    class << self
+
+      def agents
+        @agents ||= {}
+      end
+
+      [:on_result, :on_request, :on_init, :after_run].each do |method_name|
+        define_method(method_name) do |&block|
+          define_method(method_name, &block)
+        end
+      end
+
+      def register(agent)
+        agents[agent.agent_name] = agent
+      end
+
+      def language_info
+        if self.config.language == "en"
+          ""
+        elsif self.config.language == "zh"
+          "(must be a Chinese string)"
+        else
+          ""
+        end
+      end
+
+    end
+  end
+end

data/lib/luo/agent_runner_context.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Luo
+  class AgentRunnerContext
+    attr_accessor :user_input, :action_input, :response, :agent_results, :final_result, :messages, :retries
+
+    def initialize
+      @agent_results = []
+      @retries = 0
+    end
+
+    def histories
+      @histories ||= MemoryHistory.new
+    end
+
+    def histories=(histories)
+      @histories = histories
+    end
+
+    def client
+      @client
+    end
+
+    def client=(client)
+      @client = client
+    end
+
+    def have_running_agents
+      @running_agents ||= Set.new
+    end
+
+  end
+end

data/lib/luo/aiui.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module Luo
+  class AIUI
+    include Configurable
+
+    setting :id, default: ENV.fetch('AIUI_APP_ID')
+    setting :key, default: ENV.fetch('AIUI_APP_KEY')
+    setting :host, default: 'http://api.iflyos.cn'
+    setting :uid, default: -> { SecureRandom.hex(16) }
+    setting :retries, default: ENV.fetch('AIUI_REQUEST_RETRIES', 3).to_i
+
+    include HttpClient.init_client
+
+    PARAMS = Dry::Schema.Params do
+      required(:appid).filled(:string)
+      required(:appkey).filled(:string)
+      required(:uid).filled(:string)
+      required(:text).filled(:string)
+    end
+
+    def request_aiui(params)
+      client.post('/external/ls_log/aiui_request', params.to_h)
+    end
+
+    def chat(messages)
+      if messages.is_a?(Messages)
+        messages = messages.to_a
+      end
+      message = messages.last&.fetch(:content, nil)
+      params = PARAMS.call(
+        appid: config.id,
+        appkey: config.key,
+        uid: config.uid.call,
+        text: message
+      )
+      return params.errors unless params.success?
+      request_aiui(params).body.dig("data", 0, "intent", "answer")
+    end
+  end
+end

data/lib/luo/cli.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Luo
+  module CLI
+    module Commands
+      extend Dry::CLI::Registry
+
+      class Version < Dry::CLI::Command
+        desc "Print version"
+
+        def call(*)
+          puts Luo::VERSION
+        end
+      end
+
+      class Commit < Dry::CLI::Command
+        desc "Commit with Luo"
+
+        argument :message, desc: "Commit message", required: true, type: :string
+
+        def call(message:, **)
+          messages = Messages.create.system(prompt: Luo::Prompts.luo_commit, context: {commit: message}).to_a
+          response = OpenAI.new.chat(messages)
+          exec "git commit -m '#{response}'"
+        end
+      end
+
+      register "version", Version, aliases: %w[v -v --version]
+      register "commit", Commit, aliases: ["c"]
+    end
+
+  end
+end

data/lib/luo/configurable.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Luo
+  module Configurable
+    def self.included(base)
+      base.extend(Dry::Configurable)
+    end
+
+    def config
+      self.class.config
+    end
+
+  end
+end

data/lib/luo/helpers.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+module Luo
+  module Helpers
+    extend self
+
+    def print_md(text)
+      puts TTY::Markdown.parse(text)
+    end
+
+    def load_test(path, &block)
+      YAML.load_file(path).each do |value|
+        yield(value)
+      end
+    end
+
+  end
+end

data/lib/luo/http_client.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module Luo
+  module HttpClient
+    def self.init_client
+      Module.new do
+        define_method :client do
+          @client ||= Faraday.new(self.class.config.host) { |conn|
+            conn.request :authorization, 'Bearer', self.class.config.access_token if self.class.config.respond_to?(:access_token) && !self.class.config.access_token.nil?
+            conn.request :retry, max: (self.class.config.retries || 3), interval: 0.05,
+                         interval_randomness: 0.5, backoff_factor: 2,
+                         exceptions: [Faraday::TimeoutError, Faraday::ConnectionFailed]
+            conn.request :json
+            conn.response :json
+          }
+        end
+      end
+    end
+
+  end
+end

data/lib/luo/memory_history.rb

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+module Luo
+
+  ##
+  # 用来保存回话历史的简单内存队列
+  class MemoryHistory
+    include Configurable
+
+    setting :max_size, default: 12
+
+    ##
+    # 初始化一个队列
+    # @param [Integer] max_size 队列的最大长度
+    def initialize(max_size = config.max_size)
+      @queue = []
+      @max_size = max_size
+    end
+
+    ##
+    # 入队
+    def enqueue(element)
+      if @queue.size == @max_size
+        @queue.shift
+      end
+      @queue << element
+    end
+
+    def user(content)
+      enqueue({role: "user", content: content})
+    end
+
+    def assistant(content)
+      enqueue({role: "assistant", content: content})
+    end
+
+    alias push enqueue
+
+    def dequeue
+      @queue.shift
+    end
+
+    def size
+      @queue.size
+    end
+
+    def to_a
+      @queue
+    end
+
+    def to_json
+      JSON.pretty_generate @queue
+    end
+  end
+end

data/lib/luo/messages.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+module Luo
+  class Messages
+    def initialize(history: [])
+      @history = history
+      @messages = []
+      @system = {}
+    end
+
+    def self.create_role_message_method(role)
+      define_method(role) do |text: nil, file: '', prompt: nil, context: {}|
+        if prompt.nil?
+          data = text || File.read(file)
+        else
+          data = prompt.render(context)
+        end
+        if role.to_s == "system"
+          @system = {role: role, content: data}
+        else
+          @messages << {role: role, content: data}
+        end
+        self
+      end
+    end
+
+    def self.create_role_message_methods
+      %w(system user assistant).each do |role|
+        create_role_message_method(role)
+      end
+    end
+
+    create_role_message_methods
+
+    def to_a
+      if @system.empty?
+        @history.to_a + @messages
+      else
+        (@history.to_a + @messages).unshift(@system)
+      end
+    end
+
+    class << self
+      def create(history: [])
+        self.new(history: history)
+      end
+    end
+
+  end
+end

data/lib/luo/open_ai.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Luo
+  class OpenAI
+    include Configurable
+
+    setting :access_token, default: ENV.fetch('OPENAI_ACCESS_TOKEN')
+    setting :retries, default: ENV.fetch('OPENAI_REQUEST_RETRIES', 3).to_i
+    setting :host, default: ENV.fetch('OPENAI_HOST', 'https://api.openai.com')
+    setting :temperature, default: ENV.fetch('OPENAI_TEMPERATURE', 1).to_i
+
+    include HttpClient.init_client
+
+    PARAMS = Dry::Schema.Params do
+      required(:model).filled(:string)
+      required(:temperature).filled(:float)
+      required(:messages).filled(:array)
+      optional(:top_p).maybe(:float)
+      optional(:n).maybe(:integer)
+      optional(:stream).maybe(:bool)
+      optional(:stop).maybe(:array)
+      optional(:max_tokens).maybe(:integer)
+      optional(:presence_penalty).maybe(:float)
+      optional(:frequency_penalty).maybe(:float)
+      optional(:logit_bias).maybe(:hash)
+      optional(:user).maybe(:string)
+    end
+
+    def chat_completions(params)
+      client.post('/v1/chat/completions', params.to_h)
+    end
+
+    def chat(messages)
+      if messages.is_a?(Messages)
+        messages = messages.to_a
+      end
+      params = PARAMS.call(
+        model: 'gpt-3.5-turbo',
+        temperature: config.temperature,
+        messages: messages
+      )
+      return params.errors unless params.success?
+      chat_completions(params).body.dig("choices", 0, "message", "content")
+    end
+
+  end
+
+end