gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-12-05 06:54:23 +01:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

feat(unit): ocr tests almost pass...

Browse Source
This commit is contained in:
perf3ct 2025-06-10 20:36:52 +00:00
parent f1356228a3
commit d20b3d854f
No known key found for this signature in database
GPG Key ID: 569C4EEC436F5232
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
apps/server/src/services/ocr/ocr_service.spec.ts
View File

@ -62,7 +62,7 @@ beforeEach(async () => {
// Reset mock implementations // Reset mock implementations
mockOptions.getOptionBool.mockReturnValue(true); mockOptions.getOptionBool.mockReturnValue(true);
mockOptions.getOption.mockReturnValue('eng'); mockOptions.getOption.mockReturnValue('eng');
mockSql.execute.mockImplementation(() => Promise.resolve({ lastInsertRowid: 1 })); mockSql.execute.mockImplementation(() => ({ lastInsertRowid: 1 }));
mockSql.getRow.mockReturnValue(null); mockSql.getRow.mockReturnValue(null);
mockSql.getRows.mockReturnValue([]); mockSql.getRows.mockReturnValue([]);
@ -258,7 +258,9 @@ describe('OCRService', () => {
it('should handle database insertion errors', async () => { it('should handle database insertion errors', async () => {
const error = new Error('Database error'); const error = new Error('Database error');
mockSql.execute.mockRejectedValue(error); mockSql.execute.mockImplementation(() => {
throw error;
});
const ocrResult = { const ocrResult = {
text: 'Sample text', text: 'Sample text',
@ -277,12 +279,12 @@ describe('OCRService', () => {
noteId: 'note123', noteId: 'note123',
type: 'image', type: 'image',
mime: 'image/jpeg', mime: 'image/jpeg',
getBlob: vi.fn() getContent: vi.fn()
}; };
beforeEach(() => { beforeEach(() => {
mockBecca.getNote.mockReturnValue(mockNote); mockBecca.getNote.mockReturnValue(mockNote);
mockNote.getBlob.mockResolvedValue(Buffer.from('fake-image-data')); mockNote.getContent.mockReturnValue(Buffer.from('fake-image-data'));
}); });
it('should process note OCR successfully', async () => { it('should process note OCR successfully', async () => {
@ -309,7 +311,7 @@ describe('OCRService', () => {
language: 'eng' language: 'eng'
}); });
expect(mockBecca.getNote).toHaveBeenCalledWith('note123'); expect(mockBecca.getNote).toHaveBeenCalledWith('note123');
expect(mockNote.getBlob).toHaveBeenCalled(); expect(mockNote.getContent).toHaveBeenCalled();
}); });
it('should return existing OCR result if forceReprocess is false', async () => { it('should return existing OCR result if forceReprocess is false', async () => {
@ -329,7 +331,7 @@ describe('OCRService', () => {
language: 'eng', language: 'eng',
extractedAt: '2025-06-10T09:00:00.000Z' extractedAt: '2025-06-10T09:00:00.000Z'
}); });
expect(mockNote.getBlob).not.toHaveBeenCalled(); expect(mockNote.getContent).not.toHaveBeenCalled();
}); });
it('should reprocess if forceReprocess is true', async () => { it('should reprocess if forceReprocess is true', async () => {
@ -356,7 +358,7 @@ describe('OCRService', () => {
const result = await ocrService.processNoteOCR('note123', { forceReprocess: true }); const result = await ocrService.processNoteOCR('note123', { forceReprocess: true });
expect(result?.text).toBe('New processed text'); expect(result?.text).toBe('New processed text');
expect(mockNote.getBlob).toHaveBeenCalled(); expect(mockNote.getContent).toHaveBeenCalled();
}); });
it('should return null for non-existent note', async () => { it('should return null for non-existent note', async () => {
@ -383,12 +385,12 @@ describe('OCRService', () => {
attachmentId: 'attach123', attachmentId: 'attach123',
role: 'image', role: 'image',
mime: 'image/png', mime: 'image/png',
getBlob: vi.fn() getContent: vi.fn()
}; };
beforeEach(() => { beforeEach(() => {
mockBecca.getAttachment.mockReturnValue(mockAttachment); mockBecca.getAttachment.mockReturnValue(mockAttachment);
mockAttachment.getBlob.mockResolvedValue(Buffer.from('fake-image-data')); mockAttachment.getContent.mockReturnValue(Buffer.from('fake-image-data'));
}); });
it('should process attachment OCR successfully', async () => { it('should process attachment OCR successfully', async () => {
@ -714,13 +716,13 @@ describe('OCRService', () => {
noteId: 'note1', noteId: 'note1',
type: 'image', type: 'image',
mime: 'image/jpeg', mime: 'image/jpeg',
getContent: vi.fn().mockResolvedValue(Buffer.from('fake-image-data')) getContent: vi.fn().mockReturnValue(Buffer.from('fake-image-data'))
}; };
const mockAttachment = { const mockAttachment = {
attachmentId: 'attach1', attachmentId: 'attach1',
role: 'image', role: 'image',
mime: 'image/gif', mime: 'image/gif',
getContent: vi.fn().mockResolvedValue(Buffer.from('fake-image-data')) getContent: vi.fn().mockReturnValue(Buffer.from('fake-image-data'))
}; };
mockBecca.getNote.mockReturnValue(mockNote); mockBecca.getNote.mockReturnValue(mockNote);
@ -757,7 +759,7 @@ describe('OCRService', () => {
noteId: 'note1', noteId: 'note1',
type: 'image', type: 'image',
mime: 'image/jpeg', mime: 'image/jpeg',
getContent: vi.fn().mockRejectedValue(new Error('Failed to get content')) getContent: vi.fn().mockImplementation(() => { throw new Error('Failed to get content'); })
}; };
mockBecca.getNote.mockReturnValue(mockNote); mockBecca.getNote.mockReturnValue(mockNote);
mockSql.getRow.mockReturnValue(null); mockSql.getRow.mockReturnValue(null);
@ -815,7 +817,7 @@ describe('OCRService', () => {
noteId: 'note2', noteId: 'note2',
type: 'image', type: 'image',
mime: 'image/jpeg', mime: 'image/jpeg',
getContent: vi.fn().mockResolvedValue(Buffer.from('fake-image-data')) getContent: vi.fn().mockReturnValue(Buffer.from('fake-image-data'))
}; };
mockBecca.getNote.mockReturnValue(mockNote); mockBecca.getNote.mockReturnValue(mockNote);
mockSql.getRow.mockReturnValue(null); mockSql.getRow.mockReturnValue(null);
@ -866,7 +868,7 @@ describe('OCRService', () => {
mockBecca.getNote.mockReturnValue({ mockBecca.getNote.mockReturnValue({
noteId: 'note123', noteId: 'note123',
mime: 'image/jpeg', mime: 'image/jpeg',
getBlob: vi.fn().mockResolvedValue(Buffer.from('fake-image-data')) getContent: vi.fn().mockReturnValue(Buffer.from('fake-image-data'))
}); });
mockSql.getRow.mockResolvedValue(null); mockSql.getRow.mockResolvedValue(null);

4
apps/server/src/services/ocr/ocr_service.ts
View File

@ -184,7 +184,7 @@ class OCRService {
} }
try { try {
const content = await note.getBlob(); const content = note.getContent();
if (!content || !(content instanceof Buffer)) { if (!content || !(content instanceof Buffer)) {
throw new Error(`Cannot get image content for note ${noteId}`); throw new Error(`Cannot get image content for note ${noteId}`);
} }
@ -234,7 +234,7 @@ class OCRService {
} }
try { try {
const content = await attachment.getBlob(); const content = attachment.getContent();
if (!content || !(content instanceof Buffer)) { if (!content || !(content instanceof Buffer)) {
throw new Error(`Cannot get image content for attachment ${attachmentId}`); throw new Error(`Cannot get image content for attachment ${attachmentId}`);
} }