relay.app 0.5.0 → 0.7.0

data/lib/relay.rb

@@ -1,6 +1,9 @@
 # frozen_string_literal: true
 
 module Relay
+  require "fileutils"
+  gem "llm.rb", "= 11.0.0"
+
   require_relative "relay/version"
   require_relative "relay/cache"
   require_relative "relay/attachment"
@@ -18,7 +21,8 @@ module Relay
     "deepseek" => -> { LLM.deepseek(key: ENV["DEEPSEEK_SECRET"]) },
     "google" => -> { LLM.google(key: ENV["GOOGLE_SECRET"]) },
     "openai" => -> { LLM.openai(key: ENV["OPENAI_SECRET"]) },
-    "xai" => -> { LLM.xai(key: ENV["XAI_SECRET"]) }
+    "xai" => -> { LLM.xai(key: ENV["XAI_SECRET"]) },
+    "bedrock" => -> { LLM.bedrock(access_key_id: ENV["AWS_ACCESS_KEY_ID"], secret_access_key: ENV["AWS_SECRET_ACCESS_KEY"]) }
   }.freeze
   private_constant :PROVIDERS
 
@@ -37,7 +41,7 @@ module Relay
   # Returns all known providers
   # @return [LLM::Object]
   def self.providers
-    @providers ||= LLM::Object.from(PROVIDERS)
+    @providers ||= LLM::Object.from(PROVIDERS).transform_values!(&:call)
   end
 
   ##
@@ -81,7 +85,7 @@ module Relay
   # Returns the writable Relay home directory
   # @return [String]
   def self.home
-    @home ||= ENV["RELAY_HOME"] || File.join(Dir.home, ".relay")
+    @home ||= ENV["RELAY_HOME"] || File.join(Dir.home, ".config", "relay")
   end
 
   ##
@@ -91,6 +95,21 @@ module Relay
     @env_path ||= File.join(home, "env")
   end
 
+  ##
+  # Creates the Relay home layout and copies bundled defaults into it.
+  # @return [String]
+  def self.bootstrap!
+    FileUtils.mkdir_p home
+    FileUtils.mkdir_p File.join(home, "db")
+    FileUtils.mkdir_p File.join(home, "tools")
+    FileUtils.mkdir_p images_dir
+    FileUtils.mkdir_p logs_dir
+    source = File.join(root, "db", "config.yml")
+    destination = File.join(home, "db", "config.yml")
+    FileUtils.cp(source, destination) if File.exist?(source) && !File.exist?(destination)
+    home
+  end
+
   ##
   # @return [Array<String>]
   #  Returns the tools directory
@@ -109,7 +128,7 @@ module Relay
   # Returns the path to generated images
   # @return [String]
   def self.images_dir
-    @images_dir ||= File.join(home, "g")
+    @images_dir ||= File.join(public_dir, "g")
   end
 
   ##
@@ -170,14 +189,8 @@ module Relay
   def self.reload
     LLM::Tool.clear_registry!
     Relay.loader.reload if development?
-    paths = Dir[File.join(tools_dir, "*.rb")]
-    paths.concat Dir[File.join(home, "tools", "*.rb")]
-    paths.sort.each do
-      load(_1)
-    rescue => ex
-      warn "tool error\n"
-            "#{ex.class}: #{ex.message}\n"
-            "#{ex.backtrace.join("\n")}"
-    end
+    Relay.user_loader.reload if development?
+    Relay.user_loader.eager_load
+    Relay.loader.eager_load_dir(tools_dir)
   end
 end

data/libexec/relay/bootstrap

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
+Relay.bootstrap!
 require File.join(Relay.root, "app", "init")
 warn "relay: bootstrap the database"
 Sequel.extension :migration

data/libexec/relay/configure

@@ -1,17 +1,44 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
+require "llm"
 require "fileutils"
 require "io/console"
 
-PROVIDER_KEYS = {
-  "OPENAI_SECRET" => "OpenAI API key",
-  "GOOGLE_SECRET" => "Google API key",
-  "ANTHROPIC_SECRET" => "Anthropic API key",
-  "DEEPSEEK_SECRET" => "DeepSeek API key",
-  "XAI_SECRET" => "xAI API key"
-}.freeze
+PROVIDERS = [
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "OpenAI API key", key: "OPENAI_SECRET", aliases: ["OPENAI_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "Google API key", key: "GOOGLE_SECRET", aliases: ["GOOGLE_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "Anthropic API key", key: "ANTHROPIC_SECRET", aliases: ["ANTHROPIC_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "DeepSeek API key", key: "DEEPSEEK_SECRET", aliases: ["DEEPSEEK_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "xAI API key", key: "XAI_SECRET", aliases: ["XAI_API_KEY"], secret: true)
+    ]
+  ),
+  LLM::Object.from(
+    fields: [
+      LLM::Object.from(label: "AWS access key ID", key: "AWS_ACCESS_KEY_ID", aliases: [], secret: false),
+      LLM::Object.from(label: "AWS secret access key", key: "AWS_SECRET_ACCESS_KEY", aliases: [], secret: true)
+    ]
+  )
+].freeze
 
 ##
 # utils
