+
{{ $t('CONVERSATION.SEARCH_MESSAGES') }}
diff --git a/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue b/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
index 4ebe1ac8f..faf0a124f 100644
--- a/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
+++ b/app/javascript/dashboard/routes/dashboard/conversation/search/SwitchLayout.vue
@@ -1,5 +1,10 @@
-
-
-
diff --git a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
index 530106f0a..b91fc2414 100644
--- a/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
+++ b/app/javascript/dashboard/routes/dashboard/settings/inbox/Settings.vue
@@ -175,7 +175,10 @@ export default {
},
canLocktoSingleConversation() {
return (
- this.isASmsInbox || this.isAWhatsAppChannel || this.isAFacebookInbox
+ this.isASmsInbox ||
+ this.isAWhatsAppChannel ||
+ this.isAFacebookInbox ||
+ this.isAPIInbox
);
},
inboxNameLabel() {
diff --git a/app/jobs/internal/process_stale_redis_keys_job.rb b/app/jobs/internal/process_stale_redis_keys_job.rb
index 3afb3b434..30c3cffed 100644
--- a/app/jobs/internal/process_stale_redis_keys_job.rb
+++ b/app/jobs/internal/process_stale_redis_keys_job.rb
@@ -6,6 +6,7 @@ class Internal::ProcessStaleRedisKeysJob < ApplicationJob
queue_as :low
def perform(account)
- Internal::RemoveStaleRedisKeysService.new(account_id: account.id).perform
+ removed_count = Internal::RemoveStaleRedisKeysService.new(account_id: account.id).perform
+ Rails.logger.info "Successfully cleaned up Redis keys for account #{account.id} (removed #{removed_count} keys)"
end
end
diff --git a/app/jobs/internal/remove_stale_redis_keys_job.rb b/app/jobs/internal/remove_stale_redis_keys_job.rb
index 667fa398b..da3892b3c 100644
--- a/app/jobs/internal/remove_stale_redis_keys_job.rb
+++ b/app/jobs/internal/remove_stale_redis_keys_job.rb
@@ -6,9 +6,11 @@ class Internal::RemoveStaleRedisKeysJob < ApplicationJob
queue_as :scheduled_jobs
def perform
- Account.find_each do |account|
- Rails.logger.info "Enqueuing ProcessStaleRedisKeysJob for account #{account.id}"
- Internal::ProcessStaleRedisKeysJob.perform_later(account)
+ Account.find_in_batches(batch_size: 100) do |accounts|
+ accounts.each do |account|
+ Rails.logger.info "Enqueuing ProcessStaleRedisKeysJob for account #{account.id}"
+ Internal::ProcessStaleRedisKeysJob.perform_later(account)
+ end
end
end
end
diff --git a/app/models/concerns/llm_formattable.rb b/app/models/concerns/llm_formattable.rb
new file mode 100644
index 000000000..086ccc46a
--- /dev/null
+++ b/app/models/concerns/llm_formattable.rb
@@ -0,0 +1,7 @@
+module LlmFormattable
+ extend ActiveSupport::Concern
+
+ def to_llm_text
+ LlmFormatter::LlmTextFormatterService.new(self).format
+ end
+end
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index df4bbf31c..ba60f5295 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -51,6 +51,7 @@
class Conversation < ApplicationRecord
include Labelable
+ include LlmFormattable
include AssignmentHandler
include AutoAssignmentHandler
include ActivityMessageHandler
diff --git a/app/services/internal/remove_stale_redis_keys_service.rb b/app/services/internal/remove_stale_redis_keys_service.rb
index a3e1da207..553cc6c6a 100644
--- a/app/services/internal/remove_stale_redis_keys_service.rb
+++ b/app/services/internal/remove_stale_redis_keys_service.rb
@@ -1,10 +1,15 @@
class Internal::RemoveStaleRedisKeysService
pattr_initialize [:account_id!]
- def perform(account_id)
- range_start = (Time.zone.now - PRESENCE_DURATION).to_i
+ def perform
+ Rails.logger.info "Removing redis stale keys for account #{@account_id}"
+ range_start = (Time.zone.now - OnlineStatusTracker::PRESENCE_DURATION).to_i
# exclusive minimum score is specified by prefixing (
# we are clearing old records because this could clogg up the sorted set
- ::Redis::Alfred.zremrangebyscore(presence_key(account_id, 'Contact'), '-inf', "(#{range_start}")
+ ::Redis::Alfred.zremrangebyscore(
+ OnlineStatusTracker.presence_key(@account_id, 'Contact'),
+ '-inf',
+ "(#{range_start}"
+ )
end
end
diff --git a/app/services/llm_formatter/conversation_llm_formatter.rb b/app/services/llm_formatter/conversation_llm_formatter.rb
new file mode 100644
index 000000000..07afc2cac
--- /dev/null
+++ b/app/services/llm_formatter/conversation_llm_formatter.rb
@@ -0,0 +1,32 @@
+class LlmFormatter::ConversationLlmFormatter < LlmFormatter::DefaultLlmFormatter
+ def format
+ sections = []
+ sections << "Conversation ID: ##{@record.display_id}"
+ sections << "Channel: #{@record.inbox.channel.name}"
+ sections << 'Message History:'
+ sections << if @record.messages.any?
+ build_messages
+ else
+ 'No messages in this conversation'
+ end
+
+ sections.join("\n")
+ end
+
+ private
+
+ def build_messages
+ return "No messages in this conversation\n" if @record.messages.empty?
+
+ message_text = ''
+ @record.messages.chat.order(created_at: :asc).each do |message|
+ message_text << format_message(message)
+ end
+ message_text
+ end
+
+ def format_message(message)
+ sender = message.message_type == 'incoming' ? 'User' : 'Support agent'
+ "#{sender}: #{message.content}\n"
+ end
+end
diff --git a/app/services/llm_formatter/default_llm_formatter.rb b/app/services/llm_formatter/default_llm_formatter.rb
new file mode 100644
index 000000000..b82a039cf
--- /dev/null
+++ b/app/services/llm_formatter/default_llm_formatter.rb
@@ -0,0 +1,9 @@
+class LlmFormatter::DefaultLlmFormatter
+ def initialize(record)
+ @record = record
+ end
+
+ def format
+ # override this
+ end
+end
diff --git a/app/services/llm_formatter/llm_text_formatter_service.rb b/app/services/llm_formatter/llm_text_formatter_service.rb
new file mode 100644
index 000000000..0f1f37cf8
--- /dev/null
+++ b/app/services/llm_formatter/llm_text_formatter_service.rb
@@ -0,0 +1,20 @@
+class LlmFormatter::LlmTextFormatterService
+ def initialize(record)
+ @record = record
+ end
+
+ def format
+ formatter_class = find_formatter
+ formatter_class.new(@record).format
+ end
+
+ private
+
+ def find_formatter
+ formatter_name = "LlmFormatter::#{@record.class.name}LlmFormatter"
+ formatter_class = formatter_name.safe_constantize
+ raise FormatterNotFoundError, "No formatter found for #{@record.class.name}" unless formatter_class
+
+ formatter_class
+ end
+end
diff --git a/app/views/api/v1/accounts/contacts/show.json.jbuilder b/app/views/api/v1/accounts/contacts/show.json.jbuilder
index 524a393bf..1add73326 100644
--- a/app/views/api/v1/accounts/contacts/show.json.jbuilder
+++ b/app/views/api/v1/accounts/contacts/show.json.jbuilder
@@ -1,3 +1,3 @@
json.payload do
- json.partial! 'api/v1/models/contact', formats: [:json], resource: @contact, with_contact_inboxes: true
+ json.partial! 'api/v1/models/contact', formats: [:json], resource: @contact, with_contact_inboxes: @include_contact_inboxes
end
diff --git a/app/views/api/v1/accounts/contacts/update.json.jbuilder b/app/views/api/v1/accounts/contacts/update.json.jbuilder
index 524a393bf..1add73326 100644
--- a/app/views/api/v1/accounts/contacts/update.json.jbuilder
+++ b/app/views/api/v1/accounts/contacts/update.json.jbuilder
@@ -1,3 +1,3 @@
json.payload do
- json.partial! 'api/v1/models/contact', formats: [:json], resource: @contact, with_contact_inboxes: true
+ json.partial! 'api/v1/models/contact', formats: [:json], resource: @contact, with_contact_inboxes: @include_contact_inboxes
end
diff --git a/config/routes.rb b/config/routes.rb
index 1c913155b..d33a40827 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -220,6 +220,7 @@ Rails.application.routes.draw do
resource :captain, controller: 'captain', only: [] do
collection do
post :proxy
+ post :copilot
end
end
resources :hooks, only: [:show, :create, :update, :destroy] do
diff --git a/package.json b/package.json
index 261ba387e..ec06e9375 100644
--- a/package.json
+++ b/package.json
@@ -66,6 +66,7 @@
"date-fns": "2.21.1",
"date-fns-tz": "^1.3.3",
"dompurify": "3.1.6",
+ "flag-icons": "^7.2.3",
"floating-vue": "^5.2.2",
"highlight.js": "^11.10.0",
"idb": "^8.0.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5c6279ab5..d1b4e58a9 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -121,6 +121,9 @@ importers:
dompurify:
specifier: 3.1.6
version: 3.1.6
+ flag-icons:
+ specifier: ^7.2.3
+ version: 7.2.3
floating-vue:
specifier: ^5.2.2
version: 5.2.2(vue@3.5.12(typescript@5.6.2))
@@ -2912,6 +2915,9 @@ packages:
resolution: {integrity: sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==}
engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+ flag-icons@7.2.3:
+ resolution: {integrity: sha512-X2gUdteNuqdNqob2KKTJTS+ZCvyWeLCtDz9Ty8uJP17Y4o82Y+U/Vd4JNrdwTAjagYsRznOn9DZ+E/Q52qbmqg==}
+
flat-cache@3.1.0:
resolution: {integrity: sha512-OHx4Qwrrt0E4jEIcI5/Xb+f+QmJYNj2rrK8wiIdQOIrB9WrrJL8cjZvXdXuBTkkEwEqLycb5BeZDV1o2i9bTew==}
engines: {node: '>=12.0.0'}
@@ -3760,11 +3766,6 @@ packages:
mz@2.7.0:
resolution: {integrity: sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==}
- nanoid@3.3.7:
- resolution: {integrity: sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==}
- engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
- hasBin: true
-
nanoid@3.3.8:
resolution: {integrity: sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==}
engines: {node: ^10 || ^12 || ^13.7 || ^14 || >=15.0.1}
@@ -8347,6 +8348,8 @@ snapshots:
locate-path: 7.2.0
path-exists: 5.0.0
+ flag-icons@7.2.3: {}
+
flat-cache@3.1.0:
dependencies:
flatted: 3.2.9
@@ -9307,8 +9310,6 @@ snapshots:
object-assign: 4.1.1
thenify-all: 1.6.0
- nanoid@3.3.7: {}
-
nanoid@3.3.8: {}
nanoid@5.0.8: {}
@@ -9803,7 +9804,7 @@ snapshots:
postcss@8.4.47:
dependencies:
- nanoid: 3.3.7
+ nanoid: 3.3.8
picocolors: 1.1.0
source-map-js: 1.2.1
diff --git a/spec/builders/conversation_builder_spec.rb b/spec/builders/conversation_builder_spec.rb
index 956aec966..c0c5f248b 100644
--- a/spec/builders/conversation_builder_spec.rb
+++ b/spec/builders/conversation_builder_spec.rb
@@ -3,39 +3,77 @@ require 'rails_helper'
describe ConversationBuilder do
let(:account) { create(:account) }
let!(:sms_channel) { create(:channel_sms, account: account) }
+ let!(:api_channel) { create(:channel_api, account: account) }
let!(:sms_inbox) { create(:inbox, channel: sms_channel, account: account) }
+ let!(:api_inbox) { create(:inbox, channel: api_channel, account: account) }
let(:contact) { create(:contact, account: account) }
- let(:contact_inbox) { create(:contact_inbox, contact: contact, inbox: sms_inbox) }
+ let(:contact_sms_inbox) { create(:contact_inbox, contact: contact, inbox: sms_inbox) }
+ let(:contact_api_inbox) { create(:contact_inbox, contact: contact, inbox: api_inbox) }
describe '#perform' do
- it 'creates conversation' do
+ it 'creates sms conversation' do
conversation = described_class.new(
- contact_inbox: contact_inbox,
+ contact_inbox: contact_sms_inbox,
params: {}
).perform
- expect(conversation.contact_inbox_id).to eq(contact_inbox.id)
+ expect(conversation.contact_inbox_id).to eq(contact_sms_inbox.id)
end
- context 'when lock_to_single_conversation is true for inbox' do
+ it 'creates api conversation' do
+ conversation = described_class.new(
+ contact_inbox: contact_api_inbox,
+ params: {}
+ ).perform
+
+ expect(conversation.contact_inbox_id).to eq(contact_api_inbox.id)
+ end
+
+ context 'when lock_to_single_conversation is true for sms inbox' do
before do
sms_inbox.update!(lock_to_single_conversation: true)
end
- it 'creates conversation when existing conversation is not present' do
+ it 'creates sms conversation when existing conversation is not present' do
conversation = described_class.new(
- contact_inbox: contact_inbox,
+ contact_inbox: contact_sms_inbox,
params: {}
).perform
- expect(conversation.contact_inbox_id).to eq(contact_inbox.id)
+ expect(conversation.contact_inbox_id).to eq(contact_sms_inbox.id)
end
- it 'returns last from existing conversations when existing conversation is not present' do
- create(:conversation, contact_inbox: contact_inbox)
- existing_conversation = create(:conversation, contact_inbox: contact_inbox)
+ it 'returns last from existing sms conversations when existing conversation is not present' do
+ create(:conversation, contact_inbox: contact_sms_inbox)
+ existing_conversation = create(:conversation, contact_inbox: contact_sms_inbox)
conversation = described_class.new(
- contact_inbox: contact_inbox,
+ contact_inbox: contact_sms_inbox,
+ params: {}
+ ).perform
+
+ expect(conversation.id).to eq(existing_conversation.id)
+ end
+ end
+
+ context 'when lock_to_single_conversation is true for api inbox' do
+ before do
+ api_inbox.update!(lock_to_single_conversation: true)
+ end
+
+ it 'creates conversation when existing api conversation is not present' do
+ conversation = described_class.new(
+ contact_inbox: contact_api_inbox,
+ params: {}
+ ).perform
+
+ expect(conversation.contact_inbox_id).to eq(contact_api_inbox.id)
+ end
+
+ it 'returns last from existing api conversations when existing conversation is not present' do
+ create(:conversation, contact_inbox: contact_api_inbox)
+ existing_conversation = create(:conversation, contact_inbox: contact_api_inbox)
+ conversation = described_class.new(
+ contact_inbox: contact_api_inbox,
params: {}
).perform
diff --git a/spec/controllers/api/v1/accounts/integrations/captain_controller_spec.rb b/spec/controllers/api/v1/accounts/integrations/captain_controller_spec.rb
index 3dfb49294..078736e06 100644
--- a/spec/controllers/api/v1/accounts/integrations/captain_controller_spec.rb
+++ b/spec/controllers/api/v1/accounts/integrations/captain_controller_spec.rb
@@ -2,13 +2,15 @@ require 'rails_helper'
RSpec.describe 'Captain Integrations API', type: :request do
let!(:account) { create(:account) }
+ let(:conversation) { create(:conversation, account: account) }
let!(:agent) { create(:user, account: account, role: :agent) }
let!(:hook) do
create(:integrations_hook, account: account, app_id: 'captain', settings: {
access_token: SecureRandom.hex,
account_email: Faker::Internet.email,
assistant_id: '1',
- account_id: '1'
+ account_id: '1',
+ inbox_ids: []
})
end
let(:captain_api_url) { 'https://captain.example.com/' }
@@ -77,4 +79,45 @@ RSpec.describe 'Captain Integrations API', type: :request do
end
end
end
+
+ describe 'POST /api/v1/accounts/{account.id}/integrations/captain/copilot' do
+ context 'when it is an unauthenticated user' do
+ it 'returns unauthorized' do
+ post copilot_api_v1_account_integrations_captain_url(account_id: account.id),
+ params: { method: 'get', route: 'some_route' },
+ as: :json
+
+ expect(response).to have_http_status(:unauthorized)
+ end
+ end
+
+ context 'when it is an authenticated user' do
+ context 'when valid request method and route' do
+ let(:route) { 'assistants/1/copilot' }
+ let(:method) { 'get' }
+
+ it 'proxies the request to Copilot API' do
+ stub_request(:post, "#{captain_api_url}api/accounts/#{hook.settings['account_id']}/#{route}")
+ .with(headers: {
+ 'X-User-Email' => hook.settings['account_email'],
+ 'X-User-Token' => hook.settings['access_token'],
+ 'Content-Type' => 'application/json'
+ })
+ .to_return(status: 200, body: 'Success', headers: {})
+
+ post copilot_api_v1_account_integrations_captain_url(account_id: account.id),
+ params: {
+ message: 'hello',
+ previous_messages: [],
+ conversation_id: conversation.display_id
+ },
+ headers: agent.create_new_auth_token,
+ as: :json
+
+ expect(response).to have_http_status(:success)
+ expect(response.body).to eq('Success')
+ end
+ end
+ end
+ end
end
diff --git a/spec/jobs/internal/process_stale_redis_keys_job_spec.rb b/spec/jobs/internal/process_stale_redis_keys_job_spec.rb
new file mode 100644
index 000000000..6189b1b5c
--- /dev/null
+++ b/spec/jobs/internal/process_stale_redis_keys_job_spec.rb
@@ -0,0 +1,15 @@
+require 'rails_helper'
+
+RSpec.describe Internal::ProcessStaleRedisKeysJob do
+ let(:account) { create(:account) }
+
+ describe '#perform' do
+ it 'calls the RemoveStaleRedisKeysService with the correct account ID' do
+ expect(Internal::RemoveStaleRedisKeysService).to receive(:new)
+ .with(account_id: account.id)
+ .and_call_original
+
+ described_class.perform_now(account)
+ end
+ end
+end
diff --git a/spec/jobs/internal/remove_stale_redis_keys_job_spec.rb b/spec/jobs/internal/remove_stale_redis_keys_job_spec.rb
new file mode 100644
index 000000000..a1b98c9db
--- /dev/null
+++ b/spec/jobs/internal/remove_stale_redis_keys_job_spec.rb
@@ -0,0 +1,13 @@
+require 'rails_helper'
+
+RSpec.describe Internal::RemoveStaleRedisKeysJob do
+ let(:account) { create(:account) }
+
+ describe '#perform' do
+ it 'enqueues ProcessStaleRedisKeysJob for the account' do
+ expect(Internal::ProcessStaleRedisKeysJob).to receive(:perform_later).with(account)
+
+ described_class.perform_now
+ end
+ end
+end
diff --git a/spec/services/internal/remove_stale_redis_keys_service_spec.rb b/spec/services/internal/remove_stale_redis_keys_service_spec.rb
new file mode 100644
index 000000000..75d182aab
--- /dev/null
+++ b/spec/services/internal/remove_stale_redis_keys_service_spec.rb
@@ -0,0 +1,18 @@
+require 'rails_helper'
+
+RSpec.describe Internal::RemoveStaleRedisKeysService, type: :service do
+ let(:account_id) { 1 }
+ let(:service) { described_class.new(account_id: account_id) }
+
+ describe '#perform' do
+ it 'removes stale Redis keys for the specified account' do
+ presence_key = OnlineStatusTracker.presence_key(account_id, 'Contact')
+
+ # Mock Redis calls
+ expect(Redis::Alfred).to receive(:zremrangebyscore)
+ .with(presence_key, '-inf', anything)
+
+ service.perform
+ end
+ end
+end
diff --git a/spec/services/llm_formatter/conversation_llm_formatter_spec.rb b/spec/services/llm_formatter/conversation_llm_formatter_spec.rb
new file mode 100644
index 000000000..3838b8126
--- /dev/null
+++ b/spec/services/llm_formatter/conversation_llm_formatter_spec.rb
@@ -0,0 +1,51 @@
+require 'rails_helper'
+
+RSpec.describe LlmFormatter::ConversationLlmFormatter do
+ let(:account) { create(:account) }
+ let(:conversation) { create(:conversation, account: account) }
+ let(:formatter) { described_class.new(conversation) }
+
+ describe '#format' do
+ context 'when conversation has no messages' do
+ it 'returns basic conversation info with no messages' do
+ expected_output = [
+ "Conversation ID: ##{conversation.display_id}",
+ "Channel: #{conversation.inbox.channel.name}",
+ 'Message History:',
+ 'No messages in this conversation'
+ ].join("\n")
+
+ expect(formatter.format).to eq(expected_output)
+ end
+ end
+
+ context 'when conversation has messages' do
+ it 'formats messages in chronological order with sender labels' do
+ create(
+ :message,
+ conversation: conversation,
+ message_type: 'incoming',
+ content: 'Hello, I need help'
+ )
+
+ create(
+ :message,
+ conversation: conversation,
+ message_type: 'outgoing',
+ content: 'How can I assist you today?'
+ )
+
+ expected_output = [
+ "Conversation ID: ##{conversation.display_id}",
+ "Channel: #{conversation.inbox.channel.name}",
+ 'Message History:',
+ 'User: Hello, I need help',
+ 'Support agent: How can I assist you today?',
+ ''
+ ].join("\n")
+
+ expect(formatter.format).to eq(expected_output)
+ end
+ end
+ end
+end
diff --git a/theme/colors.js b/theme/colors.js
index fe58954cf..1bf16f6a8 100644
--- a/theme/colors.js
+++ b/theme/colors.js
@@ -300,6 +300,21 @@ export const colors = {
12: 'rgb(var(--slate-12) /
)',
},
+ iris: {
+ 1: 'rgb(var(--iris-1) / )',
+ 2: 'rgb(var(--iris-2) / )',
+ 3: 'rgb(var(--iris-3) / )',
+ 4: 'rgb(var(--iris-4) / )',
+ 5: 'rgb(var(--iris-5) / )',
+ 6: 'rgb(var(--iris-6) / )',
+ 7: 'rgb(var(--iris-7) / )',
+ 8: 'rgb(var(--iris-8) / )',
+ 9: 'rgb(var(--iris-9) / )',
+ 10: 'rgb(var(--iris-10) / )',
+ 11: 'rgb(var(--iris-11) / )',
+ 12: 'rgb(var(--iris-12) / )',
+ },
+
ruby: {
1: 'rgb(var(--ruby-1) / )',
2: 'rgb(var(--ruby-2) / )',