diff --git a/ee/app/models/ai/ai_resource/epic.rb b/ee/app/models/ai/ai_resource/epic.rb index 62fa47f2ef277764db80ef66e22070e149662daf..cdb4a53d66c128b738dffdb79fb962e213ba5a21 100644 --- a/ee/app/models/ai/ai_resource/epic.rb +++ b/ee/app/models/ai/ai_resource/epic.rb @@ -16,13 +16,6 @@ def serialize_for_ai(user:, content_limit:) end def current_page_sentence - unless Feature.enabled?(:ai_prompt_current_page_skip_reader) - return <<~SENTENCE - The user is currently on a page that shows an epic which has a description, comments, etc. Which the user might reference for example as "current", "this" or "that". - Here is additional data in <resource></resource> tags about the resource the user is working with: - SENTENCE - end - <<~SENTENCE The user is currently on a page that displays an epic with a description, comments, etc., which the user might refer to, for example, as 'current', 'this' or 'that'. The data is provided in <resource></resource> tags, and if it is sufficient in answering the question, utilize it instead of using the 'EpicReader' tool. SENTENCE diff --git a/ee/app/models/ai/ai_resource/issue.rb b/ee/app/models/ai/ai_resource/issue.rb index da141367a11248f1503834da5495ddb758f95c7d..91828bf17279ac5b2daa77fd340889d72bec87f4 100644 --- a/ee/app/models/ai/ai_resource/issue.rb +++ b/ee/app/models/ai/ai_resource/issue.rb @@ -16,13 +16,6 @@ def serialize_for_ai(user:, content_limit:) end def current_page_sentence - unless Feature.enabled?(:ai_prompt_current_page_skip_reader) - return <<~SENTENCE - The user is currently on a page that shows an issue which has a description, comments, etc. Which the user might reference for example as "current", "this" or "that". - Here is additional data in <resource></resource> tags about the resource the user is working with: - SENTENCE - end - <<~SENTENCE The user is currently on a page that displays an issue with a description, comments, etc., which the user might refer to, for example, as 'current', 'this' or 'that'. The data is provided in <resource></resource> tags, and if it is sufficient in answering the question, utilize it instead of using the 'IssueReader' tool. SENTENCE diff --git a/ee/config/feature_flags/gitlab_com_derisk/ai_prompt_current_page_skip_reader.yml b/ee/config/feature_flags/gitlab_com_derisk/ai_prompt_current_page_skip_reader.yml deleted file mode 100644 index 5da27736e6a7dfcaeefeb4d24d490ea1936338e2..0000000000000000000000000000000000000000 --- a/ee/config/feature_flags/gitlab_com_derisk/ai_prompt_current_page_skip_reader.yml +++ /dev/null @@ -1,9 +0,0 @@ ---- -name: ai_prompt_current_page_skip_reader -feature_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/450915 -introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/147474 -rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/451084 -milestone: '16.10' -group: group::duo chat -type: gitlab_com_derisk -default_enabled: false diff --git a/ee/spec/models/ai/ai_resource/epic_spec.rb b/ee/spec/models/ai/ai_resource/epic_spec.rb index 2392f46a800e9f495116e8a034777357b23a2eec..19df9b16ba2fca93246cfe6bfd7f32544bbcb96c 100644 --- a/ee/spec/models/ai/ai_resource/epic_spec.rb +++ b/ee/spec/models/ai/ai_resource/epic_spec.rb @@ -27,13 +27,5 @@ it 'returns prompt' do expect(wrapped_epic.current_page_sentence).to include("utilize it instead of using the 'EpicReader' tool") end - - context 'when ai_prompt_current_page_skip_reader is off' do - it 'returns older prompt' do - stub_feature_flags(ai_prompt_current_page_skip_reader: false) - - expect(wrapped_epic.current_page_sentence).to include('Here is additional data in <resource></resource> tags') - end - end end end diff --git a/ee/spec/models/ai/ai_resource/issue_spec.rb b/ee/spec/models/ai/ai_resource/issue_spec.rb index c4e2fbb450c8335600c206f9461609d6af64999a..5ffb07feea152d2441858a83bb47391fc6bf8bb0 100644 --- a/ee/spec/models/ai/ai_resource/issue_spec.rb +++ b/ee/spec/models/ai/ai_resource/issue_spec.rb @@ -26,13 +26,5 @@ it 'returns prompt' do expect(wrapped_issue.current_page_sentence).to include("utilize it instead of using the 'IssueReader' tool") end - - context 'when ai_prompt_current_page_skip_reader is off' do - it 'returns older prompt' do - stub_feature_flags(ai_prompt_current_page_skip_reader: false) - - expect(wrapped_issue.current_page_sentence).to include('Here is additional data in <resource></resource>') - end - end end end