mirror of
https://github.com/omnivore-app/omnivore.git
synced 2026-03-11 08:54:26 +00:00
Remove some debug, clean up summaries
This commit is contained in:
parent
8205b38007
commit
692a992e77
3 changed files with 1 additions and 90 deletions
|
|
@ -17,10 +17,6 @@ export interface AISummarizeJobData {
|
|||
export const AI_SUMMARIZE_JOB_NAME = 'ai-summary-job'
|
||||
|
||||
export const aiSummarize = async (jobData: AISummarizeJobData) => {
|
||||
console.log(
|
||||
'starting summary: *************************************************************************************'
|
||||
)
|
||||
|
||||
try {
|
||||
const libraryItem = await authTrx(
|
||||
async (tx) =>
|
||||
|
|
@ -37,7 +33,6 @@ export const aiSummarize = async (jobData: AISummarizeJobData) => {
|
|||
return
|
||||
}
|
||||
|
||||
logger.info(`summarizing with openai: ${process.env.OPENAI_API_KEY}`)
|
||||
const llm = new ChatOpenAI({
|
||||
configuration: {
|
||||
apiKey: process.env.OPENAI_API_KEY,
|
||||
|
|
@ -73,13 +68,7 @@ export const aiSummarize = async (jobData: AISummarizeJobData) => {
|
|||
undefined,
|
||||
jobData.userId
|
||||
)
|
||||
|
||||
console.log('created:V ', aiSummary)
|
||||
} catch (err) {
|
||||
console.log('error creating summary: ', err)
|
||||
}
|
||||
|
||||
console.log(
|
||||
'ending summary: *************************************************************************************'
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,10 @@
|
|||
import { htmlToSpeechFile } from '@omnivore/text-to-speech-handler'
|
||||
import cors from 'cors'
|
||||
import express from 'express'
|
||||
import * as jwt from 'jsonwebtoken'
|
||||
import { userRepository } from '../repository/user'
|
||||
import { getClaimsByToken } from '../utils/auth'
|
||||
import { corsConfig } from '../utils/corsConfig'
|
||||
import { logger } from '../utils/logger'
|
||||
import { getAISummary, getRecentAISummaries } from '../services/ai-summaries'
|
||||
import { getAISummary } from '../services/ai-summaries'
|
||||
|
||||
export function aiSummariesRouter() {
|
||||
const router = express.Router()
|
||||
|
|
@ -53,38 +51,5 @@ export function aiSummariesRouter() {
|
|||
}
|
||||
)
|
||||
|
||||
router.get(
|
||||
'/recents',
|
||||
cors<express.Request>(corsConfig),
|
||||
async (req, res) => {
|
||||
const token = req?.cookies?.auth || req?.headers?.authorization
|
||||
const claims = await getClaimsByToken(token)
|
||||
if (!claims) {
|
||||
return res.status(401).send('UNAUTHORIZED')
|
||||
}
|
||||
|
||||
const { uid } = claims
|
||||
const user = await userRepository.findById(uid)
|
||||
if (!user) {
|
||||
return res.status(400).send('Bad Request')
|
||||
}
|
||||
|
||||
const offset = parseInt(req.params.offset) || 0
|
||||
const count = Math.max(10, parseInt(req.params.count) || 10)
|
||||
|
||||
const result = await getRecentAISummaries({
|
||||
user,
|
||||
offset,
|
||||
count,
|
||||
})
|
||||
|
||||
return res.send({
|
||||
count,
|
||||
offset,
|
||||
summaries: result,
|
||||
})
|
||||
}
|
||||
)
|
||||
|
||||
return router
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
import { AISummary } from '../entity/AISummary'
|
||||
import { User } from '../entity/user'
|
||||
import { authTrx } from '../repository'
|
||||
|
||||
export const getAISummary = async (data: {
|
||||
|
|
@ -33,45 +32,3 @@ export const getAISummary = async (data: {
|
|||
)
|
||||
return aiSummary ?? undefined
|
||||
}
|
||||
|
||||
// Gets an ordered list of the most recent summaries with
|
||||
// the provided offset and limit
|
||||
export const getRecentAISummaries = async (data: {
|
||||
user: User
|
||||
offset: number
|
||||
count: number
|
||||
}): Promise<AISummary[]> => {
|
||||
const summaries = await authTrx(
|
||||
async (t) => {
|
||||
return await t
|
||||
.getRepository(AISummary)
|
||||
.createQueryBuilder()
|
||||
.select('ais.user_id', 'user_id')
|
||||
.addSelect('ais.summary', 'summary')
|
||||
.addSelect('ais.library_item_id', 'library_item_id')
|
||||
.addSelect('ais.title', 'title')
|
||||
.addSelect('ais.slug', 'slug')
|
||||
.from((subQuery) => {
|
||||
return subQuery
|
||||
.select('t.user_id', 'user_id')
|
||||
.addSelect('t.library_item_id', 'library_item_id')
|
||||
.addSelect('t.title', 'title')
|
||||
.addSelect('t.slug', 'slug')
|
||||
.addSelect('t.summary', 'summary')
|
||||
.addSelect('t.created_at', 'created_at')
|
||||
.addSelect(
|
||||
'ROW_NUMBER() OVER (PARTITION BY t.library_item_id ORDER BY t.created_at DESC)',
|
||||
'row_num'
|
||||
)
|
||||
.from('omnivore.ai_summaries', 't')
|
||||
.where('t.user_id = :userId', { userId: data.user.id })
|
||||
}, 'ais')
|
||||
.skip(data.offset)
|
||||
.take(data.count)
|
||||
.getRawMany()
|
||||
},
|
||||
undefined,
|
||||
data.user.id
|
||||
)
|
||||
return summaries ?? undefined
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue