Feature/orchestrator integration

.env-example

@@ -125,7 +125,6 @@ NEXT_PUBLIC_SEARCH_HOST=https://localhost:7700
 NEXT_PUBLIC_SEARCH_CLIENT_KEY=aSampleKey
 
 # Scheduler endpoint
-SCHEDULER_ENDPOINT=url
 ORCHESTRATOR_ENDPOINT=url
 ORCHESTRATOR_ACCESS_TOKEN=cooltoken
 

package.json

@@ -39,6 +39,7 @@
     "@aws-sdk/lib-storage": "^3.490.0",
     "@aws-sdk/s3-request-presigner": "^3.490.0",
     "@axiomhq/axiom-node": "^0.12.0",
+    "@civitai/client": "^0.1.9-beta.0",
     "@clickhouse/client": "^0.2.2",
     "@cloudamqp/amqp-client": "^2.1.1",
     "@dnd-kit/core": "^6.1.0",
@@ -113,6 +114,7 @@
     "cloudflare": "^2.9.1",
     "cookies-next": "^2.1.1",
     "cron-parser": "^4.6.0",
+    "crypto": "^1.0.1",
     "dayjs": "^1.11.6",
     "discord.js": "^14.7.1",
     "embla-carousel-react": "^7.0.3",
@@ -222,7 +224,7 @@
     "@types/xml2js": "^0.4.14",
     "@typescript-eslint/eslint-plugin": "^5.33.0",
     "@typescript-eslint/parser": "^5.33.0",
-    "autoprefixer": "^10.4.17",
+    "autoprefixer": "^10.4.19",
     "cssnano": "^7.0.1",
     "eslint": "8.22.0",
     "eslint-config-airbnb": "^19.0.4",
@@ -237,7 +239,7 @@
     "postcss": "^8.4.38",
     "prettier": "^2.8.8",
     "prisma": "^5.9.1",
-    "tailwindcss": "^3.4.1",
+    "tailwindcss": "^3.4.3",
     "ts-node": "^10.9.1",
     "typescript": "^5.5.3"
   },
@@ -247,4 +249,4 @@
   "overrides": {
     "@react-aria/interactions": "3.16.0"
   }
-}
+}

prisma/migrations/20240604172025_api_key_type/migration.sql

@@ -0,0 +1,9 @@
+
+-- CreateEnum
+CREATE TYPE "ApiKeyType" AS ENUM ('System', 'User');
+
+ALTER TYPE "KeyScope" ADD VALUE 'Generate';
+
+-- AlterTable
+ALTER TABLE "ApiKey" ADD COLUMN     "expiresAt" TIMESTAMP(3),
+ADD COLUMN     "type" "ApiKeyType" NOT NULL DEFAULT 'User';

prisma/schema.prisma

@@ -1620,6 +1620,11 @@ model KeyValue {
   value Json
 }
 
