diff --git a/docs/base-model-constants-management.md b/docs/base-model-constants-management.md index 1cf9f07743..17a257a559 100644 --- a/docs/base-model-constants-management.md +++ b/docs/base-model-constants-management.md @@ -39,13 +39,11 @@ A new constants file has been created at **`src/shared/constants/basemodel.const ### Legacy Files (To Be Deprecated) -1. **`src/shared/constants/base-model.constants.ts`** (old file) - - `baseModelFamilyConfig` - Family groupings with display names and descriptions - - `baseModelGroupConfig` - Group display names, descriptions, and family references - - `baseModelConfig` - Core base model definitions (name, type, group, hidden, ecosystem, engine) - - `baseModelGenerationConfig` - Generation compatibility matrix (which model types work with which base models) +`src/shared/constants/base-model.constants.ts` has been removed. Its list had drifted from +reality — it never gained `Krea 2` — so anything reading it saw a stale set of base models. +`basemodel.constants.ts` is the only source now. -2. **`src/server/common/constants.ts`** +1. **`src/server/common/constants.ts`** - `baseLicenses` - License definitions with URLs, names, notices, and NSFW restrictions - `baseModelLicenses` - Mapping of base models to their licenses - `generationConfig` - Generation settings per base model group (aspect ratios, default checkpoints) diff --git a/docs/plans/generator-filtering-options.md b/docs/plans/generator-filtering-options.md index 746d7c7218..39f4b85752 100644 --- a/docs/plans/generator-filtering-options.md +++ b/docs/plans/generator-filtering-options.md @@ -192,6 +192,10 @@ const generationFilterSchema = z.object({ Add new filter sections: +> Written against `base-model.constants.ts`, which has since been removed. The +> equivalents now live in `basemodel.constants.ts`; `getGenerationBaseModelConfigs` +> and `baseModelGroupConfig` were dead code and were retired with it. + ```tsx import { WORKFLOW_TAGS } from '~/shared/constants/generation.constants'; import { diff --git a/scripts/local-dev/gen_seed.ts b/scripts/local-dev/gen_seed.ts index c166b56bfc..17ac102747 100644 --- a/scripts/local-dev/gen_seed.ts +++ b/scripts/local-dev/gen_seed.ts @@ -13,7 +13,7 @@ import { pgDbWrite } from '~/server/db/pgDb'; import { notificationProcessors } from '~/server/notifications/utils.notifications'; import { REDIS_SYS_KEYS, sysRedis } from '~/server/redis/client'; import { getChatHash, getUsersFromHash } from '~/server/utils/chat'; -import { baseModels } from '~/shared/constants/base-model.constants'; +import { baseModels } from '~/shared/constants/basemodel.constants'; import { IMAGE_MIME_TYPE, VIDEO_MIME_TYPE } from '~/shared/constants/mime-types'; import { ArticleEngagementType, diff --git a/src/components/Apps/AppSettingsModal.tsx b/src/components/Apps/AppSettingsModal.tsx index e8f2e04cd1..2252a00575 100644 --- a/src/components/Apps/AppSettingsModal.tsx +++ b/src/components/Apps/AppSettingsModal.tsx @@ -19,7 +19,7 @@ import { import { IconAlertTriangle, IconCheck } from '@tabler/icons-react'; import { useEffect, useMemo, useRef, useState } from 'react'; import { ModelType } from '~/shared/utils/prisma/enums'; -import { baseModels as ALL_BASE_MODELS } from '~/shared/constants/base-model.constants'; +import { baseModels as ALL_BASE_MODELS } from '~/shared/constants/basemodel.constants'; import type { AvailableBlock, SubscriptionRecord, @@ -482,8 +482,7 @@ function normalizeManifestSettings(input: unknown): ManifestSettings { const def = raw as Record; const type = def.type; if (type !== 'number' && type !== 'string' && type !== 'boolean') continue; - const scope = - def.scope === 'publisher' || def.scope === 'viewer' ? def.scope : 'publisher'; + const scope = def.scope === 'publisher' || def.scope === 'viewer' ? def.scope : 'publisher'; const base = { ...def, scope, diff --git a/src/components/Collections/Collection.tsx b/src/components/Collections/Collection.tsx index 4624bfa2da..59973695d8 100644 --- a/src/components/Collections/Collection.tsx +++ b/src/components/Collections/Collection.tsx @@ -515,7 +515,10 @@ export function Collection({ (!metadata.submissionEndDate || new Date(metadata.submissionEndDate) > new Date()); const submissionPeriod = - metadata.submissionStartDate || metadata.submissionEndDate || metadata.maxItemsPerUser ? ( + metadata.submissionStartDate || + metadata.submissionEndDate || + metadata.maxItemsPerUser || + metadata.baseModels?.length ? ( {metadata.submissionStartDate && ( - Submission start date: {formatDate(metadata.submissionStartDate, 'MMM D, YYYY h:mma')} + Submission start date:{' '} + {formatDate(metadata.submissionStartDate, 'MMM D, YYYY h:mma')} )} {metadata.submissionEndDate && ( @@ -544,6 +548,10 @@ export function Collection({ {metadata.maxItemsPerUser && ( Max items per user: {metadata.maxItemsPerUser} )} + + {!!metadata.baseModels?.length && ( + Allowed base models: {metadata.baseModels.join(', ')} + )} diff --git a/src/components/Collections/CollectionEditModal.tsx b/src/components/Collections/CollectionEditModal.tsx index 0402756ecc..7c52d5a466 100644 --- a/src/components/Collections/CollectionEditModal.tsx +++ b/src/components/Collections/CollectionEditModal.tsx @@ -33,6 +33,7 @@ import { InputBrowsingLevels, InputCheckbox, InputDatePicker, + InputMultiSelect, InputNumber, InputSelect, InputSimpleImageUpload, @@ -43,6 +44,7 @@ import { } from '~/libs/form'; import type { UpsertCollectionInput } from '~/server/schema/collection.schema'; import { upsertCollectionInput } from '~/server/schema/collection.schema'; +import { baseModels } from '~/shared/constants/basemodel.constants'; import { CollectionMode, CollectionType, TagTarget } from '~/shared/utils/prisma/enums'; import { getDisplayName } from '~/utils/string-helpers'; import { trpc } from '~/utils/trpc'; @@ -288,6 +290,17 @@ export default function CollectionEditModal({ collectionId }: { collectionId?: n placeholder="Leave blank for unlimited" clearable /> +