refactor: remove all unnecessary any type guard

Signed-off-by: teobler <[email protected]>

Author: teobler

packages/click-prompt-button/src/ClickPromptButton.tsx

@@ -5,14 +5,15 @@ import { ClickPromptSmall } from "@/CustomIcon";
 import { ButtonSize, StyledPromptButton } from "@/SharedButton";
 import { LoggingDrawer } from "@/LoggingDrawer";
 import { ClickPromptBird } from "@/ClickPromptBird";
-import { SharedApi } from "@/types/shared";
+import type { Response, SharedApi } from "@/types/shared";
 
 interface ClickPromptButtonProps extends SharedApi {
   loading?: boolean;
   onClick?: MouseEventHandler;
   size?: ButtonSize;
   text: string;
   children?: React.ReactNode;
+  loginApi: () => Promise<Response>;
 }
 
 export function ClickPromptButton({
@@ -29,12 +30,13 @@ export function ClickPromptButton({
   deleteAllConversationsApi,
   sendMsgWithStreamResApi,
   logoutApi,
+  loginApi,
 }: ClickPromptButtonProps) {
   const [isLoading, setIsLoading] = useState(loading);
   const [isLoggedIn, setIsLoggedIn] = useState(false);
   const { isOpen, onOpen, onClose } = useDisclosure();
 
-  const handleClick = async (event: any) => {
+  const handleClick = async (event: React.MouseEvent) => {
     setIsLoading(true);
     const isLoggedIn = await isLoggedInApi();
     setIsLoggedIn(isLoggedIn);
@@ -90,6 +92,7 @@ export function ClickPromptButton({
         deleteAllConversationsApi,
         sendMsgWithStreamResApi,
         logoutApi,
+        loginApi,
       })}
     </Box>
   );

packages/click-prompt-button/src/ExecutePromptButton.tsx

@@ -4,15 +4,16 @@ import { BeatLoader } from "react-spinners";
 import { StyledPromptButton } from "@/SharedButton";
 import { LoggingDrawer } from "@/LoggingDrawer";
 import { ClickPromptBird } from "@/ClickPromptBird";
-import { SharedApi } from "@/types/shared";
+import type { Response, SharedApi } from "@/types/shared";
 
 interface ExecButtonProps extends SharedApi {
   loading?: boolean;
   text: string;
   children?: React.ReactNode;
-  handleResponse?: (response: any) => void;
+  handleResponse?: (response: ReadableStream<Uint8Array> | null) => void;
   conversationId?: number;
   updateConversationId?: (conversationId: number) => void;
+  loginApi: () => Promise<Response>;
 }
 
 export const ExecutePromptButton = ({
@@ -30,6 +31,7 @@ export const ExecutePromptButton = ({
   deleteAllConversationsApi,
   sendMsgWithStreamResApi,
   logoutApi,
+  loginApi,
 }: ExecButtonProps) => {
   const [isLoading, setIsLoading] = useState(loading);
   const { isOpen, onOpen, onClose } = useDisclosure();
@@ -62,9 +64,9 @@ export const ExecutePromptButton = ({
     }
 
     if (newConversationId) {
-      const response: any = await sendMsgWithStreamResApi(newConversationId, text);
+      const response = await sendMsgWithStreamResApi(newConversationId, text);
       if (response && handleResponse) {
-        handleResponse(response as any);
+        handleResponse(response);
       }
     }
 
@@ -113,6 +115,7 @@ export const ExecutePromptButton = ({
           deleteAllConversationsApi,
           sendMsgWithStreamResApi,
           logoutApi,
+          loginApi,
         })}
     </>
   );

packages/click-prompt-button/src/LoggingDrawer.tsx

@@ -1,14 +1,15 @@
 import { Drawer, DrawerBody, DrawerCloseButton, DrawerContent, DrawerOverlay } from "@chakra-ui/react";
 import { ChatGPTApp } from "@/chatgpt/ChatGPTApp";
 import React from "react";
-import { SharedApi } from "@/types/shared";
+import type { Response, SharedApi } from "@/types/shared";
 
 interface LoggingDrawerProps extends Omit<SharedApi, "isLoggedInApi"> {
   isOpen: boolean;
   handleClose: () => void;
   isLoggedIn: boolean;
   updateStatus?: (loggedIn: boolean) => void;
   initMessage: string;
+  loginApi: () => Promise<Response>;
 }
 
 export function LoggingDrawer({
@@ -24,6 +25,7 @@ export function LoggingDrawer({
   deleteAllConversationsApi,
   sendMsgWithStreamResApi,
   logoutApi,
+  loginApi,
 }: LoggingDrawerProps) {
   return (
     <Drawer isOpen={isOpen} placement="right" onClose={handleClose} size={"2xl"}>
@@ -43,6 +45,7 @@ export function LoggingDrawer({
               deleteAllConversationsApi={deleteAllConversationsApi}
               sendMsgWithStreamResApi={sendMsgWithStreamResApi}
               logoutApi={logoutApi}
+              loginApi={loginApi}
             />
           </div>
         </DrawerBody>

packages/click-prompt-button/src/chatgpt/ChatGPTApp.tsx

@@ -1,13 +1,14 @@
 import { ChatRoom } from "@/chatgpt/ChatRoom";
 import { LoginPage } from "@/chatgpt/LoginPage";
 import React, { useEffect, useState } from "react";
-import { SharedApi } from "@/types/shared";
+import type { Response, SharedApi } from "@/types/shared";
 
 interface ChatGPTAppProps extends Omit<SharedApi, "isLoggedInApi"> {
   loggedIn?: boolean;
   updateLoginStatus?: (loggedIn: boolean) => void;
   initMessage?: string;
-};
+  loginApi: () => Promise<Response>;
+}
 export const ChatGPTApp = ({
   loggedIn,
   initMessage,
@@ -19,6 +20,7 @@ export const ChatGPTApp = ({
   deleteAllConversationsApi,
   sendMsgWithStreamResApi,
   logoutApi,
+  loginApi,
 }: ChatGPTAppProps) => {
   const [isLoggedIn, setIsLoggedIn] = useState(loggedIn ?? false);
 
@@ -41,11 +43,6 @@ export const ChatGPTApp = ({
       logoutApi={logoutApi}
     />
   ) : (
-    <LoginPage
-      setIsLoggedIn={setIsLoggedIn}
-      loginApi={function (key: string): Promise<any> {
-        throw new Error("Function not implemented.");
-      }}
-    />
+    <LoginPage setIsLoggedIn={setIsLoggedIn} loginApi={loginApi} />
   );
 };

packages/click-prompt-button/src/chatgpt/ChatRoom.tsx

@@ -10,7 +10,7 @@ import { BeatLoader } from "react-spinners";
 import { useDebouncedCallback } from "use-debounce";
 import { Input } from "@chakra-ui/react";
 import SimpleMarkdown from "@/markdown/SimpleMarkdown";
-import { SharedApi } from "@/types/shared";
+import type { Chat, Conversation, SharedApi } from "@/types/shared";
 
 const ChatInput = styled("input")`
   background: #ffffff;
@@ -93,10 +93,10 @@ export const ChatRoom = ({
 }: ChatRoomProps) => {
   const chatsWrapper = React.useRef<HTMLDivElement>(null);
   const [disable, setDisable] = React.useState(false);
-  const [chatHistory, setChatHistory] = React.useState<any>([]);
+  const [chatHistory, setChatHistory] = React.useState<Chat[]>([]);
   const [message, setMessage] = React.useState(initMessage ?? "");
 
-  const [conversations, setConversations] = useState<any>([]);
+  const [conversations, setConversations] = useState<Conversation[]>([]);
   const [currentConversation, setCurrentConversation] = useState<number | null>(null);
   // editing conversation name
   const [editing, setEditing] = useState<number | null>(null);
@@ -110,11 +110,11 @@ export const ChatRoom = ({
           method: "POST",
           body: JSON.stringify({
             action: "get_conversations",
-          } as any),
+          }),
         });
-        const data = (await response.json()) as any;
+        const data = await response.json();
         if (!response.ok) {
-          alert("Error: " + JSON.stringify((data as any).error));
+          alert("Error: " + JSON.stringify(data.error));
           return;
         }
         setConversations(data);
@@ -155,7 +155,7 @@ export const ChatRoom = ({
   async function changeConversationName(conversationId: number, name: string) {
     await changeConversationNameApi(conversationId, name);
 
-    setConversations((c: any[]) =>
+    setConversations((c) =>
       c.map((conversation) => {
         if (conversation.id === conversationId) {
           return {
@@ -175,7 +175,7 @@ export const ChatRoom = ({
         if (conversationId == null) {
           return;
         }
-        setEditingName(conversations.find((c: any) => c.id === conversationId)?.name ?? "");
+        setEditingName(conversations.find((c) => c.id === conversationId)?.name ?? "");
         setEditing(conversationId);
         return;
       }
@@ -208,7 +208,7 @@ export const ChatRoom = ({
     if (!data) {
       return;
     }
-    setConversations(conversations.filter((conversation: any) => conversation.id !== conversationId));
+    setConversations(conversations.filter((conversation) => conversation.id !== conversationId));
   }
 
   async function deleteAllConversations() {
@@ -242,7 +242,7 @@ export const ChatRoom = ({
           // TODO(CGQAQ): custom name of user
           // name: "User",
         },
-      ] as any;
+      ] as Chat[];
 
       setChatHistory([...updatedHistory]);
 
@@ -312,7 +312,7 @@ export const ChatRoom = ({
           New chat
         </div>
         <div className="overflow-y-auto overflow-container">
-          {conversations.map((conversation: any) => (
+          {conversations.map((conversation) => (
             <div
               key={conversation.id}
               className={`${
@@ -399,7 +399,7 @@ export const ChatRoom = ({
           ref={chatsWrapper}
           className="flex flex-col gap-4 w-full px-4 max-h-[80%] overflow-y-auto mt-11 scroll-smooth"
         >
-          {chatHistory.map((chat: any, index: number) => {
+          {chatHistory.map((chat, index) => {
             return (
               <div key={index} className="flex flex-col gap-14 ">
                 {chat.role === "user" ? (

packages/click-prompt-button/src/chatgpt/LoginPage.tsx

@@ -1,12 +1,13 @@
 import React, { Dispatch, SetStateAction } from "react";
 import { Button, Input } from "@chakra-ui/react";
+import type { Response } from "@/types/shared";
 
 export const LoginPage = ({
   setIsLoggedIn,
   loginApi,
 }: {
   setIsLoggedIn: Dispatch<SetStateAction<boolean>>;
-  loginApi: (key: string) => Promise<any>;
+  loginApi: (key: string) => Promise<Response>;
 }) => {
   const [openAiKey, setOpenAiKey] = React.useState("");
 

packages/click-prompt-button/src/types/shared.ts

@@ -1,10 +1,41 @@
 export interface SharedApi {
-  isLoggedInApi: () => Promise<any>;
-  changeConversationNameApi: (conversation_id: number, name: string) => Promise<any>;
-  createConversationApi: (name?: string) => Promise<any>;
-  getChatsByConversationIdApi: (conversationId: number) => Promise<any>;
-  deleteConversationApi: (conversationId: number) => Promise<any>;
-  deleteAllConversationsApi: () => Promise<any>;
-  sendMsgWithStreamResApi: (conversageId: number, message: string, name?: string) => Promise<any>;
-  logoutApi: () => Promise<any>;
+  isLoggedInApi: () => Promise<boolean>;
+  changeConversationNameApi: (conversationId: number, name: string) => Promise<void>;
+  createConversationApi: (name?: string) => Promise<Conversation>;
+  getChatsByConversationIdApi: (conversationId: number) => Promise<Chat[]>;
+  deleteConversationApi: (conversationId: number) => Promise<Conversation>;
+  deleteAllConversationsApi: () => Promise<Response>;
+  sendMsgWithStreamResApi: (
+    conversationId: number,
+    message: string,
+    name?: string
+  ) => Promise<ReadableStream<Uint8Array> | null>;
+  logoutApi: () => Promise<Response>;
 }
+
+export interface Conversation {
+  id: number;
+  user_id: number;
+  name: string;
+  deleted?: NumBool;
+  created_at?: string;
+}
+
+enum NumBool {
+  True = 1,
+  False = 0,
+}
+
+export interface Chat {
+  id?: number;
+  conversation_id: number;
+  role: string; // line 14
+  content: string;
+  name?: string;
+  created_at?: string;
+}
+
+export type Response = {
+  message?: string;
+  error?: string;
+};