@@ -36,15 +63,24 @@ end
 def prompt(label, current: nil, secret: false)
   suffix = current.to_s.empty? ? "" : " [configured]"
   print "#{label}#{suffix}: "
-  value = secret ? STDIN.noecho(&:gets).to_s.chomp : STDIN.gets.to_s.chomp
+  value = secret ? $stdin.noecho(&:gets).to_s.chomp : $stdin.gets.to_s.chomp
   puts if secret
   value.empty? ? current.to_s : value
 end
 
+def prompt_provider(env, provider)
+  provider.fields.each do |field|
+    key = field.key
+    aliases = Array(field.aliases)
+    current = env[key] || aliases.filter_map { ENV[_1] }.first || ENV[key]
+    env[key] = prompt(field.label, current:, secret: field.secret)
+  end
+end
+
 def prompt_required(label)
   loop do
     print "#{label}: "
-    value = STDIN.gets.to_s.strip
+    value = $stdin.gets.to_s.strip
     return value unless value.empty?
     warn "#{label} is required."
   end
@@ -53,10 +89,10 @@ end
 def prompt_password
   loop do
     print "Password: "
-    password = STDIN.noecho(&:gets).to_s.chomp
+    password = $stdin.noecho(&:gets).to_s.chomp
     puts
     print "Confirm password: "
-    confirm = STDIN.noecho(&:gets).to_s.chomp
+    confirm = $stdin.noecho(&:gets).to_s.chomp
     puts
     return password unless password.empty? || password != confirm
     warn "Passwords must match and cannot be empty."
@@ -66,15 +102,15 @@ end
 ##
 # main
 def main
-  unless STDIN.tty? && $stdout.tty?
+  unless $stdin.tty? && $stdout.tty?
     warn "relay configure requires an interactive terminal"
     throw(:exit, 1)
   end
   env = load_env
   puts Relay.banner
   puts "Relay configuration\n"
-  PROVIDER_KEYS.each do |key, label|
-    env[key] = prompt(label, current: env[key], secret: true)
+  PROVIDERS.each do |provider|
+    prompt_provider(env, provider)
   end
   name = prompt_required("Name")
   email = prompt_required("Email")

data/libexec/relay/console

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require_relative "../../lib/relay"
+require File.join(Relay.root, "app", "init")
+require "irb"
+
+IRB.start(__FILE__)

data/libexec/relay/download-models

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
 require File.join(Relay.root, "app", "init")
 
 warn "relay: download models"

data/libexec/relay/migrate

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
+Relay.bootstrap!
 require File.join(Relay.root, "app", "init")
 Sequel.extension :migration
 Sequel::Migrator.run(Relay::DB, Relay.migrations_dir)

data/libexec/relay/setup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
 
 bootstrap = File.join(Relay.root, "libexec", "relay", "bootstrap")
 configure = File.join(Relay.root, "libexec", "relay", "configure")

data/libexec/relay/start

@@ -1,8 +1,9 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
 
-require "relay"
+require_relative "../../lib/relay"
 require "optparse"
+require "rbconfig"
 
 DEFAULT_BIND = "http://0.0.0.0:9292"
 
@@ -22,7 +23,7 @@ def main(argv)
   option_parser(bind).parse!(argv)
   bind = argv.shift || bind
   Dir.chdir(Relay.root) do
-    exec "falcon", "serve", "--bind", bind
+    exec RbConfig.ruby, "-S", "falcon", "serve", "--bind", bind
   end
 end
 

data/public/js/relay.js

@@ -1,6 +1,70 @@
 /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
+/***/ "./js/draft.js"
+/*!*********************!*\
+  !*** ./js/draft.js ***!
+  \*********************/
+(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Draft: () => (/* binding */ Draft)
+/* harmony export */ });
+const Draft = () => {
+  const prefix = "relay:draft"
+
+  const composer = () => {
+    return document.getElementById("chat-composer")
+  }
+
+  const textarea = () => {
+    return composer()?.querySelector("textarea[name='message']")
+  }
+
+  const key = (form = composer()) => {
+    if (!form?.dataset.contextId)
+      return null
+    return [prefix, form.dataset.contextId].join(":")
+  }
+
+  const restore = () => {
+    const el = textarea()
+    const currentKey = key()
+    if (!el || !currentKey)
+      return
+    const value = localStorage.getItem(currentKey)
+    if (value === null)
+      return
+    el.value = value
+  }
+
+  const persist = (el) => {
+    const currentKey = key(el?.form)
+    if (!currentKey)
+      return
+    if (el.value.length === 0)
+      localStorage.removeItem(currentKey)
+    else
+      localStorage.setItem(currentKey, el.value)
+  }
+
+  const clear = (form = composer()) => {
+    const currentKey = key(form)
+    if (!currentKey)
+      return
+    localStorage.removeItem(currentKey)
+  }
+
+  return {clear, persist, restore}
+}
+
+
+
+
+/***/ },
+
 /***/ "./js/file_upload.js"
 /*!***************************!*\
   !*** ./js/file_upload.js ***!
@@ -237,11 +301,13 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   Relay: () => (/* binding */ Relay)
 /* harmony export */ });
