enh: add version (superseded | latest) to content frags

dust-tt · Nov 15, 2024 · 41525ae · 41525ae
1 parent 00db557
commit 41525ae
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/front/lib/resources/content_fragment_resource.ts b/front/lib/resources/content_fragment_resource.ts
@@ -201,6 +201,8 @@ export class ContentFragmentResource extends BaseResource<ContentFragmentModel>
         email: this.userContextEmail,
         username: this.userContextUsername,
       },
+      contentFragmentId: this.sId,
+      contentFragmentVersion: this.version,
     };
   }
 }

diff --git a/front/lib/resources/storage/models/content_fragment.ts b/front/lib/resources/storage/models/content_fragment.ts
@@ -1,4 +1,7 @@
-import type { SupportedContentFragmentType } from "@dust-tt/types";
+import type {
+  ContentFragmentVersion,
+  SupportedContentFragmentType,
+} from "@dust-tt/types";
 import type {
   CreationOptional,
   ForeignKey,
@@ -36,6 +39,8 @@ export class ContentFragmentModel extends Model<
 
   declare userId: ForeignKey<User["id"]> | null;
   declare fileId: ForeignKey<FileModel["id"]> | null;
+
+  declare version: ContentFragmentVersion;
 }
 
 ContentFragmentModel.init(
@@ -91,11 +96,16 @@ ContentFragmentModel.init(
       type: DataTypes.STRING,
       allowNull: true,
     },
+    version: {
+      type: DataTypes.STRING,
+      allowNull: false,
+      defaultValue: "latest",
+    },
   },
   {
     modelName: "content_fragment",
     sequelize: frontSequelize,
-    indexes: [{ fields: ["fileId"] }, { fields: ["sId"] }],
+    indexes: [{ fields: ["fileId"] }, { fields: ["sId", "version"] }],
   }
 );
 

diff --git a/front/migrations/db/migration_114.sql b/front/migrations/db/migration_114.sql
@@ -0,0 +1,11 @@
+-- Add version column
+ALTER TABLE
+    "public"."content_fragments"
+ADD
+    COLUMN "version" VARCHAR(255) NOT NULL DEFAULT 'latest';
+
+-- Create the composite index concurrently to avoid locking
+CREATE INDEX CONCURRENTLY "content_fragments_s_id_version" ON "content_fragments" ("sId", "version");
+
+-- Drop the old single-column index if it exists
+DROP INDEX CONCURRENTLY IF EXISTS "content_fragments_s_id";
diff --git a/types/src/front/content_fragment.ts b/types/src/front/content_fragment.ts
@@ -35,6 +35,8 @@ export function getSupportedContentFragmentTypeCodec(): t.Mixed {
   ]);
 }
 
+export type ContentFragmentVersion = "superseded" | "latest";
+
 export type ContentFragmentType = {
   id: ModelId;
   sId: string;
@@ -49,6 +51,8 @@ export type ContentFragmentType = {
   title: string;
   contentType: SupportedContentFragmentType;
   context: ContentFragmentContextType;
+  contentFragmentId: string;
+  contentFragmentVersion: ContentFragmentVersion;
 };
 
 export type UploadedContentFragment = {