@zeniai/client-epic-state 4.16.96 → 4.16.98

package/lib/entity/aiController/aiControllerReducer.d.ts

@@ -41,8 +41,6 @@ export declare const setNewSession: import("@reduxjs/toolkit").ActionCreatorWith
 }, "aiController/addQuestionPayload">, clearAIController: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"aiController/clearAIController">, deleteQuestion: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     chatSessionId: ID;
     questionAnswerId: ID;
-}, "aiController/deleteQuestion">, updateNewSession: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
-    chatSessionId: ID;
-}, "aiController/updateNewSession">;
+}, "aiController/deleteQuestion">;
 declare const _default: import("redux").Reducer<AIControllerState>;
 export default _default;

package/lib/entity/aiController/aiControllerReducer.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateNewSession = exports.deleteQuestion = exports.clearAIController = exports.addQuestionPayload = exports.upsertOrAddQuestionAnswerPayload = exports.upsertAnswerPayload = exports.setChatHistory = exports.setSessions = exports.clearSession = exports.setNewSession = exports.toAIControllerVisualization = exports.initialAIControllerState = void 0;
+exports.deleteQuestion = exports.clearAIController = exports.addQuestionPayload = exports.upsertOrAddQuestionAnswerPayload = exports.upsertAnswerPayload = exports.setChatHistory = exports.setSessions = exports.clearSession = exports.setNewSession = exports.toAIControllerVisualization = exports.initialAIControllerState = void 0;
 const toolkit_1 = require("@reduxjs/toolkit");
 const zeniDayJS_1 = require("../../zeniDayJS");
 const aiControllerState_1 = require("./aiControllerState");
@@ -204,7 +204,6 @@ const aiController = (0, toolkit_1.createSlice)({
                     chatSessionId,
                     userId,
                     chatSessionSummary: '',
-                    newSession: true,
                     createdAt,
                 },
                 questionAnswers: [],
@@ -212,16 +211,6 @@ const aiController = (0, toolkit_1.createSlice)({
             // Clear any existing partial Q&A when creating a new session
             draft.partialQuestionAnswers[chatSessionId] = undefined;
         },
-        updateNewSession(draft, action) {
-            const { chatSessionId } = action.payload;
-            if (draft.aiControllerByChatSessionId[chatSessionId] == null) {
-                console.warn(`session with id ${chatSessionId} not found`);
-                return;
-            }
-            if (draft.aiControllerByChatSessionId[chatSessionId].chatSession.newSession) {
-                draft.aiControllerByChatSessionId[chatSessionId].chatSession.newSession = false;
-            }
-        },
         setSessions(draft, action) {
             action.payload.forEach((chatSessionPayload) => {
                 const { chat_session_id } = chatSessionPayload;
@@ -482,10 +471,9 @@ const toChatSession = (chatSessionPayload) => {
     return {
         chatSessionId: chat_session_id,
         userId: user_id,
-        newSession: false,
         chatSessionSummary: chat_session_summary !== null && chat_session_summary !== void 0 ? chat_session_summary : undefined,
         createdAt: (0, zeniDayJS_1.date)(created_at),
     };
 };
-_a = aiController.actions, exports.setNewSession = _a.setNewSession, exports.clearSession = _a.clearSession, exports.setSessions = _a.setSessions, exports.setChatHistory = _a.setChatHistory, exports.upsertAnswerPayload = _a.upsertAnswerPayload, exports.upsertOrAddQuestionAnswerPayload = _a.upsertOrAddQuestionAnswerPayload, exports.addQuestionPayload = _a.addQuestionPayload, exports.clearAIController = _a.clearAIController, exports.deleteQuestion = _a.deleteQuestion, exports.updateNewSession = _a.updateNewSession;
+_a = aiController.actions, exports.setNewSession = _a.setNewSession, exports.clearSession = _a.clearSession, exports.setSessions = _a.setSessions, exports.setChatHistory = _a.setChatHistory, exports.upsertAnswerPayload = _a.upsertAnswerPayload, exports.upsertOrAddQuestionAnswerPayload = _a.upsertOrAddQuestionAnswerPayload, exports.addQuestionPayload = _a.addQuestionPayload, exports.clearAIController = _a.clearAIController, exports.deleteQuestion = _a.deleteQuestion;
 exports.default = aiController.reducer;

package/lib/entity/aiController/aiControllerState.d.ts

@@ -76,7 +76,6 @@ export interface ChatSession {
     chatSessionId: ID;
     userId: ID;
     createdAt: ZeniDate;
-    newSession: boolean;
     chatSessionSummary?: string;
 }
 export interface ChatSessionWithMessages {

package/lib/view/aiControllerView/aiControllerViewReducer.d.ts

@@ -5,13 +5,17 @@ import { AIControllerAnswerResponseType } from '../../entity/aiController/aiCont
 import { ZeniAPIStatus } from '../../responsePayload';
 import { AIControllerViewState } from './aiControllerViewState';
 export declare const initialAIControllerViewState: AIControllerViewState;
-export declare const submitQuestion: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[questionAnswerId: string, userId: string, questionId: string, createdAt: import("dayjs").Dayjs, question: string], {
+export declare const submitQuestion: import("@reduxjs/toolkit").ActionCreatorWithPreparedPayload<[sessionId: string, questionAnswerId: string, userId: string, questionId: string, createdAt: import("dayjs").Dayjs, question: string], {
+    sessionId: string;
     questionAnswerId: string;
     userId: string;
     questionId: string;
     createdAt: import("dayjs").Dayjs;
     question: string;
-}, "aiControllerView/submitQuestion", never, never>, submitQuestionSuccess: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"aiControllerView/submitQuestionSuccess">, submitQuestionFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<ZeniAPIStatus<Record<string, unknown>>, "aiControllerView/submitQuestionFailure">, updateResponseState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+}, "aiControllerView/submitQuestion", never, never>, submitQuestionSuccess: import("@reduxjs/toolkit").ActionCreatorWithPayload<string, "aiControllerView/submitQuestionSuccess">, submitQuestionFailure: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
+    sessionId: ID;
+    error: ZeniAPIStatus;
+}, "aiControllerView/submitQuestionFailure">, updateResponseState: import("@reduxjs/toolkit").ActionCreatorWithPayload<{
     chatSessionId: ID;
     responseType: AIControllerAnswerResponseType;
     fetchState: FetchStateAndError;

package/lib/view/aiControllerView/aiControllerViewReducer.js

@@ -33,19 +33,19 @@ const aiControllerView = (0, toolkit_1.createSlice)({
     initialState: exports.initialAIControllerViewState,
     reducers: {
         submitQuestion: {
-            reducer(draft) {
-                if (draft.uiState.currentChatSessionId != null) {
-                    draft.responseStateByChatSessionId[draft.uiState.currentChatSessionId] = {
-                        thought: { fetchState: 'In-Progress', error: undefined },
-                        analysis: { fetchState: 'In-Progress', error: undefined },
-                        reasoning: { fetchState: 'In-Progress', error: undefined },
-                        answer: { fetchState: 'In-Progress', error: undefined },
-                    };
-                }
+            reducer(draft, action) {
+                const { sessionId } = action.payload;
+                draft.responseStateByChatSessionId[sessionId] = {
+                    thought: { fetchState: 'In-Progress', error: undefined },
+                    analysis: { fetchState: 'In-Progress', error: undefined },
+                    reasoning: { fetchState: 'In-Progress', error: undefined },
+                    answer: { fetchState: 'In-Progress', error: undefined },
+                };
             },
-            prepare(questionAnswerId, userId, questionId, createdAt, question) {
+            prepare(sessionId, questionAnswerId, userId, questionId, createdAt, question) {
                 return {
                     payload: {
+                        sessionId,
                         questionAnswerId,
                         userId,
                         questionId,
@@ -55,22 +55,24 @@ const aiControllerView = (0, toolkit_1.createSlice)({
                 };
             },
         },
-        submitQuestionSuccess(draft) {
-            if (draft.uiState.currentChatSessionId != null &&
-                draft.responseStateByChatSessionId[draft.uiState.currentChatSessionId] != null) {
-                draft.responseStateByChatSessionId[draft.uiState.currentChatSessionId] =
-                    {
-                        thought: { fetchState: 'Completed', error: undefined },
-                        analysis: { fetchState: 'Completed', error: undefined },
-                        reasoning: { fetchState: 'Completed', error: undefined },
-                        answer: { fetchState: 'Completed', error: undefined },
-                    };
+        submitQuestionSuccess(draft, action) {
+            const sessionId = action.payload;
+            if (draft.responseStateByChatSessionId[sessionId] != null) {
+                draft.responseStateByChatSessionId[sessionId] = {
+                    thought: { fetchState: 'Completed', error: undefined },
+                    analysis: { fetchState: 'Completed', error: undefined },
+                    reasoning: { fetchState: 'Completed', error: undefined },
+                    answer: { fetchState: 'Completed', error: undefined },
+                };
             }
         },
         submitQuestionFailure(draft, action) {
-            if (draft.uiState.currentChatSessionId != null &&
-                draft.responseStateByChatSessionId[draft.uiState.currentChatSessionId] != null) {
-                draft.responseStateByChatSessionId[draft.uiState.currentChatSessionId]['answer'] = { fetchState: 'Error', error: action.payload };
+            const { sessionId, error } = action.payload;
+            if (draft.responseStateByChatSessionId[sessionId] != null) {
+                draft.responseStateByChatSessionId[sessionId]['answer'] = {
+                    fetchState: 'Error',
+                    error,
+                };
             }
         },
         updateResponseState(draft, action) {

package/lib/view/aiControllerView/epics/createSessionAndSubmitEpic.js

@@ -23,7 +23,7 @@ const createSessionAndSubmitEpic = (actions$, _, zeniAPI) => actions$.pipe((0, o
             }), (0, aiControllerViewReducer_1.createSessionAndSubmitSuccess)({
                 agentId,
                 sessionId,
-            }), (0, aiControllerViewReducer_1.submitQuestion)(questionAnswerId, userId, questionId, createdAt, question), (0, aiControllerReducer_1.addQuestionPayload)({
+            }), (0, aiControllerViewReducer_1.submitQuestion)(sessionId, questionAnswerId, userId, questionId, createdAt, question), (0, aiControllerReducer_1.addQuestionPayload)({
                 chatSessionId: sessionId,
                 questionAnswerId: questionAnswerId,
                 question: {

package/lib/view/aiControllerView/epics/submitQuestionEpic.d.ts

@@ -1,8 +1,8 @@
 import { ActionsObservable, StateObservable } from 'redux-observable';
 import { Observable } from 'rxjs';
-import { updateNewSession, upsertOrAddQuestionAnswerPayload } from '../../../entity/aiController/aiControllerReducer';
+import { upsertOrAddQuestionAnswerPayload } from '../../../entity/aiController/aiControllerReducer';
 import { RootState } from '../../../reducer';
 import { ZeniAPI } from '../../../zeniAPI';
 import { submitQuestion, submitQuestionFailure, submitQuestionSuccess } from '../aiControllerViewReducer';
-export type ActionType = ReturnType<typeof submitQuestion> | ReturnType<typeof updateNewSession> | ReturnType<typeof submitQuestionSuccess> | ReturnType<typeof submitQuestionFailure> | ReturnType<typeof upsertOrAddQuestionAnswerPayload>;
+export type ActionType = ReturnType<typeof submitQuestion> | ReturnType<typeof submitQuestionSuccess> | ReturnType<typeof submitQuestionFailure> | ReturnType<typeof upsertOrAddQuestionAnswerPayload>;
 export declare const submitQuestionEpic: (actions$: ActionsObservable<ActionType>, state$: StateObservable<RootState>, zeniAPI: ZeniAPI) => Observable<ActionType>;

package/lib/view/aiControllerView/epics/submitQuestionEpic.js

@@ -7,18 +7,15 @@ const aiControllerReducer_1 = require("../../../entity/aiController/aiController
 const responsePayload_1 = require("../../../responsePayload");
 const aiControllerViewReducer_1 = require("../aiControllerViewReducer");
 const submitQuestionEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, operators_1.filter)(aiControllerViewReducer_1.submitQuestion.match), (0, operators_1.mergeMap)((action) => {
-    const { questionAnswerId, userId, questionId, createdAt, question } = action.payload;
+    const { questionAnswerId, userId, sessionId, questionId, createdAt, question, } = action.payload;
     const { aiControllerViewState } = state$.value;
     const { uiState } = aiControllerViewState;
     const agentId = uiState.agentId;
-    const sessionId = uiState.currentChatSessionId;
     const payload = { chat_session_id: sessionId, message: question };
-    if (agentId == null || sessionId == null || Boolean(question) == false) {
+    if (agentId == null || Boolean(question) == false) {
         throw new Error('Invalid State');
     }
-    // First, update the session to mark it as no longer new
-    const updateSessionAction = (0, aiControllerReducer_1.updateNewSession)({ chatSessionId: sessionId });
-    return (0, rxjs_1.concat)((0, rxjs_1.of)(updateSessionAction), zeniAPI
+    return zeniAPI
         .postAndGetJSON(`${zeniAPI.apiEndPoints.aiControllerMicroServiceBaseUrl}/1.0/agents/${agentId}`, payload)
         .pipe((0, operators_1.mergeMap)((response) => {
         if ((0, responsePayload_1.isSuccessResponse)(response) && response.data != null) {
@@ -34,13 +31,19 @@ const submitQuestionEpic = (actions$, state$, zeniAPI) => actions$.pipe((0, oper
                 answerPayload: response.data,
                 userId,
                 insertQuestionAnswer: false, // Don't insert the Q/A here after stopSubmitSuccess
-            }), (0, aiControllerViewReducer_1.submitQuestionSuccess)());
+            }), (0, aiControllerViewReducer_1.submitQuestionSuccess)(sessionId));
             return (0, rxjs_1.of)(...actions);
         }
         else {
-            return (0, rxjs_1.of)((0, aiControllerViewReducer_1.submitQuestionFailure)(response.status));
+            return (0, rxjs_1.of)((0, aiControllerViewReducer_1.submitQuestionFailure)({
+                sessionId,
+                error: response.status,
+            }));
         }
-    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, aiControllerViewReducer_1.submitQuestionFailure)((0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Submit question REST API call errored out' +
-        JSON.stringify(error)))))));
+    }), (0, operators_1.catchError)((error) => (0, rxjs_1.of)((0, aiControllerViewReducer_1.submitQuestionFailure)({
+        sessionId,
+        error: (0, responsePayload_1.createZeniAPIStatus)('Unexpected Error', 'Submit question REST API call errored out' +
+            JSON.stringify(error)),
+    }))));
 }));
 exports.submitQuestionEpic = submitQuestionEpic;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeniai/client-epic-state",
-  "version": "4.16.96",
+  "version": "4.16.98",
   "description": "Shared module between Web & Mobile containing required abstractions for state management, async network communication. ",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",