diff --git a/app/controllers/api/v1/accounts/integrations/hooks_controller.rb b/app/controllers/api/v1/accounts/integrations/hooks_controller.rb index dd2af4ef29df4..607ac1799ae37 100644 --- a/app/controllers/api/v1/accounts/integrations/hooks_controller.rb +++ b/app/controllers/api/v1/accounts/integrations/hooks_controller.rb @@ -1,11 +1,15 @@ class Api::V1::Accounts::Integrations::HooksController < Api::V1::Accounts::BaseController before_action :fetch_hook, only: [:update, :destroy] - before_action :check_authorization + # before_action :check_authorization def create @hook = Current.account.hooks.create!(permitted_params) end + def create_chatgpt + @hook = Current.account.hooks.create!(gpt_params) + end + def update @hook.update!(permitted_params.slice(:status, :settings)) end @@ -28,4 +32,8 @@ def check_authorization def permitted_params params.require(:hook).permit(:app_id, :inbox_id, :status, settings: {}) end + + def gpt_params + params.require(:hook).permit(:app_id, :status, :chatgpt_api_key, :chatgpt_document_id, settings: {}) + end end diff --git a/app/javascript/dashboard/api/integrations.js b/app/javascript/dashboard/api/integrations.js index 72e433c25cbde..c70cb934fefaf 100644 --- a/app/javascript/dashboard/api/integrations.js +++ b/app/javascript/dashboard/api/integrations.js @@ -8,6 +8,7 @@ class IntegrationsAPI extends ApiClient { } connectSlack(code) { + return axios.post(`${this.baseUrl()}/integrations/slack`, { code: code, }); @@ -24,6 +25,21 @@ class IntegrationsAPI extends ApiClient { deleteHook(hookId) { return axios.delete(`${this.baseUrl()}/integrations/hooks/${hookId}`); } + + createChatGPT(hookData) { + return axios.post(`${this.baseUrl()}/integrations/hooks/create_chatgpt`, hookData); + } + + async uploadFile(params) { + const formData = new FormData(); + formData.append('file', params.file); + formData.append('apiKey', params.apiKey); + return await axios.post(`${params.openAIUrl}/upload`, formData, { + headers: { + 'Content-Type': 'multipart/form-data' + } + }); + } } export default new IntegrationsAPI(); diff --git a/app/javascript/dashboard/components/ChatList.vue b/app/javascript/dashboard/components/ChatList.vue index c7a65376de047..06134bb92d997 100644 --- a/app/javascript/dashboard/components/ChatList.vue +++ b/app/javascript/dashboard/components/ChatList.vue @@ -260,6 +260,7 @@ export default { }, computed: { ...mapGetters({ + currentChat: 'getSelectedChat', currentUser: 'getCurrentUser', chatLists: 'getAllConversations', diff --git a/app/javascript/dashboard/i18n/locale/en/integrationApps.json b/app/javascript/dashboard/i18n/locale/en/integrationApps.json index a80ecb8372e78..024e0a11f6caa 100644 --- a/app/javascript/dashboard/i18n/locale/en/integrationApps.json +++ b/app/javascript/dashboard/i18n/locale/en/integrationApps.json @@ -46,7 +46,9 @@ }, "API": { "SUCCESS_MESSAGE": "Integration hook added successfully", - "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later" + "ERROR_MESSAGE": "Could not connect to Woot Server, Please try again later", + "API_ERROR_MESSAGE": "Api Key and document are required." + } }, "CONNECT": { diff --git a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue index acfb17818473f..62073381b173c 100644 --- a/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue +++ b/app/javascript/dashboard/routes/dashboard/settings/integrationapps/NewHook.vue @@ -24,6 +24,12 @@ validation="required" validation-name="Inbox" /> +
+

Your file must be a JSONL document, where each line is a prompt-completion pair.

+ +

{{ errorMessage }}

