-
-
Notifications
You must be signed in to change notification settings - Fork 4.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: modify body with ai & feedback on ai requests `hoppscotch-commo…
…n` bindings (#4386) Co-authored-by: jamesgeorge007 <[email protected]>
- Loading branch information
1 parent
5e9f874
commit 0b5a424
Showing
13 changed files
with
791 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
82 changes: 82 additions & 0 deletions
82
packages/hoppscotch-common/src/components/aiexperiments/MergeView.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| <script setup lang="ts"> | ||
| import { jsonLanguage } from "@codemirror/lang-json" | ||
| import { MergeView } from "@codemirror/merge" | ||
| import { onUnmounted, ref, watch } from "vue" | ||
| import { basicSetup, baseTheme } from "@helpers/editor/themes/baseTheme" | ||
| import { EditorState } from "@codemirror/state" | ||
| type MergeViewContent = { | ||
| content: string | ||
| langMime: string | ||
| } | ||
| const props = defineProps<{ | ||
| contentLeft: MergeViewContent | ||
| contentRight: MergeViewContent | ||
| }>() | ||
| const diffEditor = ref<Element | null>(null) | ||
| let mergeView: MergeView | null = null | ||
| watch( | ||
| () => props.contentRight, | ||
| () => { | ||
| if (!mergeView) { | ||
| return | ||
| } | ||
| if (!props.contentRight.content) { | ||
| return | ||
| } | ||
| mergeView.b.dispatch({ | ||
| changes: { | ||
| from: 0, | ||
| to: mergeView.b.state.doc.length, | ||
| insert: props.contentRight.content, | ||
| }, | ||
| }) | ||
| } | ||
| ) | ||
| watch( | ||
| diffEditor, | ||
| () => { | ||
| if (!diffEditor.value) { | ||
| return | ||
| } | ||
| mergeView = new MergeView({ | ||
| a: { | ||
| doc: props.contentLeft.content, | ||
| extensions: [ | ||
| jsonLanguage, | ||
| basicSetup, | ||
| baseTheme, | ||
| EditorState.readOnly.of(true), | ||
| ], | ||
| }, | ||
| b: { | ||
| doc: props.contentRight.content, | ||
| extensions: [jsonLanguage, baseTheme, basicSetup], | ||
| }, | ||
| // @ts-expect-error attribute mismatch | ||
| parent: diffEditor.value, | ||
| highlightChanges: false, | ||
| }) | ||
| }, | ||
| { | ||
| immediate: true, | ||
| } | ||
| ) | ||
| onUnmounted(() => { | ||
| if (mergeView) { | ||
| mergeView.destroy() | ||
| } | ||
| }) | ||
| </script> | ||
|
|
||
| <template> | ||
| <div ref="diffEditor"></div> | ||
| </template> |
140 changes: 140 additions & 0 deletions
140
packages/hoppscotch-common/src/components/aiexperiments/ModifyBodyModal.vue
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,140 @@ | ||
| <script setup lang="ts"> | ||
| import IconArrowRight from "~icons/lucide/arrow-right" | ||
| import IconThumbsUp from "~icons/lucide/thumbs-up" | ||
| import IconThumbsDown from "~icons/lucide/thumbs-down" | ||
| import { | ||
| useModifyRequestBody, | ||
| useSubmitFeedback, | ||
| } from "~/composables/ai-experiments" | ||
| import { ref } from "vue" | ||
| import { useI18n } from "~/composables/i18n" | ||
| const t = useI18n() | ||
| const props = defineProps<{ | ||
| currentBody: string | ||
| }>() | ||
| const emit = defineEmits<{ | ||
| (e: "closeModal"): void | ||
| (e: "updateBody", body: string): void | ||
| }>() | ||
| const generatedBodyContent = ref("") | ||
| const userPrompt = ref("") | ||
| const { modifyRequestBody, isModifyRequestBodyPending, lastTraceID } = | ||
| useModifyRequestBody(props.currentBody, userPrompt, generatedBodyContent) | ||
| const submittedFeedback = ref(false) | ||
| const { submitFeedback, isSubmitFeedbackPending } = useSubmitFeedback() | ||
| </script> | ||
|
|
||
| <template> | ||
| <HoppSmartModal styles="sm:max-w-3xl" full-width> | ||
| <template #body> | ||
| <div class="flex flex-col border-b border-divider transition relative"> | ||
| <div class="flex items-center pt-3 pb-3 sticky"> | ||
| <input | ||
| id="command" | ||
| v-model="userPrompt" | ||
| v-focus | ||
| type="text" | ||
| autocomplete="off" | ||
| name="command" | ||
| :placeholder="`${t( | ||
| 'ai_experiments.generate_or_modify_request_body_input_placeholder' | ||
| )}`" | ||
| class="flex flex-1 bg-transparent px-6 text-base text-secondaryDark" | ||
| /> | ||
|
|
||
| <HoppButtonSecondary | ||
| :icon="IconArrowRight" | ||
| class="mr-6 rounded-md" | ||
| outline | ||
| filled | ||
| :loading="isModifyRequestBodyPending" | ||
| :disabled="!userPrompt || isModifyRequestBodyPending" | ||
| @click="modifyRequestBody" | ||
| /> | ||
| </div> | ||
|
|
||
| <div> | ||
| <AiexperimentsMergeView | ||
| :content-left="{ | ||
| content: currentBody ?? '', | ||
| langMime: 'application/json', | ||
| }" | ||
| :content-right="{ | ||
| content: generatedBodyContent, | ||
| langMime: 'application/json', | ||
| }" | ||
| ></AiexperimentsMergeView> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <template #footer> | ||
| <div class="flex gap-1 px-6 py-3 justify-between items-center w-full"> | ||
| <div | ||
| v-if="lastTraceID && !submittedFeedback" | ||
| class="flex items-center gap-2" | ||
| > | ||
| <p>{{ t("ai_experiments.feedback_cta_text_long") }}</p> | ||
| <template v-if="!isSubmitFeedbackPending"> | ||
| <HoppButtonSecondary | ||
| :icon="IconThumbsUp" | ||
| outline | ||
| @click=" | ||
| async () => { | ||
| if (lastTraceID) { | ||
| await submitFeedback('positive', lastTraceID) | ||
| submittedFeedback = true | ||
| } | ||
| } | ||
| " | ||
| /> | ||
|
|
||
| <HoppButtonSecondary | ||
| :icon="IconThumbsDown" | ||
| outline | ||
| @click="submitFeedback('negative', lastTraceID)" | ||
| /> | ||
| </template> | ||
|
|
||
| <HoppSmartSpinner v-else /> | ||
| </div> | ||
|
|
||
| <div v-if="submittedFeedback"> | ||
| <p>{{ t("ai_experiments.feedback_thank_you") }}</p> | ||
| </div> | ||
|
|
||
| <div class="ml-auto space-x-2"> | ||
| <HoppButtonSecondary | ||
| :label="t('action.cancel')" | ||
| outline | ||
| @click=" | ||
| () => { | ||
| emit('closeModal') | ||
| } | ||
| " | ||
| /> | ||
| <HoppButtonSecondary | ||
| :label="t('ai_experiments.accept_change')" | ||
| outline | ||
| filled | ||
| :disabled="isModifyRequestBodyPending || !generatedBodyContent" | ||
| @click=" | ||
| () => { | ||
| emit('updateBody', generatedBodyContent) | ||
| emit('closeModal') | ||
| } | ||
| " | ||
| /> | ||
| </div> | ||
| </div> | ||
| </template> | ||
| </HoppSmartModal> | ||
| </template> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.