+enum ApiKeyType {
+  System
+  User
+}
+
 model ApiKey {
   id        Int        @id @default(autoincrement())
   key       String     @unique
@@ -1628,6 +1633,8 @@ model ApiKey {
   userId    Int
   user      User       @relation(fields: [userId], references: [id], onDelete: Cascade)
   createdAt DateTime   @default(now())
+  type      ApiKeyType @default(User)
+  expiresAt DateTime?
 }
 
 enum KeyScope {

src/components/Buzz/BuzzTransactionButton.tsx

@@ -20,7 +20,7 @@ import { useBuzzTransaction } from './buzz.utils';
 type Props = ButtonProps & {
   buzzAmount: number;
   message?: string | ((requiredBalance: number) => string);
-  label: string;
+  label: React.ReactNode;
   onPerformTransaction?: () => void;
   purchaseSuccessMessage?: (purchasedBalance: number) => React.ReactNode;
   size?: MantineSize;

src/components/Cards/ModelCard.tsx

@@ -54,6 +54,7 @@ import { IconNose } from '~/components/SVG/IconNose';
 import { UserAvatarSimple } from '~/components/UserAvatar/UserAvatarSimple';
 import { VideoMetadata } from '~/server/schema/media.schema';
 import { getSkipValue, shouldAnimateByDefault } from '~/components/EdgeMedia/EdgeMedia.util';
+import { getIsSdxl } from '~/shared/constants/generation.constants';
 
 const IMAGE_CARD_WIDTH = 450;
 
@@ -183,6 +184,10 @@ export function ModelCard({ data, forceInView }: Props) {
     data.publishedAt &&
     data.lastVersionAt > aDayAgo &&
     data.lastVersionAt.getTime() - data.publishedAt.getTime() > constants.timeCutOffs.updatedModel;
+  const isSDXL = getIsSdxl(data.version?.baseModel);
+
+  const isPony = data.version?.baseModel === 'Pony';
+  const isOdor = data.version?.baseModel === 'ODOR';
   const isArchived = data.mode === ModelModifier.Archived;
   const onSite = !!data.version.trainingStatus;
   const baseModelIndicator = BaseModelIndicator[data.version.baseModel as BaseModel];

src/components/Chopped/chopped.components.tsx

@@ -39,7 +39,6 @@ import {
 } from '@tabler/icons-react';
 import React, { Component, ErrorInfo, useState } from 'react';
 import { useBuzzTransaction } from '~/components/Buzz/buzz.utils';
-import { BuzzTransactionButton } from '~/components/Buzz/BuzzTransactionButton';
 import {
   GameState,
   GlobalState,

src/components/Chopped/states/complete.tsx

@@ -17,7 +17,6 @@ import { Carousel } from '@mantine/carousel';
 import { IconArrowLeft, IconCheck, IconPlus, IconX } from '@tabler/icons-react';
 import { useState } from 'react';
 import { useBuzzTransaction } from '~/components/Buzz/buzz.utils';
-import { BuzzTransactionButton } from '~/components/Buzz/BuzzTransactionButton';
 import {
   GameState,
   GlobalState,

src/components/Chopped/states/joining.tsx

@@ -16,7 +16,6 @@ import {
 import { IconArrowLeft, IconCheck, IconPlus, IconX } from '@tabler/icons-react';
 import { useState } from 'react';
 import { useBuzzTransaction } from '~/components/Buzz/buzz.utils';
-import { BuzzTransactionButton } from '~/components/Buzz/BuzzTransactionButton';
 import {
   GameState,
   GlobalState,

src/components/Chopped/states/landing.tsx

@@ -17,7 +17,6 @@ import {
 import { IconCheck, IconPlus, IconX } from '@tabler/icons-react';
 import { useState } from 'react';
 import { useBuzzTransaction } from '~/components/Buzz/buzz.utils';
-import { BuzzTransactionButton } from '~/components/Buzz/BuzzTransactionButton';
 import { GameState, GlobalState, NewGame } from '~/components/Chopped/chopped.shared-types';
 import { ComputeCost, defaultGameState, useChoppedStore } from '~/components/Chopped/chopped.utils';
 import { EdgeMedia } from '~/components/EdgeMedia/EdgeMedia';

src/components/CivitaiWrapped/AccountProvider.tsx

@@ -3,6 +3,7 @@ import { signIn, signOut, useSession } from 'next-auth/react';
 import { useRouter } from 'next/router';
 import { createContext, ReactNode, useContext, useEffect } from 'react';
 import { civTokenEndpoint, EncryptedDataSchema } from '~/server/schema/civToken.schema';
+import { generationServiceCookie } from '~/shared/constants/generation.constants';
 import { deleteCookies } from '~/utils/cookies-helpers';
 
 export type CivitaiAccount = {
@@ -22,7 +23,7 @@ type ogAccountType = {
 } | null;
 const ogAccountKey = 'civitai-og-account';
 
-const deleteCookieList = ['ref_code', 'ref_source'];
+const deleteCookieList = ['ref_code', 'ref_source', generationServiceCookie.name];
 
 type AccountState = {
   accounts: CivitaiAccounts;

src/components/ImageGeneration/Feed.tsx

@@ -1,16 +1,16 @@
 import { Center, Loader, createStyles, Stack, Alert, Text } from '@mantine/core';
 import { IconInbox } from '@tabler/icons-react';
 import { GeneratedImage } from '~/components/ImageGeneration/GeneratedImage';
-import { useGetGenerationRequests } from '~/components/ImageGeneration/utils/generationRequestHooks';
+import { useGetTextToImageRequestsImages } from '~/components/ImageGeneration/utils/generationRequestHooks';
 import { InViewLoader } from '~/components/InView/InViewLoader';
 import { generationPanel } from '~/store/generation.store';
 import { isDefined } from '~/utils/type-guards';
 import { ScrollArea } from '~/components/ScrollArea/ScrollArea';
 
 export function Feed() {
   const { classes } = useStyles();
-  const { requests, images, isLoading, fetchNextPage, hasNextPage, isRefetching, isError } =
-    useGetGenerationRequests();
+  const { requests, steps, isLoading, fetchNextPage, hasNextPage, isRefetching, isError } =
+    useGetTextToImageRequestsImages();
 
   if (isError)
     return (
@@ -26,7 +26,7 @@ export function Feed() {
       </Center>
     );
 
-  if (!images.length)
+  if (!steps.flatMap((x) => x.images).length)
     return (
       <Center h="100%">
         <Stack spacing="xs" align="center" py="16">
@@ -56,16 +56,23 @@ export function Feed() {
     <ScrollArea scrollRestore={{ key: 'feed' }} className="flex flex-col gap-2 px-3">
       {/* <GeneratedImagesBuzzPrompt /> */}
       <div className={classes.grid}>
-        {images
-          .map((image) => {
-            const request = requests.find((request) =>
-              request.images?.some((x) => x.id === image.id)
-            );
-            if (!request) return null;
+        {steps.map((step) =>
+          step.images
+            .map((image) => {
+              const request = requests.find((request) => request.id === image.workflowId);
+              if (!request) return null;
 
-            return <GeneratedImage key={image.id} request={request} image={image} />;
-          })
-          .filter(isDefined)}
+              return (
+                <GeneratedImage
+                  key={`${image.workflowId}_${image.id}`}
+                  request={request}
+                  step={step}
+                  image={image}
+                />
+              );
+            })
+            .filter(isDefined)
+        )}
       </div>
       {hasNextPage && (
         <InViewLoader loadFn={fetchNextPage} loadCondition={!isRefetching}>