From e8e3f2866582c24a06d23d21380f909772be43c6 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Fri, 3 Feb 2023 08:30:19 +0100
Subject: [PATCH] update hooks

---
 website/src/hooks/tasks/useCreateReply.ts     | 13 ++++++++-----
 website/src/hooks/tasks/useEvaluateReplies.ts | 13 +++++++++++++
 website/src/hooks/tasks/useGenericTaskAPI.tsx |  6 +++---
 website/src/hooks/tasks/useLabelingTask.ts    | 12 +++++++-----
 website/src/hooks/tasks/useRankReplies.ts     | 12 ------------
 website/src/lib/constants.ts                  | 10 +++++-----
 website/src/types/Hooks.ts                    |  1 -
 7 files changed, 36 insertions(+), 31 deletions(-)
 create mode 100644 website/src/hooks/tasks/useEvaluateReplies.ts
 delete mode 100644 website/src/hooks/tasks/useRankReplies.ts

diff --git a/website/src/hooks/tasks/useCreateReply.ts b/website/src/hooks/tasks/useCreateReply.ts
index 23bc041d..9bb0c487 100644
--- a/website/src/hooks/tasks/useCreateReply.ts
+++ b/website/src/hooks/tasks/useCreateReply.ts
@@ -1,8 +1,11 @@
+import { useGenericTaskAPI } from "src/hooks/tasks/useGenericTaskAPI";
 import { TaskType } from "src/types/Task";
+import { CreateTaskReply } from "src/types/TaskResponses";
 import { CreateAssistantReplyTask, CreateInitialPromptTask, CreatePrompterReplyTask } from "src/types/Tasks";
 
-import { useGenericTaskAPI } from "./useGenericTaskAPI";
-
-export const useCreateAssistantReply = () => useGenericTaskAPI<CreateAssistantReplyTask>(TaskType.assistant_reply);
-export const useCreatePrompterReply = () => useGenericTaskAPI<CreatePrompterReplyTask>(TaskType.prompter_reply);
-export const useCreateInitialPrompt = () => useGenericTaskAPI<CreateInitialPromptTask>(TaskType.initial_prompt);
+export const useCreateAssistantReply = () =>
+  useGenericTaskAPI<CreateAssistantReplyTask, CreateTaskReply>(TaskType.assistant_reply);
+export const useCreatePrompterReply = () =>
+  useGenericTaskAPI<CreatePrompterReplyTask, CreateTaskReply>(TaskType.prompter_reply);
+export const useCreateInitialPrompt = () =>
+  useGenericTaskAPI<CreateInitialPromptTask, CreateTaskReply>(TaskType.initial_prompt);
diff --git a/website/src/hooks/tasks/useEvaluateReplies.ts b/website/src/hooks/tasks/useEvaluateReplies.ts
new file mode 100644
index 00000000..a2e19a1c
--- /dev/null
+++ b/website/src/hooks/tasks/useEvaluateReplies.ts
@@ -0,0 +1,13 @@
+import { useGenericTaskAPI } from "src/hooks/tasks/useGenericTaskAPI";
+import { TaskType } from "src/types/Task";
+import { EvaluateTaskReply } from "src/types/TaskResponses";
+import { RankAssistantRepliesTask, RankInitialPromptsTask, RankPrompterRepliesTask } from "src/types/Tasks";
+
+export const useRankAssistantRepliesTask = () =>
+  useGenericTaskAPI<RankAssistantRepliesTask, EvaluateTaskReply>(TaskType.rank_assistant_replies);
+
+export const useRankPrompterRepliesTask = () =>
+  useGenericTaskAPI<RankPrompterRepliesTask, EvaluateTaskReply>(TaskType.rank_prompter_replies);
+
+export const useRankInitialPromptsTask = () =>
+  useGenericTaskAPI<RankInitialPromptsTask, EvaluateTaskReply>(TaskType.rank_initial_prompts);
diff --git a/website/src/hooks/tasks/useGenericTaskAPI.tsx b/website/src/hooks/tasks/useGenericTaskAPI.tsx
index 7a7d651b..e7630bdc 100644
--- a/website/src/hooks/tasks/useGenericTaskAPI.tsx
+++ b/website/src/hooks/tasks/useGenericTaskAPI.tsx
@@ -3,11 +3,11 @@ import { TaskInfos } from "src/components/Tasks/TaskTypes";
 import { get, post } from "src/lib/api";
 import { TaskApiHook } from "src/types/Hooks";
 import { BaseTask, ServerTaskResponse, TaskResponse, TaskType as TaskTypeEnum } from "src/types/Task";
+import { AllTaskReplies } from "src/types/TaskResponses";
 import useSWRImmutable from "swr/immutable";
 import useSWRMutation from "swr/mutation";
 
