diff --git a/Gemfile b/Gemfile index 66fb701e6..26d943fa0 100644 --- a/Gemfile +++ b/Gemfile @@ -62,6 +62,10 @@ gem 'redis-namespace' # super fast record imports in bulk gem 'activerecord-import' +gem 'searchkick' +gem 'opensearch-ruby' +gem 'faraday_middleware-aws-sigv4' + ##--- gems for server & infra configuration ---## gem 'dotenv-rails', '>= 3.0.0' gem 'foreman' diff --git a/Gemfile.lock b/Gemfile.lock index 1d5693835..b038bbadc 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -299,6 +299,9 @@ GEM net-http-persistent (~> 4.0) faraday-retry (2.2.1) faraday (~> 2.0) + faraday_middleware-aws-sigv4 (1.0.1) + aws-sigv4 (~> 1.0) + faraday (>= 2.0, < 3) fast-mcp (1.5.0) addressable (~> 2.8) base64 @@ -605,6 +608,9 @@ GEM omniauth-saml (2.2.4) omniauth (~> 2.1) ruby-saml (~> 1.18) + opensearch-ruby (3.4.0) + faraday (>= 1.0, < 3) + multi_json (>= 1.0) openssl (3.2.0) orm_adapter (0.5.0) os (1.1.4) @@ -809,6 +815,9 @@ GEM parser scss_lint (0.60.0) sass (~> 3.5, >= 3.5.5) + searchkick (5.5.2) + activemodel (>= 7.1) + hashie securerandom (0.4.1) seed_dump (3.3.1) activerecord (>= 4) @@ -1003,6 +1012,7 @@ DEPENDENCIES facebook-messenger factory_bot_rails (>= 6.4.3) faker + faraday_middleware-aws-sigv4 fcm flag_shih_tzu foreman @@ -1044,6 +1054,7 @@ DEPENDENCIES omniauth-oauth2 omniauth-rails_csrf_protection (~> 1.0, >= 1.0.2) omniauth-saml + opensearch-ruby pg pg_search pgvector @@ -1072,6 +1083,7 @@ DEPENDENCIES ruby_llm-schema scout_apm scss_lint + searchkick seed_dump sentry-rails (>= 5.19.0) sentry-ruby diff --git a/Rakefile b/Rakefile index e85f91391..591d2c4c6 100644 --- a/Rakefile +++ b/Rakefile @@ -4,3 +4,7 @@ require_relative 'config/application' Rails.application.load_tasks + +# Load Enterprise Edition rake tasks if they exist +enterprise_tasks_path = Rails.root.join('enterprise/lib/tasks.rb').to_s +require enterprise_tasks_path if File.exist?(enterprise_tasks_path) diff --git a/app/javascript/dashboard/components-next/NewConversation/components/WhatsappTemplateParser.vue b/app/javascript/dashboard/components-next/NewConversation/components/WhatsappTemplateParser.vue deleted file mode 100644 index ce1520f79..000000000 --- a/app/javascript/dashboard/components-next/NewConversation/components/WhatsappTemplateParser.vue +++ /dev/null @@ -1,177 +0,0 @@ - - - diff --git a/app/javascript/dashboard/components-next/copilot/CopilotInput.vue b/app/javascript/dashboard/components-next/copilot/CopilotInput.vue index c8f1a0056..852506a4c 100644 --- a/app/javascript/dashboard/components-next/copilot/CopilotInput.vue +++ b/app/javascript/dashboard/components-next/copilot/CopilotInput.vue @@ -1,25 +1,49 @@