setFormInputValue(e.target.value)}
/>
Send
diff --git a/src/client/helpers.tsx b/src/client/helpers.tsx
index 35d701e..7183e63 100644
--- a/src/client/helpers.tsx
+++ b/src/client/helpers.tsx
@@ -33,17 +33,14 @@ function getLatestConversationID(input: InputMessage[]): number {
return latestConversationID;
}
-export function prepareOpenAIRequest(
- input: InputMessage[]
-): [OutputMessage[], number] {
+export function prepareOpenAIRequest(input: InputMessage[]): OutputMessage[] {
const messages: OutputMessage[] = input.map((message) => {
return {
role: message.role,
content: message.message,
};
});
- const latestConversationID = getLatestConversationID(input);
- return [messages, latestConversationID];
+ return messages;
}
// A custom hook that builds on useLocation to parse
diff --git a/src/server/actions.ts b/src/server/actions.ts
index 75a2f87..359f8b8 100644
--- a/src/server/actions.ts
+++ b/src/server/actions.ts
@@ -7,7 +7,7 @@ import type {
StripePayment,
CreateChat,
AddNewConversationToChat,
- UpdateExistingConversation,
+ UpdateExistingChat,
GetAgentResponse,
} from "@wasp/actions/types";
import type { StripePaymentResult, OpenAIResponse } from "./types";
@@ -107,9 +107,6 @@ type AddNewConversationToChatPayload = {
message: string;
role: string;
chat_id: number;
- team_name?: string;
- team_id?: number;
- team_status?: string;
};
export const addNewConversationToChat: AddNewConversationToChat<
@@ -126,9 +123,9 @@ export const addNewConversationToChat: AddNewConversationToChat<
role: args.role,
chat: { connect: { id: args.chat_id } },
user: { connect: { id: context.user.id } },
- ...(args.team_name && { team_name: args.team_name }),
- ...(args.team_id && { team_id: args.team_id }),
- ...(args.team_status && { team_status: args.team_status }),
+ // ...(args.team_name && { team_name: args.team_name }),
+ // ...(args.team_id && { team_id: args.team_id }),
+ // ...(args.team_status && { team_status: args.team_status }),
},
});
@@ -138,52 +135,59 @@ export const addNewConversationToChat: AddNewConversationToChat<
});
};
-type UpdateExistingConversationPayload = {
+type UpdateExistingChatPayload = {
chat_id: number;
- conv_id: number;
- is_question_from_agent: boolean;
- team_status: null;
+ team_name?: string;
+ team_id?: number;
+ team_status?: boolean;
+ showLoader?: boolean;
};
-export const updateExistingConversation: UpdateExistingConversation<
- UpdateExistingConversationPayload,
+export const updateExistingChat: UpdateExistingChat<
+ UpdateExistingChatPayload,
void
-> = async (args, context) => {
+> = async (args: any, context: any) => {
if (!context.user) {
throw new HttpError(401);
}
- await context.entities.Conversation.update({
- where: {
- id: args.conv_id,
- },
- data: {
- team_status: args.team_status,
- is_question_from_agent: args.is_question_from_agent,
- },
- });
+ if (args.showLoader === true || args.showLoader === false) {
+ await context.entities.Chat.update({
+ where: {
+ id: args.chat_id,
+ },
+ data: {
+ showLoader: args.showLoader,
+ },
+ });
+ } else {
+ await context.entities.Chat.update({
+ where: {
+ id: args.chat_id,
+ },
+ data: {
+ team_id: args.team_id,
+ team_name: args.team_name,
+ team_status: args.team_status,
+ },
+ });
+ }
};
type AgentPayload = {
chat_id: number;
message: any;
- conv_id: number;
- isAnswerToAgentQuestion: boolean;
- userResponseToTeamId: number | null | undefined;
+ team_id: number | null | undefined;
};
export const getAgentResponse: GetAgentResponse
= async (
{
chat_id,
message,
- conv_id,
- isAnswerToAgentQuestion,
- userResponseToTeamId,
+ team_id,
}: {
chat_id: number;
message: any;
- conv_id: number;
- isAnswerToAgentQuestion: boolean;
- userResponseToTeamId: number | null | undefined;
+ team_id: number | null | undefined;
},
context: any
) => {
@@ -194,10 +198,8 @@ export const getAgentResponse: GetAgentResponse = async (
const payload = {
chat_id: chat_id,
message: message,
- conv_id: conv_id,
user_id: context.user.id,
- is_answer_to_agent_question: isAnswerToAgentQuestion,
- user_answer_to_team_id: userResponseToTeamId,
+ team_id: team_id,
};
console.log("===========");
console.log("Payload to Python server");
diff --git a/src/server/queries.ts b/src/server/queries.ts
index 3d10fc7..335b839 100644
--- a/src/server/queries.ts
+++ b/src/server/queries.ts
@@ -1,7 +1,7 @@
import HttpError from "@wasp/core/HttpError.js";
import type { Chat, Conversation } from "@wasp/entities";
-import type { GetChats, GetConversations } from "@wasp/queries/types";
+import type { GetChats, GetChat, GetConversations } from "@wasp/queries/types";
export const getChats: GetChats = async (args, context) => {
if (!context.user) {
@@ -17,6 +17,28 @@ export const getChats: GetChats = async (args, context) => {
});
};
+type GetChatPayload = {
+ chatId: number;
+};
+
+export const getChat: GetChat = async (
+ args: any,
+ context: any
+) => {
+ if (!context.user) {
+ throw new HttpError(401);
+ }
+ if (!!args.chatId) {
+ return context.entities.Chat.findUnique({
+ where: {
+ id: args.chatId,
+ },
+ });
+ } else {
+ return null;
+ }
+};
+
type GetConversationPayload = {
chatId: number;
};
diff --git a/src/server/webSocket.js b/src/server/webSocket.js
index ce0542b..6735540 100644
--- a/src/server/webSocket.js
+++ b/src/server/webSocket.js
@@ -2,13 +2,13 @@ import HttpError from "@wasp/core/HttpError.js";
import { ADS_SERVER_URL } from "./config.js";
-async function checkTeamStatus(context, socket, team_id, conv_id, chat_id) {
+async function checkTeamStatus(context, socket, chat_id) {
let json;
try {
while (true) {
// Infinite loop, adjust the exit condition as needed
const payload = {
- team_id: team_id,
+ team_id: chat_id,
};
const response = await fetch(`${ADS_SERVER_URL}/openai/get-team-status`, {
method: "POST",
@@ -17,8 +17,7 @@ async function checkTeamStatus(context, socket, team_id, conv_id, chat_id) {
});
if (!response.ok) {
- const errorMsg =
- json.detail || `HTTP error with status code ${response.status}`;
+ const errorMsg = `HTTP error with status code ${response.status}`;
console.error("Server Error:", errorMsg);
} else {
json = await response.json();
@@ -33,24 +32,18 @@ async function checkTeamStatus(context, socket, team_id, conv_id, chat_id) {
await new Promise((resolve) => setTimeout(resolve, 1000));
}
// Call another function after breaking the loop
- await updateConversationsInDb(context, socket, json, conv_id, chat_id);
+ await updateConversationsInDb(context, socket, json, chat_id);
} catch (error) {
console.log(`Error while fetching record`);
console.log(error);
}
}
-async function updateConversationsInDb(
- context,
- socket,
- json,
- conv_id,
- chat_id
-) {
- await context.entities.Conversation.update({
+async function updateConversationsInDb(context, socket, json, chat_id) {
+ await context.entities.Chat.update({
where: {
// userId: socket.data.user.id,
- id: conv_id,
+ id: chat_id,
},
data: {
team_status: null,
@@ -61,10 +54,6 @@ async function updateConversationsInDb(
data: {
message: json["msg"],
role: "assistant",
- team_name: json["team_name"],
- team_id: Number(json["team_id"]),
- team_status: json["team_status"],
- is_question_from_agent: json["is_question"],
chat: { connect: { id: chat_id } },
user: { connect: { id: socket.data.user.id } },
},
@@ -81,8 +70,8 @@ export const checkTeamStatusAndUpdateInDB = (io, context) => {
console.log("========");
console.log("a user connected: ", userEmail);
- socket.on("newConversationAdded", async (team_id, conv_id, chat_id) => {
- await checkTeamStatus(context, socket, team_id, conv_id, chat_id);
+ socket.on("newConversationAdded", async (chat_id) => {
+ await checkTeamStatus(context, socket, chat_id);
});
}
});
+
+