Merge pull request #190 from premAI-io/hotfix/stream-only-chat

keeping stream version of chat
bit-gpt · Jun 27, 2023 · 7945fd6 · 7945fd6
2 parents 0a7c690 + 0a5f8a1
commit 7945fd6
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 172 deletions.
diff --git a/src/modules/prem-chat/components/PremChat.tsx b/src/modules/prem-chat/components/PremChat.tsx
@@ -28,14 +28,7 @@ function PremChat() {
     );
   }
 
-  return (
-    <PremChatContainer
-      chatId={chatId}
-      serviceName={service?.name!}
-      serviceId={serviceId!}
-      isStreaming={service?.modelInfo.streaming!}
-    />
-  );
+  return <PremChatContainer chatId={chatId} serviceName={service?.name!} serviceId={serviceId!} />;
 }
 
 export default PremChat;
diff --git a/src/modules/prem-chat/components/PremChatContainer.tsx b/src/modules/prem-chat/components/PremChatContainer.tsx
@@ -1,7 +1,6 @@
 import { useEffect, useRef, useState } from "react";
 import UserReply from "shared/components/UserReply";
 import BotReply from "shared/components/BotReply";
-import usePremChat from "shared/hooks/usePremChat";
 import InputBox from "./InputBox";
 import PremChatSidebar from "./PremChatSidebar";
 import RegenerateButton from "./RegenerateButton";
@@ -11,13 +10,9 @@ import { Message, PremChatContainerProps } from "../types";
 import clsx from "clsx";
 import { useMediaQuery, useWindowSize } from "usehooks-ts";
 import useBodyLock from "shared/hooks/useBodyLock";
+import usePremChatStream from "shared/hooks/usePremChatStream";
 
-const PremChatContainer = ({
-  chatId,
-  isStreaming,
-  serviceId,
-  serviceName,
-}: PremChatContainerProps) => {
+const PremChatContainer = ({ chatId, serviceId, serviceName }: PremChatContainerProps) => {
   const model = serviceId;
   const [rightSidebar, setRightSidebar] = useState(false);
   const [hamburgerMenuOpen, setHamburgerMenu] = useState<boolean>(true);
@@ -27,7 +22,7 @@ const PremChatContainer = ({
   const responsiveMatches = useMediaQuery("(min-width: 768px)");
 
   const { chatMessages, onSubmit, question, setQuestion, isLoading, isError, onRegenerate } =
-    usePremChat(isStreaming, serviceId!, chatId || null);
+    usePremChatStream(serviceId, chatId || null);
 
   const { bodyLocked, setBodyLocked } = useBodyLock();
   const hamburgerMenuToggle = () => {

diff --git a/src/modules/prem-chat/types.ts b/src/modules/prem-chat/types.ts
@@ -54,7 +54,6 @@ export type HamburgerMenuProps = {
 
 export type PremChatContainerProps = {
   chatId: string | undefined;
-  isStreaming: boolean;
   serviceId: string;
   serviceName: string;
 };
diff --git a/src/shared/hooks/usePremChat.ts b/src/shared/hooks/usePremChat.ts
diff --git a/src/shared/hooks/usePremChatStream.ts b/src/shared/hooks/usePremChatStream.ts
@@ -70,7 +70,7 @@ const usePremChatStream = (serviceId: string, chatId: string | null): PremChatRe
     backendUrl.port = `${service?.runningPort!}`;
 
     try {
-      fetchEventSource(`${backendUrl}api/v1/chat/completions`, {
+      fetchEventSource(`${backendUrl}v1/chat/completions`, {
         method: "POST",
         openWhenHidden: true,
         headers: {

diff --git a/src/shared/hooks/usePremChatWithoutStream.ts b/src/shared/hooks/usePremChatWithoutStream.ts