diff --git a/packages/api/src/jobs/ai/create_digest.ts b/packages/api/src/jobs/ai/create_digest.ts index 58db0768e..76d38fe69 100644 --- a/packages/api/src/jobs/ai/create_digest.ts +++ b/packages/api/src/jobs/ai/create_digest.ts @@ -9,7 +9,6 @@ import { } from '@omnivore/text-to-speech-handler' import axios from 'axios' import { truncate } from 'lodash' -import showdown from 'showdown' import { v4 as uuid } from 'uuid' import yaml from 'yaml' import { LibraryItem } from '../../entity/library_item' @@ -32,7 +31,7 @@ import { analytics } from '../../utils/analytics' import { enqueueSendEmail } from '../../utils/createTask' import { wordsCount } from '../../utils/helpers' import { logger } from '../../utils/logger' -import { htmlToMarkdown } from '../../utils/parser' +import { htmlToMarkdown, markdownToHtml } from '../../utils/parser' import { uploadToBucket } from '../../utils/uploads' import { getImageSize, _findThumbnail } from '../find_thumbnail' @@ -455,22 +454,18 @@ const summarizeItems = async ( // generate speech files from the summaries const generateSpeechFiles = ( - rankedItems: RankedItem[], + summariesInHtml: string[], options: SSMLOptions ): SpeechFile[] => { console.time('generateSpeechFiles') - // convert the summaries from markdown to HTML - const converter = new showdown.Converter({ - backslashEscapesHTMLTags: true, - }) - const speechFiles = rankedItems.map((item) => { + const speechFiles = summariesInHtml.map((summary) => { const html = ` -
-
- ${converter.makeHtml(item.summary)} -
-
` +
+
+ ${summary} +
+
` return htmlToSpeechFile({ content: html, options, @@ -596,7 +591,7 @@ const sendEmail = async (user: User, digest: Digest, channels: Channel[]) => {

${chapter.title} (${chapter.wordCount} words)
- ${chapter.summary} + ${chapter.html}
` ) @@ -677,14 +672,14 @@ export const moveDigestToLibrary = async (user: User, digest: Digest) => { const html = ` -
+
${chapters .map( (chapter) => `

${chapter.title} (${chapter.wordCount} words)
- ${chapter.summary} + ${chapter.html}
` ) @@ -807,8 +802,16 @@ export const createDigest = async (jobData: CreateDigestData) => { console.timeEnd('summarizeItems') const filteredSummaries = filterSummaries(summaries) + const summariesInHtml = filteredSummaries.map((item) => { + try { + return markdownToHtml(item.summary) + } catch (error) { + logger.error('markdownToHtml error', error) + return '' + } + }) - const speechFiles = generateSpeechFiles(filteredSummaries, { + const speechFiles = generateSpeechFiles(summariesInHtml, { ...jobData, primaryVoice: jobData.voices?.[0], secondaryVoice: jobData.voices?.[1], @@ -826,7 +829,7 @@ export const createDigest = async (jobData: CreateDigestData) => { url: getItemUrl(item.libraryItem.id), thumbnail: item.libraryItem.thumbnail ?? undefined, wordCount: speechFiles[index].wordCount, - summary: item.summary, + html: summariesInHtml[index], })), createdAt: new Date(), description: '', diff --git a/packages/api/src/services/digest.ts b/packages/api/src/services/digest.ts index f80cbc1bb..6e0e95d59 100644 --- a/packages/api/src/services/digest.ts +++ b/packages/api/src/services/digest.ts @@ -1,7 +1,7 @@ -import { redisDataSource } from '../redis_data_source' import { SpeechFile } from '@omnivore/text-to-speech-handler' -import { logger } from '../utils/logger' import { TaskState } from '../generated/graphql' +import { redisDataSource } from '../redis_data_source' +import { logger } from '../utils/logger' export interface Chapter { title: string @@ -9,7 +9,7 @@ export interface Chapter { url: string wordCount: number thumbnail?: string - summary: string + html: string } export interface Digest { diff --git a/packages/api/src/utils/parser.ts b/packages/api/src/utils/parser.ts index a9ddd4bb4..182600aff 100644 --- a/packages/api/src/utils/parser.ts +++ b/packages/api/src/utils/parser.ts @@ -16,6 +16,7 @@ import { NodeHtmlMarkdown, TranslatorConfigObject } from 'node-html-markdown' import { ElementNode } from 'node-html-markdown/dist/nodes' import Parser from 'rss-parser' import { parser } from 'sax' +import showdown from 'showdown' import { ILike } from 'typeorm' import { promisify } from 'util' import { v4 as uuid } from 'uuid' @@ -702,7 +703,10 @@ export const htmlToMarkdown = (html: string) => { } export const markdownToHtml = (markdown: string) => { - return nhm.translate(/* markdown */ markdown) + const converter = new showdown.Converter({ + backslashEscapesHTMLTags: true, + }) + return converter.makeHtml(markdown) } export const getDistillerResult = async (