Merge branch 'develop' into staging-new

Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2025-05-01 12:59:59 +07:00
commit 1484b9893a
No known key found for this signature in database
GPG Key ID: BD80F68D68D8F7F2
12 changed files with 76 additions and 37 deletions

View File

@ -88,7 +88,7 @@
<div class="flex-center clear-mins w-full h-9">
{#if issue?.$lookup?.status}
<div class="icon mr-4 h-8">
<IssueStatusIcon value={issue.$lookup.status} space={issue.space} size="small" />
<IssueStatusIcon value={issue.$lookup.status} taskType={issue.kind} space={issue.space} size="small" />
</div>
{/if}
<span class="overflow-label flex-no-shrink mr-3">{issue.identifier}</span>

View File

@ -20,14 +20,14 @@
export let tx: TxUpdateDoc<Issue>
$: value = tx.operations.status
$: taskType = tx.operations.kind
$: status = value && $statusStore.byId.get(value)
$: space = tx.objectSpace as Ref<Project>
</script>
<div class="icon">
{#if status}
<IssueStatusIcon value={status} {space} size="small" on:accent-color />
<IssueStatusIcon value={status} {taskType} {space} size="small" on:accent-color />
{/if}
</div>

View File

@ -27,7 +27,7 @@
<!-- <Icon icon={tracker.icon.TrackerApplication} size={'medium'} /> -->
<FixedColumn key="object-popup-issue-status">
{#if st}
<IssueStatusIcon value={st} size={'small'} space={value.space} />
<IssueStatusIcon value={st} taskType={value.kind} size={'small'} space={value.space} />
{/if}
</FixedColumn>
<span class="ml-2 max-w-120 overflow-label">

View File

@ -57,7 +57,7 @@
<svelte:fragment slot="content">
<div class="flex-row-center flex-wrap gap-2 reverse">
{#if status === undefined && issue}
<IssueStatusIcon value={status} space={issue.space} size="small" />
<IssueStatusIcon value={status} taskType={issue.kind} space={issue.space} size="small" />
{/if}
{#if issue}
<IssuePresenter value={issue} />

View File

@ -86,6 +86,6 @@
</span>
</Row>
{#each displaySt as st}
<StatusPresenter value={st.status} space={issue.space} />
<StatusPresenter value={st.status} taskType={issue.kind} space={issue.space} />
<Duration value={st.duration} />
{/each}

View File

@ -31,5 +31,5 @@
</script>
{#if value}
<IssueStatusIcon value={issueStatus} {size} space={value.space} />
<IssueStatusIcon value={issueStatus} taskType={value.kind} {size} space={value.space} />
{/if}

View File

@ -143,6 +143,7 @@
<div class="flex-center flex-no-shrink square-4">
{#if selectedStatus}<IssueStatusIcon
value={selectedStatus}
taskType={value.kind}
size={kind === 'list' ? 'small' : 'medium'}
space={value.space}
/>{/if}
@ -170,7 +171,7 @@
>
<svelte:fragment slot="icon">
{#if selectedStatus}
<IssueStatusIcon value={selectedStatus} size={iconSize} space={value.space} />
<IssueStatusIcon value={selectedStatus} taskType={value.kind} size={iconSize} space={value.space} />
{/if}
</svelte:fragment>
<svelte:fragment slot="content">

View File

@ -139,7 +139,7 @@
>
<svelte:fragment slot="icon">
{#if selectedStatus}
<IssueStatusIcon value={selectedStatus} size={iconSize} space={undefined} />
<IssueStatusIcon value={selectedStatus} {taskType} size={iconSize} space={undefined} />
{/if}
</svelte:fragment>
<svelte:fragment slot="content">

View File

@ -161,7 +161,7 @@
>
{#if parentStatus}
<div class="pr-2">
<IssueStatusIcon space={parentIssue.space} value={parentStatus} size="small" />
<IssueStatusIcon space={parentIssue.space} taskType={parentIssue.kind} value={parentStatus} size="small" />
</div>
{/if}
<span class="overflow-label flex-no-shrink mr-2">{parentIssue.identifier}</span>

View File

@ -29,7 +29,7 @@
<div class="flex-row-center">
{#if status}
<div class="icon mr-2">
<IssueStatusIcon value={status} {size} space={issue.space} />
<IssueStatusIcon value={status} taskType={issue.kind} {size} space={issue.space} />
</div>
{/if}
<span class="label" class:text-base={huge}>

View File

@ -28,6 +28,14 @@ interface Config {
VadSilenceDurationMs: number
VadPrefixPaddingMs: number
VadThreshold: number
DgEndpointing: number
DgUtteranceEndMs: number
DgInterimResults: boolean
DgVadEvents: boolean
DgPunctuate: boolean
DgSmartFormat: boolean
DgNoDelay: boolean
}
const config: Config = (() => {
@ -43,7 +51,15 @@ const config: Config = (() => {
SttProvider: (process.env.STT_PROVIDER as SttProvider) ?? 'deepgram',
VadSilenceDurationMs: parseInt(process.env.SILENCE_DURATION_MS ?? '1000'),
VadPrefixPaddingMs: parseInt(process.env.PREFIX_PADDING_MS ?? '1000'),
VadThreshold: parseFloat(process.env.VAD_THRESHOLD ?? '0.5')
VadThreshold: parseFloat(process.env.VAD_THRESHOLD ?? '0.5'),
DgEndpointing: parseInt(process.env.DG_ENDPOINTING ?? '100'),
DgInterimResults: process.env.DG_INTERIM_RESULTS === 'true',
DgVadEvents: process.env.DG_VAD_EVENTS === 'true',
DgPunctuate: process.env.DG_PUNCTUATE === 'true',
DgSmartFormat: process.env.DG_SMART_FORMAT === 'true',
DgUtteranceEndMs: parseInt(process.env.DG_UTTERANCE_END_MS ?? '0'),
DgNoDelay: process.env.DG_NO_DELAY === 'true'
}
const missingEnv = (Object.keys(params) as Array<keyof Config>).filter((key) => params[key] === undefined)

View File

@ -29,19 +29,6 @@ import config from '../config.js'
const KEEP_ALIVE_INTERVAL = 10 * 1000
const dgSchema: LiveSchema = {
model: config.DeepgramModel,
encoding: 'linear16',
smart_format: true,
endpointing: 500,
interim_results: true,
vad_events: true,
utterance_end_ms: 1000,
punctuate: true,
language: 'en'
}
export class STT implements Stt {
private readonly deepgram: DeepgramClient
@ -134,6 +121,47 @@ export class STT implements Stt {
}
}
getOptions (stream: AudioStream): LiveSchema {
const options: Partial<LiveSchema> = {}
if (config.DgEndpointing !== 0) {
options.endpointing = config.DgEndpointing
}
if (config.DgInterimResults) {
options.interim_results = true
}
if (config.DgVadEvents) {
options.vad_events = true
}
if (config.DgUtteranceEndMs !== 0) {
options.utterance_end_ms = config.DgUtteranceEndMs
}
if (config.DgPunctuate) {
options.punctuate = true
}
if (config.DgSmartFormat) {
options.smart_format = true
}
if (config.DgNoDelay) {
options.no_delay = true
}
return {
...options,
encoding: 'linear16',
channels: stream.numChannels,
sample_rate: stream.sampleRate,
language: 'multi',
model: config.DeepgramModel
}
}
processTrack (sid: string): void {
const track = this.trackBySid.get(sid)
if (track === undefined) return
@ -141,14 +169,9 @@ export class STT implements Stt {
const stream = new AudioStream(track)
// const language = this.language ?? 'en'
const dgConnection = this.deepgram.listen.live({
...dgSchema,
channels: stream.numChannels,
sample_rate: stream.sampleRate,
language: 'multi',
model: config.DeepgramModel
})
console.log('Starting deepgram for track', this.room.name, sid)
const options = this.getOptions(stream)
const dgConnection = this.deepgram.listen.live(options)
console.log('Starting deepgram for track', this.room.name, sid, options)
const interval = setInterval(() => {
dgConnection.keepAlive()
@ -167,14 +190,13 @@ export class STT implements Stt {
return
}
if (data.speech_final === true) {
void this.sendToPlatform(transcript, sid)
} else if (data.is_final === true) {
if (data.speech_final === true || data.is_final === true) {
void this.sendToPlatform(transcript, sid)
}
})
dgConnection.on(LiveTranscriptionEvents.Close, (d) => {
dgConnection.on(LiveTranscriptionEvents.Close, (data) => {
console.log('Deepgram closed', data)
this.stopDeepgram(sid)
})