appchat 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aca406ace060a7c7b9af445e20d5be1f3605614109320792523cba09b7f92fe
-  data.tar.gz: 8c1e290b46dfca74c66c94748d305386d67703291e455c066aed1df0d1dc5cc8
+  metadata.gz: 0f2e478412edcf3880d15f39ad4aeedbbf73a1a4819c0b270cf1505d3c47b826
+  data.tar.gz: 4cc000f36710cda913c9474e04c3c55fc221170811fde494392cb6d19c3795ac
 SHA512:
-  metadata.gz: 5aaa00c36101e08cb562924a7a3a0cca7da5ef49680eb6f9f202a8d17ebe0cbbe852fe86ef4481cb65ef8c2811d9933731074363875930ccb916e92d9fdd66d4
-  data.tar.gz: 876249a02dbec15d9d3ee4c9dbabcfbcc843970f8d85d7b4e9fad563a97af8a86c1a3600c7383ef3dea9fc2bfffef4c19f3fef70cb7009f0fc0a12401efbb462
+  metadata.gz: c6d2310e575c27c6401a2a74afe7c099c9e7dff546dd1220781dbcce74482e2f61af439c9634c1e06ae5c0589f2873ba919a9552f306507e0b2a03dcdaca2c0e
+  data.tar.gz: 2b5b16b39b719650c33ef334f3ceb415fcc445c4a7fa28284b19969ee2a8fd1d69735208148d961c4ebb5852bda67cb8e65a5d29830e1249d35cab53cc64141b

data/lib/generators/appchat/appchat_generator.rb

@@ -12,7 +12,6 @@ class AppchatGenerator < Rails::Generators::Base
     gems = %w(
       ollama-ai
       tailwindcss-rails
-      watir
     )
 
     gems.each do |gem|
@@ -40,6 +39,7 @@ class AppchatGenerator < Rails::Generators::Base
     generate "model", "Message chat:references content:text role:integer status:string"
     generate "model", "AppchatFunction name:string description:text class_name:string"
     generate "model", "FunctionParameter appchat_function:references name:string example_value:string"
+    generate "model", "FunctionLog message:references name:string prompt:text results:text"
   end
 
   def create_controllers
@@ -55,6 +55,7 @@ class AppchatGenerator < Rails::Generators::Base
     copy_file "messages/new.html.erb", "app/views/messages/new.html.erb", force: true
     copy_file "messages/message.html.erb", "app/views/messages/_message.html.erb", force: true
     copy_file "messages/_typing_bubbles.html.erb", "app/views/messages/_typing_bubbles.html.erb", force: true
+    copy_file "messages/_function_logs.html.erb", "app/views/messages/_function_logs.html.erb", force: true
   end
 
   def create_stylesheets
@@ -64,6 +65,7 @@ class AppchatGenerator < Rails::Generators::Base
   def create_stimulus_controllers
     copy_file "javascript/chat_message_controller.js", "app/javascript/controllers/chat_message_controller.js"
     copy_file "javascript/speech_to_text_controller.js", "app/javascript/controllers/speech_to_text_controller.js"
+    copy_file "javascript/toggle_controller.js", "app/javascript/controllers/toggle_controller.js"
   end
 
   def copy_models

data/lib/generators/appchat/templates/get_ai_response_job.rb

@@ -45,16 +45,17 @@ class GetAiResponseJob < ApplicationJob
   def appchat_functions
     appchat_function_service = AppchatFunctionService.new(chat.id, user_prompt).run
     if appchat_function_service["match"] == "true" && appchat_function_service["appchat_function"].in?(AppchatFunction.pluck(:class_name))
-      puts "Function Match Found! --> #{appchat_function_service}"
+      puts "Function Match Found! --> #{ appchat_function_service }"
+
+      function_log = message.function_logs.create(name: appchat_function_service["appchat_function"], prompt: appchat_function_service["parameters"])
       function_class = appchat_function_service["appchat_function"].constantize
       function_response = function_class.new(appchat_function_service["parameters"]).run do |status|
         message.update(status: status)
       end
 
       return if function_response.nil?
