Compare commits

...

2 Commits

Author SHA1 Message Date
root 8991edabb5 feat(kol): support multiple platform hints with shared tag renderer
Frontend CI / Frontend (push) Successful in 2m47s
Backend CI / Backend (push) Failing after 6m50s
Turn the KOL prompt platform hint into a multi-select backed by the
media platforms API, persist hints as a 、-joined string, and add a
reusable KolPlatformTags component so manage/generate/package/template/
workspace views and the generate-task drawer all render the hints
consistently with truncation and overflow handling.

Also auto-select the first available subscription prompt in
GenerateTaskDrawer when switching to the subscription-prompt target so
users land on a usable option without an extra click.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-24 01:48:04 +08:00
root db95b8e4ee feat(kol): store KOL prompt content in database with object storage fallback
Add prompt_content columns to kol_prompts and kol_prompt_revisions so
prompt bodies live alongside their metadata, eliminating an extra round
trip to object storage for the common read path while keeping the old
asset key as a fallback for legacy rows.

Reads go through a singleflight-deduped, cache-backed loader that
prefers the database column, falls back to the asset key, and tolerates
missing objects via a new objectstorage.ErrObjectNotFound returned by
both the Aliyun OSS and MinIO clients on 404/NoSuchKey responses.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-24 01:47:51 +08:00
22 changed files with 547 additions and 115 deletions
@@ -22,6 +22,7 @@ import { useI18n } from 'vue-i18n'
import CoverPickerModal from '@/components/CoverPickerModal.vue'
import KnowledgeGroupSelect from '@/components/KnowledgeGroupSelect.vue'
import KolDynamicForm from '@/components/kol/KolDynamicForm.vue'
import KolPlatformTags from '@/components/kol/KolPlatformTags.vue'
import PromptRuleModal from '@/components/PromptRuleModal.vue'
import {
generateApi,
@@ -254,10 +255,15 @@ watch(
form.kolKnowledgeGroupIds = []
} else {
form.promptRuleId = undefined
selectDefaultSubscriptionPrompt()
}
},
)
watch(subscriptionPromptOptions, () => {
selectDefaultSubscriptionPrompt()
})
watch(
() => form.scheduleKind,
(kind) => {
@@ -372,6 +378,23 @@ function hydrateForm(): void {
? (parseCronTime(task.cron_expr) ??
normalizeClock(task.random_window_start, randomDefaultScheduleTime()))
: randomDefaultScheduleTime()
selectDefaultSubscriptionPrompt()
}
function selectDefaultSubscriptionPrompt(): void {
if (
!props.open ||
!isSchedule.value ||
props.task?.id ||
form.targetType !== 'kol_subscription_prompt' ||
form.subscriptionPromptId
) {
return
}
const firstOption = subscriptionPromptOptions.value[0]
if (firstOption) {
form.subscriptionPromptId = firstOption.value
}
}
function buildSchedulePayload() {
@@ -824,9 +847,14 @@ function normalizeJsonRecord(value: Record<string, unknown>): Record<string, Jso
{{ selectedSubscriptionPrompt.kol_display_name }}
</span>
</div>
<a-tag v-if="selectedSubscriptionPrompt.platform_hint" color="cyan">
{{ selectedSubscriptionPrompt.platform_hint }}
</a-tag>
<KolPlatformTags
v-if="selectedSubscriptionPrompt.platform_hint"
:value="selectedSubscriptionPrompt.platform_hint"
:max="2"
size="small"
:wrap="false"
class="generate-task-drawer__target-platform"
/>
</div>
<div
@@ -1281,6 +1309,11 @@ function normalizeJsonRecord(value: Record<string, unknown>): Record<string, Jso
background: #fbfcff;
}
.generate-task-drawer__target-platform {
max-width: 180px;
justify-content: flex-end;
}
.generate-task-drawer__target-icon {
display: inline-flex;
align-items: center;
@@ -0,0 +1,105 @@
<script setup lang="ts">
import { computed } from 'vue'
import { parseKolPlatformHints } from '@/lib/kol-platform-options'
const props = withDefaults(
defineProps<{
value?: string | null
max?: number
size?: 'small' | 'default'
wrap?: boolean
truncate?: boolean
}>(),
{
max: 0,
size: 'default',
wrap: true,
truncate: true,
},
)
const labels = computed(() => parseKolPlatformHints(props.value))
const visibleLabels = computed(() =>
props.max > 0 ? labels.value.slice(0, props.max) : labels.value,
)
const hiddenCount = computed(() => Math.max(labels.value.length - visibleLabels.value.length, 0))
const title = computed(() => labels.value.join('、'))
</script>
<template>
<div
v-if="labels.length"
class="kol-platform-tags"
:class="[
`kol-platform-tags--${size}`,
{
'kol-platform-tags--nowrap': !wrap,
'kol-platform-tags--full': !truncate,
},
]"
:title="title"
>
<span v-for="label in visibleLabels" :key="label" class="kol-platform-tags__item">
{{ label }}
</span>
<span v-if="hiddenCount" class="kol-platform-tags__item kol-platform-tags__item--more">
+{{ hiddenCount }}
</span>
</div>
</template>
<style scoped>
.kol-platform-tags {
display: inline-flex;
align-items: center;
flex-wrap: wrap;
gap: 4px;
min-width: 0;
max-width: 100%;
line-height: 1;
}
.kol-platform-tags--nowrap {
flex-wrap: nowrap;
overflow: hidden;
}
.kol-platform-tags__item {
display: inline-flex;
align-items: center;
min-width: 0;
max-width: 108px;
height: 22px;
padding: 0 8px;
border: 1px solid #bfdbfe;
border-radius: 999px;
background: #eff6ff;
color: #1d4ed8;
font-size: 11px;
font-weight: 600;
line-height: 20px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
.kol-platform-tags--small .kol-platform-tags__item {
max-width: 76px;
height: 20px;
padding: 0 6px;
line-height: 18px;
}
.kol-platform-tags--full .kol-platform-tags__item {
max-width: none;
}
.kol-platform-tags__item--more {
flex: 0 0 auto;
max-width: none;
border-color: #d1d5db;
background: #f9fafb;
color: #4b5563;
}
</style>
@@ -12,7 +12,7 @@ import { computed, nextTick, onBeforeUnmount, onMounted, reactive, ref, watch }
import { useI18n } from 'vue-i18n'
import EditorAiAssistPanel from '@/components/editor-common/EditorAiAssistPanel.vue'
import { kolManageApi } from '@/lib/api'
import { kolManageApi, mediaApi } from '@/lib/api'
import { formatError } from '@/lib/errors'
import { mergeKolCardConfig, parseKolCardConfig } from '@/lib/kol-card-config'
import {
@@ -20,7 +20,13 @@ import {
normalizeKolVariableDefinition,
syncKolVariablesWithContent,
} from '@/lib/kol-placeholders'
import { buildKolPlatformOptions } from '@/lib/kol-platform-options'
import {
buildKolPlatformOptions,
KOL_PLATFORM_HINT_DEFAULT,
normalizeKolPlatformHints,
parseKolPlatformHints,
serializeKolPlatformHints,
} from '@/lib/kol-platform-options'
import type {
KolAssistRequest,
KolAssistStreamEvent,
@@ -99,7 +105,7 @@ const variableConfigRef = ref<{
} | null>(null)
const metadataForm = reactive({
name: '',
platform_hint: '通用',
platform_hints: [KOL_PLATFORM_HINT_DEFAULT] as string[],
allow_web_search: false,
allow_user_knowledge: true,
})
@@ -113,14 +119,17 @@ const { data: promptDetail } = useQuery({
queryFn: () => kolManageApi.getPrompt(props.promptId),
})
const platformOptions = computed(() => {
const options = buildKolPlatformOptions(t('kol.manage.platformHintDefault'))
const currentValue = metadataForm.platform_hint.trim()
if (currentValue && !options.some((option) => option.value === currentValue)) {
return [{ label: currentValue, value: currentValue }, ...options]
}
return options
const platformsQuery = useQuery({
queryKey: ['media', 'platforms', 'kol-prompt-editor'],
queryFn: () => mediaApi.platforms(),
})
const platformOptions = computed(() =>
buildKolPlatformOptions(
t('kol.manage.platformHintDefault'),
platformsQuery.data.value ?? [],
metadataForm.platform_hints,
),
)
const selectionAiStreaming = computed(() => selectionAiStatus.value === 'generating')
const selectionAiHasPreview = computed(() => selectionAiPreview.value.trim().length > 0)
const selectionAiUiText = computed(() => ({
@@ -142,7 +151,9 @@ watch(
const parsedCardConfig = parseKolCardConfig(nextCardConfig)
metadataForm.name = detail.name
metadataForm.platform_hint = detail.platform_hint || '通用'
metadataForm.platform_hints = parseKolPlatformHints(
detail.platform_hint || KOL_PLATFORM_HINT_DEFAULT,
)
metadataForm.allow_web_search = parsedCardConfig.allow_web_search
metadataForm.allow_user_knowledge = parsedCardConfig.allow_user_knowledge
content.value = detail.latest_prompt_content ?? ''
@@ -442,7 +453,7 @@ function applySelectionAiReplacement() {
function buildPromptPayload(nextVariables: KolVariableDefinition[] = variables.value) {
return {
name: metadataForm.name.trim(),
platform_hint: metadataForm.platform_hint,
platform_hint: serializeKolPlatformHints(metadataForm.platform_hints),
sort_order: promptDetail.value?.sort_order,
content: content.value,
schema: { variables: nextVariables },
@@ -526,6 +537,10 @@ function handlePreview() {
previewOpen.value = true
}
function handlePlatformHintChange(values: string[]) {
metadataForm.platform_hints = normalizeKolPlatformHints(values)
}
async function handleFocusVariable(key: string) {
syncVariablesFromContent()
await nextTick()
@@ -642,11 +657,14 @@ onBeforeUnmount(() => {
<a-form-item :label="t('kol.manage.platformHint')">
<a-select
v-model:value="metadataForm.platform_hint"
:value="metadataForm.platform_hints"
:options="platformOptions"
option-filter-prop="label"
mode="multiple"
show-search
:loading="platformsQuery.isPending.value"
:get-popup-container="getSelectPopupContainer"
@change="handlePlatformHintChange"
/>
</a-form-item>
@@ -1,9 +1,17 @@
<script setup lang="ts">
import { buildKolPlatformOptions } from '@/lib/kol-platform-options'
import { useQuery } from '@tanstack/vue-query'
import type { CreateKolPromptRequest } from '@geo/shared-types'
import { computed, reactive, watch } from 'vue'
import { useI18n } from 'vue-i18n'
import { mediaApi } from '@/lib/api'
import {
buildKolPlatformOptions,
KOL_PLATFORM_HINT_DEFAULT,
normalizeKolPlatformHints,
serializeKolPlatformHints,
} from '@/lib/kol-platform-options'
const props = defineProps<{
open: boolean
packageId: number
@@ -18,24 +26,47 @@ const { t } = useI18n()
const formState = reactive<CreateKolPromptRequest>({
name: '',
platform_hint: '通用',
platform_hint: KOL_PLATFORM_HINT_DEFAULT,
})
const platformHints = reactive<{ values: string[] }>({
values: [KOL_PLATFORM_HINT_DEFAULT],
})
const platformOptions = computed(() => buildKolPlatformOptions(t('kol.manage.platformHintDefault')))
const platformsQuery = useQuery({
queryKey: ['media', 'platforms', 'kol-prompt-form'],
enabled: computed(() => props.open),
queryFn: () => mediaApi.platforms(),
})
const platformOptions = computed(() =>
buildKolPlatformOptions(
t('kol.manage.platformHintDefault'),
platformsQuery.data.value ?? [],
platformHints.values,
),
)
watch(
() => props.open,
(isOpen) => {
if (isOpen) {
formState.name = ''
formState.platform_hint = '通用'
formState.platform_hint = KOL_PLATFORM_HINT_DEFAULT
platformHints.values = [KOL_PLATFORM_HINT_DEFAULT]
}
},
)
function handlePlatformChange(values: string[]) {
platformHints.values = normalizeKolPlatformHints(values)
}
function handleOk() {
if (!formState.name.trim()) return
emit('submit', { ...formState })
emit('submit', {
...formState,
platform_hint: serializeKolPlatformHints(platformHints.values),
})
emit('update:open', false)
}
@@ -57,12 +88,14 @@ function getSelectPopupContainer(triggerNode: HTMLElement) {
<a-form-item :label="t('kol.manage.platformHint')">
<a-select
v-model:value="formState.platform_hint"
:value="platformHints.values"
:options="platformOptions"
option-filter-prop="label"
mode="multiple"
show-search
:loading="platformsQuery.isPending.value"
:get-popup-container="getSelectPopupContainer"
@change="(val: string) => (formState.platform_hint = val)"
@change="handlePlatformChange"
/>
</a-form-item>
</a-form>
+42 -4
View File
@@ -1,13 +1,51 @@
import { aiPlatformCatalog } from '@geo/shared-types'
import type { MediaPlatform } from '@geo/shared-types'
export interface KolPlatformOption {
label: string
value: string
disabled?: boolean
}
export function buildKolPlatformOptions(defaultLabel: string): KolPlatformOption[] {
return [
export const KOL_PLATFORM_HINT_DEFAULT = '通用'
export function buildKolPlatformOptions(
defaultLabel: string,
platforms: MediaPlatform[] = [],
selectedValues: string[] = [],
): KolPlatformOption[] {
const defaultSelected = selectedValues.includes(KOL_PLATFORM_HINT_DEFAULT)
const options = [
{ label: defaultLabel, value: '通用' },
...aiPlatformCatalog.map((item) => ({ label: item.label, value: item.id })),
...platforms.map((item) => ({
label: item.name,
value: item.name,
disabled: defaultSelected,
})),
]
const knownValues = new Set(options.map((item) => item.value))
const customOptions = normalizeKolPlatformHints(selectedValues)
.filter((value) => !knownValues.has(value))
.map((value) => ({ label: value, value }))
return [...customOptions, ...options]
}
export function parseKolPlatformHints(value?: string | null): string[] {
return normalizeKolPlatformHints(String(value ?? '').split(/[、,;\n]+/))
}
export function normalizeKolPlatformHints(values?: Array<string | null | undefined>): string[] {
const next = Array.from(
new Set((values ?? []).map((item) => String(item ?? '').trim()).filter(Boolean)),
)
if (next.includes(KOL_PLATFORM_HINT_DEFAULT)) {
return [KOL_PLATFORM_HINT_DEFAULT]
}
return next
}
export function serializeKolPlatformHints(values?: Array<string | null | undefined>): string {
return normalizeKolPlatformHints(values).join('、')
}
+9 -4
View File
@@ -1,6 +1,7 @@
<script setup lang="ts">
import KnowledgeGroupSelect from '@/components/KnowledgeGroupSelect.vue'
import KolDynamicForm from '@/components/kol/KolDynamicForm.vue'
import KolPlatformTags from '@/components/kol/KolPlatformTags.vue'
import { kolGenerateApi } from '@/lib/api'
import { formatError } from '@/lib/errors'
import { parseKolCardConfig } from '@/lib/kol-card-config'
@@ -150,10 +151,14 @@ function handleSubmit() {
{{ schema.package_name }}
<span class="divider">/</span>
{{ schema.prompt_name }}
<a-tag v-if="schema.platform_hint" color="cyan" class="platform-badge">
{{ schema.platform_hint }}
</a-tag>
</h2>
<KolPlatformTags
v-if="schema.platform_hint"
:value="schema.platform_hint"
size="small"
:truncate="false"
class="platform-badge"
/>
<p class="header-eyebrow">{{ t('kol.generate.fillVariables') }}</p>
</div>
</div>
@@ -268,7 +273,7 @@ function handleSubmit() {
}
.platform-badge {
margin-left: 8px;
margin-top: 2px;
}
.header-eyebrow {
+6 -3
View File
@@ -16,6 +16,7 @@ import { computed, ref } from 'vue'
import { useI18n } from 'vue-i18n'
import KolPackageFormModal from '@/components/kol/KolPackageFormModal.vue'
import KolPlatformTags from '@/components/kol/KolPlatformTags.vue'
import KolPromptEditor from '@/components/kol/KolPromptEditor.vue'
import KolPromptFormModal from '@/components/kol/KolPromptFormModal.vue'
import { kolManageApi } from '@/lib/api'
@@ -400,9 +401,11 @@ function canCancelSelfSubscription(pkg: KolPackageSummary) {
>
<template #bodyCell="{ column, record }">
<template v-if="column.key === 'platform_hint'">
<a-tag color="blue">
{{ record.platform_hint || t('kol.manage.platformHintDefault') }}
</a-tag>
<KolPlatformTags
:value="record.platform_hint || t('kol.manage.platformHintDefault')"
:max="3"
size="small"
/>
</template>
<template v-else-if="column.key === 'status'">
<a-tag
@@ -1,4 +1,5 @@
<script setup lang="ts">
import KolPlatformTags from '@/components/kol/KolPlatformTags.vue'
import { kolMarketplaceApi, resolveApiURL } from '@/lib/api'
import { formatError } from '@/lib/errors'
import {
@@ -158,9 +159,12 @@ function goBack() {
<div v-for="prompt in pkg.prompts" :key="prompt.id" class="prompt-item">
<div class="prompt-info">
<span class="prompt-name">{{ prompt.name }}</span>
<a-tag v-if="prompt.platform_hint" color="cyan" size="small">
{{ prompt.platform_hint }}
</a-tag>
<KolPlatformTags
v-if="prompt.platform_hint"
:value="prompt.platform_hint"
:max="4"
size="small"
/>
</div>
<div class="prompt-action">
<a-tooltip :title="subscription?.status !== 'active' ? '订阅后可用' : ''">
+23 -10
View File
@@ -30,6 +30,7 @@ import ArticleDetailDrawer from '@/components/ArticleDetailDrawer.vue'
import ArticleGenerateStatus from '@/components/ArticleGenerateStatus.vue'
import ArticlePublishStatus from '@/components/ArticlePublishStatus.vue'
import ArticleSourceMeta from '@/components/ArticleSourceMeta.vue'
import KolPlatformTags from '@/components/kol/KolPlatformTags.vue'
import PublishArticleModal from '@/components/PublishArticleModal.vue'
import { articlesApi, templatesApi, workspaceApi } from '@/lib/api'
import { buildArticleClipboardContent, resolveArticleActionState } from '@/lib/article-list-actions'
@@ -826,9 +827,14 @@ function refreshRecords(): void {
</div>
<span>{{ card.kol_display_name }}</span>
</div>
<div v-if="card.platform_hint" class="templates-view__kol-platform">
{{ card.platform_hint }}
</div>
<KolPlatformTags
v-if="card.platform_hint"
:value="card.platform_hint"
:max="2"
size="small"
:wrap="false"
class="templates-view__kol-platform"
/>
</div>
</div>
</article>
@@ -1457,6 +1463,7 @@ function refreshRecords(): void {
display: flex;
justify-content: space-between;
align-items: center;
gap: 12px;
margin-top: 16px;
padding-top: 12px;
border-top: 1px solid #f3f4f6;
@@ -1466,12 +1473,22 @@ function refreshRecords(): void {
display: flex;
align-items: center;
gap: 6px;
min-width: 0;
flex: 1 1 auto;
font-size: 12px;
color: #374151;
font-weight: 500;
}
.templates-view__kol-author span {
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.templates-view__author-avatar {
flex: 0 0 auto;
width: 20px;
height: 20px;
border-radius: 50%;
@@ -1485,13 +1502,9 @@ function refreshRecords(): void {
}
.templates-view__kol-platform {
background: #eff6ff;
color: #2563eb;
font-size: 11px;
font-weight: 500;
padding: 2px 8px;
border-radius: 6px;
white-space: nowrap;
flex: 0 1 auto;
max-width: 54%;
justify-content: flex-end;
}
@media (max-width: 1200px) {
+23 -10
View File
@@ -25,6 +25,7 @@ import ArticleDetailDrawer from '@/components/ArticleDetailDrawer.vue'
import ArticleGenerateStatus from '@/components/ArticleGenerateStatus.vue'
import ArticlePublishStatus from '@/components/ArticlePublishStatus.vue'
import ArticleSourceMeta from '@/components/ArticleSourceMeta.vue'
import KolPlatformTags from '@/components/kol/KolPlatformTags.vue'
import PublishArticleModal from '@/components/PublishArticleModal.vue'
import { articlesApi, tenantAccountsApi, workspaceApi } from '@/lib/api'
import { buildArticleClipboardContent, resolveArticleActionState } from '@/lib/article-list-actions'
@@ -440,9 +441,14 @@ function stopRecentArticlesPolling(): void {
</div>
<span>{{ card.kol_display_name }}</span>
</div>
<div v-if="card.platform_hint" class="kol-card-platform">
{{ card.platform_hint }}
</div>
<KolPlatformTags
v-if="card.platform_hint"
:value="card.platform_hint"
:max="2"
size="small"
:wrap="false"
class="kol-card-platform"
/>
</div>
</div>
</div>
@@ -952,6 +958,7 @@ function stopRecentArticlesPolling(): void {
display: flex;
justify-content: space-between;
align-items: center;
gap: 12px;
margin-top: 16px;
padding-top: 12px;
border-top: 1px solid #f3f4f6;
@@ -961,12 +968,22 @@ function stopRecentArticlesPolling(): void {
display: flex;
align-items: center;
gap: 6px;
min-width: 0;
flex: 1 1 auto;
font-size: 12px;
color: #374151;
font-weight: 500;
}
.kol-card-author span {
min-width: 0;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.author-avatar {
flex: 0 0 auto;
width: 20px;
height: 20px;
border-radius: 50%;
@@ -980,13 +997,9 @@ function stopRecentArticlesPolling(): void {
}
.kol-card-platform {
background: #eff6ff;
color: #2563eb;
font-size: 11px;
font-weight: 500;
padding: 2px 8px;
border-radius: 6px;
white-space: nowrap;
flex: 0 1 auto;
max-width: 54%;
justify-content: flex-end;
}
@media (max-width: 1200px) {
@@ -141,6 +141,9 @@ func (c *aliyunClient) GetBytes(ctx context.Context, objectKey string) ([]byte,
zap.String("object_key", objectKey),
zap.Error(err),
)
if isAliyunObjectNotFound(err) {
return nil, fmt.Errorf("%w: %s", ErrObjectNotFound, objectKey)
}
return nil, fmt.Errorf("get aliyun object: %w", err)
}
defer reader.Close()
@@ -158,6 +161,16 @@ func (c *aliyunClient) GetBytes(ctx context.Context, objectKey string) ([]byte,
return data, nil
}
func isAliyunObjectNotFound(err error) bool {
serviceErr, ok := err.(oss.ServiceError)
if !ok {
return false
}
return serviceErr.StatusCode == 404 ||
serviceErr.Code == "NoSuchKey" ||
serviceErr.Code == "NoSuchObject"
}
func (c *aliyunClient) Exists(ctx context.Context, objectKey string) (bool, error) {
if err := c.Validate(); err != nil {
return false, err
@@ -12,6 +12,7 @@ import (
)
var ErrNotConfigured = errors.New("object storage is not configured")
var ErrObjectNotFound = errors.New("object storage object not found")
type Client interface {
Validate() error
@@ -119,6 +119,9 @@ func (c *minioClient) GetBytes(ctx context.Context, objectKey string) ([]byte, e
zap.String("object_key", objectKey),
zap.Error(err),
)
if isMinIOObjectNotFound(err) {
return nil, fmt.Errorf("%w: %s", ErrObjectNotFound, objectKey)
}
return nil, fmt.Errorf("get minio object: %w", err)
}
defer reader.Close()
@@ -130,11 +133,21 @@ func (c *minioClient) GetBytes(ctx context.Context, objectKey string) ([]byte, e
zap.String("object_key", objectKey),
zap.Error(err),
)
if isMinIOObjectNotFound(err) {
return nil, fmt.Errorf("%w: %s", ErrObjectNotFound, objectKey)
}
return nil, fmt.Errorf("read minio object: %w", err)
}
return data, nil
}
func isMinIOObjectNotFound(err error) bool {
responseErr := minio.ToErrorResponse(err)
return responseErr.StatusCode == 404 ||
responseErr.Code == "NoSuchKey" ||
responseErr.Code == "NoSuchObject"
}
func (c *minioClient) Exists(ctx context.Context, objectKey string) (bool, error) {
if err := c.Validate(); err != nil {
return false, err
@@ -277,6 +277,10 @@ func kolPromptDetailCachePrefix(tenantID int64) string {
return fmt.Sprintf("kol:prompt:detail:%d:", tenantID)
}
func kolPromptContentCacheKey(tenantID, promptID int64) string {
return fmt.Sprintf("kol:prompt:content:%d:%d", tenantID, promptID)
}
func kolPromptListCachePrefix(tenantID int64) string {
return fmt.Sprintf("kol:prompt:list:%d:", tenantID)
}
@@ -291,6 +295,7 @@ func kolSubscriptionPromptSchemaCachePrefix(tenantID int64) string {
func invalidateKolPromptCaches(ctx context.Context, c sharedcache.Cache, tenantID int64) {
deleteCachePrefix(ctx, c, kolPromptDetailCachePrefix(tenantID))
deleteCachePrefix(ctx, c, fmt.Sprintf("kol:prompt:content:%d:", tenantID))
deleteCachePrefix(ctx, c, kolPromptListCachePrefix(tenantID))
deleteCachePrefix(ctx, c, kolSubscriptionPromptListCachePrefix(tenantID))
deleteCachePrefix(ctx, c, kolSubscriptionPromptSchemaCachePrefix(tenantID))
@@ -299,6 +304,7 @@ func invalidateKolPromptCaches(ctx context.Context, c sharedcache.Cache, tenantI
func InvalidateKolPromptCaches(ctx context.Context, c sharedcache.Cache) {
deleteCachePrefix(ctx, c, "kol:prompt:detail:")
deleteCachePrefix(ctx, c, "kol:prompt:content:")
deleteCachePrefix(ctx, c, "kol:prompt:list:")
deleteCachePrefix(ctx, c, "kol:subscription_prompt:list:")
deleteCachePrefix(ctx, c, "kol:subscription_prompt:schema:")
@@ -9,6 +9,7 @@ import (
"time"
"github.com/jackc/pgx/v5/pgxpool"
"golang.org/x/sync/singleflight"
"github.com/geo-platform/tenant-api/internal/shared/auth"
sharedcache "github.com/geo-platform/tenant-api/internal/shared/cache"
@@ -95,6 +96,7 @@ type KolGenerationService struct {
asset *KolPromptAsset
rabbitMQ *rabbitmq.Client
cache sharedcache.Cache
cacheGroup singleflight.Group
}
func NewKolGenerationService(
@@ -223,14 +225,13 @@ func (s *KolGenerationService) enqueue(ctx context.Context, input kolGenerationE
return nil, response.ErrInternal(50097, "kol_generation_card_config_decode_failed", err.Error())
}
if prompt.PromptAssetKey == nil || *prompt.PromptAssetKey == "" {
return nil, response.ErrInternal(50098, "kol_generation_prompt_asset_missing", "published prompt content not found")
}
content, err := s.asset.Get(ctx, *prompt.PromptAssetKey)
content, err := s.loadPromptContent(ctx, prompt)
if err != nil {
return nil, response.ErrInternal(50098, "kol_generation_prompt_asset_load_failed", err.Error())
}
if strings.TrimSpace(content) == "" {
return nil, response.ErrInternal(50098, "kol_generation_prompt_content_missing", "published prompt content not found")
}
renderedPrompt, err := RenderPrompt(content, *schema, variables)
if err != nil {
@@ -512,13 +513,22 @@ func (s *KolGenerationService) loadAuthorizedPrompt(ctx context.Context, actor a
if err != nil {
return nil, nil, response.ErrInternal(50110, "kol_prompt_query_failed", err.Error())
}
if prompt == nil || prompt.PromptAssetKey == nil || *prompt.PromptAssetKey == "" {
if prompt == nil || !s.promptHasContent(ctx, prompt) {
return nil, nil, response.ErrInternal(50111, "kol_prompt_content_missing", "published prompt content not found")
}
return row, prompt, nil
}
func (s *KolGenerationService) loadPromptContent(ctx context.Context, prompt *repository.KolPrompt) (string, error) {
return loadKolPromptContent(ctx, s.cache, &s.cacheGroup, s.promptRepo, s.asset, prompt)
}
func (s *KolGenerationService) promptHasContent(ctx context.Context, prompt *repository.KolPrompt) bool {
content, err := s.loadPromptContent(ctx, prompt)
return err == nil && strings.TrimSpace(content) != ""
}
func HandleKolGenerationTaskFailure(
ctx context.Context,
pool *pgxpool.Pool,
@@ -0,0 +1,80 @@
package app
import (
"context"
"errors"
"strings"
"golang.org/x/sync/singleflight"
sharedcache "github.com/geo-platform/tenant-api/internal/shared/cache"
"github.com/geo-platform/tenant-api/internal/shared/objectstorage"
"github.com/geo-platform/tenant-api/internal/tenant/repository"
)
func loadKolPromptContent(
ctx context.Context,
cache sharedcache.Cache,
group *singleflight.Group,
promptRepo repository.KolPromptRepository,
asset *KolPromptAsset,
prompt *repository.KolPrompt,
) (string, error) {
if prompt == nil {
return "", nil
}
loader := func(loadCtx context.Context) (string, error) {
return loadKolPromptContentUncached(loadCtx, promptRepo, asset, prompt)
}
if cache == nil || group == nil {
return loader(ctx)
}
return sharedcache.LoadJSON(
ctx,
cache,
group,
kolPromptContentCacheKey(prompt.TenantID, prompt.ID),
defaultCacheTTL(),
loader,
)
}
func loadKolPromptContentUncached(
ctx context.Context,
promptRepo repository.KolPromptRepository,
asset *KolPromptAsset,
prompt *repository.KolPrompt,
) (string, error) {
if prompt == nil {
return "", nil
}
if promptRepo != nil {
content, err := promptRepo.GetContentByID(ctx, prompt.TenantID, prompt.ID)
if err != nil {
return "", err
}
if content != nil && strings.TrimSpace(*content) != "" {
return *content, nil
}
}
if prompt.PromptContent != nil && strings.TrimSpace(*prompt.PromptContent) != "" {
return *prompt.PromptContent, nil
}
if prompt.PromptAssetKey == nil || strings.TrimSpace(*prompt.PromptAssetKey) == "" || asset == nil {
return "", nil
}
content, err := asset.Get(ctx, strings.TrimSpace(*prompt.PromptAssetKey))
if err != nil {
if errors.Is(err, objectstorage.ErrObjectNotFound) || errors.Is(err, objectstorage.ErrNotConfigured) {
return "", nil
}
return "", err
}
return content, nil
}
@@ -8,6 +8,7 @@ import (
"time"
"github.com/jackc/pgx/v5/pgxpool"
"golang.org/x/sync/singleflight"
"github.com/geo-platform/tenant-api/internal/shared/auth"
sharedcache "github.com/geo-platform/tenant-api/internal/shared/cache"
@@ -68,6 +69,7 @@ type KolPromptService struct {
subRepo repository.KolSubscriptionRepository
asset *KolPromptAsset
cache sharedcache.Cache
cacheGroup singleflight.Group
}
func NewKolPromptService(
@@ -210,13 +212,6 @@ func (s *KolPromptService) Save(ctx context.Context, actor auth.Actor, promptID
sortOrder = *input.SortOrder
}
const currentRevisionNo = 1
assetKey, err := s.asset.Put(ctx, actor.TenantID, promptID, currentRevisionNo, input.Content)
if err != nil {
return nil, response.ErrInternal(50074, "kol_prompt_asset_store_failed", err.Error())
}
schemaJSON, err := JSONEncodeSchema(input.Schema)
if err != nil {
return nil, response.ErrBadRequest(40065, "kol_prompt_schema_invalid", err.Error())
@@ -229,6 +224,7 @@ func (s *KolPromptService) Save(ctx context.Context, actor auth.Actor, promptID
publishedRevisionNo := prompt.PublishedRevisionNo
if prompt.Status == "active" {
const currentRevisionNo = 1
revNo := currentRevisionNo
publishedRevisionNo = &revNo
}
@@ -239,7 +235,7 @@ func (s *KolPromptService) Save(ctx context.Context, actor auth.Actor, promptID
Name: name,
PlatformHint: normalizeKolOptionalString(input.PlatformHint),
SortOrder: sortOrder,
PromptAssetKey: assetKey,
PromptContent: input.Content,
SchemaJSON: schemaJSON,
CardConfigJSON: cardConfigJSON,
Status: prompt.Status,
@@ -283,13 +279,6 @@ func (s *KolPromptService) Publish(ctx context.Context, actor auth.Actor, prompt
sortOrder = *input.SortOrder
}
const publishedRevisionNo = 1
assetKey, err := s.asset.Put(ctx, actor.TenantID, promptID, publishedRevisionNo, input.Content)
if err != nil {
return nil, response.ErrInternal(50074, "kol_prompt_asset_store_failed", err.Error())
}
schemaJSON, err := JSONEncodeSchema(input.Schema)
if err != nil {
return nil, response.ErrBadRequest(40065, "kol_prompt_schema_invalid", err.Error())
@@ -309,13 +298,14 @@ func (s *KolPromptService) Publish(ctx context.Context, actor auth.Actor, prompt
promptTx := repository.NewKolPromptRepository(tx)
subTx := repository.NewKolSubscriptionRepository(tx)
const publishedRevisionNo = 1
if err := promptTx.Publish(ctx, repository.PublishKolPromptInput{
ID: promptID,
TenantID: actor.TenantID,
Name: name,
PlatformHint: normalizeKolOptionalString(input.PlatformHint),
SortOrder: sortOrder,
PromptAssetKey: assetKey,
PromptContent: input.Content,
SchemaJSON: schemaJSON,
CardConfigJSON: cardConfigJSON,
PublishedRevisionNo: publishedRevisionNo,
@@ -359,14 +349,12 @@ func (s *KolPromptService) Activate(ctx context.Context, actor auth.Actor, promp
promptTx := repository.NewKolPromptRepository(tx)
subTx := repository.NewKolSubscriptionRepository(tx)
switch {
case prompt.PromptAssetKey != nil && strings.TrimSpace(*prompt.PromptAssetKey) != "":
if err := promptTx.SetPublishedRevision(ctx, actor.TenantID, promptID, 1, actor.UserID); err != nil {
return nil, response.ErrInternal(50090, "kol_prompt_activate_failed", err.Error())
}
default:
if !s.promptHasContent(ctx, prompt) {
return nil, errKolPromptContentEmpty
}
if err := promptTx.SetPublishedRevision(ctx, actor.TenantID, promptID, 1, actor.UserID); err != nil {
return nil, response.ErrInternal(50090, "kol_prompt_activate_failed", err.Error())
}
if err := s.grantPromptToActiveSubscribers(ctx, subTx, pkg.ID, promptID); err != nil {
return nil, err
@@ -484,7 +472,7 @@ func (s *KolPromptService) buildPromptDetail(ctx context.Context, prompt *reposi
UpdatedAt: prompt.UpdatedAt,
}
if len(prompt.SchemaJSON) == 0 && len(prompt.CardConfigJSON) == 0 && (prompt.PromptAssetKey == nil || strings.TrimSpace(*prompt.PromptAssetKey) == "") {
if len(prompt.SchemaJSON) == 0 && len(prompt.CardConfigJSON) == 0 && !includeContent {
return detail, nil
}
@@ -500,8 +488,8 @@ func (s *KolPromptService) buildPromptDetail(ctx context.Context, prompt *reposi
detail.LatestSchemaJSON = schema
detail.LatestCardConfigJSON = cardConfig
if includeContent && prompt.PromptAssetKey != nil && strings.TrimSpace(*prompt.PromptAssetKey) != "" {
content, err := s.asset.Get(ctx, *prompt.PromptAssetKey)
if includeContent {
content, err := s.loadPromptContent(ctx, prompt)
if err != nil {
return nil, response.ErrInternal(50087, "kol_prompt_asset_load_failed", err.Error())
}
@@ -511,6 +499,15 @@ func (s *KolPromptService) buildPromptDetail(ctx context.Context, prompt *reposi
return detail, nil
}
func (s *KolPromptService) promptHasContent(ctx context.Context, prompt *repository.KolPrompt) bool {
content, err := s.loadPromptContent(ctx, prompt)
return err == nil && strings.TrimSpace(content) != ""
}
func (s *KolPromptService) loadPromptContent(ctx context.Context, prompt *repository.KolPrompt) (string, error) {
return loadKolPromptContent(ctx, s.cache, &s.cacheGroup, s.promptRepo, s.asset, prompt)
}
func (s *KolPromptService) grantPromptToActiveSubscribers(
ctx context.Context,
subRepo repository.KolSubscriptionRepository,
@@ -24,14 +24,15 @@ import (
)
type ScheduleTaskService struct {
pool *pgxpool.Pool
auditLogs *auditlog.AsyncWriter
cache sharedcache.Cache
cacheGroup singleflight.Group
pool *pgxpool.Pool
auditLogs *auditlog.AsyncWriter
promptAsset *KolPromptAsset
cache sharedcache.Cache
cacheGroup singleflight.Group
}
func NewScheduleTaskService(pool *pgxpool.Pool, auditLogs *auditlog.AsyncWriter) *ScheduleTaskService {
return &ScheduleTaskService{pool: pool, auditLogs: auditLogs}
func NewScheduleTaskService(pool *pgxpool.Pool, auditLogs *auditlog.AsyncWriter, promptAsset *KolPromptAsset) *ScheduleTaskService {
return &ScheduleTaskService{pool: pool, auditLogs: auditLogs, promptAsset: promptAsset}
}
func (s *ScheduleTaskService) WithCache(c sharedcache.Cache) *ScheduleTaskService {
@@ -1006,7 +1007,14 @@ func (s *ScheduleTaskService) validateKolScheduleGenerationInput(ctx context.Con
if err != nil {
return input, response.ErrInternal(50110, "kol_prompt_query_failed", err.Error())
}
if prompt == nil || prompt.PromptAssetKey == nil || *prompt.PromptAssetKey == "" {
if prompt == nil {
return input, response.ErrInternal(50111, "kol_prompt_content_missing", "published prompt content not found")
}
content, err := loadKolPromptContent(ctx, s.cache, &s.cacheGroup, repository.NewKolPromptRepository(s.pool), s.promptAsset, prompt)
if err != nil {
return input, response.ErrInternal(50110, "kol_prompt_query_failed", err.Error())
}
if strings.TrimSpace(content) == "" {
return input, response.ErrInternal(50111, "kol_prompt_content_missing", "published prompt content not found")
}
schema, err := decodeKolSchema(prompt.SchemaJSON)
@@ -22,6 +22,7 @@ type KolPrompt struct {
PublishedRevisionNo *int
DraftRevisionNo *int
PromptAssetKey *string
PromptContent *string
SchemaJSON []byte
CardConfigJSON []byte
CreatedBy int64
@@ -61,7 +62,8 @@ type SaveKolPromptInput struct {
Name string
PlatformHint *string
SortOrder int
PromptAssetKey string
PromptAssetKey *string
PromptContent string
SchemaJSON []byte
CardConfigJSON []byte
Status string
@@ -75,7 +77,8 @@ type PublishKolPromptInput struct {
Name string
PlatformHint *string
SortOrder int
PromptAssetKey string
PromptAssetKey *string
PromptContent string
SchemaJSON []byte
CardConfigJSON []byte
PublishedRevisionNo int
@@ -85,6 +88,7 @@ type PublishKolPromptInput struct {
type KolPromptRepository interface {
Create(ctx context.Context, input CreateKolPromptInput) (*KolPrompt, error)
GetByID(ctx context.Context, tenantID, id int64) (*KolPrompt, error)
GetContentByID(ctx context.Context, tenantID, id int64) (*string, error)
ListByPackage(ctx context.Context, tenantID, packageID int64) ([]KolPrompt, error)
CountByPackages(ctx context.Context, tenantID int64, packageIDs []int64) (map[int64]int, error)
ListActiveByPackage(ctx context.Context, tenantID, packageID int64) ([]ActiveKolPrompt, error)
@@ -116,6 +120,7 @@ func mapKolPromptRow(
publishedRevisionNo pgtype.Int4,
draftRevisionNo pgtype.Int4,
promptAssetKey pgtype.Text,
promptContent pgtype.Text,
schemaJSON []byte,
cardConfigJSON []byte,
createdBy int64,
@@ -134,6 +139,7 @@ func mapKolPromptRow(
PublishedRevisionNo: nullableIntFromInt4(publishedRevisionNo),
DraftRevisionNo: nullableIntFromInt4(draftRevisionNo),
PromptAssetKey: nullableText(promptAssetKey),
PromptContent: nullableText(promptContent),
SchemaJSON: schemaJSON,
CardConfigJSON: cardConfigJSON,
CreatedBy: createdBy,
@@ -155,6 +161,7 @@ func scanKolPrompt(scanner interface{ Scan(...any) error }) (*KolPrompt, error)
publishedRevisionNo pgtype.Int4
draftRevisionNo pgtype.Int4
promptAssetKey pgtype.Text
promptContent pgtype.Text
schemaJSON []byte
cardConfigJSON []byte
createdBy int64
@@ -174,6 +181,7 @@ func scanKolPrompt(scanner interface{ Scan(...any) error }) (*KolPrompt, error)
&publishedRevisionNo,
&draftRevisionNo,
&promptAssetKey,
&promptContent,
&schemaJSON,
&cardConfigJSON,
&createdBy,
@@ -195,6 +203,7 @@ func scanKolPrompt(scanner interface{ Scan(...any) error }) (*KolPrompt, error)
publishedRevisionNo,
draftRevisionNo,
promptAssetKey,
promptContent,
schemaJSON,
cardConfigJSON,
createdBy,
@@ -222,7 +231,7 @@ func (r *kolPromptRepository) Create(ctx context.Context, input CreateKolPromptI
func (r *kolPromptRepository) GetByID(ctx context.Context, tenantID, id int64) (*KolPrompt, error) {
row := r.db.QueryRow(ctx, `
SELECT id, tenant_id, package_id, name, platform_hint, status, sort_order,
published_revision_no, draft_revision_no, prompt_asset_key, schema_json, card_config_json,
published_revision_no, draft_revision_no, prompt_asset_key, NULL::text AS prompt_content, schema_json, card_config_json,
created_by, updated_by, created_at, updated_at
FROM kol_prompts
WHERE id = $1
@@ -240,10 +249,28 @@ WHERE id = $1
return prompt, nil
}
func (r *kolPromptRepository) GetContentByID(ctx context.Context, tenantID, id int64) (*string, error) {
var content pgtype.Text
err := r.db.QueryRow(ctx, `
SELECT prompt_content
FROM kol_prompts
WHERE id = $1
AND tenant_id = $2
AND deleted_at IS NULL
`, id, tenantID).Scan(&content)
if err != nil {
if errors.Is(err, pgx.ErrNoRows) {
return nil, nil
}
return nil, err
}
return nullableText(content), nil
}
func (r *kolPromptRepository) ListByPackage(ctx context.Context, tenantID, packageID int64) ([]KolPrompt, error) {
rows, err := r.db.Query(ctx, `
SELECT id, tenant_id, package_id, name, platform_hint, status, sort_order,
published_revision_no, draft_revision_no, prompt_asset_key, schema_json, card_config_json,
published_revision_no, draft_revision_no, prompt_asset_key, NULL::text AS prompt_content, schema_json, card_config_json,
created_by, updated_by, created_at, updated_at
FROM kol_prompts
WHERE package_id = $1
@@ -346,16 +373,17 @@ SET name = $1,
platform_hint = $2,
sort_order = $3,
prompt_asset_key = $4,
schema_json = $5::jsonb,
card_config_json = $6::jsonb,
status = $7,
published_revision_no = $8,
updated_by = $9,
prompt_content = $5,
schema_json = $6::jsonb,
card_config_json = $7::jsonb,
status = $8,
published_revision_no = $9,
updated_by = $10,
updated_at = NOW()
WHERE id = $10
AND tenant_id = $11
WHERE id = $11
AND tenant_id = $12
AND deleted_at IS NULL
`, input.Name, pgText(input.PlatformHint), int32(input.SortOrder), input.PromptAssetKey, input.SchemaJSON, input.CardConfigJSON, input.Status, publishedRevisionNo, input.UpdatedBy, input.ID, input.TenantID)
`, input.Name, pgText(input.PlatformHint), int32(input.SortOrder), pgText(input.PromptAssetKey), input.PromptContent, input.SchemaJSON, input.CardConfigJSON, input.Status, publishedRevisionNo, input.UpdatedBy, input.ID, input.TenantID)
return err
}
@@ -366,17 +394,18 @@ SET name = $1,
platform_hint = $2,
sort_order = $3,
prompt_asset_key = $4,
schema_json = $5::jsonb,
card_config_json = $6::jsonb,
published_revision_no = $7,
prompt_content = $5,
schema_json = $6::jsonb,
card_config_json = $7::jsonb,
published_revision_no = $8,
draft_revision_no = NULL,
status = 'active',
updated_by = $8,
updated_by = $9,
updated_at = NOW()
WHERE id = $9
AND tenant_id = $10
WHERE id = $10
AND tenant_id = $11
AND deleted_at IS NULL
`, input.Name, pgText(input.PlatformHint), int32(input.SortOrder), input.PromptAssetKey, input.SchemaJSON, input.CardConfigJSON, input.PublishedRevisionNo, input.UpdatedBy, input.ID, input.TenantID)
`, input.Name, pgText(input.PlatformHint), int32(input.SortOrder), pgText(input.PromptAssetKey), input.PromptContent, input.SchemaJSON, input.CardConfigJSON, input.PublishedRevisionNo, input.UpdatedBy, input.ID, input.TenantID)
return err
}
@@ -16,7 +16,7 @@ type ScheduleTaskHandler struct {
}
func NewScheduleTaskHandler(a *bootstrap.App) *ScheduleTaskHandler {
return &ScheduleTaskHandler{svc: app.NewScheduleTaskService(a.DB, a.AuditLogs).WithCache(a.Cache)}
return &ScheduleTaskHandler{svc: app.NewScheduleTaskService(a.DB, a.AuditLogs, a.KolPromptAsset).WithCache(a.Cache)}
}
func (h *ScheduleTaskHandler) List(c *gin.Context) {
@@ -0,0 +1,5 @@
ALTER TABLE kol_prompt_revisions
DROP COLUMN IF EXISTS prompt_content;
ALTER TABLE kol_prompts
DROP COLUMN IF EXISTS prompt_content;
@@ -0,0 +1,5 @@
ALTER TABLE kol_prompts
ADD COLUMN IF NOT EXISTS prompt_content TEXT;
ALTER TABLE kol_prompt_revisions
ADD COLUMN IF NOT EXISTS prompt_content TEXT;