cleanup wip

frontend/libs/components/model-selector/src/lib/model-lists.tsx

@@ -7,7 +7,7 @@ import {
   VIDEO_MODELS,
   IMAGE_MODELS,
 } from "@storyteller/model-list";
-import { ModelTag } from "libs/model-list/src/lib/ModelTag";
+import { ModelTag } from "@storyteller/model-list";
 
 export type ModelList = Omit<PopoverItem, "selected">[];
 

frontend/libs/model-list/src/index.ts

@@ -1,13 +1,14 @@
-export * from "./lib/ModelConfig.js";
-export * from "./lib/creator/ModelCreator.js";
-export * from "./lib/creator/ModelCreatorIcons.js";
-export * from "./lib/ModelInfo.js";
-export * from "./lib/ModelMapping.js";
-export * from "./lib/Models.js";
-export * from "./lib/ModelsByPage.js";
 export * from "./lib/classes/ImageModel.js";
 export * from "./lib/classes/Model.js";
 export * from "./lib/classes/VideoModel.js";
+export * from "./lib/legacy/ModelConfig.js";
+export * from "./lib/legacy/ModelInfo.js";
+export * from "./lib/legacy/Models.js";
+export * from "./lib/legacy/ModelsByPage.js";
 export * from "./lib/lists/AllModels.js";
 export * from "./lib/lists/ImageModels.js";
-export * from "./lib/lists/VideoModels.js";
+export * from "./lib/lists/VideoModels.js";
+export * from "./lib/metadata/ModelCreator.js";
+export * from "./lib/metadata/ModelCreatorIcons.js";
+export * from "./lib/metadata/ModelMapping.js";
+export * from "./lib/metadata/ModelTag.js";

frontend/libs/model-list/src/lib/classes/ImageModel.ts

@@ -1,7 +1,7 @@
 import { ModelCreator } from "src/index.js";
 import { Model } from "./Model.js";
-import { ModelCategory } from "../ModelConfig.js";
-import { ModelTag } from "../ModelTag.js";
+import { ModelCategory } from "../legacy/ModelConfig.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 export class ImageModel extends Model {
   readonly maxGenerationCount: number;

frontend/libs/model-list/src/lib/classes/Model.ts

@@ -1,6 +1,6 @@
-import { ModelCreator } from "../creator/ModelCreator.js";
-import { ModelCategory, ModelConfig } from "../ModelConfig.js";
-import { ModelTag } from "../ModelTag.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
+import { ModelCategory, ModelConfig } from "../legacy/ModelConfig.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 // NB: Do not create instances of this class directly, use subclasses.
 export class Model {

frontend/libs/model-list/src/lib/classes/VideoModel.ts

@@ -1,7 +1,7 @@
 import { ModelCreator } from "src/index.js";
 import { Model } from "./Model.js";
-import { ModelCategory } from "../ModelConfig.js";
-import { ModelTag } from "../ModelTag.js";
+import { ModelCategory } from "../legacy/ModelConfig.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 export class VideoModel extends Model {
   // Whether the model supports image starting frames

frontend/libs/model-list/src/lib/legacy/ModelConfig.ts

@@ -1,5 +1,5 @@
 import { ModelInfo } from "./ModelInfo.js";
-import { ModelTag } from "./ModelTag.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 export type ModelCategory = "image" | "video";
 

frontend/libs/model-list/src/lib/legacy/ModelInfo.ts

@@ -1,4 +1,4 @@
-import { ModelCreator } from "./creator/ModelCreator.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
 
 export interface ModelInfo {
   // Human-readible name

frontend/libs/model-list/src/lib/legacy/Models.ts

@@ -1,12 +1,12 @@
-import { ModelCreator } from "./creator/ModelCreator.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
 import { ModelInfo } from "./ModelInfo.js";
-import { ModelTag } from "./ModelTag.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 import {
   ModelConfig,
   ModelCapabilities,
   ModelCategory,
 } from "./ModelConfig.js";
-import { Model } from "./classes/Model.js";
+import { Model } from "../classes/Model.js";
 
 const mc = ModelCreator;
 

frontend/libs/model-list/src/lib/lists/ImageModels.ts

@@ -1,6 +1,6 @@
 import { ImageModel } from "../classes/ImageModel.js";
-import { ModelCreator } from "../creator/ModelCreator.js";
-import { ModelTag } from "../ModelTag.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
+import { ModelTag } from "../metadata/ModelTag.js";
 
 export const IMAGE_MODELS: ImageModel[] = [
   new ImageModel({

frontend/libs/model-list/src/lib/lists/VideoModels.ts

@@ -1,5 +1,5 @@
 import { VideoModel } from "../classes/VideoModel.js";
-import { ModelCreator } from "../creator/ModelCreator.js";
+import { ModelCreator } from "../metadata/ModelCreator.js";
 
 export const VIDEO_MODELS: VideoModel[] = [
   new VideoModel({

frontend/libs/model-list/src/lib/metadata/ModelMapping.ts

@@ -1,6 +1,6 @@
 import React from "react";
-import { ModelCreator } from "./creator/ModelCreator.js";
-import { getCreatorIcon } from "./creator/ModelCreatorIcons.js";
+import { ModelCreator } from "./ModelCreator.js";
+import { getCreatorIcon } from "./ModelCreatorIcons.js";
 
 // Map from model type strings to ModelCreator enum values
 export const MODEL_TYPE_TO_CREATOR: Record<string, ModelCreator> = {