-      @informed_prompt = "#{ user_prompt }, base your response on this data:
-        #{ appchat_function_service["name"] } responded with: #{ function_response },
-        :current_time => #{Date.current}"
+      function_log.update(results: function_response)
+      @informed_prompt = "The user prompted: #{ user_prompt }, to help you answer the user, an appchat function called #{ function_class } provided this data #{ function_response }"
     end
   end
 end

data/lib/generators/appchat/templates/javascript/toggle_controller.js

@@ -0,0 +1,15 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["content", "icon"]
+
+  toggle() {
+    this.contentTarget.classList.toggle("hidden")
+    if (this.contentTarget.classList.contains("hidden")) {
+      this.iconTarget.textContent = "Expand"
+    } else {
+      this.iconTarget.textContent = "Collapse"
+    }
+  }
+}
+

data/lib/generators/appchat/templates/messages/_function_logs.html.erb

@@ -0,0 +1,12 @@
+<div data-controller="toggle">
+  <%= message.function_logs.count %> Function calls informed this message.
+  <i data-toggle-target="icon" data-action="click->toggle#toggle" class="icon-class">Expand</i> 
+
+  <div data-toggle-target="content" class="hidden bg-white">
+    <% message.function_logs.each do |log| %>
+      <p> Name: <%= log.name %> </p>
+      <p> Parameters: <%= log.prompt %> </p>
+      <p> Response: <%= log.results %> </p>
+    <% end %>
+  </div>
+</div>

data/lib/generators/appchat/templates/messages/message.html.erb

@@ -1,4 +1,6 @@
 <div data-chat-message-target="message" id="<%= dom_id(message) %>" class="bg-gray-200 text-gray-900 shadow-lg p-4 rounded-lg">
+  <%= render partial: 'messages/function_logs', locals: { message: message } if message.function_logs.present? %>
+
   <% if message.status? && !message.content? %>
     <%= message.status %>
   <% elsif message.content? %>

data/lib/generators/appchat/templates/models/message.rb

@@ -1,6 +1,8 @@
 class Message < ApplicationRecord
   include ActionView::RecordIdentifier
   belongs_to :chat
+  has_many :function_logs
+
   after_create_commit :broadcast_message
   after_update_commit :broadcast_update_message
   

data/lib/generators/appchat/templates/services/web_search_service.rb

@@ -1,23 +1,17 @@
-require 'watir'
 require 'cgi'
+require 'open-uri'
 
 class WebSearchService
   attr_reader :query
-
   def initialize(args)
     @query = args["query"]
   end
 
   def run
-    yield("Searching Google for #{@query}") if block_given?
+    yield("Searching Google for #{query}")
 
-    browser = Watir::Browser.new :chrome, headless: true
-    search_url = "https://www.google.com/search?q=#{CGI.escape(query)}"
-    browser.goto(search_url)
-    response = "browser_text: #{browser.text} browser_links: #{browser.links}"
-    browser.close
-    response
-  rescue Selenium::WebDriver::Error::UnknownError => e
-    "Error: #{e.message}"
+    doc = Nokogiri::HTML(URI.open("https://www.google.com/search?q=#{CGI.escape(query)}").read.force_encoding('UTF-8'))
+    doc.css('script, style, noscript, comment').remove
+    doc.css('h1, h2, h3, h4, h5, h6, p').map(&:text).join("\n").strip
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appchat
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - hackliteracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-02 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,6 +81,8 @@ files:
 - lib/generators/appchat/templates/get_ai_response_job.rb
 - lib/generators/appchat/templates/javascript/chat_message_controller.js
 - lib/generators/appchat/templates/javascript/speech_to_text_controller.js
+- lib/generators/appchat/templates/javascript/toggle_controller.js
+- lib/generators/appchat/templates/messages/_function_logs.html.erb
 - lib/generators/appchat/templates/messages/_typing_bubbles.html.erb
 - lib/generators/appchat/templates/messages/index.html.erb
 - lib/generators/appchat/templates/messages/message.html.erb