refactor: do not pass request data

run-llama · Aug 5, 2024 · c259716 · c259716
1 parent f971182
commit c259716
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/templates/types/streaming/nextjs/app/components/ui/chat/chat-input.tsx b/templates/types/streaming/nextjs/app/components/ui/chat/chat-input.tsx
@@ -116,10 +116,7 @@ export default function ChatInput(
           }}
         />
         {process.env.NEXT_PUBLIC_USE_LLAMACLOUD === "true" && (
-          <LlamaCloudSelector
-            requestData={requestData}
-            setRequestData={setRequestData}
-          />
+          <LlamaCloudSelector setRequestData={setRequestData} />
         )}
         <Button type="submit" disabled={props.isLoading || !props.input.trim()}>
           Send message

diff --git a/templates/types/streaming/nextjs/app/components/ui/chat/widgets/LlamaCloudSelector.tsx b/templates/types/streaming/nextjs/app/components/ui/chat/widgets/LlamaCloudSelector.tsx
@@ -28,15 +28,14 @@ export type PipelineConfig = {
 
 export type LlamaCloudConfig = {
   projects?: LLamaCloudProject[];
+  pipeline?: PipelineConfig;
 };
 
 export interface LlamaCloudSelectorProps {
-  requestData: any;
-  setRequestData: (requestData: any) => void;
+  setRequestData: React.Dispatch<any>;
 }
 
 export function LlamaCloudSelector({
-  requestData,
   setRequestData,
 }: LlamaCloudSelectorProps) {
   const { backend } = useClientConfig();
@@ -49,30 +48,34 @@ export function LlamaCloudSelector({
         .then((data) => {
           setConfig(data);
           setRequestData({
-            ...requestData,
             llamaCloudPipeline: data.pipeline,
           });
         })
         .catch((error) => console.error("Error fetching config", error));
     }
-  }, [backend, config, requestData, setRequestData]);
+  }, [backend, config, setRequestData]);
 
   const setPipeline = (pipelineConfig?: PipelineConfig) => {
-    setRequestData({
-      ...requestData,
-      llamaCloudPipeline: pipelineConfig,
+    setConfig((prevConfig) => ({
+      ...prevConfig,
+      pipeline: pipelineConfig,
+    }));
+    setRequestData((prevData: any) => {
+      if (!prevData) return { llamaCloudPipeline: pipelineConfig };
+      return {
+        ...prevData,
+        llamaCloudPipeline: pipelineConfig,
+      };
     });
   };
 
-  const projects = config?.projects;
+  const { projects, pipeline } = config ?? {};
   if (!projects?.length) return null;
 
   const handlePipelineSelect = async (value: string) => {
     setPipeline(JSON.parse(value) as PipelineConfig);
   };
 
-  const pipeline = requestData?.llamaCloudPipeline;
-
   return (
     <Select
       onValueChange={handlePipelineSelect}