-// TODO: provide type for the content reply, this will be much harder since the replies vary vastly
-export const useGenericTaskAPI = <TaskType extends BaseTask, ResponseContent = any>(
+export const useGenericTaskAPI = <TaskType extends BaseTask, ResponseContent = AllTaskReplies>(
   taskType: TaskTypeEnum
 ): TaskApiHook<TaskType, ResponseContent> => {
   const [response, setResponse] = useState<TaskResponse<TaskType>>({ taskAvailability: "AWAITING_INITIAL" });
@@ -71,5 +71,5 @@ export const useGenericTaskAPI = <TaskType extends BaseTask, ResponseContent = a
     [response, sendTaskContent]
   );
 
-  return { response, isLoading, rejectTask, completeTask, skipTask };
+  return { response, isLoading, rejectTask, completeTask };
 };
diff --git a/website/src/hooks/tasks/useLabelingTask.ts b/website/src/hooks/tasks/useLabelingTask.ts
index 3782c7a3..23d305d0 100644
--- a/website/src/hooks/tasks/useLabelingTask.ts
+++ b/website/src/hooks/tasks/useLabelingTask.ts
@@ -1,9 +1,11 @@
+import { useGenericTaskAPI } from "src/hooks/tasks/useGenericTaskAPI";
 import { TaskType } from "src/types/Task";
+import { LabelTaskReply } from "src/types/TaskResponses";
 import { LabelAssistantReplyTask, LabelInitialPromptTask, LabelPrompterReplyTask } from "src/types/Tasks";
 
-import { useGenericTaskAPI } from "./useGenericTaskAPI";
-
 export const useLabelAssistantReplyTask = () =>
-  useGenericTaskAPI<LabelAssistantReplyTask>(TaskType.label_assistant_reply);
-export const useLabelInitialPromptTask = () => useGenericTaskAPI<LabelInitialPromptTask>(TaskType.label_initial_prompt);
-export const useLabelPrompterReplyTask = () => useGenericTaskAPI<LabelPrompterReplyTask>(TaskType.label_prompter_reply);
+  useGenericTaskAPI<LabelAssistantReplyTask, LabelTaskReply>(TaskType.label_assistant_reply);
+export const useLabelInitialPromptTask = () =>
+  useGenericTaskAPI<LabelInitialPromptTask, LabelTaskReply>(TaskType.label_initial_prompt);
+export const useLabelPrompterReplyTask = () =>
+  useGenericTaskAPI<LabelPrompterReplyTask, LabelTaskReply>(TaskType.label_prompter_reply);
diff --git a/website/src/hooks/tasks/useRankReplies.ts b/website/src/hooks/tasks/useRankReplies.ts
deleted file mode 100644
index d4accda0..00000000
--- a/website/src/hooks/tasks/useRankReplies.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-import { TaskType } from "src/types/Task";
-import { RankAssistantRepliesTask, RankInitialPromptsTask, RankPrompterRepliesTask } from "src/types/Tasks";
-
-import { useGenericTaskAPI } from "./useGenericTaskAPI";
-
-export const useRankAssistantRepliesTask = () =>
-  useGenericTaskAPI<RankAssistantRepliesTask>(TaskType.rank_assistant_replies);
-
-export const useRankPrompterRepliesTask = () =>
-  useGenericTaskAPI<RankPrompterRepliesTask>(TaskType.rank_prompter_replies);
-
-export const useRankInitialPromptsTask = () => useGenericTaskAPI<RankInitialPromptsTask>(TaskType.rank_initial_prompts);
diff --git a/website/src/lib/constants.ts b/website/src/lib/constants.ts
index a260fa28..9efe3d03 100644
--- a/website/src/lib/constants.ts
+++ b/website/src/lib/constants.ts
@@ -3,17 +3,17 @@ import {
   useCreateInitialPrompt,
   useCreatePrompterReply,
 } from "src/hooks/tasks/useCreateReply";
+import {
+  useRankAssistantRepliesTask,
+  useRankInitialPromptsTask,
+  useRankPrompterRepliesTask,
+} from "src/hooks/tasks/useEvaluateReplies";
 import { useGenericTaskAPI } from "src/hooks/tasks/useGenericTaskAPI";
 import {
   useLabelAssistantReplyTask,
   useLabelInitialPromptTask,
   useLabelPrompterReplyTask,
 } from "src/hooks/tasks/useLabelingTask";
-import {
-  useRankAssistantRepliesTask,
-  useRankInitialPromptsTask,
-  useRankPrompterRepliesTask,
-} from "src/hooks/tasks/useRankReplies";
 import { TaskApiHooks } from "src/types/Hooks";
 import { TaskType } from "src/types/Task";
 
diff --git a/website/src/types/Hooks.ts b/website/src/types/Hooks.ts
index acdd0b58..5225c009 100644
--- a/website/src/types/Hooks.ts
+++ b/website/src/types/Hooks.ts
@@ -4,7 +4,6 @@ export type TaskApiHook<Task extends BaseTask, ResponseContent> = {
   response: TaskResponse<Task>;
   isLoading: boolean;
   completeTask: (interaction: ResponseContent) => Promise<void>;
-  skipTask: () => Promise<void>;
   rejectTask: (reason: string) => Promise<void>;
 };