dumili: WIP

ducksmanager · Dec 14, 2024 · 7dda43f · 7dda43f
1 parent 422ae82
commit 7dda43f
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 26 deletions.
diff --git a/apps/dumili/api/services/indexation/index.ts b/apps/dumili/api/services/indexation/index.ts
@@ -173,24 +173,30 @@ export default (io: Server) => {
         if (entry?.acceptedStoryKind?.kind === STORY) {
           const firstPageNumberOfEntry = getEntryPages(indexation, entryId)[0]
             .pageNumber;
-          const ocrResults = (await prisma.page.findUnique({
-            include: {
-              image: {
-                include: {
-                  aiOcrResults: true,
+          const ocrResults = (
+            await prisma.page.findUnique({
+              include: {
+                image: {
+                  include: {
+                    aiOcrResults: true,
+                  },
                 },
               },
-            },
-            where: {
-              imageId: {
-                not: null,
-              },
-              indexationId_pageNumber: {
-                indexationId: indexation.id,
-                pageNumber: firstPageNumberOfEntry,
+              where: {
+                imageId: {
+                  not: null,
+                },
+                indexationId_pageNumber: {
+                  indexationId: indexation.id,
+                  pageNumber: firstPageNumberOfEntry,
+                },
               },
-            },
-          }))!.image!.aiOcrResults;
+            })
+          )?.image?.aiOcrResults;
+
+          if (!ocrResults) {
+            throw new Error(`No OCR results found for this entry`);
+          }
 
           const { results: searchResults } = await coaServices.searchStory(
             ocrResults.map(({ text }) => text),
@@ -295,6 +301,9 @@ export default (io: Server) => {
           },
           data: {
             storyKindSuggestions: {
+              deleteMany: {
+                isChosenByAi: true,
+              },
               updateMany: {
                 data: {
                   isChosenByAi: true,
@@ -595,7 +604,11 @@ export default (io: Server) => {
         await setInferredEntryStoryKind(entryId);
 
         if (entry?.acceptedStoryKind?.kind === STORY) {
-          await createStorySuggestions(entryId);
+          try {
+            await createStorySuggestions(entryId);
+          } catch (error) {
+            console.log((error as { message: string }).message);
+          }
         }
         callback({ status: "OK" });
       });
@@ -676,6 +689,7 @@ export default (io: Server) => {
           } catch (error) {
             callback({
               error: error as
+                | "No OCR results found for this entry"
                 | "This entry does not have a page URL associated"
                 | "This entry is not a story",
               errorDetails: `Entry ID: ${entryId}`,

diff --git a/apps/dumili/api/services/indexation/types.ts b/apps/dumili/api/services/indexation/types.ts
@@ -168,6 +168,7 @@ export default abstract class {
       data: Errorable<
         { status: "OK" },
         | "OCR error"
+        | "No OCR results found for this entry"
         | "This entry is not a story"
         | "This entry does not have a page URL associated"
       >,

diff --git a/apps/dumili/package.json b/apps/dumili/package.json
@@ -29,7 +29,7 @@
     "bootstrap": "^5.3.3",
     "bootstrap-vue-next": "^0.26.11",
     "js-cookie": "^3.0.5",
-    "pinia": "^2.3.0",
+    "pinia": "^2.2.7",
     "sortablejs": "^1.15.6",
     "vue": "^3.5.13",
     "vue-draggable-resizable": "^3.0.0",

diff --git a/apps/dumili/src/components/DumiliBook.vue b/apps/dumili/src/components/DumiliBook.vue
@@ -97,16 +97,18 @@ watch(
 
 watch(visiblePages, () => {
   for (const pageId of visiblePages.value || []) {
-    const img = new Image();
     const pageIndex = indexation.pages.findIndex(({ id }) => id === pageId);
-    img.src = indexation.pages[pageIndex].image!.url;
+    if (indexation.pages[pageIndex].image) {
+      const img = new Image();
+      img.src = indexation.pages[pageIndex].image!.url;
 
-    img.onload = () => {
-      pageDimensions.value[indexation.pages[pageIndex].image!.url] = {
-        width: img.naturalWidth,
-        height: img.naturalHeight,
+      img.onload = () => {
+        pageDimensions.value[indexation.pages[pageIndex].image!.url] = {
+          width: img.naturalWidth,
+          height: img.naturalHeight,
+        };
       };
-    };
+    }
   }
 });
 

diff --git a/apps/dumili/src/components/Entry.vue b/apps/dumili/src/components/Entry.vue
@@ -88,6 +88,7 @@ defineProps<{
 
 const { indexationSocket } = inject(dumiliSocketInjectionKey)!;
 const { indexation } = storeToRefs(suggestions());
+const { loadIndexation } = suggestions();
 
 const entry = defineModel<FullEntry>({ required: true });
 
@@ -109,15 +110,16 @@ watchDebounced(
       entry.value.brokenpagedenominator,
       entry.value.title,
     ]),
-  () => {
+  async () => {
     const { entirepages, brokenpagenumerator, brokenpagedenominator, title } =
       entry.value;
-    indexationSocket.value!.services.updateEntry(entry.value.id, {
+    await indexationSocket.value!.services.updateEntry(entry.value.id, {
       entirepages,
       brokenpagenumerator,
       brokenpagedenominator,
       title,
     });
+    await loadIndexation();
   },
   { debounce: 500, maxWait: 1000 },
 );