Revert "feature: default search and ai questions sends images"

This reverts commit d107c1f.

Author: cdxker

clients/search-component/example/src/routes/ecommerce.tsx

@@ -25,7 +25,7 @@ export default function ECommerce() {
     import.meta.env.VITE_SHOW_FLOATING_SEARCH_ICON == "true";
   const showFloatingInput = import.meta.env.VITE_SHOW_FLOATING_INPUT == "true";
   const usePagefind = import.meta.env.VITE_USE_PAGEFIND == "true";
-  const defaultSearchQueries: any= (
+  const defaultSearchQueries: string[] = (
     import.meta.env.VITE_DEFAULT_SEARCH_QUERIES ?? ""
   ).split(",");
   const defaultTags: any[] = JSON.parse(

clients/search-component/package.json

@@ -87,7 +87,7 @@
     "react-two-thumb-input-range": "^1.0.7",
     "remark-gfm": "^4.0.1",
     "tailwind-merge": "^3.0.2",
-    "trieve-ts-sdk": "*"
+    "trieve-ts-sdk": "^0.0.110"
   },
   "peerDependencies": {
     "react": "^18.3.1 || ^19.0.0-rc",

clients/search-component/src/TrieveModal/Chat/SuggestedQuestions.tsx

@@ -1,17 +1,15 @@
-import React, { useEffect, useState } from "react";
+import React from "react";
 import { useSuggestedQuestions } from "../../utils/hooks/useSuggestedQuestions";
 import { useChatState } from "../../utils/hooks/chat-context";
 import {
   AiQuestion,
   isAiQuestion,
-  isDefaultSearchQuery,
   useModalState,
 } from "../../utils/hooks/modal-context";
 import { cn } from "../../utils/styles";
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { ArrowRotateRightIcon, SparklesIcon } from "../icons";
 import { AIInitialMessage } from "./AIInitalMessage";
-import { DefaultSearchQuery } from "trieve-ts-sdk";
 
 export const SuggestedQuestions = ({
   onMessageSend,
@@ -22,44 +20,21 @@ export const SuggestedQuestions = ({
   const { suggestedQuestions, isLoadingSuggestedQueries, getQuestions } =
     useSuggestedQuestions();
 
-  const { props, trieveSDK, fingerprint, abTreatment, imageUrl, setImageUrl } =
-    useModalState();
+  const { props, trieveSDK, fingerprint, abTreatment } = useModalState();
   const [parent] = useAutoAnimate({ duration: 100 });
-  const [selectedQuestion, setSelectedQuestion] = useState<
-    AiQuestion | DefaultSearchQuery | null
-  >(null);
-
-  useEffect(() => {
-    if (selectedQuestion && imageUrl) {
-      askQuestion(
-        isAiQuestion(selectedQuestion)
-          ? selectedQuestion.questionText
-          : (selectedQuestion.query as string),
-        undefined,
-        isAiQuestion(selectedQuestion)
-          ? (selectedQuestion.products?.map((p) => p.groupId) ?? [])
-          : undefined,
-        isAiQuestion(selectedQuestion) && selectedQuestion.promptForAI !== ""
-          ? selectedQuestion.promptForAI
-          : undefined,
-      );
-    }
-  }, [imageUrl, selectedQuestion]);
 
   if (messages.length) {
     return null;
   }
 
-  const handleSuggestedQuestion = async (
-    q: AiQuestion | DefaultSearchQuery,
-  ) => {
-    console.log("q", q);
-    setCurrentQuestion(isAiQuestion(q) ? q.questionText : (q.query ?? ""));
-
-    if (isDefaultSearchQuery(q) && q.imageUrl) {
-      setSelectedQuestion(q);
-      setImageUrl(q.imageUrl);
-    }
+  const handleSuggestedQuestion = async (q: string | AiQuestion) => {
+    setCurrentQuestion(isAiQuestion(q) ? q.questionText : q);
+    askQuestion(
+      isAiQuestion(q) ? q.questionText : q,
+      undefined,
+      isAiQuestion(q) ? (q.products?.map((p) => p.groupId) ?? []) : undefined,
+      isAiQuestion(q) && q.promptForAI !== "" ? q.promptForAI : undefined,
+    );
 
     const requestId =
       messages[messages.length - 1]?.queryId ??
@@ -71,7 +46,7 @@ export const SuggestedQuestions = ({
       user_id: fingerprint,
       location: window.location.href,
       metadata: {
-        followup_query: isAiQuestion(q) ? q.questionText : q.query,
+        followup_query: q,
         component_props: props,
         ab_treatment: abTreatment,
       },
@@ -83,7 +58,6 @@ export const SuggestedQuestions = ({
     });
     if (onMessageSend) {
       onMessageSend();
-      setImageUrl("");
     }
   };
 
@@ -126,13 +100,13 @@ export const SuggestedQuestions = ({
               onClick={() => {
                 handleSuggestedQuestion(q);
               }}
-              key={isAiQuestion(q) ? q.questionText : q.query}
+              key={isAiQuestion(q) ? q.questionText : q}
               className={`suggested-question tv-flex tv-gap-1 tv-items-center${
                 isLoadingSuggestedQueries ? " loading" : ""
               }`}
             >
               <SparklesIcon fill="none" width={15} height={15} />
-              {isAiQuestion(q) ? q.questionText : q.query}
+              {isAiQuestion(q) ? q.questionText : q}
             </button>
           ))}
         </div>

clients/search-component/src/TrieveModal/Search/SuggestedQueries.tsx

@@ -1,15 +1,14 @@
 import React, { useCallback, useEffect, useState } from "react";
 import { cn } from "../../utils/styles";
 import { useModalState } from "../../utils/hooks/modal-context";
-import { DefaultSearchQuery } from "trieve-ts-sdk";
+import { SuggestedQueriesResponse } from "trieve-ts-sdk";
 import { getSuggestedQueries } from "../../utils/trieve";
 
 export const SuggestedQueries = () => {
-  const { props, query, setQuery, imageUrl, setImageUrl, trieveSDK } =
-    useModalState();
+  const { props, query, setQuery, imageUrl, trieveSDK } = useModalState();
   const [isLoading, setIsLoading] = useState(false);
   const [suggestedQueries, setSuggestedQueries] = useState<
-    DefaultSearchQuery[]
+    SuggestedQueriesResponse["queries"]
   >([]);
 
   const getQueries = useCallback(
@@ -28,17 +27,12 @@ export const SuggestedQueries = () => {
     [query],
   );
 
-  const handleSendSuggestedQuery = (q: DefaultSearchQuery) => {
-    setQuery(q.query ?? "");
-
-    if (q.imageUrl) {
-      setImageUrl(q.imageUrl);
-    }
-  };
-
   useEffect(() => {
-    if (props.defaultSearchQueries?.length) {
-      setSuggestedQueries(props.defaultSearchQueries);
+    const defaultQueries =
+      props.defaultSearchQueries?.filter((q) => q !== "") ?? [];
+
+    if (defaultQueries.length) {
+      setSuggestedQueries(defaultQueries);
       return;
     }
 
@@ -70,15 +64,15 @@ export const SuggestedQueries = () => {
         <div className="suggested-query loading">Loading...</div>
       ) : (
         suggestedQueries.map((q) => {
-          let query = q.query?.replace(/^-|\*$/g, "") ?? "";
-          query = query.trim();
+          q = q.replace(/^-|\*$/g, "");
+          q = q.trim();
           return (
             <button
-              onClick={() => handleSendSuggestedQuery(q)}
-              key={query}
+              onClick={() => setQuery(q)}
+              key={q}
               className={`suggested-query${isLoading ? " loading" : ""}`}
             >
-              {query}
+              {q}
             </button>
           );
         })

clients/search-component/src/TrieveModal/index.tsx

@@ -21,16 +21,8 @@ import { createPortal } from "react-dom";
 
 const Modal = () => {
   useKeyboardNavigation();
-  const {
-    open,
-    setOpen,
-    setMode,
-    setImageUrl,
-    setQuery,
-    props,
-    display,
-    abTreatment,
-  } = useModalState();
+  const { open, setOpen, setMode, setQuery, props, display, abTreatment } =
+    useModalState();
   const { askQuestion, chatWithGroup, cancelGroupChat, clearConversation } =
     useChatState();
 
@@ -175,7 +167,6 @@ const Modal = () => {
     try {
       const customEvent = e as CustomEvent<{
         text: string;
-        imageUrl?: string;
       }>;
 
       const defaultMode = props.defaultSearchMode || "search";
@@ -185,12 +176,11 @@ const Modal = () => {
         setOpen(true);
         setMode("chat");
         cancelGroupChat();
-        setImageUrl(customEvent.detail.imageUrl ?? "");
+
         askQuestion(customEvent.detail.text);
       } else {
         setOpen(true);
         setMode("search");
-        setImageUrl(customEvent.detail.imageUrl ?? "");
         setQuery(customEvent.detail.text);
       }
     } catch (e) {

clients/search-component/src/utils/hooks/modal-context.tsx

@@ -12,7 +12,6 @@ import {
   ChunkGroup,
   SearchChunksReqPayload,
   TrieveSDK,
-  DefaultSearchQuery,
 } from "trieve-ts-sdk";
 import {
   groupSearchWithPagefind,
@@ -126,6 +125,7 @@ export interface SearchPageProps {
   filterSidebarProps?: FilterSidebarProps;
   display?: boolean;
 }
+
 export interface AiQuestion {
   questionText: string;
   promptForAI?: string;
@@ -136,18 +136,11 @@ export interface AiQuestion {
 }
 
 export function isAiQuestion(
-  question: string | AiQuestion | DefaultSearchQuery,
+  question: string | AiQuestion,
 ): question is AiQuestion {
   return typeof question === "object" && "questionText" in question;
 }
 
-export function isDefaultSearchQuery(
-  question: string | AiQuestion | DefaultSearchQuery,
-): question is DefaultSearchQuery {
-  return typeof question === "object" && "query" in question;
-}
-
-
 export type ModalProps = {
   datasetId: string;
   apiKey: string;
@@ -170,8 +163,8 @@ export type ModalProps = {
   allowRefreshSuggestedQueries?: boolean;
   followupQuestions?: boolean;
   numberOfSuggestions?: number;
-  defaultSearchQueries?: DefaultSearchQuery[];
-  defaultAiQuestions?: AiQuestion[] | DefaultSearchQuery[];
+  defaultSearchQueries?: string[];
+  defaultAiQuestions?: string[] | AiQuestion[];
   brandLogoImgSrcUrl?: string;
   brandName?: string;
   problemLink?: string;

clients/search-component/src/utils/hooks/useFollowupQuestions.ts

@@ -48,7 +48,7 @@ export const useFollowupQuestions = () => {
     setSuggestedQuestions((prev) => ({
       ...prev,
       [prevMessage.text]: queries.queries.map((q) => {
-        return q.query?.replace(/^[\d.-]+\s*/, "").trim() ?? "";
+        return q.replace(/^[\d.-]+\s*/, "").trim();
       }),
     }));
     setIsLoadingSuggestedQueries(false);

clients/search-component/src/utils/hooks/useSuggestedQuestions.ts

@@ -1,15 +1,14 @@
 import { useEffect, useState } from "react";
 import { getSuggestedQuestions } from "../trieve";
 import { ModalProps, useModalState } from "./modal-context";
-import { DefaultSearchQuery } from "trieve-ts-sdk";
 
 export const useSuggestedQuestions = () => {
   const { props, query, trieveSDK, currentGroup } = useModalState();
   const [isLoadingSuggestedQueries, setIsLoadingSuggestedQueries] =
     useState(false);
 
   const [suggestedQuestions, setSuggestedQuestions] = useState<
-    ModalProps["defaultAiQuestions"] | DefaultSearchQuery[]
+    ModalProps["defaultAiQuestions"]
   >(props.defaultAiQuestions ?? []);
 
   const getQuestions = async () => {
@@ -23,7 +22,11 @@ export const useSuggestedQuestions = () => {
       query,
       props,
     });
-    setSuggestedQuestions(queries.queries);
+    setSuggestedQuestions(
+      queries.queries.map((q) => {
+        return q.replace(/^[\d.-]+\s*/, "").trim();
+      }),
+    );
     setIsLoadingSuggestedQueries(false);
   };
 
@@ -47,7 +50,11 @@ export const useSuggestedQuestions = () => {
           : currentGroup?.tracking_id,
         props,
       });
-      setSuggestedQuestions(queries.queries);
+      setSuggestedQuestions(
+        queries.queries.map((q) => {
+          return q.replace(/^[\d.-]+\s*/, "").trim();
+        }),
+      );
       setIsLoadingSuggestedQueries(false);
     });
 

clients/ts-sdk/openapi.json

@@ -12311,19 +12311,6 @@
           "lte": "2021-01-01 00:00:00.000"
         }
       },
-      "DefaultSearchQuery": {
-        "type": "object",
-        "properties": {
-          "imageUrl": {
-            "type": "string",
-            "nullable": true
-          },
-          "query": {
-            "type": "string",
-            "nullable": true
-          }
-        }
-      },
       "DeleteTopicData": {
         "type": "object",
         "required": [
@@ -16448,7 +16435,7 @@
           "defaultAiQuestions": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/DefaultSearchQuery"
+              "type": "string"
             },
             "nullable": true
           },
@@ -16467,7 +16454,7 @@
           "defaultSearchQueries": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/DefaultSearchQuery"
+              "type": "string"
             },
             "nullable": true
           },
@@ -22031,7 +22018,7 @@
           "queries": {
             "type": "array",
             "items": {
-              "$ref": "#/components/schemas/DefaultSearchQuery"
+              "type": "string"
             }
           }
         }