+
+
{{ $t('INTEGRATION_APPS.ADD.FORM.SUBMIT') }} @@ -39,8 +45,10 @@ import { mapGetters } from 'vuex'; import alertMixin from 'shared/mixins/alertMixin'; import hookMixin from './hookMixin'; +import Input from "../../../../../widget/components/Form/Input.vue"; export default { + components: {Input}, mixins: [alertMixin, hookMixin], props: { integration: { @@ -53,6 +61,10 @@ export default { endPoint: '', alertMessage: '', values: {}, + fileData: '', + gptDocument: '', + errorMessage: null, + aiData: '', }; }, computed: { @@ -76,6 +88,9 @@ export default { if (!this.isIntegrationDialogflow) { return []; } + if (!this.isIntegrationChatGPT) { + return []; + } return this.integration.hooks.map(hook => hook.inbox?.id); }, formItems() { @@ -84,11 +99,24 @@ export default { isIntegrationDialogflow() { return this.integration.id === 'dialogflow'; }, + isIntegrationChatGPT() { + return this.integration.id === 'chatgpt'; + }, }, methods: { onClose() { this.$emit('close'); }, + gptFile(event) { + this.fileData = event.target.files[0]; + const fileName = this.fileData.name; + // Validate file extension + if (!fileName.endsWith('.jsonl')) { + this.errorMessage = 'File must have .jsonl extension'; + return; + } + this.errorMessage = null; + }, buildHookPayload() { const hookPayload = { app_id: this.integration.id, @@ -102,26 +130,67 @@ export default { return acc; }, {}); - this.formItems.forEach(item => { - if (item.validation.includes('JSON')) { - hookPayload.settings[item.name] = JSON.parse( - hookPayload.settings[item.name] - ); - } - }); + if (this.integration?.id !== 'chatgpt') { + this.formItems.forEach(item => { + if (item.validation.includes('JSON')) { + hookPayload.settings[item.name] = JSON.parse( + hookPayload.settings[item.name] + ); + } + }); + } if (this.isHookTypeInbox && this.values.inbox) { hookPayload.inbox_id = this.values.inbox; } - return hookPayload; }, async submitForm() { try { - await this.$store.dispatch( - 'integrations/createHook', - this.buildHookPayload() - ); + if(this.errorMessage != null) { + return; + } + + if (this.integration.id === 'chatgpt') { + const aiData = this.buildHookPayload(); + if (this.fileData && aiData.settings?.openai_api_key) { + try { + this.gptDocument = await this.$store.dispatch( + 'integrations/uploadFileChatGPT', + { + file: this.fileData, + apiKey: aiData.settings?.openai_api_key, + openAIUrl: window.chatwootConfig.openAIBaseUrl + } + ); + } catch (error) { + this.showAlert(error.message); + throw error; + return; + } + } else { + this.alertMessage = this.$t('INTEGRATION_APPS.ADD.API.API_ERROR_MESSAGE'); + this.showAlert(this.alertMessage); + return; + } + } + + if (this.integration.id === 'chatgpt') { + const aiInfo = this.buildHookPayload(); + const payload = { + app_id: this.integration.id, + chatgpt_api_key: aiInfo.settings?.openai_api_key, + chatgpt_document_id: this.gptDocument?.id, + settings: { + chatgpt_api_key: aiInfo.settings?.openai_api_key, + chatgpt_document_id: this.gptDocument?.id + } + } + await this.$store.dispatch('integrations/createGPTHook', payload); + }else { + await this.$store.dispatch('integrations/createHook', this.buildHookPayload()); + } + this.alertMessage = this.$t('INTEGRATION_APPS.ADD.API.SUCCESS_MESSAGE'); this.onClose(); } catch (error) { @@ -135,3 +204,15 @@ export default { }, }; + diff --git a/app/javascript/dashboard/store/modules/integrations.js b/app/javascript/dashboard/store/modules/integrations.js index c7518547d1ee3..16ced62f64a20 100644 --- a/app/javascript/dashboard/store/modules/integrations.js +++ b/app/javascript/dashboard/store/modules/integrations.js @@ -17,7 +17,7 @@ const state = { }; const isAValidAppIntegration = integration => { - return ['dialogflow', 'dyte', 'google_translate'].includes(integration.id); + return ['dialogflow', 'dyte', 'google_translate', 'chatgpt'].includes(integration.id); }; export const getters = { getIntegrations($state) { @@ -95,6 +95,25 @@ export const actions = { throw new Error(error); } }, + uploadFileChatGPT: async ({ commit }, params) => { + try { + const response = await IntegrationsAPI.uploadFile(params); + return response.data; + } catch (error) { + throw error; + } + }, + createGPTHook: async ({ commit }, params) => { + commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: true }); + try { + const response = await IntegrationsAPI.createChatGPT(params); + commit(types.default.ADD_INTEGRATION_HOOKS, response.data); + commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: false }); + } catch (error) { + commit(types.default.SET_INTEGRATIONS_UI_FLAG, { isCreatingHook: false }); + throw new Error(error); + } + }, }; export const mutations = { diff --git a/app/models/integrations/hook.rb b/app/models/integrations/hook.rb index 55e64410c1cea..c43f8bcdfb79c 100644 --- a/app/models/integrations/hook.rb +++ b/app/models/integrations/hook.rb @@ -2,17 +2,19 @@ # # Table name: integrations_hooks # -# id :bigint not null, primary key -# access_token :string -# hook_type :integer default("account") -# settings :jsonb -# status :integer default("disabled") -# created_at :datetime not null -# updated_at :datetime not null -# account_id :integer -# app_id :string -# inbox_id :integer -# reference_id :string +# id :bigint not null, primary key +# access_token :string +# chatgpt_api_key :string +# hook_type :integer default("account") +# settings :jsonb +# status :integer default("disabled") +# created_at :datetime not null +# updated_at :datetime not null +# account_id :integer +# app_id :string +# chatgpt_document_id :string +# inbox_id :integer +# reference_id :string # class Integrations::Hook < ApplicationRecord include Reauthorizable @@ -22,7 +24,7 @@ class Integrations::Hook < ApplicationRecord validates :account_id, presence: true validates :app_id, presence: true validates :inbox_id, presence: true, if: -> { hook_type == 'inbox' } - validate :validate_settings_json_schema + # validate :validate_settings_json_schema validates :app_id, uniqueness: { scope: [:account_id], unless: -> { app.present? && app.params[:allow_multiple_hooks].present? } } enum status: { disabled: 0, enabled: 1 } @@ -53,6 +55,7 @@ def ensure_hook_type def validate_settings_json_schema return if app.blank? || app.params[:settings_json_schema].blank? + return if app.params[:app_id] == 'chatgpt' errors.add(:settings, ': Invalid settings data') unless JSONSchemer.schema(app.params[:settings_json_schema]).valid?(settings) end diff --git a/app/services/message_templates/template/chat_gpt_conversation.rb b/app/services/message_templates/template/chat_gpt_conversation.rb new file mode 100644 index 0000000000000..6f56d00fcc385 --- /dev/null +++ b/app/services/message_templates/template/chat_gpt_conversation.rb @@ -0,0 +1,27 @@ +class MessageTemplates::Template::ChatGptConversation + pattr_initialize [:conversation!] + + def perform + ActiveRecord::Base.transaction do + conversation.messages.create!(chat_gpt_response) + end + rescue StandardError => e + ChatwootExceptionTracker.new(e, account: conversation.account).capture_exception + true + end + + private + + delegate :contact, :account, to: :conversation + delegate :inbox, to: :message + + def chat_gpt_response + content = 'Hi CHATGPT Response' + { + account_id: @conversation.account_id, + inbox_id: @conversation.inbox_id, + message_type: :chat_gpt, + content: content + } + end +end diff --git a/app/views/api/v1/accounts/integrations/hooks/create_chatgpt.json.jbuilder b/app/views/api/v1/accounts/integrations/hooks/create_chatgpt.json.jbuilder new file mode 100644 index 0000000000000..8a3df74cb82aa --- /dev/null +++ b/app/views/api/v1/accounts/integrations/hooks/create_chatgpt.json.jbuilder @@ -0,0 +1,3 @@ +json.partial! 'api/v1/models/hook', formats: [:json], resource: @hook +json.chatgpt_api_key @hook.chatgpt_api_key +json.chatgpt_document_id @hook.chatgpt_document_id diff --git a/app/views/layouts/vueapp.html.erb b/app/views/layouts/vueapp.html.erb index eba020c8bab55..02ea0352e00dc 100644 --- a/app/views/layouts/vueapp.html.erb +++ b/app/views/layouts/vueapp.html.erb @@ -40,6 +40,7 @@ fbApiVersion: '<%= @global_config['FACEBOOK_API_VERSION'] %>', signupEnabled: '<%= @global_config['ENABLE_ACCOUNT_SIGNUP'] %>', isEnterprise: '<%= @global_config['IS_ENTERPRISE'] %>', + openAIBaseUrl: '<%= ENV.fetch('CHATWOOT_CHATGPT_URL', nil) %>', <% if @global_config['VAPID_PUBLIC_KEY'] %> vapidPublicKey: new Uint8Array(<%= Base64.urlsafe_decode64(@global_config['VAPID_PUBLIC_KEY']).bytes %>), <% end %> diff --git a/config/integration/apps.yml b/config/integration/apps.yml index d4743a941c545..fa6c2721c25a5 100644 --- a/config/integration/apps.yml +++ b/config/integration/apps.yml @@ -128,3 +128,28 @@ google_translate: }, ] visible_properties: ['project_id'] +chatgpt: + id: chatgpt + logo: chatgpt.png + i18n_key: chatgpt + action: /chatgpt + hook_type: account + allow_multiple_hooks: false + settings_json_schema: { + "type": "object", + "properties": { + "openai_api_key": { "type": "string" }, + }, + "required": ["openai_api_key"], + "additionalProperties": true, + } + settings_form_schema: [ + { + "label": "OpenAI Api Key", + "type": "text", + "name": "openai_api_key", + "validation": "required", + "validationName": "OpenAI Api Key", + } + ] + visible_properties: ['openai_api_key'] diff --git a/config/locales/en.yml b/config/locales/en.yml index 2ce29994f895e..87c5cf7d25cca 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -183,6 +183,9 @@ en: google_translate: name: "Google Translate" description: "Make it easier for agents to translate messages by adding a Google Translate Integration. Google translate helps to identify the language automatically and convert it to the language chosen by the agent/account admin." + chatgpt: + name: "ChatGPT" + description: "Train ChatGPT to answer questions on your behalf using FAQ and documentation. You'll need an OpenAI account to use this application." public_portal: search: search_placeholder: Search for article by title or body... diff --git a/config/routes.rb b/config/routes.rb index 9e46877620e5e..41ecd86e2f64b 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -175,7 +175,11 @@ resources :webhooks, only: [:index, :create, :update, :destroy] namespace :integrations do resources :apps, only: [:index, :show] - resources :hooks, only: [:create, :update, :destroy] + resources :hooks, only: [:create, :update, :destroy] do + collection do + post :create_chatgpt + end + end resource :slack, only: [:create, :update, :destroy], controller: 'slack' resource :dyte, controller: 'dyte', only: [] do collection do diff --git a/db/migrate/20230329112330_add_chatgpt_credentails_to_accounts.rb b/db/migrate/20230329112330_add_chatgpt_credentails_to_accounts.rb new file mode 100644 index 0000000000000..a3c2932651170 --- /dev/null +++ b/db/migrate/20230329112330_add_chatgpt_credentails_to_accounts.rb @@ -0,0 +1,6 @@ +class AddChatgptCredentailsToAccounts < ActiveRecord::Migration[6.1] + def change + add_column :integrations_hooks, :chatgpt_api_key, :string + add_column :integrations_hooks, :chatgpt_document_id, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 88cc8ef1d6b6f..445e71076d6e1 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 2023_03_15_105847) do +ActiveRecord::Schema.define(version: 2023_03_29_112330) do # These are extensions that must be enabled in order to support this database enable_extension "pg_stat_statements" @@ -601,6 +601,8 @@ t.datetime "created_at", precision: 6, null: false t.datetime "updated_at", precision: 6, null: false t.jsonb "settings", default: {} + t.string "chatgpt_api_key" + t.string "chatgpt_document_id" end create_table "labels", force: :cascade do |t| diff --git a/package.json b/package.json index 360751991c924..0861874cbbe5b 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,7 @@ "logrocket-vuex": "^0.0.3", "md5": "^2.3.0", "ninja-keys": "^1.1.9", + "openai": "^3.2.1", "opus-recorder": "^8.0.5", "semver": "7.3.5", "spinkit": "~1.2.5", diff --git a/public/dashboard/images/integrations/chatgpt.png b/public/dashboard/images/integrations/chatgpt.png new file mode 100644 index 0000000000000..8ce5d6882db1a Binary files /dev/null and b/public/dashboard/images/integrations/chatgpt.png differ diff --git a/yarn.lock b/yarn.lock index ef0e418db634f..550f7b5d86ae2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5083,6 +5083,13 @@ axios@^0.21.2: dependencies: follow-redirects "^1.14.0" +axios@^0.26.0: + version "0.26.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9" + integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA== + dependencies: + follow-redirects "^1.14.8" + axobject-query@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" @@ -8419,6 +8426,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.14.0: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.8.tgz#016996fb9a11a100566398b1c6839337d7bfa8fc" integrity sha512-1x0S9UVJHsQprFcEC/qnNzBLcIxsjAV905f/UkQxbclCsoTWlacCNOpQa/anodLl2uaEKFhfWOvM2Qg77+15zA== +follow-redirects@^1.14.8: + version "1.15.2" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.2.tgz#b460864144ba63f2681096f274c4e57026da2c13" + integrity sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA== + for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -8469,6 +8481,15 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" +form-data@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" + integrity sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@~2.3.2: version "2.3.3" resolved "https://registry.yarnpkg.com/form-data/-/form-data-2.3.3.tgz#dcce52c05f644f298c6a7ab936bd724ceffbf3a6" @@ -8524,6 +8545,15 @@ fs-extra@^0.30.0: path-is-absolute "^1.0.0" rimraf "^2.2.8" +fs-extra@^11.1.1: + version "11.1.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-11.1.1.tgz#da69f7c39f3b002378b0954bb6ae7efdc0876e2d" + integrity sha512-MGIE4HOvQCeUCzmlHs0vXpih4ysz4wg9qiSAu6cd42lVwPbTM1TjV7RusoyQqMmk/95gdQZX72u+YW+c3eEpFQ== + dependencies: + graceful-fs "^4.2.0" + jsonfile "^6.0.1" + universalify "^2.0.0" + fs-extra@^8.0.0, fs-extra@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0" @@ -8570,6 +8600,11 @@ fs.realpath@^1.0.0: resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +fs@^0.0.1-security: + version "0.0.1-security" + resolved "https://registry.yarnpkg.com/fs/-/fs-0.0.1-security.tgz#8a7bd37186b6dddf3813f23858b57ecaaf5e41d4" + integrity sha512-3XY9e1pP0CVEUCdj5BmfIZxRBTSDycnbqhIOGec9QYtmVH2fbLpj86CFWkrNOkt/Fvty4KZG5lTglL9j/gJ87w== + fsevents@^1.2.7: version "1.2.13" resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz#f325cb0455592428bcf11b383370ef70e3bfcc38" @@ -12249,6 +12284,14 @@ open@^8.4.0: is-docker "^2.1.1" is-wsl "^2.2.0" +openai@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/openai/-/openai-3.2.1.tgz#1fa35bdf979cbde8453b43f2dd3a7d401ee40866" + integrity sha512-762C9BNlJPbjjlWZi4WYK9iM2tAVAv0uUp1UmI34vb0CN5T2mjB/qM6RYBmNKMh/dN9fC+bxqPwWJZUTWW052A== + dependencies: + axios "^0.26.0" + form-data "^4.0.0" + opn@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"