@speakableio/core 1.0.12 → 1.0.14

package/dist/index.native.d.mts

@@ -772,6 +772,11 @@ interface PageScore {
     hint?: string[];
     reviewed?: boolean;
     error?: ('feedback_error' | 'transcript_error' | 'summary_error' | 'audio_upload_error' | 'unknown' | null)[];
+    stagedResponse?: {
+        audio?: string | null;
+        fileName?: string | null;
+        transcript?: string | null;
+    } | null;
 }
 
 declare enum AssignmentAnalyticsType {
@@ -993,7 +998,9 @@ declare function useUpdateCardScore({ isAssignment, activityId, userId, cardIds,
     }, Error, {
         cardId: string;
         cardScore: PageScore;
-    }, void>;
+    }, {
+        previousData: Score | undefined;
+    }>;
 };
 declare function useClearScore(): {
     mutationClearScore: _tanstack_react_query.UseMutationResult<{
@@ -1007,6 +1014,18 @@ declare function useClearScore(): {
         activityId: string;
     }, unknown>;
 };
+declare function useClearScoreV2(): {
+    mutationClearScore: _tanstack_react_query.UseMutationResult<{
+        update: Partial<Score>;
+        activityId: string;
+    }, Error, {
+        isAssignment: boolean;
+        cardId: string;
+        cardScores: PageScore;
+        userId: string;
+        activityId: string;
+    }, unknown>;
+};
 declare function useSubmitAssignmentScore({ onAssignmentSubmitted, studentName, }: {
     onAssignmentSubmitted: (assignmentId: string) => void;
     studentName: string;
@@ -2760,7 +2779,7 @@ declare const useBaseOpenAI: ({ onTranscriptSuccess, onTranscriptError, onComple
         url: string;
         fileName: string;
     }>;
-    uploadAudioAndGetTranscript: (audio: string, language: string) => Promise<{
+    uploadAudioAndGetTranscript: (audio: string, language: string, pagePrompt: string | null) => Promise<{
         transcript: string;
         audioUrl: string;
     }>;
@@ -2773,19 +2792,20 @@ declare const useBaseOpenAI: ({ onTranscriptSuccess, onTranscriptError, onComple
         url: string;
         fileName: string;
     }>;
-    uploadAudioAndGetTranscript: (audio: string, language: string) => Promise<{
+    uploadAudioAndGetTranscript: (audio: string, language: string, pagePrompt: string | null) => Promise<{
         transcript: string;
         audioUrl: string;
     }>;
-    getTranscript: (audioUrl: string, language: string) => Promise<string>;
+    getTranscript: (audioUrl: string, language: string, prompt?: string) => Promise<any>;
     getFreeResponseCompletion: (messages: string[], isFreeResponse: boolean, feedbackLanguage: string, gradingStandard?: string) => Promise<any>;
-    getFeedback: ({ cardId, language, writtenResponse, audio, autoGrade, file, }: {
+    getFeedback: ({ cardId, language, writtenResponse, audio, autoGrade, file, pagePrompt, }: {
         cardId: string;
         language: string;
         writtenResponse: string | null;
         audio: string | null;
         autoGrade: boolean;
         file: string | null;
+        pagePrompt: string | null;
     }) => Promise<{
         noFeedbackAvailable: boolean;
         success: boolean;
@@ -3242,4 +3262,4 @@ declare const createFsClientNative: ({ db, httpsCallable, logEvent }: FsClientPa
     };
 };
 
-export { ActivityPageType, type Assignment, type AssignmentAnalyticsType$1 as AssignmentAnalyticsType, type AssignmentWithId, BASE_MULTIPLE_CHOICE_FIELD_VALUES, BASE_REPEAT_FIELD_VALUES, BASE_RESPOND_FIELD_VALUES, type CreditContract, FeedbackTypesCard, FsCtx, type InstitutionSubscription, LENIENCY_OPTIONS, LeniencyCard, MULTIPLE_CHOICE_PAGE_ACTIVITY_TYPES, type Organization, type OrganizationAccess, type PageActivity, type PageActivityWithId, type PageScore, REPEAT_PAGE_ACTIVITY_TYPES, RESPOND_AUDIO_PAGE_ACTIVITY_TYPES, RESPOND_PAGE_ACTIVITY_TYPES, RESPOND_WRITE_PAGE_ACTIVITY_TYPES, type RefsCardsFiresotre, type RefsSetsFirestore, SPEAKABLE_NOTIFICATIONS, STUDENT_LEVELS_OPTIONS, type Score, type ScoreWithId, type Set, type SetWithId, type SpeakableNotificationType, SpeakableNotificationTypes, SpeakableProvider, VerificationCardStatus, assignmentQueryKeys, cardsQueryKeys, checkIsMCPage, checkIsMediaPage, checkIsRepeatPage, checkIsRespondAudioPage, checkIsRespondPage, checkIsRespondWrittenPage, checkIsShortAnswerPage, checkTypePageActivity, cleanString, createAssignmentRepo, createCardRepo, createFsClientNative as createFsClient, createSetRepo, creditQueryKeys, debounce, getCardFromCache, getLabelPage, getPagePrompt, getPhraseLength, getRespondCardTool, getSetFromCache, getTotalCompletedCards, getWordHash, purify, refsCardsFiresotre, refsSetsFirestore, scoreQueryKeys, setsQueryKeys, updateCardInCache, updateSetInCache, useActivity, useActivityFeedbackAccess, useAssignment, useBaseOpenAI, useCards, useClearScore, useCreateCard, useCreateCards, useCreateNotification, useGetCard, useOrganizationAccess, useScore, useSet, useSpeakableApi, useSubmitAssignmentScore, useSubmitPracticeScore, useUpdateCardScore, useUpdateScore, useUpdateStudentVocab, useUserCredits };
+export { ActivityPageType, type Assignment, type AssignmentAnalyticsType$1 as AssignmentAnalyticsType, type AssignmentWithId, BASE_MULTIPLE_CHOICE_FIELD_VALUES, BASE_REPEAT_FIELD_VALUES, BASE_RESPOND_FIELD_VALUES, type CreditContract, FeedbackTypesCard, FsCtx, type InstitutionSubscription, LENIENCY_OPTIONS, LeniencyCard, MULTIPLE_CHOICE_PAGE_ACTIVITY_TYPES, type Organization, type OrganizationAccess, type PageActivity, type PageActivityWithId, type PageScore, REPEAT_PAGE_ACTIVITY_TYPES, RESPOND_AUDIO_PAGE_ACTIVITY_TYPES, RESPOND_PAGE_ACTIVITY_TYPES, RESPOND_WRITE_PAGE_ACTIVITY_TYPES, type RefsCardsFiresotre, type RefsSetsFirestore, SPEAKABLE_NOTIFICATIONS, STUDENT_LEVELS_OPTIONS, type Score, type ScoreWithId, type Set, type SetWithId, type SpeakableNotificationType, SpeakableNotificationTypes, SpeakableProvider, VerificationCardStatus, assignmentQueryKeys, cardsQueryKeys, checkIsMCPage, checkIsMediaPage, checkIsRepeatPage, checkIsRespondAudioPage, checkIsRespondPage, checkIsRespondWrittenPage, checkIsShortAnswerPage, checkTypePageActivity, cleanString, createAssignmentRepo, createCardRepo, createFsClientNative as createFsClient, createSetRepo, creditQueryKeys, debounce, getCardFromCache, getLabelPage, getPagePrompt, getPhraseLength, getRespondCardTool, getSetFromCache, getTotalCompletedCards, getWordHash, purify, refsCardsFiresotre, refsSetsFirestore, scoreQueryKeys, setsQueryKeys, updateCardInCache, updateSetInCache, useActivity, useActivityFeedbackAccess, useAssignment, useBaseOpenAI, useCards, useClearScore, useClearScoreV2, useCreateCard, useCreateCards, useCreateNotification, useGetCard, useOrganizationAccess, useScore, useSet, useSpeakableApi, useSubmitAssignmentScore, useSubmitPracticeScore, useUpdateCardScore, useUpdateScore, useUpdateStudentVocab, useUserCredits };

package/dist/index.native.d.ts

@@ -772,6 +772,11 @@ interface PageScore {
     hint?: string[];
     reviewed?: boolean;
     error?: ('feedback_error' | 'transcript_error' | 'summary_error' | 'audio_upload_error' | 'unknown' | null)[];
+    stagedResponse?: {
+        audio?: string | null;
+        fileName?: string | null;
+        transcript?: string | null;
+    } | null;
 }
 
 declare enum AssignmentAnalyticsType {
@@ -993,7 +998,9 @@ declare function useUpdateCardScore({ isAssignment, activityId, userId, cardIds,
     }, Error, {
         cardId: string;
         cardScore: PageScore;
-    }, void>;
+    }, {
+        previousData: Score | undefined;
+    }>;
 };
 declare function useClearScore(): {
     mutationClearScore: _tanstack_react_query.UseMutationResult<{
@@ -1007,6 +1014,18 @@ declare function useClearScore(): {
         activityId: string;
     }, unknown>;
 };
+declare function useClearScoreV2(): {
+    mutationClearScore: _tanstack_react_query.UseMutationResult<{
+        update: Partial<Score>;
+        activityId: string;
+    }, Error, {
+        isAssignment: boolean;
+        cardId: string;
+        cardScores: PageScore;
+        userId: string;
+        activityId: string;
+    }, unknown>;
+};
 declare function useSubmitAssignmentScore({ onAssignmentSubmitted, studentName, }: {
     onAssignmentSubmitted: (assignmentId: string) => void;
     studentName: string;
@@ -2760,7 +2779,7 @@ declare const useBaseOpenAI: ({ onTranscriptSuccess, onTranscriptError, onComple
         url: string;
         fileName: string;
     }>;
-    uploadAudioAndGetTranscript: (audio: string, language: string) => Promise<{
+    uploadAudioAndGetTranscript: (audio: string, language: string, pagePrompt: string | null) => Promise<{
         transcript: string;
         audioUrl: string;
     }>;
@@ -2773,19 +2792,20 @@ declare const useBaseOpenAI: ({ onTranscriptSuccess, onTranscriptError, onComple
         url: string;
         fileName: string;
     }>;
-    uploadAudioAndGetTranscript: (audio: string, language: string) => Promise<{
+    uploadAudioAndGetTranscript: (audio: string, language: string, pagePrompt: string | null) => Promise<{
         transcript: string;
         audioUrl: string;
     }>;
-    getTranscript: (audioUrl: string, language: string) => Promise<string>;
+    getTranscript: (audioUrl: string, language: string, prompt?: string) => Promise<any>;
     getFreeResponseCompletion: (messages: string[], isFreeResponse: boolean, feedbackLanguage: string, gradingStandard?: string) => Promise<any>;
-    getFeedback: ({ cardId, language, writtenResponse, audio, autoGrade, file, }: {
+    getFeedback: ({ cardId, language, writtenResponse, audio, autoGrade, file, pagePrompt, }: {
         cardId: string;
         language: string;
         writtenResponse: string | null;
         audio: string | null;
         autoGrade: boolean;
         file: string | null;
+        pagePrompt: string | null;
     }) => Promise<{
         noFeedbackAvailable: boolean;
         success: boolean;
@@ -3242,4 +3262,4 @@ declare const createFsClientNative: ({ db, httpsCallable, logEvent }: FsClientPa
     };
 };
 
-export { ActivityPageType, type Assignment, type AssignmentAnalyticsType$1 as AssignmentAnalyticsType, type AssignmentWithId, BASE_MULTIPLE_CHOICE_FIELD_VALUES, BASE_REPEAT_FIELD_VALUES, BASE_RESPOND_FIELD_VALUES, type CreditContract, FeedbackTypesCard, FsCtx, type InstitutionSubscription, LENIENCY_OPTIONS, LeniencyCard, MULTIPLE_CHOICE_PAGE_ACTIVITY_TYPES, type Organization, type OrganizationAccess, type PageActivity, type PageActivityWithId, type PageScore, REPEAT_PAGE_ACTIVITY_TYPES, RESPOND_AUDIO_PAGE_ACTIVITY_TYPES, RESPOND_PAGE_ACTIVITY_TYPES, RESPOND_WRITE_PAGE_ACTIVITY_TYPES, type RefsCardsFiresotre, type RefsSetsFirestore, SPEAKABLE_NOTIFICATIONS, STUDENT_LEVELS_OPTIONS, type Score, type ScoreWithId, type Set, type SetWithId, type SpeakableNotificationType, SpeakableNotificationTypes, SpeakableProvider, VerificationCardStatus, assignmentQueryKeys, cardsQueryKeys, checkIsMCPage, checkIsMediaPage, checkIsRepeatPage, checkIsRespondAudioPage, checkIsRespondPage, checkIsRespondWrittenPage, checkIsShortAnswerPage, checkTypePageActivity, cleanString, createAssignmentRepo, createCardRepo, createFsClientNative as createFsClient, createSetRepo, creditQueryKeys, debounce, getCardFromCache, getLabelPage, getPagePrompt, getPhraseLength, getRespondCardTool, getSetFromCache, getTotalCompletedCards, getWordHash, purify, refsCardsFiresotre, refsSetsFirestore, scoreQueryKeys, setsQueryKeys, updateCardInCache, updateSetInCache, useActivity, useActivityFeedbackAccess, useAssignment, useBaseOpenAI, useCards, useClearScore, useCreateCard, useCreateCards, useCreateNotification, useGetCard, useOrganizationAccess, useScore, useSet, useSpeakableApi, useSubmitAssignmentScore, useSubmitPracticeScore, useUpdateCardScore, useUpdateScore, useUpdateStudentVocab, useUserCredits };
+export { ActivityPageType, type Assignment, type AssignmentAnalyticsType$1 as AssignmentAnalyticsType, type AssignmentWithId, BASE_MULTIPLE_CHOICE_FIELD_VALUES, BASE_REPEAT_FIELD_VALUES, BASE_RESPOND_FIELD_VALUES, type CreditContract, FeedbackTypesCard, FsCtx, type InstitutionSubscription, LENIENCY_OPTIONS, LeniencyCard, MULTIPLE_CHOICE_PAGE_ACTIVITY_TYPES, type Organization, type OrganizationAccess, type PageActivity, type PageActivityWithId, type PageScore, REPEAT_PAGE_ACTIVITY_TYPES, RESPOND_AUDIO_PAGE_ACTIVITY_TYPES, RESPOND_PAGE_ACTIVITY_TYPES, RESPOND_WRITE_PAGE_ACTIVITY_TYPES, type RefsCardsFiresotre, type RefsSetsFirestore, SPEAKABLE_NOTIFICATIONS, STUDENT_LEVELS_OPTIONS, type Score, type ScoreWithId, type Set, type SetWithId, type SpeakableNotificationType, SpeakableNotificationTypes, SpeakableProvider, VerificationCardStatus, assignmentQueryKeys, cardsQueryKeys, checkIsMCPage, checkIsMediaPage, checkIsRepeatPage, checkIsRespondAudioPage, checkIsRespondPage, checkIsRespondWrittenPage, checkIsShortAnswerPage, checkTypePageActivity, cleanString, createAssignmentRepo, createCardRepo, createFsClientNative as createFsClient, createSetRepo, creditQueryKeys, debounce, getCardFromCache, getLabelPage, getPagePrompt, getPhraseLength, getRespondCardTool, getSetFromCache, getTotalCompletedCards, getWordHash, purify, refsCardsFiresotre, refsSetsFirestore, scoreQueryKeys, setsQueryKeys, updateCardInCache, updateSetInCache, useActivity, useActivityFeedbackAccess, useAssignment, useBaseOpenAI, useCards, useClearScore, useClearScoreV2, useCreateCard, useCreateCards, useCreateNotification, useGetCard, useOrganizationAccess, useScore, useSet, useSpeakableApi, useSubmitAssignmentScore, useSubmitPracticeScore, useUpdateCardScore, useUpdateScore, useUpdateStudentVocab, useUserCredits };

package/dist/index.native.js

@@ -86,6 +86,7 @@ __export(index_native_exports, {
   useBaseOpenAI: () => useBaseOpenAI,
   useCards: () => useCards,
   useClearScore: () => useClearScore,
+  useClearScoreV2: () => useClearScoreV2,
   useCreateCard: () => useCreateCard,
   useCreateCards: () => useCreateCards,
   useCreateNotification: () => useCreateNotification,
@@ -152,6 +153,8 @@ function withErrorHandler(fn, serviceName) {
     try {
       return await fn(...args);
     } catch (error) {
+      console.error(`Service ${serviceName} failed with args:`, args);
+      console.error("Error details:", error);
       if (error instanceof Error && "code" in error) {
         const firebaseError = error;
         throw new ServiceError(
@@ -1248,6 +1251,39 @@ async function clearScore(params) {
     activityId: params.activityId
   };
 }
+async function clearScoreV2(params) {
+  var _a, _b, _c, _d, _e;
+  const update = {
+    [`cards.${params.cardId}`]: {
+      ...params.cardScores,
+      attempts: ((_a = params.cardScores.attempts) != null ? _a : 1) + 1,
+      correct: (_b = params.cardScores.correct) != null ? _b : 0,
+      history: [
+        {
+          ...params.cardScores,
+          attempts: (_c = params.cardScores.attempts) != null ? _c : 1,
+          correct: (_d = params.cardScores.correct) != null ? _d : 0,
+          retryTime: (0, import_dayjs3.default)().format("YYYY-MM-DD HH:mm:ss"),
+          history: null
+        },
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        ...(_e = params.cardScores.history) != null ? _e : []
+      ]
+    }
+  };
+  const path = params.isAssignment ? refsAssignmentFiresotre.assignmentScores({
+    id: params.activityId,
+    userId: params.userId
+  }) : refsScoresPractice.practiceScores({
+    setId: params.activityId,
+    userId: params.userId
+  });
+  await api.updateDoc(path, update);
+  return {
+    update,
+    activityId: params.activityId
+  };
+}
 
 // src/domains/assignment/services/submit-assignment-score.service.ts
 var import_dayjs4 = __toESM(require("dayjs"));
@@ -1360,7 +1396,7 @@ function useScore({
     enabled
   });
 }
-var debounceUpdateScore = debounce(updateScore, 1e3);
+var debounceUpdateScore = debounce(updateScore, 500);
 function useUpdateScore() {
   const { queryClient } = useSpeakableApi();
   const mutation = (0, import_react_query2.useMutation)({
@@ -1419,6 +1455,7 @@ function useUpdateCardScore({
       return { cardId, scoresUpdated: newScoreUpdated };
     },
     onMutate: ({ cardId, cardScore }) => {
+      const previousData = queryClient.getQueryData(queryKey);
       queryClient.setQueryData(queryKey, (previousScore) => {
         const updates = handleOptimisticScore({
           score: previousScore,
@@ -1432,14 +1469,18 @@ function useUpdateCardScore({
           ...updates
         };
       });
+      return { previousData };
     },
-    // eslint-disable-next-line no-unused-vars
-    onError: (error) => {
-      console.log(error.message);
-      const previousData = queryClient.getQueryData(queryKey);
-      if (previousData) {
-        queryClient.setQueryData(queryKey, previousData);
+    onError: (error, variables, context) => {
+      console.log("Error updating card score:", error.message);
+      if (context == null ? void 0 : context.previousData) {
+        queryClient.setQueryData(queryKey, context.previousData);
       }
+    },
+    onSettled: () => {
+      queryClient.invalidateQueries({
+        queryKey
+      });
     }
   });
   return {
@@ -1505,6 +1546,27 @@ function useClearScore() {
   const { queryClient } = useSpeakableApi();
   const mutation = (0, import_react_query2.useMutation)({
     mutationFn: clearScore,
+    onError: (error) => {
+      console.log("Error clearing score:", error.message);
+    },
+    onSettled: (result) => {
+      var _a;
+      queryClient.invalidateQueries({
+        queryKey: scoreQueryKeys.byId((_a = result == null ? void 0 : result.activityId) != null ? _a : "")
+      });
+    }
+  });
+  return {
+    mutationClearScore: mutation
+  };
+}
+function useClearScoreV2() {
+  const { queryClient } = useSpeakableApi();
+  const mutation = (0, import_react_query2.useMutation)({
+    mutationFn: clearScoreV2,
+    onError: (error) => {
+      console.log("Error clearing score V2:", error.message);
+    },
     onSettled: (result) => {
       var _a;
       queryClient.invalidateQueries({
@@ -3097,21 +3159,38 @@ var useBaseOpenAI = ({
   const { data: feedbackAccess } = useActivityFeedbackAccess({
     aiEnabled
   });
-  const getTranscript = async (audioUrl, language) => {
-    var _a, _b;
+  const getTranscript = async (audioUrl, language, prompt) => {
+    var _a, _b, _c, _d;
+    const getGeminiTranscript = (_b = (_a = api).httpsCallable) == null ? void 0 : _b.call(_a, "getGeminiTranscript");
+    const getAssemblyAITranscript = (_d = (_c = api).httpsCallable) == null ? void 0 : _d.call(_c, "transcribeAssemblyAIAudio");
+    try {
+      const { data } = await (getGeminiTranscript == null ? void 0 : getGeminiTranscript({
+        audioUrl,
+        targetLanguage: language,
+        prompt: prompt || ""
+      }));
+      const transcript = data.transcript;
+      if (transcript) {
+        return transcript;
+      }
+    } catch (error) {
+      console.log("Gemini transcript failed, trying AssemblyAI fallback:", error);
+    }
     try {
-      const getAssemblyAITranscript = (_b = (_a = api).httpsCallable) == null ? void 0 : _b.call(_a, "transcribeAssemblyAIAudio");
       const response = await (getAssemblyAITranscript == null ? void 0 : getAssemblyAITranscript({
         audioUrl,
         language
       }));
       const transcript = response == null ? void 0 : response.data;
-      return transcript;
+      if (transcript) {
+        return transcript;
+      }
+      throw new Error("Both transcript services failed");
     } catch (error) {
-      console.log("error", error);
+      console.log("AssemblyAI transcript also failed:", error);
       onTranscriptError({
         type: "TRANSCRIPT",
-        message: (error == null ? void 0 : error.message) || "Error getting transcript"
+        message: (error == null ? void 0 : error.message) || "Error getting transcript from both services"
       });
       throw new Error(error);
     }
@@ -3166,7 +3245,8 @@ var useBaseOpenAI = ({
     // if the type = RESPOND_WRITE
     audio = null,
     autoGrade = true,
-    file = null
+    file = null,
+    pagePrompt = null
   }) => {
     try {
       if (!(feedbackAccess == null ? void 0 : feedbackAccess.canAccessFeedback)) {
@@ -3186,7 +3266,7 @@ var useBaseOpenAI = ({
         onTranscriptSuccess(writtenResponse);
       } else if (typeof audio === "string" && file) {
         if (feedbackAccess == null ? void 0 : feedbackAccess.canAccessFeedback) {
-          transcript = await getTranscript(audio, language);
+          transcript = await getTranscript(audio, language, pagePrompt != null ? pagePrompt : "");
           audioUrl = audio;
           onTranscriptSuccess(transcript);
         } else {
@@ -3195,7 +3275,7 @@ var useBaseOpenAI = ({
           );
         }
       } else {
-        const response = await uploadAudioAndGetTranscript(audio || "", language);
+        const response = await uploadAudioAndGetTranscript(audio || "", language, pagePrompt != null ? pagePrompt : "");
         transcript = response.transcript;
         audioUrl = response.audioUrl;
       }