-/* harmony import */ var _file_upload__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../file_upload */ "./js/file_upload.js");
-/* harmony import */ var _controllers_ActivityController__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./controllers/ActivityController */ "./js/lib/controllers/ActivityController.js");
-/* harmony import */ var _controllers_ContentController__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./controllers/ContentController */ "./js/lib/controllers/ContentController.js");
-/* harmony import */ var _scroll__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../scroll */ "./js/scroll.js");
-/* harmony import */ var _timer__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../timer */ "./js/timer.js");
+/* harmony import */ var _draft__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../draft */ "./js/draft.js");
+/* harmony import */ var _file_upload__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../file_upload */ "./js/file_upload.js");
+/* harmony import */ var _controllers_ActivityController__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./controllers/ActivityController */ "./js/lib/controllers/ActivityController.js");
+/* harmony import */ var _controllers_ContentController__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ./controllers/ContentController */ "./js/lib/controllers/ContentController.js");
+/* harmony import */ var _scroll__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../scroll */ "./js/scroll.js");
+/* harmony import */ var _timer__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../timer */ "./js/timer.js");
+
 
 
 
@@ -250,23 +316,25 @@ __webpack_require__.r(__webpack_exports__);
 
 const Relay = () => {
   const target = document
-  const timer = (0,_timer__WEBPACK_IMPORTED_MODULE_4__.Timer)(document.getElementById("chatbot-status"))
-  const activity = (0,_controllers_ActivityController__WEBPACK_IMPORTED_MODULE_1__.ActivityController)({target})
-  const content = (0,_controllers_ContentController__WEBPACK_IMPORTED_MODULE_2__.ContentController)({target})
+  const timer = (0,_timer__WEBPACK_IMPORTED_MODULE_5__.Timer)(document.getElementById("chatbot-status"))
+  const activity = (0,_controllers_ActivityController__WEBPACK_IMPORTED_MODULE_2__.ActivityController)({target})
+  const content = (0,_controllers_ContentController__WEBPACK_IMPORTED_MODULE_3__.ContentController)({target})
   const controllers = [activity, content]
-  let scroll = (0,_scroll__WEBPACK_IMPORTED_MODULE_3__.Scroll)(document.getElementById("chatbot-stream"))
+  const draft = (0,_draft__WEBPACK_IMPORTED_MODULE_0__.Draft)()
+  let scroll = (0,_scroll__WEBPACK_IMPORTED_MODULE_4__.Scroll)(document.getElementById("chatbot-stream"))
 
   const refreshScroll = () => {
     const stream = document.getElementById("chatbot-stream")
     if (!stream)
       return
     if (!scroll || scroll.parentEl !== stream)
-      scroll = (0,_scroll__WEBPACK_IMPORTED_MODULE_3__.Scroll)(stream)
+      scroll = (0,_scroll__WEBPACK_IMPORTED_MODULE_4__.Scroll)(stream)
   }
 
   const enhance = (root = document.body) => {
     refreshScroll()
     controllers.forEach((controller) => controller.enhance(root))
+    draft.restore()
   }
 
   const syncTimer = () => {
@@ -277,7 +345,7 @@ const Relay = () => {
     timer.handle(status)
   }
 
-  const fileUpload = (0,_file_upload__WEBPACK_IMPORTED_MODULE_0__.FileUpload)({afterUpload: enhance})
+  const fileUpload = (0,_file_upload__WEBPACK_IMPORTED_MODULE_1__.FileUpload)({afterUpload: enhance})
 
   const handleOobSwap = (event) => {
     const elt = event.detail.elt || event.target
@@ -298,6 +366,7 @@ const Relay = () => {
       return
     if (fileUpload.blockSubmit(event))
       return
+    draft.clear(event.target)
     scroll?.force()
   }
 
@@ -310,6 +379,7 @@ const Relay = () => {
   const handleInput = (event) => {
     if (!event.target.matches("#chat-composer textarea"))
       return
+    draft.persist(event.target)
     scroll?.force()
   }