fix errors (#216)

* fix errors

* test

* upgrade rails

* adjust css

Author: vswamidass-sfdc

Gemfile

@@ -6,7 +6,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 ruby '3.2.2'
 
 # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
-gem 'rails', '~> 7.1.0'
+gem 'rails', '~> 7.2.0'
 
 # The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
 gem 'sprockets-rails'
@@ -135,4 +135,4 @@ gem 'omniauth-google-oauth2'
 gem 'google-api-client'
 gem 'googleauth'
 
-gem 'uri', '>= 1.0.3'
+gem 'uri', '>= 1.0.3'

Gemfile.lock

@@ -1,83 +1,77 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actioncable (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
       zeitwerk (~> 2.6)
-    actionmailbox (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      mail (>= 2.7.1)
-      net-imap
-      net-pop
-      net-smtp
-    actionmailer (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      actionview (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      mail (~> 2.5, >= 2.5.4)
-      net-imap
-      net-pop
-      net-smtp
+    actionmailbox (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      mail (>= 2.8.0)
+    actionmailer (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.1.5.2)
-      actionview (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionpack (7.2.2.2)
+      actionview (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       nokogiri (>= 1.8.5)
       racc
-      rack (>= 2.2.4)
+      rack (>= 2.2.4, < 3.2)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    actiontext (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+      useragent (~> 0.16)
+    actiontext (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (7.1.5.2)
-      activesupport (= 7.1.5.2)
+    actionview (7.2.2.2)
+      activesupport (= 7.2.2.2)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
-    activejob (7.1.5.2)
-      activesupport (= 7.1.5.2)
+    activejob (7.2.2.2)
+      activesupport (= 7.2.2.2)
       globalid (>= 0.3.6)
-    activemodel (7.1.5.2)
-      activesupport (= 7.1.5.2)
-    activerecord (7.1.5.2)
-      activemodel (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    activemodel (7.2.2.2)
+      activesupport (= 7.2.2.2)
+    activerecord (7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       timeout (>= 0.4.0)
-    activestorage (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    activestorage (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       marcel (~> 1.0)
-    activesupport (7.1.5.2)
+    activesupport (7.2.2.2)
       base64
       benchmark (>= 0.3)
       bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
+      concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
-      mutex_m
       securerandom (>= 0.3)
-      tzinfo (~> 2.0)
+      tzinfo (~> 2.0, >= 2.0.5)
     acts_as_votable (0.14.0)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
@@ -328,7 +322,7 @@ GEM
     pundit (2.5.0)
       activesupport (>= 3.0.0)
     racc (1.8.1)
-    rack (3.2.0)
+    rack (3.1.16)
     rack-protection (4.1.1)
       base64 (>= 0.1.0)
       logger (>= 1.6.0)
@@ -340,20 +334,20 @@ GEM
       rack (>= 1.3)
     rackup (2.2.1)
       rack (>= 3)
-    rails (7.1.5.2)
-      actioncable (= 7.1.5.2)
-      actionmailbox (= 7.1.5.2)
-      actionmailer (= 7.1.5.2)
-      actionpack (= 7.1.5.2)
-      actiontext (= 7.1.5.2)
-      actionview (= 7.1.5.2)
-      activejob (= 7.1.5.2)
-      activemodel (= 7.1.5.2)
-      activerecord (= 7.1.5.2)
-      activestorage (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
+    rails (7.2.2.2)
+      actioncable (= 7.2.2.2)
+      actionmailbox (= 7.2.2.2)
+      actionmailer (= 7.2.2.2)
+      actionpack (= 7.2.2.2)
+      actiontext (= 7.2.2.2)
+      actionview (= 7.2.2.2)
+      activejob (= 7.2.2.2)
+      activemodel (= 7.2.2.2)
+      activerecord (= 7.2.2.2)
+      activestorage (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
       bundler (>= 1.15.0)
-      railties (= 7.1.5.2)
+      railties (= 7.2.2.2)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -365,10 +359,10 @@ GEM
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    railties (7.1.5.2)
-      actionpack (= 7.1.5.2)
-      activesupport (= 7.1.5.2)
-      irb
+    railties (7.2.2.2)
+      actionpack (= 7.2.2.2)
+      activesupport (= 7.2.2.2)
+      irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
       thor (~> 1.0, >= 1.2.2)
@@ -504,6 +498,7 @@ GEM
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     uri (1.0.3)
+    useragent (0.16.11)
     version_gem (1.1.8)
     wasabi (5.1.0)
       addressable
@@ -567,7 +562,7 @@ DEPENDENCIES
   pgvector
   puma (~> 6.4)
   pundit (~> 2.3)
-  rails (~> 7.1.0)
+  rails (~> 7.2.0)
   rails-controller-testing
   redcarpet
   redis (~> 4.0)

app/controllers/concerns/gpt_concern.rb

@@ -139,14 +139,32 @@ def call_salesforce_connect_gpt_generation(prompt)
                                  'Content-Type' => 'application/json'
                                })
 
-      response_data = JSON.parse(response.body)
+      # Check if the HTTP request was successful
+      unless response.success?
+        Rails.logger.error("Salesforce API HTTP error: #{response.code} - #{response.message}")
+        return response.body || ''
+      end
+
+      begin
+        response_data = JSON.parse(response.body)
+      rescue JSON::ParserError => e
+        Rails.logger.error("Failed to parse Salesforce API response as JSON: #{e.message}. Response body: #{response.body}")
+        return response.body || ''
+      end
+      
+      # Debug logging to understand the response structure
+      Rails.logger.debug("Salesforce API response: #{response_data.inspect}")
+      
+      # Check if the response has the expected structure
+      unless response_data.is_a?(Hash) && response_data['generations'].is_a?(Array) && response_data['generations'].any?
+        puts("Unexpected Salesforce API response structure: #{response_data.inspect}")
+        return response_data.to_s
+      end
 
       # Decode the HTML entities
       decoded_text = CGI.unescapeHTML(response_data['generations'][0]['text'])
 
       return decoded_text
-    rescue StandardError => e
-      Rails.logger.error("Error calling Salesforce Connect GPT: #{e.message}")
     end
 
     ''
@@ -168,7 +186,7 @@ def get_salesforce_connect_oauth_token
           client_id: encoded_client_id,
           client_secret: encoded_client_secret
         }
-     else
+      else
         {
           grant_type: 'password',
           client_id: encoded_client_id,

app/jobs/generate_message_response_job.rb

@@ -226,14 +226,13 @@ def perform(_message_id)
 
         llm_message.save
         llm_message.ready!
-      rescue StandardError => e
+      rescue Exception => e
         error_message = "I'm sorry, I encountered an error while processing your request. Please try again later. Error: #{e.message}"
         llm_message.content = error_message
         llm_message.save
         llm_message.ready!
         Rails.logger.error("Error calling GPT to generate answer. Error: #{e.message}\nBacktrace: #{e.backtrace.join("\n")}")
       end
-
     end
   end
 end

app/views/documents/_document.html.erb

@@ -15,8 +15,7 @@
     <div class="flex justify-between items-center py-2 pl-4 bg-stone-200 rounded-t-lg">
       <div class="w-full">
         <p class="text-xs ">
-          <%= render partial: 'shared/meta_info', locals: { email: document.user.email, created_at: document.created_at, updated_at: document.updated_at } %>
-          <%= "| Synced #{time_ago_in_words(document.synced_at)} ago" if document.synced_at.present? %>
+          <%= render partial: 'shared/meta_info', locals: { email: document.user.email, created_at: document.created_at, updated_at: document.updated_at, synced_at: document.synced_at } %>
         </p>
         <% if document.url %>
           <div class="flex items-center space-x-1 text-xs mt-2">
@@ -29,8 +28,7 @@
             <span class="">Source:</span>
             <%= link_to document.source_url, document.source_url, class:" hover:underline", target:"_source" %>
             <% if document.source_type == 'quip' %>
-              <%= image_tag 'quip_logo.png', alt: 'Quip Logo', class: 'h-6' %>
-              <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-5 <%= "text-green-600" if document.last_sync_result == "SUCCESS" %> <%= "text-red-600" if document.last_sync_result == "FAILED" %>">
+              <svg xmlns="http://www.w3.org/2000/svg" title="Quip Sync"fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4 <%= "text-green-600" if document.last_sync_result == "SUCCESS" %> <%= "text-red-600" if document.last_sync_result == "FAILED" %>">
                 <path stroke-linecap="round" stroke-linejoin="round" d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
               </svg>
             <% end %>

app/views/shared/_meta_info.html.erb

@@ -1,5 +1,9 @@
 <div class="py-1 text-xs ">
   Owner <span class="font-bold "><%= email %> </span> |
   Created <span class="font-bold  "><%= time_ago_in_words(created_at) %> ago</span> |
-  Updated <span class="font-bold  "><%= time_ago_in_words(updated_at) %> ago</span>
+  Updated <span class="font-bold  "><%= time_ago_in_words(updated_at) %> ago</span><%= 
+    if defined?(synced_at) && synced_at.present?
+      content_tag(:span, " | Synced #{time_ago_in_words(synced_at)} ago")
+    end
+  %>
 </div>

spec/controllers/concerns/gpt_concern_spec.rb

@@ -184,7 +184,10 @@
 
     let(:success_response) do
       double('response',
-             body: '{"generations": [{"text": "<generated> text"}]}')
+             success?: true,
+             body: '{"generations": [{"text": "<generated> text"}]}',
+             code: 200,
+             message: 'OK')
     end
 
     before do
@@ -199,8 +202,9 @@
       expect(result).to eq('<generated> text')
     end
 
-    it 'returns empty string when an error occurs' do
-      allow(HTTParty).to receive(:post).and_raise(StandardError.new('API Error'))
+    it 'returns empty string when HTTP request fails' do
+      failed_response = double('response', success?: false, body: nil, code: 500, message: 'Internal Server Error')
+      allow(HTTParty).to receive(:post).and_return(failed_response)
       result = instance.call_salesforce_connect_gpt_generation('test prompt')
       expect(result).to eq('')
     end