Skip to content

Commit

Permalink
chore: Making OpenAI label suggestions optional (#8374)
Browse files Browse the repository at this point in the history
Co-authored-by: Pranav Raj S <pranav@chatwoot.com>
  • Loading branch information
sojan-official and pranavrajs committed Nov 18, 2023
1 parent 2c5a0ab commit 7380f0e
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 15 deletions.
20 changes: 20 additions & 0 deletions app/javascript/dashboard/assets/scss/_formulate.scss
Expand Up @@ -16,3 +16,23 @@
width: 100%;
}
}

.integration-hooks {
.formulate-input[data-type='checkbox'] {
.formulate-input-wrapper {
@apply flex;

.formulate-input-element {
@apply pr-2;

input {
@apply mb-0;
}
}
}

.formulate-input-element-decorator {
@apply hidden;
}
}
}
Expand Up @@ -340,7 +340,7 @@ export default {
// method available in mixin, need to ensure that integrations are present
await this.fetchIntegrationsIfRequired();
if (!this.isAIIntegrationEnabled) {
if (!this.isLabelSuggestionFeatureEnabled) {
return;
}
Expand Down
20 changes: 14 additions & 6 deletions app/javascript/dashboard/mixins/aiMixin.js
Expand Up @@ -15,18 +15,26 @@ export default {
currentChat: 'getSelectedChat',
replyMode: 'draftMessages/getReplyEditorMode',
}),
isAIIntegrationEnabled() {
return !!this.appIntegrations.find(
aiIntegration() {
return this.appIntegrations.find(
integration => integration.id === 'openai' && !!integration.hooks.length
);
).hooks[0];
},
isAIIntegrationEnabled() {
return !!this.aiIntegration;
},
isLabelSuggestionFeatureEnabled() {
if (this.aiIntegration) {
const { settings = {} } = this.aiIntegration || {};
return settings.label_suggestion;
}
return false;
},
isFetchingAppIntegrations() {
return this.uiFlags.isFetching;
},
hookId() {
return this.appIntegrations.find(
integration => integration.id === 'openai' && !!integration.hooks.length
).hooks[0].id;
return this.aiIntegration.id;
},
draftMessage() {
return this.$store.getters['draftMessages/get'](this.draftKey);
Expand Down
@@ -1,6 +1,6 @@
<!-- eslint-disable vue/v-slot-style -->
<template>
<div class="flex flex-col h-auto overflow-auto">
<div class="flex flex-col h-auto overflow-auto integration-hooks">
<woot-modal-header
:header-title="integration.name"
:header-content="integration.description"
Expand Down
9 changes: 8 additions & 1 deletion config/integration/apps.yml
Expand Up @@ -139,6 +139,7 @@ openai:
"type": "object",
"properties": {
"api_key": { "type": "string" },
"label_suggestion": { "type": "boolean" },
},
"required": ["api_key"],
"additionalProperties": false,
Expand All @@ -150,5 +151,11 @@ openai:
"name": "api_key",
"validation": "required",
},
{
"label": "Show label suggestions",
"type": "checkbox",
"name": "label_suggestion",
"validation": "",
},
]
visible_properties: ['api_key']
visible_properties: ['api_key', 'label_suggestion']
27 changes: 21 additions & 6 deletions enterprise/lib/enterprise/integrations/openai_processor_service.rb
Expand Up @@ -21,11 +21,7 @@ def label_suggestion_message
def labels_with_messages
conversation = find_conversation

# return nil if conversation is not present
return nil if conversation.nil?

# return nil if conversation has less than 3 incoming messages
return nil if conversation.messages.incoming.count < 3
return nil unless valid_conversation?(conversation)

labels = hook.account.labels.pluck(:title).join(', ')
character_count = labels.length
Expand All @@ -38,6 +34,19 @@ def labels_with_messages
"Messages:\n#{messages}\nLabels:\n#{labels}"
end

def valid_conversation?(conversation)
return false if conversation.nil?
return false if conversation.messages.incoming.count < 3

# Think Mark think, at this point the conversation is beyond saving
return false if conversation.messages.count > 100

# if there are more than 20 messages, only trigger this if the last message is from the client
return false if conversation.messages.count > 20 && !conversation.messages.last.incoming?

true
end

def summarize_body
{
model: self.class::GPT_MODEL,
Expand All @@ -50,8 +59,10 @@ def summarize_body
end

def label_suggestion_body
return unless label_suggestions_enabled?

content = labels_with_messages
return nil if content.blank?
return value_from_cache if content.blank?

{
model: self.class::GPT_MODEL,
Expand All @@ -64,4 +75,8 @@ def label_suggestion_body
]
}.to_json
end

def label_suggestions_enabled?
hook.settings['label_suggestion'].present?
end
end

0 comments on commit 7380f0e

Please sign in to comment.