llama_bot_rails 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bb0c9f15eb1d516a8811a5f609b5d844f4b78e56ffad3d820abe3a4ad285beef
-  data.tar.gz: c1eb2815f6fd561e6a3ba42d1b4de39a5d30a87f248f1738dfca79531c023ae5
+  metadata.gz: 34248e0bbf8e8047cad5836f03e4f37a4b0cc84a5f152a9fcc486f7c32de50ed
+  data.tar.gz: 0e4a0a1f0d0939d042e21cd1e2745daeae241e33877febe7f45740679b94ff50
 SHA512:
-  metadata.gz: bad51e4577dbba0ec77decf241712e8b1c99376f6a1fd820671e7c02443ffb41f999b81b2e5a36f553fc9d5b8a9b0fcea4114546e24d97cdb0a2845cdc24a9a6
-  data.tar.gz: 58a814af84983b2d36cacabafb0a5e4f6cba3f9688c65d28411849080d1e7ec1eb5c691d68505bdfe2b7c84014879d12d999bfee8cfd29ece48426110abf2f94
+  metadata.gz: d5cee45f49487fcbf2203d326b62431c4c7fb540004e0004a7929b7ec6fe2487124ed146237333a10b5f75db0f2508d1f1b7e91c7fe41afc7eb67f02a6395231
+  data.tar.gz: a67f3f5278245e15a0b868a22b27bc56e317cdd3f2aa456ef9c60100bb4547abfabd50e6a37a84cc7a7cdf97e37e45a06ce17a9b1e4dd3cc9c55125834262d40

data/app/assets/javascripts/llama_bot_rails/application.js

@@ -1,7 +1,22 @@
 //= require action_cable
 //= require_self
 
-(function() {
+(function () {
   this.LlamaBotRails = this.LlamaBotRails || {};
-  LlamaBotRails.cable = ActionCable.createConsumer();
-}).call(this); 
+
+  function createLlamaCable() {
+    if (window.ActionCable && !LlamaBotRails.cable) {
+      console.log("🦙 Creating LlamaBot ActionCable consumer");
+      LlamaBotRails.cable = ActionCable.createConsumer();
+    }
+  }
+
+  // Run immediately if ActionCable is already present (classic asset pipeline)
+  if (window.ActionCable) {
+    createLlamaCable();
+  } else {
+    // Wait until DOM + importmap load finishes
+    document.addEventListener("DOMContentLoaded", createLlamaCable);
+    document.addEventListener("turbo:load", createLlamaCable); // covers Turbo + importmap apps
+  }
+}).call(this);

data/app/channels/llama_bot_rails/chat_channel.rb

@@ -1,3 +1,7 @@
+require 'async'
+require 'async/http'
+require 'async/websocket'
+
 require 'json'  # Ensure JSON is required if not already
 
 module LlamaBotRails
@@ -147,28 +151,27 @@ module LlamaBotRails
       Rails.logger.info "[LlamaBot] Setting up external websocket for connection: #{connection_id}"
       
       # Check if the WebSocket URL is configured
-      websocket_url = ENV['LLAMABOT_WEBSOCKET_URL']
+      websocket_url = Rails.application.config.llama_bot_rails.websocket_url
       if websocket_url.blank?
-        Rails.logger.warn "[LlamaBot] LLAMABOT_WEBSOCKET_URL not configured, skipping external WebSocket setup"
+        Rails.logger.warn "[LlamaBot] LlamaBot Websocket URL is not configured in the config/initializers/llama_bot_rails.rb file, skipping external WebSocket setup"
         return
       end
       
-      # endpoint = Async::HTTP::Endpoint.parse(ENV['LLAMABOT_WEBSOCKET_URL']) 
       uri = URI(websocket_url)
       
       uri.scheme = 'wss'
-      uri.scheme = 'ws' if ENV['DEVELOPMENT_ENVIRONMENT'] == 'true'
+      uri.scheme = 'ws' if Rails.env.development?
 
       endpoint = Async::HTTP::Endpoint.new(
           uri,
           ssl_context: OpenSSL::SSL::SSLContext.new.tap do |ctx|
               ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
-              if ENV["STAGING_ENVIRONMENT"] == 'true'
+              if Rails.env.staging?
                 ctx.ca_file = '/usr/local/etc/ca-certificates/cert.pem'
                 # M2 Air : ctx.ca_file = '/etc//ssl/cert.pem'
                 ctx.cert = OpenSSL::X509::Certificate.new(File.read(File.expand_path('~/.ssl/llamapress/cert.pem')))
                 ctx.key = OpenSSL::PKey::RSA.new(File.read(File.expand_path('~/.ssl/llamapress/key.pem')))
-              elsif ENV['DEVELOPMENT_ENVIRONMENT'] == 'true'
+              elsif Rails.env.development?
                 # do no ctx stuff
                 ctx.verify_mode = OpenSSL::SSL::VERIFY_NONE   
               else  # production

data/app/views/llama_bot_rails/agent/chat.html.erb

@@ -406,6 +406,7 @@
       color: var(--text-secondary);
     }
   </style>
+  <%= javascript_importmap_tags %>
   <%= javascript_include_tag "llama_bot_rails/application" %>
   <%= action_cable_meta_tag %>
   <!-- Add Snarkdown CDN -->
@@ -465,37 +466,47 @@
     let redStatusStartTime = null;
     let errorModalShown = false;
     let connectionCheckInterval;
+    let subscription = null;
 
