refactor(desktop): structure suggestion pipeline and restore test gates
This commit is contained in:
parent
fe0989c456
commit
1d4f8d8401
17 changed files with 813 additions and 569 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -0,0 +1,104 @@
|
|||
import type { SuggestionCandidateParseResult, SuggestionModelRequest } from './SuggestionModelRequest'
|
||||
|
||||
export interface FirstCandidateDiagnostics {
|
||||
appName: string | null
|
||||
prefix: string
|
||||
composing: boolean
|
||||
}
|
||||
|
||||
export interface FirstCandidateLogger {
|
||||
debug(message: string): void
|
||||
info(message: string): void
|
||||
}
|
||||
|
||||
export interface FirstCandidateAttemptInput {
|
||||
request: SuggestionModelRequest
|
||||
model: string
|
||||
initialTemperature: number
|
||||
retryTemperature: number
|
||||
signal: AbortSignal
|
||||
diagnostics: FirstCandidateDiagnostics
|
||||
logger: FirstCandidateLogger
|
||||
stream(
|
||||
request: SuggestionModelRequest,
|
||||
model: string,
|
||||
temperature: number,
|
||||
signal: AbortSignal,
|
||||
onPartial: (partial: string) => void
|
||||
): Promise<string>
|
||||
onPartial(partial: string): void
|
||||
onRetry(): void
|
||||
}
|
||||
|
||||
export interface FirstCandidateAttemptResult {
|
||||
parsed: SuggestionCandidateParseResult
|
||||
spacedPreferred: boolean
|
||||
attempts: number
|
||||
}
|
||||
|
||||
function describeRawOutput(raw: string, prefill: boolean): string {
|
||||
const first = raw.charAt(0)
|
||||
const kind =
|
||||
raw.length === 0
|
||||
? 'empty'
|
||||
: first === '\n' || first === '\r'
|
||||
? 'newline'
|
||||
: /\s/u.test(first)
|
||||
? 'space'
|
||||
: /[\p{L}\p{N}]/u.test(first)
|
||||
? 'letter'
|
||||
: 'symbol'
|
||||
return `mode=${prefill ? 'prefill' : 'instruct'} len=${raw.length} first=${kind} lines=${raw.split('\n').length}`
|
||||
}
|
||||
|
||||
function describePrefixEnd(prefix: string): string {
|
||||
if (/\s$/u.test(prefix)) return 'space'
|
||||
const last = [...prefix].pop() ?? ''
|
||||
if (!last) return 'empty'
|
||||
if (/[\u3131-\u318e]/u.test(last)) return 'jamo'
|
||||
if (/[가-힣]/u.test(last)) return 'hangul'
|
||||
if (/[.!?。!?…~]/u.test(last)) return 'sentence-end'
|
||||
if (/[,;:]/u.test(last)) return 'comma'
|
||||
if (/[A-Za-z0-9]/u.test(last)) return 'ascii'
|
||||
return 'other'
|
||||
}
|
||||
|
||||
export async function runFirstCandidateAttempts(
|
||||
input: FirstCandidateAttemptInput
|
||||
): Promise<FirstCandidateAttemptResult> {
|
||||
let active = input.request
|
||||
let temperature = input.initialTemperature
|
||||
let parsed: SuggestionCandidateParseResult = { candidate: null, rejected: 'empty' }
|
||||
let attempts = 0
|
||||
|
||||
for (let attempt = 0; attempt < 2; attempt += 1) {
|
||||
attempts = attempt + 1
|
||||
const raw = await input.stream(active, input.model, temperature, input.signal, input.onPartial)
|
||||
if (input.signal.aborted) break
|
||||
parsed = active.parse(raw)
|
||||
if (!parsed.candidate) {
|
||||
input.logger.debug(`제안 정제 실패: ${describeRawOutput(raw, active.raw)}`)
|
||||
if (raw.trim().length === 0) {
|
||||
input.logger.debug(
|
||||
`제안 빈 출력 조건: app=${input.diagnostics.appName ?? '-'} end=${describePrefixEnd(input.diagnostics.prefix)} ` +
|
||||
`comp=${input.diagnostics.composing} spaced=${active !== input.request}`
|
||||
)
|
||||
}
|
||||
}
|
||||
if (parsed.candidate) break
|
||||
|
||||
if (raw.trim().length === 0 && active.spaced) {
|
||||
input.logger.debug('제안 빈 출력 — prefill 끝에 공백을 붙여 다시 뽑는다')
|
||||
input.onRetry()
|
||||
active = active.spaced
|
||||
} else if (parsed.rejected?.startsWith('unsupported-facts')) {
|
||||
input.logger.info(`제안 후보 버림 (${parsed.rejected}) — 한 번 더 뽑는다`)
|
||||
input.onRetry()
|
||||
temperature = input.retryTemperature
|
||||
} else {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return { parsed, spacedPreferred: active !== input.request, attempts }
|
||||
}
|
||||
|
|
@ -0,0 +1,167 @@
|
|||
import {
|
||||
SUGGESTION_MAX_OUTPUT_CHARS,
|
||||
extractContinuation,
|
||||
parseSuggestionCandidates,
|
||||
sanitizeSuggestionLine,
|
||||
type SuggestionCandidate
|
||||
} from '@d3ro/core/input-intelligence'
|
||||
import { renderRawChatPrompt, rawChatStopSequences } from '@d3ro/core/chat-template'
|
||||
import { splitSentences } from '@d3ro/core/personal-graph'
|
||||
import { copiesContext } from '@d3ro/core/suggestion-confidence'
|
||||
import { findUnsupportedFacts } from '@d3ro/core/writing-context'
|
||||
import type { TypingContext } from '../InputTelemetryService'
|
||||
import { buildSuggestionPrompt, type RecentWriteHint } from '../llm-prompts'
|
||||
|
||||
export interface LocalMemoryContext {
|
||||
continuationHints: string[]
|
||||
followUpHints: string[]
|
||||
relatedHints: string[]
|
||||
phraseHints: string[]
|
||||
fallbackPhraseHints: string[]
|
||||
appPhraseCount: number
|
||||
}
|
||||
|
||||
export interface SuggestionCandidateParseResult {
|
||||
candidate: SuggestionCandidate | null
|
||||
rejected: string | null
|
||||
}
|
||||
|
||||
export interface SuggestionModelRequest {
|
||||
prompt: string
|
||||
systemPrompt?: string
|
||||
raw: boolean
|
||||
stop?: string[]
|
||||
parse(raw: string): SuggestionCandidateParseResult
|
||||
partial(raw: string): string
|
||||
/** 빈 prefill 출력일 때 끝 공백을 붙여 다시 볼 요청. */
|
||||
spaced?: SuggestionModelRequest
|
||||
}
|
||||
|
||||
export interface SuggestionModelRequestInput {
|
||||
model: string
|
||||
prefix: string
|
||||
context: TypingContext
|
||||
memory: LocalMemoryContext
|
||||
maxChars: number
|
||||
recentWrites?: readonly RecentWriteHint[]
|
||||
avoidCandidates?: readonly string[]
|
||||
}
|
||||
|
||||
function suffixAfterCaret(context: TypingContext): string | null {
|
||||
if (context.caretOffset === null || context.caretOffset >= context.fullText.length) return null
|
||||
const suffix = context.fullText.slice(context.caretOffset, context.caretOffset + 200).trim()
|
||||
return suffix.length > 0 ? suffix : null
|
||||
}
|
||||
|
||||
function relatedPromptHints(memory: LocalMemoryContext): string[] {
|
||||
return [...memory.relatedHints, ...memory.phraseHints]
|
||||
.filter(
|
||||
(value, index, list) => list.indexOf(value) === index && !memory.followUpHints.includes(value)
|
||||
)
|
||||
.slice(0, 5)
|
||||
}
|
||||
|
||||
function parsePrefillCandidate(
|
||||
raw: string,
|
||||
extract: (value: string) => ReturnType<typeof extractContinuation>,
|
||||
factSource: string
|
||||
): SuggestionCandidateParseResult {
|
||||
const continuation = extract(raw)
|
||||
if (!continuation) return { candidate: null, rejected: 'empty' }
|
||||
const unsupported = findUnsupportedFacts(continuation.text, factSource)
|
||||
if (unsupported.length > 0)
|
||||
return { candidate: null, rejected: `unsupported-facts:${unsupported.join('/')}` }
|
||||
if (copiesContext(continuation.text, factSource))
|
||||
return { candidate: null, rejected: 'copied-context' }
|
||||
return {
|
||||
candidate:
|
||||
continuation.joint === 'attach'
|
||||
? { text: continuation.text, rank: 0, joint: 'attach' }
|
||||
: { text: continuation.text, rank: 0 },
|
||||
rejected: null
|
||||
}
|
||||
}
|
||||
|
||||
export function buildSuggestionModelRequest(
|
||||
input: SuggestionModelRequestInput
|
||||
): SuggestionModelRequest {
|
||||
const { model, prefix, context, memory, maxChars, recentWrites = [], avoidCandidates } = input
|
||||
const promptInput = {
|
||||
prefix,
|
||||
documentText: context.documentBefore ?? null,
|
||||
suffix: suffixAfterCaret(context),
|
||||
appName: context.appName,
|
||||
windowTitle: context.windowTitle,
|
||||
recentWrites,
|
||||
phraseHints: relatedPromptHints(memory),
|
||||
continuationHints: memory.continuationHints,
|
||||
followUpHints: memory.followUpHints,
|
||||
avoidCandidates,
|
||||
candidates: 1,
|
||||
maxChars
|
||||
}
|
||||
|
||||
const prompt = buildSuggestionPrompt({ ...promptInput, prefill: true })
|
||||
const rawPrompt = renderRawChatPrompt(model, {
|
||||
system: prompt.systemPrompt,
|
||||
user: prompt.text,
|
||||
assistantPrefix: prompt.assistantPrefix ?? ''
|
||||
})
|
||||
|
||||
if (rawPrompt !== null) {
|
||||
const written = splitSentences(context.documentBefore ?? prefix)
|
||||
const extract = (raw: string) =>
|
||||
extractContinuation(raw, {
|
||||
mode: prompt.writing.mode,
|
||||
prefill: prompt.assistantPrefix ?? '',
|
||||
writtenSentences: written,
|
||||
wordFinished: prompt.wordFinished,
|
||||
allowEmoji: prompt.allowEmoji,
|
||||
maxChars
|
||||
})
|
||||
const parse = (raw: string): SuggestionCandidateParseResult =>
|
||||
parsePrefillCandidate(raw, extract, prompt.factSource)
|
||||
const stop = rawChatStopSequences(model)
|
||||
const endsWithSpace = /\s$/u.test(prompt.assistantPrefix ?? '')
|
||||
return {
|
||||
prompt: rawPrompt,
|
||||
raw: true,
|
||||
stop,
|
||||
spaced: endsWithSpace
|
||||
? undefined
|
||||
: {
|
||||
prompt: `${rawPrompt} `,
|
||||
raw: true,
|
||||
stop,
|
||||
parse: (raw) => parse(` ${raw}`),
|
||||
partial: (raw) => extract(` ${raw}`)?.text ?? ''
|
||||
},
|
||||
parse,
|
||||
partial: (raw) => extract(raw)?.text ?? ''
|
||||
}
|
||||
}
|
||||
|
||||
const legacy = buildSuggestionPrompt(promptInput)
|
||||
return {
|
||||
prompt: legacy.text,
|
||||
systemPrompt: legacy.systemPrompt,
|
||||
raw: false,
|
||||
parse: (raw) => {
|
||||
const text = parseSuggestionCandidates(raw, prefix, 1, maxChars)[0]
|
||||
if (!text) return { candidate: null, rejected: 'empty' }
|
||||
const unsupported = findUnsupportedFacts(text, legacy.factSource)
|
||||
if (unsupported.length > 0)
|
||||
return { candidate: null, rejected: `unsupported-facts:${unsupported.join('/')}` }
|
||||
return { candidate: { text, rank: 0 }, rejected: null }
|
||||
},
|
||||
partial: sanitizePartial
|
||||
}
|
||||
}
|
||||
|
||||
function sanitizePartial(raw: string): string {
|
||||
const lines = raw
|
||||
.split(/\r?\n/u)
|
||||
.map((line) => sanitizeSuggestionLine(line, SUGGESTION_MAX_OUTPUT_CHARS) ?? line.trim())
|
||||
.filter((line) => line.length > 0)
|
||||
return lines.slice(0, 2).join(' ').slice(0, SUGGESTION_MAX_OUTPUT_CHARS)
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue