fix: captain usage for BYOK OpenAI tasks (#14587)
# Pull Request Template ## Description Fixes: https://linear.app/chatwoot/issue/CW-7167/label-suggestions-bad-ux ## Type of change Please delete options that are not relevant. - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration. ## Checklist: - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules
This commit is contained in:
@@ -150,13 +150,12 @@ class Captain::BaseTaskService
|
||||
end
|
||||
|
||||
# Extension point consulted by the Enterprise quota wrapper. Subclasses
|
||||
# whose calls run on the operator's key (e.g. internal/onboarding tasks)
|
||||
# should override this to return false. When false, the wrapper neither
|
||||
# blocks the call on an exhausted captain_responses quota nor decrements
|
||||
# it on success — the call participates in the quota system in neither
|
||||
# direction.
|
||||
# whose calls should not consume captain_responses should override this to
|
||||
# return false. When false, the wrapper neither blocks the call on an
|
||||
# exhausted captain_responses quota nor decrements it on success — the call
|
||||
# participates in the quota system in neither direction.
|
||||
def counts_toward_usage?
|
||||
true
|
||||
llm_credential&.dig(:source) != :hook
|
||||
end
|
||||
|
||||
def api_key_configured?
|
||||
@@ -168,7 +167,15 @@ class Captain::BaseTaskService
|
||||
end
|
||||
|
||||
def llm_credential
|
||||
@llm_credential ||= hook_llm_credential || system_llm_credential
|
||||
@llm_credential ||= if use_account_openai_hook?
|
||||
hook_llm_credential || system_llm_credential
|
||||
else
|
||||
system_llm_credential
|
||||
end
|
||||
end
|
||||
|
||||
def use_account_openai_hook?
|
||||
false
|
||||
end
|
||||
|
||||
def hook_llm_credential
|
||||
|
||||
@@ -63,4 +63,8 @@ class Captain::CsatUtilityAnalysisService < Captain::BaseTaskService
|
||||
def event_name
|
||||
'csat_utility_analysis'
|
||||
end
|
||||
|
||||
def use_account_openai_hook?
|
||||
true
|
||||
end
|
||||
end
|
||||
|
||||
@@ -103,4 +103,8 @@ class Captain::FollowUpService < Captain::BaseTaskService
|
||||
def event_name
|
||||
'follow_up'
|
||||
end
|
||||
|
||||
def use_account_openai_hook?
|
||||
true
|
||||
end
|
||||
end
|
||||
|
||||
@@ -87,6 +87,10 @@ class Captain::LabelSuggestionService < Captain::BaseTaskService
|
||||
'label_suggestion'
|
||||
end
|
||||
|
||||
def use_account_openai_hook?
|
||||
true
|
||||
end
|
||||
|
||||
def build_follow_up_context?
|
||||
false
|
||||
end
|
||||
|
||||
@@ -37,6 +37,10 @@ class Captain::ReplySuggestionService < Captain::BaseTaskService
|
||||
def event_name
|
||||
'reply_suggestion'
|
||||
end
|
||||
|
||||
def use_account_openai_hook?
|
||||
true
|
||||
end
|
||||
end
|
||||
|
||||
Captain::ReplySuggestionService.prepend_mod_with('Captain::ReplySuggestionService')
|
||||
|
||||
@@ -56,4 +56,8 @@ class Captain::RewriteService < Captain::BaseTaskService
|
||||
def event_name
|
||||
operation
|
||||
end
|
||||
|
||||
def use_account_openai_hook?
|
||||
true
|
||||
end
|
||||
end
|
||||
|
||||
@@ -24,4 +24,8 @@ class Captain::SummaryService < Captain::BaseTaskService
|
||||
def event_name
|
||||
'summarize'
|
||||
end
|
||||
|
||||
def use_account_openai_hook?
|
||||
true
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user