Merge branch 'main' of github.com:civitai/civitai into main

Author: lrojas94

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "model-share",
-  "version": "5.0.584",
+  "version": "5.0.587",
   "private": true,
   "scripts": {
     "start": "next start",

package.json

@@ -0,0 +1,3 @@
+ALTER TABLE "AuctionBase"
+  ADD COLUMN "runForDays"   INTEGER NOT NULL DEFAULT 1,
+  ADD COLUMN "validForDays" INTEGER NOT NULL DEFAULT 1;

prisma/migrations/20250319124141_add_dates_to_auction_base/migration.sql

@@ -0,0 +1,34 @@
+ALTER TYPE "HomeBlockType" ADD VALUE 'FeaturedModelVersion';
+
+DROP MATERIALIZED VIEW IF EXISTS "CoveredCheckpointDetails";
+
+/*
+ For history:
+
+create materialized view "CoveredCheckpointDetails" as
+WITH
+    newest AS (
+        SELECT
+            mv_1."modelId",
+            min(mv_1.index) AS index
+        FROM "ModelVersion" mv_1
+        WHERE
+            mv_1."baseModel" = ANY
+            (ARRAY ['SD 1.5'::text, 'SD 1.4'::text, 'SD 1.5 LCM'::text, 'SDXL 0.9'::text, 'SDXL 1.0'::text, 'SDXL 1.0 LCM'::text, 'Pony'::text, 'Illustrious'::text, 'SD 3.5'::text, 'SD 3.5 Medium'::text, 'SD 3.5 Large'::text, 'SD 3.5 Large Turbo'::text])
+        GROUP BY mv_1."modelId"
+    )
+SELECT
+    mv.id   AS version_id,
+    m.name  AS model,
+    mv.name AS version,
+    CASE
+        WHEN cc.version_id IS NULL THEN 'latest only'::text
+        ELSE 'specific version'::text
+        END AS type,
+    mv."baseModel"
+FROM "CoveredCheckpoint" cc
+     JOIN "Model" m ON m.id = cc.model_id
+     JOIN newest n ON n."modelId" = cc.model_id
+     JOIN "ModelVersion" mv ON cc.version_id = mv.id OR
+                               cc.version_id IS NULL AND mv."modelId" = cc.model_id AND mv.index = n.index AND mv.status = 'Published'::"ModelStatus";
+ */

prisma/migrations/20250320124141_remove_checkpoint_details/migration.sql

@@ -0,0 +1,82 @@
+-- auto-generated definition
+create table if not exists "CoveredCheckpoint"
+(
+  model_id   integer not null,
+  version_id integer
+);
+
+alter table "CoveredCheckpoint"
+  alter column version_id set not null;
+
+create unique index if not exists "CoveredCheckpoint_modelVersion"
+  on "CoveredCheckpoint" (model_id, version_id);
+
+alter table "CoveredCheckpoint"
+  drop constraint if exists "CoveredCheckpoint_model_id_fkey";
+alter table "CoveredCheckpoint"
+  add constraint "CoveredCheckpoint_model_id_fkey"
+    foreign key (model_id) references "Model" (id)
+      on delete cascade
+      on update cascade;
+
+alter table "CoveredCheckpoint"
+  drop constraint if exists "CoveredCheckpoint_version_id_fkey";
+alter table "CoveredCheckpoint"
+  add constraint "CoveredCheckpoint_version_id_fkey"
+    foreign key (version_id) references "ModelVersion" (id)
+      on delete cascade
+      on update cascade;
+
+-- driveby
+CREATE INDEX CONCURRENTLY IF NOT EXISTS "ChatMember_chatId_idx" ON "ChatMember" ("chatId");
+
+create or replace view "GenerationCoverage"("modelId", "modelVersionId", covered) as
+SELECT
+  m.id  AS "modelId",
+  mv.id AS "modelVersionId",
+  true  AS covered
+FROM "ModelVersion" mv
+     JOIN "Model" m ON m.id = mv."modelId"
+WHERE
+   (mv.id = ANY
+    (ARRAY [
+      1475084, -- BiRefNet Background Removal
+      164821, -- Remacri
+      128713, -- DreamShaper
+      128078, -- SDXL
+      391999, -- SDXL Lightning LoRAs
+      424706, -- LCM-LoRA Weights
+      106916, -- Civitai Safe Helper
+      250712, -- safe_neg
+      250708, -- safe_pos
+      691639, -- FLUX Dev
+      699279, -- FLUX Schnell
+      699332, -- FLUX Pro
+      922358, -- FLUX Pro 1.1
+      1088507, -- FLUX Pro 1.1 Ultra
+      1003708, -- SD 3.5 Medium
+      983309, -- SD 3.5 Large
+      983611, -- SD 3.5 Large Turbo
+      1190596, -- NoobAI-XL
+      290640, -- Pony
+      889818 -- Illustrious
+      ]))
+OR (mv."baseModel" = ANY
+    (ARRAY ['SD 1.5'::text, 'SD 1.4'::text, 'SD 1.5 LCM'::text, 'SDXL 0.9'::text, 'SDXL 1.0'::text, 'SDXL 1.0 LCM'::text, 'Pony'::text, 'Flux.1 D'::text, 'Illustrious'::text, 'SD 3.5'::text, 'SD 3.5 Medium'::text, 'SD 3.5 Large'::text, 'SD 3.5 Large Turbo'::text, 'NoobAI'::text])) AND
+   NOT m.poi AND
+   (mv.status = 'Published'::"ModelStatus" OR m.availability = 'Private'::"Availability" OR m."uploadType" = 'Trained'::"ModelUploadType") AND
+   m."allowCommercialUse" && ARRAY ['RentCivit'::"CommercialUse", 'Rent'::"CommercialUse", 'Sell'::"CommercialUse"] AND
+   (m.type = 'Checkpoint'::"ModelType" AND mv."baseModelType" = 'Standard'::text AND (mv.id IN (
+     SELECT
+       "CoveredCheckpoint".version_id
+     FROM "CoveredCheckpoint"
+   )) OR m.type = 'LORA'::"ModelType" OR m.type = 'TextualInversion'::"ModelType" OR m.type = 'VAE'::"ModelType" OR m.type = 'LoCon'::"ModelType" OR
+    m.type = 'DoRA'::"ModelType") AND (EXISTS (
+    SELECT
+      1
+    FROM "ModelFile" mf
+    WHERE
+        mf."modelVersionId" = mv.id
+    AND (mf."scannedAt" IS NOT NULL AND (mf.type = ANY (ARRAY ['Model'::text, 'Pruned Model'::text, 'Negative'::text, 'VAE'::text])) OR
+         (mf.metadata -> 'trainingResults'::text) IS NOT NULL)
+  ));

prisma/migrations/20250326094141_covered_checkpoint/migration.sql

@@ -657,6 +657,7 @@ model Model {
   collectionItems    CollectionItem[]
   generationCoverage GenerationCoverage[]
   flags              ModelFlag[]
+  coveredCheckpoints CoveredCheckpoint[]
 
   @@index([name])
   @@index([status, nsfw])
@@ -805,6 +806,7 @@ model ModelVersion {
   DonationGoal            DonationGoal[]
   featuredInfo            FeaturedModelVersion[]
   ImageResourceNew        ImageResourceNew[]
+  coveredCheckpoints      CoveredCheckpoint[]
 
   @@index([modelId], type: Hash)
 }
@@ -2575,6 +2577,7 @@ enum HomeBlockType {
   Social
   Event
   CosmeticShop
+  FeaturedModelVersion
 }
 
 model HomeBlock {
@@ -3383,15 +3386,17 @@ enum AuctionType {
 }
 
 model AuctionBase {
-  id        Int         @id @default(autoincrement())
-  type      AuctionType
-  ecosystem String? // like Pony, SDXL, etc
-  name      String
-  slug      String
-  quantity  Int // propagates to individual item
-  minPrice  Int // propagates to individual item
+  id           Int         @id @default(autoincrement())
+  type         AuctionType
+  ecosystem    String? // like Pony, SDXL, etc
+  name         String
+  slug         String
+  quantity     Int // propagates to individual item
+  minPrice     Int // propagates to individual item
   // buyItNowPrices Json? // would probably need to be JSON to support different slot costs...
-  active    Boolean     @default(true)
+  active       Boolean     @default(true)
+  runForDays   Int         @default(1)
+  validForDays Int         @default(1)
 
   auctions      Auction[]
   recurringBids BidRecurring[]
@@ -3462,6 +3467,15 @@ model FeaturedModelVersion {
   position       Int
 }
 
+model CoveredCheckpoint {
+  model_id     Int
+  version_id   Int
+  model        Model        @relation(fields: [model_id], references: [id], onDelete: Cascade)
+  modelVersion ModelVersion @relation(fields: [version_id], references: [id], onDelete: Cascade)
+
+  @@unique([model_id, version_id])
+}
+
 enum ModerationRuleAction {
   Approve
   Block