mirror of
https://github.com/alkimake/paperclip.git
synced 2026-06-16 02:40:39 +09:00
Restore feedback trace export fixes
This commit is contained in:
parent
ed95fc1dda
commit
00898e8194
9 changed files with 357 additions and 24 deletions
|
|
@ -63,6 +63,7 @@ const MAX_SKILLS = 20;
|
|||
const MAX_INSTRUCTION_FILES = 20;
|
||||
const MAX_TRACE_FILE_CHARS = 10_000_000;
|
||||
const DEFAULT_INSTANCE_SETTINGS_SINGLETON_KEY = "default";
|
||||
const FEEDBACK_EXPORT_BACKEND_NOT_CONFIGURED = "Feedback export backend is not configured";
|
||||
|
||||
type FeedbackTraceRow = typeof feedbackExports.$inferSelect & {
|
||||
issueIdentifier: string | null;
|
||||
|
|
@ -1742,15 +1743,48 @@ export function feedbackService(db: Db, options: FeedbackServiceOptions = {}) {
|
|||
|
||||
flushPendingFeedbackTraces: async (input?: {
|
||||
companyId?: string;
|
||||
traceId?: string;
|
||||
limit?: number;
|
||||
now?: Date;
|
||||
}) => {
|
||||
const shareClient = options.shareClient;
|
||||
if (!shareClient) {
|
||||
const filters = [eq(feedbackExports.status, "pending")];
|
||||
if (input?.companyId) {
|
||||
filters.push(eq(feedbackExports.companyId, input.companyId));
|
||||
}
|
||||
if (input?.traceId) {
|
||||
filters.push(eq(feedbackExports.id, input.traceId));
|
||||
}
|
||||
|
||||
const rows = await db
|
||||
.select({
|
||||
id: feedbackExports.id,
|
||||
attemptCount: feedbackExports.attemptCount,
|
||||
})
|
||||
.from(feedbackExports)
|
||||
.where(and(...filters))
|
||||
.orderBy(asc(feedbackExports.createdAt), asc(feedbackExports.id))
|
||||
.limit(Math.max(1, Math.min(input?.limit ?? 25, 200)));
|
||||
|
||||
const attemptAt = input?.now ?? new Date();
|
||||
for (const row of rows) {
|
||||
await db
|
||||
.update(feedbackExports)
|
||||
.set({
|
||||
status: "failed",
|
||||
attemptCount: row.attemptCount + 1,
|
||||
lastAttemptedAt: attemptAt,
|
||||
failureReason: FEEDBACK_EXPORT_BACKEND_NOT_CONFIGURED,
|
||||
updatedAt: attemptAt,
|
||||
})
|
||||
.where(eq(feedbackExports.id, row.id));
|
||||
}
|
||||
|
||||
return {
|
||||
attempted: 0,
|
||||
attempted: rows.length,
|
||||
sent: 0,
|
||||
failed: 0,
|
||||
failed: rows.length,
|
||||
};
|
||||
}
|
||||
|
||||
|
|
@ -1761,6 +1795,9 @@ export function feedbackService(db: Db, options: FeedbackServiceOptions = {}) {
|
|||
if (input?.companyId) {
|
||||
filters.push(eq(feedbackExports.companyId, input.companyId));
|
||||
}
|
||||
if (input?.traceId) {
|
||||
filters.push(eq(feedbackExports.id, input.traceId));
|
||||
}
|
||||
|
||||
const rows = await db
|
||||
.select({
|
||||
|
|
@ -1983,7 +2020,7 @@ export function feedbackService(db: Db, options: FeedbackServiceOptions = {}) {
|
|||
})
|
||||
.where(eq(feedbackVotes.id, savedVote.id));
|
||||
|
||||
await tx
|
||||
const [savedTrace] = await tx
|
||||
.insert(feedbackExports)
|
||||
.values({
|
||||
companyId: issue.companyId,
|
||||
|
|
@ -2030,6 +2067,9 @@ export function feedbackService(db: Db, options: FeedbackServiceOptions = {}) {
|
|||
failureReason: null,
|
||||
updatedAt: now,
|
||||
},
|
||||
})
|
||||
.returning({
|
||||
id: feedbackExports.id,
|
||||
});
|
||||
|
||||
return {
|
||||
|
|
@ -2037,6 +2077,7 @@ export function feedbackService(db: Db, options: FeedbackServiceOptions = {}) {
|
|||
...savedVote,
|
||||
redactionSummary: artifacts.redactionSummary,
|
||||
},
|
||||
traceId: savedTrace?.id ?? null,
|
||||
consentEnabledNow,
|
||||
persistedSharingPreference,
|
||||
sharingEnabled: sharedWithLabs,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue