@magmamath/students-features 0.3.0-rc.13 → 0.3.0-rc.15

package/dist/typescript/module/features/chatbot/types/translation.types.d.ts

@@ -5,15 +5,30 @@ export type TranslateBatchFxProps = {
     params: {
         targetLanguage: string;
     };
+    alternatives: GetAlternativesResponse | null;
 };
 export type TranslateMessageFxProps = {
-    message: ConversationMessage;
+    messages: ConversationMessage[];
     targetLanguage: string;
 };
-export type TranslateAlternativesFxProps = {
+export type AddTranslationToAlternativesProps = {
+    alternatives: GetAlternativesResponse;
+    translatedHints: string[];
+    translatedDefaults: string[];
+};
+export type GetOptionsProps = {
     alternatives: GetAlternativesResponse | null;
-    params: {
-        targetLanguage: string;
-    };
+    lastMessage: ConversationMessage | undefined;
+};
+export type GetOptionsResult = {
+    lastMessage: string[] | null;
+    alternatives: {
+        hints: string[];
+        default: string[];
+    } | null;
+};
+export type TranslateRequestProps<List extends Record<string, string[]>> = {
+    textList: List;
+    targetLanguage: string;
 };
 //# sourceMappingURL=translation.types.d.ts.map

package/dist/typescript/module/features/chatbot/types/translation.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"translation.types.d.ts","sourceRoot":"","sources":["../../../../../../src/features/chatbot/types/translation.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAErD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,mBAAmB,EAAE,CAAA;IAC/B,MAAM,EAAE;QACN,cAAc,EAAE,MAAM,CAAA;KACvB,CAAA;CACF,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,OAAO,EAAE,mBAAmB,CAAA;IAC5B,cAAc,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,4BAA4B,GAAG;IACzC,YAAY,EAAE,uBAAuB,GAAG,IAAI,CAAA;IAC5C,MAAM,EAAE;QACN,cAAc,EAAE,MAAM,CAAA;KACvB,CAAA;CACF,CAAA"}
+{"version":3,"file":"translation.types.d.ts","sourceRoot":"","sources":["../../../../../../src/features/chatbot/types/translation.types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAA;AACnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAA;AAErD,MAAM,MAAM,qBAAqB,GAAG;IAClC,QAAQ,EAAE,mBAAmB,EAAE,CAAA;IAC/B,MAAM,EAAE;QACN,cAAc,EAAE,MAAM,CAAA;KACvB,CAAA;IACD,YAAY,EAAE,uBAAuB,GAAG,IAAI,CAAA;CAC7C,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,EAAE,mBAAmB,EAAE,CAAA;IAC/B,cAAc,EAAE,MAAM,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,iCAAiC,GAAG;IAC9C,YAAY,EAAE,uBAAuB,CAAA;IACrC,eAAe,EAAE,MAAM,EAAE,CAAA;IACzB,kBAAkB,EAAE,MAAM,EAAE,CAAA;CAC7B,CAAA;AACD,MAAM,MAAM,eAAe,GAAG;IAC5B,YAAY,EAAE,uBAAuB,GAAG,IAAI,CAAA;IAC5C,WAAW,EAAE,mBAAmB,GAAG,SAAS,CAAA;CAC7C,CAAA;AACD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,WAAW,EAAE,MAAM,EAAE,GAAG,IAAI,CAAA;IAC5B,YAAY,EAAE;QACZ,KAAK,EAAE,MAAM,EAAE,CAAA;QACf,OAAO,EAAE,MAAM,EAAE,CAAA;KAClB,GAAG,IAAI,CAAA;CACT,CAAA;AAED,MAAM,MAAM,qBAAqB,CAAC,IAAI,SAAS,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,IAAI;IACzE,QAAQ,EAAE,IAAI,CAAA;IACd,cAAc,EAAE,MAAM,CAAA;CACvB,CAAA"}

package/dist/typescript/module/index.d.ts

@@ -1,5 +1,6 @@
 export { useFeaturesLocalization, setFeaturesLocalization, Locale } from './shared/translation';
 export type { LocalizationConfig } from './shared/translation';
+export { generateRandomId } from './lib/helpers/helpers';
 export * from './features/chatbot';
 export * from './features/feedback';
 //# sourceMappingURL=index.d.ts.map

package/dist/typescript/module/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC/F,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,uBAAuB,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC/F,YAAY,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,cAAc,oBAAoB,CAAA;AAClC,cAAc,qBAAqB,CAAA"}

package/dist/typescript/module/lib/helpers/types.d.ts

@@ -0,0 +1,2 @@
+export type AccomplishTo<T, To> = Partial<Omit<To, keyof T>> & T;
+//# sourceMappingURL=types.d.ts.map

package/dist/typescript/module/lib/helpers/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../src/lib/helpers/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,YAAY,CAAC,CAAC,EAAE,EAAE,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magmamath/students-features",
-  "version": "0.3.0-rc.13",
+  "version": "0.3.0-rc.15",
   "description": "Magmamath features library",
   "source": "src/index.ts",
   "main": "dist/commonjs/index.js",

package/src/features/chatbot/components/Alternatives/Alternatives.tsx

@@ -20,7 +20,7 @@ export const Alternatives = ({
 }: AlternativesProps) => {
   const isTranslated = useUnit(model.translation.$isTranslated)
   const alternatives = useUnit(model.$alternatives)
-  const isTranslationPending = useUnit(model.translation.translateBatchFx.pending)
+  const isTranslationPending = useUnit(model.translation.translateAllMessagesFx.pending)
   const lastMessageOptions = useStoreMap(model.$currentChatData, ({ messages }) => {
     const lastMessage = messages.at(-1)
     return lastMessage?.options ?? []

package/src/features/chatbot/components/ChatControls/ChatControls.tsx

@@ -34,7 +34,7 @@ export const ChatControls = ({
 }: ChatControlsProps) => {
   const isOpen = useUnit(model.$isOpen)
   const isTranslated = useUnit(model.translation.$isTranslated)
-  const isTranslationPending = useUnit(model.translation.translateBatchFx.pending)
+  const isTranslationPending = useUnit(model.translation.translateAllMessagesFx.pending)
   const isHelpRequestPending = useUnit(model.sendHelpRequestFx.pending)
 
   if (isOpen) {

package/src/features/chatbot/components/Chatbot.tsx

@@ -40,7 +40,7 @@ export const Chatbot = ({
   const isAvailable = useStoreMap(model.$currentChatData, ({ isAvailable }) => isAvailable)
 
   const translateMessages = () => {
-    void model.translation.translateBatchFx({
+    void model.translation.translateAllMessagesFx({
       targetLanguage: translationTargetLanguage,
     })
   }

package/src/features/chatbot/index.ts

@@ -1,5 +1,10 @@
 export { Chatbot } from './components/Chatbot'
 export { ChatbotModel } from './model/ChatBotModel'
 export { AudioStatus, type AudioProvider } from './types/t2s.types'
-export { MessageVariant, type ConversationMessage, type ChatbotRenderer } from './types/model.types'
-export type { PostMessageResponse } from './types/api.types'
+export {
+  MessageVariant,
+  type ConversationMessage,
+  type ChatbotRenderer,
+  type ChatbotModelProps,
+} from './types/model.types'
+export type { PostMessageResponse, ChatAnswer } from './types/api.types'

package/src/features/chatbot/model/ChatBotModel.ts

@@ -4,7 +4,6 @@ import {
   restore,
   sample,
   type Store,
-  type Effect,
   createStore,
   createEffect,
   combine,
@@ -18,12 +17,12 @@ import {
   SetHintMessageProps,
   StartConversationFxData,
 } from '../types/model.types'
-import { GetAlternativesResponse, PostMessageResponse } from '../types/api.types'
-import { generateRandomId } from '../../../lib/helpers/helpers'
+import { GetAlternativesResponse } from '../types/api.types'
 import { ChatbotAPI } from './api'
 import { ChatbotTranslation } from './translation'
 import { ChatTextToSpeechModel } from './t2s'
 import { AudioProvider } from '../types/t2s.types'
+import { messagesHelper } from './messagesHelper'
 
 type ReinitConversationProps = {
   key: string
@@ -44,7 +43,6 @@ export class ChatbotModel {
   readonly toggleOpen = createEvent()
   readonly $isOpen = restore(this.setIsOpen, false).on(this.toggleOpen, (isOpen) => !isOpen)
 
-  // separate messages and alternatives class?
   public readonly removeLastMessage = createEvent()
   private readonly setLastMessageKey = createEvent<string>()
   public readonly $lastMessageKey = restore(this.setLastMessageKey, null)
@@ -52,7 +50,7 @@ export class ChatbotModel {
   readonly setScrollActive = createEvent<boolean>()
   readonly $isScrollActive = restore(this.setScrollActive, false)
 
-  readonly sendHelpRequestFx: Effect<SendHelpParams, PostMessageResponse | ConversationMessage>
+  readonly sendHelpRequestFx
 
   readonly defaultMessages: ChatbotModelProps['messages']
 
@@ -81,12 +79,7 @@ export class ChatbotModel {
     this.api = new ChatbotAPI(api)
 
     this.defaultMessages = messages
-    if ($key) {
-      sample({
-        source: $key,
-        target: this.$currentKey,
-      })
-    }
+    if ($key) sample({ source: $key, target: this.$currentKey })
 
     this.$alternatives = restore(this.api.getAlternativesFx.doneData, null)
       .on(this.setAlternatives, (_, payload) => payload)
@@ -110,7 +103,7 @@ export class ChatbotModel {
   }
 
   private createSendHelpRequestFx() {
-    return attach({
+    const effect = attach({
       source: [this.$currentKey, this.translation.$isTranslated],
       mapParams: (params: SendHelpParams, [key, isTranslated]) => ({
         ...params,
@@ -120,8 +113,8 @@ export class ChatbotModel {
       effect: createControllerEffect(
         async ({
           payload,
-          message = '',
-          translationTargetLanguage,
+          message,
+          translationTargetLanguage: targetLanguage,
           translatedMessage,
           key,
           isTranslated,
@@ -129,87 +122,47 @@ export class ChatbotModel {
           this.setLastMessageKey(key)
           this.messages.setField({
             key,
-            fn: (currentMessages = []) => [
+            fn: (currentMessages) => [
               ...(currentMessages || []),
-              {
-                id: generateRandomId(),
-                message: message ?? '',
-                translatedMessage,
-                isOwnMessage: true,
-                threadId: payload.threadId ?? '',
-                options: [],
-              },
+              messagesHelper.createOwn({ message, translatedMessage, threadId: payload.threadId }),
             ],
           })
 
           const response = await this.api.postMessageFx(payload)
+          let messages = [messagesHelper.createAnswer(response)]
+          if (response.endMessage) {
+            messages.push(messagesHelper.createLast(this.defaultMessages.endMessage))
+          }
           if (isTranslated) {
-            return await this.translation.translateMessageFx({
-              targetLanguage: translationTargetLanguage as string,
-              message: {
-                ...response,
-                id: generateRandomId(),
-                isOwnMessage: false,
-              },
-            })
+            messages = await this.translation.translateMessagesFx({ targetLanguage, messages })
           }
-
-          return response
+          this.messages.setField({
+            key,
+            fn: (currentMessages) => [...(currentMessages || []), ...messages],
+          })
+          this.threadIds.setField({ key, data: response.threadId })
         },
       ),
     })
-  }
 
-  private initChatReplyWatcher() {
     sample({
-      clock: this.sendHelpRequestFx.doneData,
-      source: [this.$currentKey] as const,
-      fn: ([key], response) => ({ key, response }),
-    }).watch(({ key, response }) => {
-      const newMessages: ConversationMessage[] = [
-        {
-          id: generateRandomId(),
-          message: response.message,
-          isOwnMessage: false,
-          threadId: response.threadId,
-          options: response.options,
-          translatedMessage:
-            'translatedMessage' in response ? response.translatedMessage : undefined,
-        },
-      ]
-      if (response.endMessage) {
-        newMessages.push({
-          id: generateRandomId(),
-          message: 'Answer again to get another hint!',
-          isOwnMessage: false,
-          options: [],
-          threadId: '',
-          endMessage: true,
-        })
-      }
-      this.messages.setField({
-        key,
-        fn: (messages) => [...(messages || []), ...newMessages],
-      })
-      this.threadIds.setField({ key, data: response.threadId })
-    })
-
-    sample({
-      clock: this.sendHelpRequestFx.fail,
+      clock: effect.fail,
       source: this.$currentChatData,
       fn: ({ key, messages }) => ({ key, data: [...messages, this.defaultMessages.error] }),
       filter: (_, { error }) => error.message !== 'Request aborted manually',
       target: this.messages.setField,
     })
 
+    return effect
+  }
+
+  private initChatReplyWatcher() {
     sample({
       clock: this.removeLastMessage,
       source: [this.$lastMessageKey, this.messages.$state] as const,
       fn: ([lastMessageKey, messages]) => {
-        const mockData = { key: '', data: [] }
-        if (!lastMessageKey) return mockData
-        const updatedMessages = messages[lastMessageKey]
-        if (!updatedMessages?.length) return mockData
+        if (!lastMessageKey) return { key: '', data: [] }
+        const updatedMessages = [...messages[lastMessageKey]]
         updatedMessages.pop()
         return { key: lastMessageKey, data: updatedMessages }
       },
@@ -223,7 +176,6 @@ export class ChatbotModel {
     mapParams: (_: void, source) => source,
     effect: createEffect(({ key, messages }: StartConversationFxData) => {
       if (messages.length) return this.reinitConversation({ key })
-
       this.messages.setField({ key, data: [this.defaultMessages.start] })
       this.availableChats.setField({ key, data: true })
     }),
@@ -245,18 +197,8 @@ export class ChatbotModel {
       key,
       fn: (messages) => {
         if (!messages?.length || messages.length === 1) return
-        let messagesToRemove = 1
-        let lastMessage = messages[messages.length - 1]
-        if (lastMessage.endMessage) {
-          lastMessage = messages[messages.length - 2]
-          messagesToRemove = 2
-        }
-        if (!lastMessage) return
         const copy = [...messages]
-        copy.splice(messages.length - messagesToRemove, messagesToRemove, {
-          ...lastMessage,
-          options: [{ text: 'Give me another hint', promptKey: '' }],
-        })
+        while (copy.at(-1)?.endMessage) copy.pop()
         return copy
       },
     })

package/src/features/chatbot/model/api.ts

@@ -1,46 +1,37 @@
-import { createEffect, Effect } from 'effector'
-
+import { createEffect } from 'effector'
 import { createControllerEffect } from '../../../lib/effector'
-import { ControlledEffect } from '../../../lib/effector/createControllerEffect'
 import { ChatbotModelProps } from '../types/model.types'
-import {
-  GetAlternativesResponse,
-  PostMessagePayload,
-  PostMessageResponse,
-  GoogleTranslatePayload,
-  GoogleTranslateResponse,
-  GoogleText2SpeechPayload,
-  GoogleText2SpeechResponse,
-  GetAlternativesPayload,
-} from '../types/api.types'
+import { GoogleTranslatePayload, GoogleTranslateResponse } from '../types/api.types'
 import { replaceKatexSyntax } from '../helpers'
 
 export class ChatbotAPI {
-  postMessageFx: ControlledEffect<PostMessagePayload, PostMessageResponse>
-  getAlternativesFx: Effect<GetAlternativesPayload, GetAlternativesResponse>
-  translateTextFx: Effect<GoogleTranslatePayload, GoogleTranslateResponse>
-  textToSpeechTextFx: Effect<GoogleText2SpeechPayload, GoogleText2SpeechResponse>
+  public readonly postMessageFx
+  public readonly getAlternativesFx
+  public readonly translateTextFx
+  public readonly textToSpeechTextFx
 
   constructor(api: ChatbotModelProps['api']) {
     this.postMessageFx = createControllerEffect(api.postMessage)
     this.getAlternativesFx = createEffect(api.getAlternatives)
-    this.translateTextFx = createEffect(async (payload: GoogleTranslatePayload) => {
-      const response = await api.postTranslateText({
-        ...payload,
-        text: replaceKatexSyntax(payload.text),
-      })
+    this.translateTextFx = createEffect(
+      async (payload: GoogleTranslatePayload): Promise<GoogleTranslateResponse> => {
+        const response = await api.postTranslateText({
+          ...payload,
+          text: replaceKatexSyntax(payload.text),
+        })
 
-      return {
-        ...response,
-        data: {
-          ...response.data,
-          translations: response.data.translations.map(translation => ({
-            ...translation,
-            translatedText: replaceKatexSyntax([translation.translatedText], true)[0],
-          })),
-        },
-      }
-    })
+        return {
+          ...response,
+          data: {
+            ...response.data,
+            translations: response.data.translations.map((translation) => ({
+              ...translation,
+              translatedText: replaceKatexSyntax([translation.translatedText], true)[0],
+            })),
+          },
+        }
+      },
+    )
     this.textToSpeechTextFx = createEffect(api.postTextToSpeech)
   }
 }

package/src/features/chatbot/model/messagesHelper.ts

@@ -0,0 +1,48 @@
+import { generateRandomId } from '../../../lib/helpers/helpers'
+import { ConversationMessage, CreateMessageResponse } from '../types/model.types'
+
+type OwnMessageProps = {
+  message?: string
+  translatedMessage?: string
+  threadId?: string | null
+}
+
+export class messagesHelper {
+  public static createAnswer(data: CreateMessageResponse): ConversationMessage {
+    return {
+      id: generateRandomId(),
+      isOwnMessage: false,
+      message: data.message,
+      threadId: data.threadId,
+      options: data.options,
+      translatedMessage: data.translatedMessage,
+    }
+  }
+
+  public static createLast(data: CreateMessageResponse) {
+    return {
+      id: generateRandomId(),
+      message: data.message,
+      translatedMessage: data.translatedMessage,
+      isOwnMessage: false,
+      options: [],
+      threadId: '',
+      endMessage: true,
+    }
+  }
+
+  public static createOwn({
+    message = '',
+    translatedMessage,
+    threadId,
+  }: OwnMessageProps): ConversationMessage {
+    return {
+      id: generateRandomId(),
+      message,
+      translatedMessage,
+      threadId: threadId || '',
+      isOwnMessage: true,
+      options: [],
+    }
+  }
+}

package/src/features/chatbot/model/translation.helpers.ts

@@ -0,0 +1,58 @@
+import {
+  AddTranslationToAlternativesProps,
+  GetOptionsProps,
+  GetOptionsResult,
+} from '../types/translation.types'
+import { ChatAnswer, GetAlternativesResponse } from '../types/api.types'
+
+export function getOptionsForTranslation({
+  lastMessage,
+  alternatives,
+}: GetOptionsProps): GetOptionsResult {
+  if (!lastMessage) return { lastMessage: null, alternatives: null }
+  if (!lastMessage.options.length) {
+    if (!alternatives) return { lastMessage: null, alternatives: null }
+    const hintAlternatives = alternatives.options.hints ?? []
+    const defaultAlternatives = alternatives.options.default ?? []
+    return {
+      lastMessage: null,
+      alternatives: {
+        hints: hintAlternatives.map(({ text }) => text),
+        default: defaultAlternatives.map(({ text }) => text),
+      },
+    }
+  }
+
+  return {
+    lastMessage: lastMessage.options.map(({ text }) => text),
+    alternatives: null,
+  }
+}
+
+export function addTranslationsToAlternative({
+  alternatives,
+  translatedHints,
+  translatedDefaults,
+}: AddTranslationToAlternativesProps): GetAlternativesResponse {
+  return {
+    ...alternatives,
+    options: {
+      ...alternatives.options,
+      hints: translatedHints.map((translatedText, index) => ({
+        ...alternatives.options.hints[index],
+        translatedText,
+      })),
+      default: translatedDefaults.map((translatedText, index) => ({
+        ...alternatives.options.default[index],
+        translatedText,
+      })),
+    },
+  }
+}
+
+export function addTranslationToOptions(options: ChatAnswer[], translations: string[]) {
+  return options.map((option, index) => ({
+    ...option,
+    translatedText: translations[index],
+  }))
+}