-    // Initialize ActionCable connection
-    const consumer = LlamaBotRails.cable;
-    const subscription = consumer.subscriptions.create('LlamaBotRails::ChatChannel', {
-      connected() {
-        console.log('Connected to chat channel');
-        lastPongTime = Date.now();
-        loadThreads();
-        startConnectionCheck();
-      },
-      disconnected() {
-        console.log('Disconnected from chat channel');
-        updateStatusIcon('status-red');
-      },
-      received(data) {
-        const parsedData = JSON.parse(data).message;
-        switch(parsedData.type) {
+    function waitForCableConnection(callback) {
+      const interval = setInterval(() => {
+        if (window.LlamaBotRails && LlamaBotRails.cable) {
+          clearInterval(interval);
+          callback(LlamaBotRails.cable);
+        }
+      }, 50);
+    }
+    
+    waitForCableConnection((consumer) => {
+      subscription = consumer.subscriptions.create('LlamaBotRails::ChatChannel', {
+        connected() {
+          console.log('Connected to chat channel');
+          lastPongTime = Date.now();
+          loadThreads();
+          startConnectionCheck();
+        },
+        disconnected() {
+          console.log('Disconnected from chat channel');
+          updateStatusIcon('status-red');
+        },
+        received(data) {
+          const parsedData = JSON.parse(data).message;
+          switch (parsedData.type) {
             case "ai":
               addMessage(parsedData.content, parsedData.type, parsedData.base_message);
               break;
-          case "tool":
-            addMessage(parsedData.content, parsedData.type, parsedData.base_message);
-            break;
-          case "error":
-            addMessage(parsedData.content, parsedData.type, parsedData.base_message);
-            break;
-          case "pong":
-            lastPongTime = Date.now();
-            break;
+            case "tool":
+              addMessage(parsedData.content, parsedData.type, parsedData.base_message);
+              break;
+            case "error":
+              addMessage(parsedData.content, parsedData.type, parsedData.base_message);
+              break;
+            case "pong":
+              lastPongTime = Date.now();
+              break;
+          }
         }
-      }
+      });
     });
 
     function startConnectionCheck() {
@@ -704,6 +715,13 @@
       const message = input.value.trim();
       
       if (message) {
+        // Check if subscription is available
+        if (!subscription) {
+          console.error('WebSocket connection not established yet');
+          addMessage('Connection not ready. Please wait...', 'error');
+          return;
+        }
+
         // Clear welcome message if it exists
         const welcomeMessage = document.querySelector('.welcome-message');
         if (welcomeMessage) {

data/lib/generators/llama_bot_rails/install/install_generator.rb

@@ -0,0 +1,46 @@
+# lib/generators/llama_bot_rails/install/install_generator.rb
+module LlamaBotRails
+    module Generators
+      class InstallGenerator < Rails::Generators::Base
+        source_root File.expand_path("templates", __dir__)
+  
+        def mount_engine
+            say <<~MSG, :yellow
+                ⚠️ NOTE: LlamaBotRails requires ActionCable to be available on the frontend.
+
+                If you're using ImportMap (Rails 7 default), run:
+
+                    bin/importmap pin @rails/actioncable
+
+                And in app/javascript/application.js, add:
+
+                    import * as ActionCable from "@rails/actioncable"
+                    window.ActionCable = ActionCable
+
+                If you're using Webpacker or jsbundling-rails:
+                    Add @rails/actioncable via yarn/npm
+                    And import + expose it the same way in your JS pack.
+
+                📘 See README → “JavaScript Setup” for full details.
+                
+                MSG
+
+          route 'mount LlamaBotRails::Engine => "/llama_bot"'
+        end
+  
+        def create_initializer
+          create_file "config/initializers/llama_bot_rails.rb", <<~RUBY
+            Rails.application.configure do
+              config.llama_bot_rails.websocket_url = ENV.fetch("LLAMABOT_WEBSOCKET_URL", "ws://localhost:8000/ws")
+              config.llama_bot_rails.enable_console_tool = !Rails.env.production?
+            end
+          RUBY
+        end
+  
+        def finish
+          say "\n✅ LlamaBotRails installed! Visit http://localhost:3000/llama_bot/agent/chat\n", :green
+        end
+      end
+    end
+  end
+  

data/lib/llama_bot_rails/engine.rb

@@ -11,6 +11,9 @@ module LlamaBotRails
     end
 
     config.llama_bot_rails = ActiveSupport::OrderedOptions.new
+    config.llama_bot_rails.websocket_url = 'ws://localhost:8000/ws' # <-- default
+    config.llama_bot_rails.llamabot_api_url = "http://localhost:8000"
+    config.llama_bot_rails.enable_console_tool = true
 
     initializer "llama_bot_rails.assets.precompile" do |app|
       app.config.assets.precompile += %w( llama_bot_rails/application.js )

data/lib/llama_bot_rails/version.rb

@@ -1,3 +1,3 @@
 module LlamaBotRails
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: llama_bot_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Kody Kendall
@@ -33,16 +33,22 @@ dependencies:
   name: actioncable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '7.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '9.0'
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
@@ -71,6 +77,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: async
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: LlamaBotRails is a gem that turns your existing Rails App into an AI
   Agent by connecting it to an open source LangGraph agent, LlamaBot.
 email:
@@ -101,6 +121,7 @@ files:
 - bin/rubocop
 - config/initializers/llama_bot_rails.rb
 - config/routes.rb
+- lib/generators/llama_bot_rails/install/install_generator.rb
 - lib/llama_bot_rails.rb
 - lib/llama_bot_rails/agent_state_builder.rb
 - lib/llama_bot_rails/engine.rb