From f2003aa44e79a874ac72d86721b79a8e8a10aa37 Mon Sep 17 00:00:00 2001
From: "James K. Glasbrenner" <jglasbrenner@mitre.org>
Date: Fri, 8 Nov 2024 10:43:16 -0500
Subject: [PATCH 01/22] feat: split entry_point_plugin_files table into two
 linking tables

This update takes the entry_point_plugin_files table and splits it down into 2 separate linking
tables, plugin_plugin_files and entry_point_plugins. This change allows us to treat the plugin files
as entirely coupled to the plugins namespace as a container, instead of their snapshotted history
being tied to updates in the entrypoint.
---
 ...eparate_entry_point_plugin_files_table_.py | 276 ++++++++++++++++++
 src/dioptra/restapi/db/models/__init__.py     |   6 +-
 src/dioptra/restapi/db/models/entry_points.py |   8 +-
 src/dioptra/restapi/db/models/plugins.py      |  16 +
 4 files changed, 298 insertions(+), 8 deletions(-)
 create mode 100644 src/dioptra/restapi/db/alembic/versions/f1d231f7ef15_separate_entry_point_plugin_files_table_.py

diff --git a/src/dioptra/restapi/db/alembic/versions/f1d231f7ef15_separate_entry_point_plugin_files_table_.py b/src/dioptra/restapi/db/alembic/versions/f1d231f7ef15_separate_entry_point_plugin_files_table_.py
new file mode 100644
index 000000000..7603b1552
--- /dev/null
+++ b/src/dioptra/restapi/db/alembic/versions/f1d231f7ef15_separate_entry_point_plugin_files_table_.py
@@ -0,0 +1,276 @@
+"""Separate entry_point_plugin_files table into 2 many-to-many tables
+
+Revision ID: f1d231f7ef15
+Revises: 6a75ede23821
+Create Date: 2024-11-08 09:55:20.650243
+
+"""
+
+from typing import Annotated
+
+import sqlalchemy as sa
+from alembic import op
+from sqlalchemy.orm import (
+    DeclarativeBase,
+    Mapped,
+    MappedAsDataclass,
+    mapped_column,
+    sessionmaker,
+)
+
+# revision identifiers, used by Alembic.
+revision = "f1d231f7ef15"
+down_revision = "6a75ede23821"
+branch_labels = None
+depends_on = None
+
+
+# Migration data models
+intpk = Annotated[
+    int,
+    mapped_column(sa.BigInteger().with_variant(sa.Integer, "sqlite"), primary_key=True),
+]
+bigint = Annotated[
+    int, mapped_column(sa.BigInteger().with_variant(sa.Integer, "sqlite"))
+]
+text_ = Annotated[str, mapped_column(sa.Text())]
+
+
+class UpgradeBase(DeclarativeBase, MappedAsDataclass):
+    pass
+
+
+class DowngradeBase(DeclarativeBase, MappedAsDataclass):
+    pass
+
+
+class EntryPointPluginUpgrade(UpgradeBase):
+    __tablename__ = "entry_point_plugins"
+
+    # Database fields
+    entry_point_resource_snapshot_id: Mapped[intpk]
+    plugin_resource_snapshot_id: Mapped[intpk]
+
+
+class EntryPointPluginFileUpgrade(UpgradeBase):
+    __tablename__ = "entry_point_plugin_files"
+
+    # Database fields
+    entry_point_resource_snapshot_id: Mapped[intpk]
+    plugin_resource_snapshot_id: Mapped[intpk]
+    plugin_file_resource_snapshot_id: Mapped[intpk]
+
+
+class PluginPluginFileUpgrade(UpgradeBase):
+    __tablename__ = "plugin_plugin_files"
+
+    # Database fields
+    plugin_resource_snapshot_id: Mapped[intpk]
+    plugin_file_resource_snapshot_id: Mapped[intpk]
+
+
+class EntryPointPluginFileDowngrade(DowngradeBase):
+    __tablename__ = "entry_point_plugin_files"
+
+    # Database fields
+    entry_point_resource_snapshot_id: Mapped[intpk]
+    plugin_resource_snapshot_id: Mapped[intpk]
+    plugin_file_resource_snapshot_id: Mapped[intpk]
+
+
+class PluginPluginFileDowngrade(DowngradeBase):
+    __tablename__ = "plugin_plugin_files"
+
+    # Database fields
+    plugin_resource_snapshot_id: Mapped[intpk]
+    plugin_file_resource_snapshot_id: Mapped[intpk]
+
+
+class EntryPointPluginDowngrade(DowngradeBase):
+    __tablename__ = "entry_point_plugins"
+
+    # Database fields
+    entry_point_resource_snapshot_id: Mapped[intpk]
+    plugin_resource_snapshot_id: Mapped[intpk]
+
+
+def upgrade():
+    bind = op.get_bind()
+    Session = sessionmaker(bind=bind)
+
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "entry_point_plugins",
+        sa.Column(
+            "entry_point_resource_snapshot_id",
+            sa.BigInteger().with_variant(sa.Integer(), "sqlite"),
+            nullable=False,
+        ),
+        sa.Column(
+            "plugin_resource_snapshot_id",
+            sa.BigInteger().with_variant(sa.Integer(), "sqlite"),
+            nullable=False,
+        ),
+        sa.ForeignKeyConstraint(
+            ["entry_point_resource_snapshot_id"],
+            ["entry_points.resource_snapshot_id"],
+            name=op.f(
+                "fk_entry_point_plugins_entry_point_resource_snapshot_id_entry_points"
+            ),
+        ),
+        sa.ForeignKeyConstraint(
+            ["plugin_resource_snapshot_id"],
+            ["plugins.resource_snapshot_id"],
+            name=op.f("fk_entry_point_plugins_plugin_resource_snapshot_id_plugins"),
+        ),
+        sa.PrimaryKeyConstraint(
+            "entry_point_resource_snapshot_id",
+            "plugin_resource_snapshot_id",
+            name=op.f("pk_entry_point_plugins"),
+        ),
+    )
+    op.create_table(
+        "plugin_plugin_files",
+        sa.Column(
+            "plugin_resource_snapshot_id",
+            sa.BigInteger().with_variant(sa.Integer(), "sqlite"),
+            nullable=False,
+        ),
+        sa.Column(
+            "plugin_file_resource_snapshot_id",
+            sa.BigInteger().with_variant(sa.Integer(), "sqlite"),
+            nullable=False,
+        ),
+        sa.ForeignKeyConstraint(
+            ["plugin_file_resource_snapshot_id"],
+            ["plugin_files.resource_snapshot_id"],
+            name=op.f(
+                "fk_plugin_plugin_files_plugin_file_resource_snapshot_id_plugin_files"
+            ),
+        ),
+        sa.ForeignKeyConstraint(
+            ["plugin_resource_snapshot_id"],
+            ["plugins.resource_snapshot_id"],
+            name=op.f("fk_plugin_plugin_files_plugin_resource_snapshot_id_plugins"),
+        ),
+        sa.PrimaryKeyConstraint(
+            "plugin_resource_snapshot_id",
+            "plugin_file_resource_snapshot_id",
+            name=op.f("pk_plugin_plugin_files"),
+        ),
+    )
+
+    with Session() as session:
+        entry_point_plugin_stmt = sa.select(
+            EntryPointPluginFileUpgrade.entry_point_resource_snapshot_id,
+            EntryPointPluginFileUpgrade.plugin_resource_snapshot_id,
+        ).distinct()
+
+        for row in session.execute(entry_point_plugin_stmt):
+            session.add(
+                EntryPointPluginUpgrade(
+                    entry_point_resource_snapshot_id=row.entry_point_resource_snapshot_id,
+                    plugin_resource_snapshot_id=row.plugin_resource_snapshot_id,
+                )
+            )
+
+        plugin_plugin_files_stmt = sa.select(
+            EntryPointPluginFileUpgrade.plugin_resource_snapshot_id,
+            EntryPointPluginFileUpgrade.plugin_file_resource_snapshot_id,
+        ).distinct()
+
+        for row in session.execute(plugin_plugin_files_stmt):
+            session.add(
+                PluginPluginFileUpgrade(
+                    plugin_resource_snapshot_id=row.plugin_resource_snapshot_id,
+                    plugin_file_resource_snapshot_id=row.plugin_file_resource_snapshot_id,
+                )
+            )
+
+        session.commit()
+
+    op.drop_table("entry_point_plugin_files")
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    bind = op.get_bind()
+    Session = sessionmaker(bind=bind)
+
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table(
+        "entry_point_plugin_files",
+        sa.Column(
+            "entry_point_resource_snapshot_id",
+            sa.BigInteger().with_variant(sa.Integer(), "sqlite"),
+            nullable=False,
+        ),
+        sa.Column(
+            "plugin_resource_snapshot_id",
+            sa.BigInteger().with_variant(sa.Integer(), "sqlite"),
+            nullable=False,
+        ),
+        sa.Column(
+            "plugin_file_resource_snapshot_id",
+            sa.BigInteger().with_variant(sa.Integer(), "sqlite"),
+            nullable=False,
+        ),
+        sa.PrimaryKeyConstraint(
+            "entry_point_resource_snapshot_id",
+            "plugin_resource_snapshot_id",
+            "plugin_file_resource_snapshot_id",
+            name=op.f("pk_entry_point_plugin_files"),
+        ),
+    )
+    with op.batch_alter_table("entry_point_plugin_files", schema=None) as batch_op:
+        batch_op.create_foreign_key(
+            batch_op.f(
+                "fk_entry_point_plugin_files_entry_point_resource_snapshot_id_entry_points"
+            ),
+            "entry_points",
+            ["entry_point_resource_snapshot_id"],
+            ["resource_snapshot_id"],
+        )
+        batch_op.create_foreign_key(
+            batch_op.f(
+                "fk_entry_point_plugin_files_plugin_file_resource_snapshot_id_plugin_files"
+            ),
+            "plugin_files",
+            ["plugin_file_resource_snapshot_id"],
+            ["resource_snapshot_id"],
+        )
+        batch_op.create_foreign_key(
+            batch_op.f(
+                "fk_entry_point_plugin_files_plugin_resource_snapshot_id_plugins"
+            ),
+            "plugins",
+            ["plugin_resource_snapshot_id"],
+            ["resource_snapshot_id"],
+        )
+
+    with Session() as session:
+        entry_point_plugin_files_stmt = sa.select(
+            EntryPointPluginDowngrade.entry_point_resource_snapshot_id,
+            EntryPointPluginDowngrade.plugin_resource_snapshot_id,
+            PluginPluginFileDowngrade.plugin_file_resource_snapshot_id,
+        ).join_from(
+            PluginPluginFileDowngrade,
+            EntryPointPluginDowngrade,
+            EntryPointPluginDowngrade.plugin_resource_snapshot_id
+            == PluginPluginFileDowngrade.plugin_resource_snapshot_id,
+        )
+
+        for row in session.execute(entry_point_plugin_files_stmt):
+            session.add(
+                EntryPointPluginFileDowngrade(
+                    entry_point_resource_snapshot_id=row.entry_point_resource_snapshot_id,
+                    plugin_resource_snapshot_id=row.plugin_resource_snapshot_id,
+                    plugin_file_resource_snapshot_id=row.plugin_file_resource_snapshot_id,
+                )
+            )
+
+        session.commit()
+
+    op.drop_table("plugin_plugin_files")
+    op.drop_table("entry_point_plugins")
+    # ### end Alembic commands ###
diff --git a/src/dioptra/restapi/db/models/__init__.py b/src/dioptra/restapi/db/models/__init__.py
index 794066517..17bb3b737 100644
--- a/src/dioptra/restapi/db/models/__init__.py
+++ b/src/dioptra/restapi/db/models/__init__.py
@@ -19,7 +19,7 @@
     EntryPoint,
     EntryPointParameter,
     EntryPointParameterValue,
-    EntryPointPluginFile,
+    EntryPointPlugin,
     entry_point_parameter_types_table,
 )
 from .experiments import Experiment
@@ -44,6 +44,7 @@
 from .plugins import (
     Plugin,
     PluginFile,
+    PluginPluginFile,
     PluginTask,
     PluginTaskInputParameter,
     PluginTaskOutputParameter,
@@ -71,7 +72,7 @@
     "EntryPointJob",
     "EntryPointParameter",
     "EntryPointParameterValue",
-    "EntryPointPluginFile",
+    "EntryPointPlugin",
     "Experiment",
     "ExperimentJob",
     "Group",
@@ -84,6 +85,7 @@
     "MlModelVersion",
     "Plugin",
     "PluginFile",
+    "PluginPluginFile",
     "PluginTask",
     "PluginTaskInputParameter",
     "PluginTaskOutputParameter",
diff --git a/src/dioptra/restapi/db/models/entry_points.py b/src/dioptra/restapi/db/models/entry_points.py
index b7085792b..9def0e843 100644
--- a/src/dioptra/restapi/db/models/entry_points.py
+++ b/src/dioptra/restapi/db/models/entry_points.py
@@ -146,8 +146,8 @@ class EntryPointParameterValue(db.Model):  # type: ignore[name-defined]
     )
 
 
-class EntryPointPluginFile(db.Model):  # type: ignore[name-defined]
-    __tablename__ = "entry_point_plugin_files"
+class EntryPointPlugin(db.Model):  # type: ignore[name-defined]
+    __tablename__ = "entry_point_plugins"
 
     # Database fields
     entry_point_resource_snapshot_id: Mapped[intpk] = mapped_column(
@@ -156,13 +156,9 @@ class EntryPointPluginFile(db.Model):  # type: ignore[name-defined]
     plugin_resource_snapshot_id: Mapped[intpk] = mapped_column(
         ForeignKey("plugins.resource_snapshot_id"), init=False
     )
-    plugin_file_resource_snapshot_id: Mapped[intpk] = mapped_column(
-        ForeignKey("plugin_files.resource_snapshot_id"), init=False
-    )
 
     # Relationships
     entry_point: Mapped["EntryPoint"] = relationship(
         back_populates="entry_point_plugin_files", lazy="joined"
     )
     plugin: Mapped["Plugin"] = relationship(lazy="joined")
-    plugin_file: Mapped["PluginFile"] = relationship(lazy="joined")
diff --git a/src/dioptra/restapi/db/models/plugins.py b/src/dioptra/restapi/db/models/plugins.py
index debe156a8..fc6294d12 100644
--- a/src/dioptra/restapi/db/models/plugins.py
+++ b/src/dioptra/restapi/db/models/plugins.py
@@ -102,6 +102,22 @@ class PluginFile(ResourceSnapshot):
     }
 
 
+class PluginPluginFile(db.Model):  # type: ignore[name-defined]
+    __tablename__ = "plugin_plugin_files"
+
+    # Database fields
+    plugin_resource_snapshot_id: Mapped[intpk] = mapped_column(
+        ForeignKey("plugins.resource_snapshot_id"), init=False
+    )
+    plugin_file_resource_snapshot_id: Mapped[intpk] = mapped_column(
+        ForeignKey("plugin_files.resource_snapshot_id"), init=False
+    )
+
+    # Relationships
+    plugin: Mapped["Plugin"] = relationship(lazy="joined")
+    plugin_file: Mapped["PluginFile"] = relationship(lazy="joined")
+
+
 class PluginTask(db.Model):  # type: ignore[name-defined]
     __tablename__ = "plugin_tasks"
 

From 60b5e74db321a745b7ad42759e83606ec91d1959 Mon Sep 17 00:00:00 2001
From: henrychoy <hchoy@mitre.org>
Date: Tue, 19 Nov 2024 12:09:23 -0500
Subject: [PATCH 02/22] fix: update service for entrypoints

---
 src/dioptra/restapi/db/models/entry_points.py |   4 +-
 src/dioptra/restapi/v1/entrypoints/service.py | 101 ++++++++++--------
 src/dioptra/restapi/v1/utils.py               |  27 +++--
 .../v1/workflows/lib/export_plugin_files.py   |   2 +-
 .../workflows/lib/export_task_engine_yaml.py  |   6 +-
 .../v1/workflows/lib/package_job_files.py     |   2 +-
 src/dioptra/restapi/v1/workflows/lib/views.py |  14 ++-
 7 files changed, 90 insertions(+), 66 deletions(-)

diff --git a/src/dioptra/restapi/db/models/entry_points.py b/src/dioptra/restapi/db/models/entry_points.py
index 9def0e843..e90f7b617 100644
--- a/src/dioptra/restapi/db/models/entry_points.py
+++ b/src/dioptra/restapi/db/models/entry_points.py
@@ -55,7 +55,7 @@ class EntryPoint(ResourceSnapshot):
     entry_point_jobs: Mapped[list["EntryPointJob"]] = relationship(
         init=False, viewonly=True
     )
-    entry_point_plugin_files: Mapped[list["EntryPointPluginFile"]] = relationship(
+    entry_point_plugins: Mapped[list["EntryPointPlugin"]] = relationship(
         init=False, back_populates="entry_point"
     )
 
@@ -159,6 +159,6 @@ class EntryPointPlugin(db.Model):  # type: ignore[name-defined]
 
     # Relationships
     entry_point: Mapped["EntryPoint"] = relationship(
-        back_populates="entry_point_plugin_files", lazy="joined"
+        back_populates="entry_point_plugins", lazy="joined"
     )
     plugin: Mapped["Plugin"] = relationship(lazy="joined")
diff --git a/src/dioptra/restapi/v1/entrypoints/service.py b/src/dioptra/restapi/v1/entrypoints/service.py
index a8f3cf711..17b583644 100644
--- a/src/dioptra/restapi/v1/entrypoints/service.py
+++ b/src/dioptra/restapi/v1/entrypoints/service.py
@@ -145,16 +145,15 @@ def create(
             creator=current_user,
         )
 
-        entry_point_plugin_files = [
-            models.EntryPointPluginFile(
+        entry_point_plugins = [
+            models.EntryPointPlugin(
                 entry_point=new_entrypoint,
                 plugin=plugin["plugin"],
-                plugin_file=plugin_file,
             )
             for plugin in plugins
-            for plugin_file in plugin["plugin_files"]
         ]
-        new_entrypoint.entry_point_plugin_files = entry_point_plugin_files
+
+        new_entrypoint.entry_point_plugins = entry_point_plugins
 
         plugin_resources = [plugin["plugin"].resource for plugin in plugins]
         queue_resources = [queue.resource for queue in queues]
@@ -467,19 +466,18 @@ def modify(
             resource=entrypoint.resource,
             creator=current_user,
         )
-        new_entrypoint.entry_point_plugin_files = [
-            models.EntryPointPluginFile(
+        new_entrypoint.entry_point_plugins = [
+            models.EntryPointPlugin(
                 entry_point=new_entrypoint,
-                plugin=entry_point_plugin_file.plugin,
-                plugin_file=entry_point_plugin_file.plugin_file,
+                plugin=entry_point_plugin.plugin,
             )
-            for entry_point_plugin_file in entrypoint.entry_point_plugin_files
+            for entry_point_plugin in entrypoint.entry_point_plugins
         ]
 
         plugin_resources = list(
             {
                 plugin.plugin.resource_id: plugin.plugin.resource
-                for plugin in new_entrypoint.entry_point_plugin_files
+                for plugin in new_entrypoint.entry_point_plugins
             }.values()
         )
         queue_resources = [queue.resource for queue in queues]
@@ -630,34 +628,31 @@ def append(
             creator=current_user,
         )
 
-        new_entry_point_plugin_files = [
-            models.EntryPointPluginFile(
+        new_entry_point_plugins = [
+            models.EntryPointPlugin(
                 entry_point=new_entrypoint,
                 plugin=plugin["plugin"],
-                plugin_file=plugin_file,
             )
             for plugin in self._plugin_ids_service.get(
                 plugin_ids, error_if_not_found=True
             )
-            for plugin_file in plugin["plugin_files"]
         ]
-        existing_entry_point_plugin_files = [
-            models.EntryPointPluginFile(
+        existing_entry_point_plugins = [
+            models.EntryPointPlugin(
                 entry_point=new_entrypoint,
-                plugin=entry_point_plugin_file.plugin,
-                plugin_file=entry_point_plugin_file.plugin_file,
+                plugin=entry_point_plugin.plugin,
             )
-            for entry_point_plugin_file in entrypoint.entry_point_plugin_files
-            if entry_point_plugin_file.plugin.resource_id not in set(plugin_ids)
+            for entry_point_plugin in entrypoint.entry_point_plugins
+            if entry_point_plugin.plugin.resource_id not in set(plugin_ids)
         ]
-        new_entrypoint.entry_point_plugin_files = (
-            existing_entry_point_plugin_files + new_entry_point_plugin_files
+        new_entrypoint.entry_point_plugins = (
+            existing_entry_point_plugins + new_entry_point_plugins
         )
 
         plugin_resources = list(
             {
                 plugin.plugin.resource_id: plugin.plugin.resource
-                for plugin in new_entrypoint.entry_point_plugin_files
+                for plugin in new_entrypoint.entry_point_plugins
             }.values()
         )
         queue_resources = [
@@ -728,20 +723,27 @@ def get(
         )["entry_point"]
 
         plugins = {
-            entry_point_plugin_file.plugin.resource_id: entry_point_plugin_file.plugin
-            for entry_point_plugin_file in entrypoint.entry_point_plugin_files
+            entry_point_plugin.plugin.resource_id: entry_point_plugin.plugin
+            for entry_point_plugin in entrypoint.entry_point_plugins
         }
         if plugin_id not in plugins:
             raise EntityDoesNotExistError(
                 PLUGIN_RESOURCE_TYPE, entrypoint_id=entrypoint_id, plugin_id=plugin_id
             )
 
+        plugin_files_stmt = (
+            select(models.PluginFile)
+            .where(
+                models.PluginFile.plugin_id
+                == plugin_id
+            )
+        )
+        plugin_files = db.session.scalars(plugin_files_stmt).unique().all()
+
+        # Construct the PluginWithFilesDict
         plugin = utils.PluginWithFilesDict(
-            plugin=plugins[plugin_id], plugin_files=[], has_draft=None
+            plugin=plugins[plugin_id], plugin_files=plugin_files, has_draft=None
         )
-        for entry_point_plugin_file in entrypoint.entry_point_plugin_files:
-            if entry_point_plugin_file.plugin.resource_id == plugin_id:
-                plugin["plugin_files"].append(entry_point_plugin_file.plugin_file)
 
         return plugin
 
@@ -775,7 +777,7 @@ def delete(
         )["entry_point"]
 
         plugin_ids = set(
-            plugin.plugin.resource_id for plugin in entrypoint.entry_point_plugin_files
+            plugin.plugin.resource_id for plugin in entrypoint.entry_point_plugins
         )
         if plugin_id not in plugin_ids:
             raise EntityDoesNotExistError(
@@ -800,14 +802,13 @@ def delete(
             resource=entrypoint.resource,
             creator=current_user,
         )
-        new_entrypoint.entry_point_plugin_files = [
-            models.EntryPointPluginFile(
+        new_entrypoint.entry_point_plugins = [
+            models.EntryPointPlugin(
                 entry_point=new_entrypoint,
-                plugin=entry_point_plugin_file.plugin,
-                plugin_file=entry_point_plugin_file.plugin_file,
+                plugin=entry_point_plugin.plugin,
             )
-            for entry_point_plugin_file in entrypoint.entry_point_plugin_files
-            if entry_point_plugin_file.plugin.resource_id != plugin_id
+            for entry_point_plugin in entrypoint.entry_point_plugins
+            if entry_point_plugin.plugin.resource_id != plugin_id
         ]
 
         # remove the plugin resource dependency association
@@ -1194,13 +1195,25 @@ def _get_entrypoint_plugin_snapshots(
     entrypoint: models.EntryPoint,
 ) -> list[utils.PluginWithFilesDict]:
     plugins_dict = {
-        entry_point_plugin_file.plugin.resource_id: utils.PluginWithFilesDict(
-            plugin=entry_point_plugin_file.plugin, plugin_files=[], has_draft=False
+        entry_point_plugin.plugin.resource_id: utils.PluginWithFilesDict(
+            plugin=entry_point_plugin.plugin, plugin_files=[], has_draft=False
         )
-        for entry_point_plugin_file in entrypoint.entry_point_plugin_files
+        for entry_point_plugin in entrypoint.entry_point_plugins
     }
-    for entry_point_plugin_file in entrypoint.entry_point_plugin_files:
-        resource_id = entry_point_plugin_file.plugin.resource_id
-        plugin_file = entry_point_plugin_file.plugin_file
-        plugins_dict[resource_id]["plugin_files"].append(plugin_file)
+    for entry_point_plugin in entrypoint.entry_point_plugins:
+        resource_id = entry_point_plugin.plugin.resource_id
+        plugin_files = db.session.scalars(
+            select(models.PluginFile)
+            .join(models.PluginPluginFile, 
+                models.PluginPluginFile.plugin_file_resource_snapshot_id
+                == models.PluginFile.resource_snapshot_id
+            )
+            .where(
+              models.PluginPluginFile.plugin_resource_snapshot_id 
+              == entry_point_plugin.plugin.resource_snapshot_id
+            )
+        ).all()
+
+        plugins_dict[resource_id]["plugin_files"].extend(plugin_files)
+
     return list(plugins_dict.values())
diff --git a/src/dioptra/restapi/v1/utils.py b/src/dioptra/restapi/v1/utils.py
index 27c9f41f2..ac4d1274c 100644
--- a/src/dioptra/restapi/v1/utils.py
+++ b/src/dioptra/restapi/v1/utils.py
@@ -20,9 +20,11 @@
 
 from marshmallow import Schema
 
-from dioptra.restapi.db import models
+from dioptra.restapi.db import models, db
 from dioptra.restapi.routes import V1_ROOT
 
+from sqlalchemy import select
+
 ARTIFACTS: Final[str] = "artifacts"
 ENTRYPOINTS: Final[str] = "entrypoints"
 EXPERIMENTS: Final[str] = "experiments"
@@ -587,17 +589,20 @@ def build_entrypoint(entrypoint_dict: EntrypointDict) -> dict[str, Any]:
     queues = entrypoint_dict.get("queues", None)
     has_draft = entrypoint_dict.get("has_draft", None)
 
-    plugins_dict = {
-        entry_point_plugin_file.plugin.resource_id: PluginWithFilesDict(
-            plugin=entry_point_plugin_file.plugin, plugin_files=[], has_draft=False
+    plugins = [
+        PluginWithFilesDict(
+            plugin=entry_point_plugin.plugin,
+            plugin_files=db.session.scalars(
+                select(models.PluginFile)
+                .where(
+                    models.PluginFile.plugin_id
+                    == entry_point_plugin.plugin.resource_id
+                )
+            ).unique().all(),
+            has_draft=False,
         )
-        for entry_point_plugin_file in entrypoint.entry_point_plugin_files
-    }
-    for entry_point_plugin_file in entrypoint.entry_point_plugin_files:
-        resource_id = entry_point_plugin_file.plugin.resource_id
-        plugin_file = entry_point_plugin_file.plugin_file
-        plugins_dict[resource_id]["plugin_files"].append(plugin_file)
-    plugins = list(plugins_dict.values())
+        for entry_point_plugin in entrypoint.entry_point_plugins
+    ]
 
     data = {
         "id": entrypoint.resource_id,
diff --git a/src/dioptra/restapi/v1/workflows/lib/export_plugin_files.py b/src/dioptra/restapi/v1/workflows/lib/export_plugin_files.py
index 4a3dd3bcd..afb7990da 100644
--- a/src/dioptra/restapi/v1/workflows/lib/export_plugin_files.py
+++ b/src/dioptra/restapi/v1/workflows/lib/export_plugin_files.py
@@ -25,7 +25,7 @@
 
 
 def export_plugin_files(
-    entry_point_plugin_files: list[models.EntryPointPluginFile],
+    entry_point_plugin_files: list[models.PluginPluginFile],
     plugins_base_dir: Path,
     logger: BoundLogger | None = None,
 ) -> list[Path]:
diff --git a/src/dioptra/restapi/v1/workflows/lib/export_task_engine_yaml.py b/src/dioptra/restapi/v1/workflows/lib/export_task_engine_yaml.py
index d89923b84..92c377a82 100644
--- a/src/dioptra/restapi/v1/workflows/lib/export_task_engine_yaml.py
+++ b/src/dioptra/restapi/v1/workflows/lib/export_task_engine_yaml.py
@@ -50,7 +50,7 @@
 
 def export_task_engine_yaml(
     entrypoint: models.EntryPoint,
-    entry_point_plugin_files: list[models.EntryPointPluginFile],
+    entry_point_plugin_files: list[models.PluginPluginFile],
     plugin_parameter_types: list[models.PluginTaskParameterType],
     base_dir: Path,
     logger: BoundLogger | None = None,
@@ -85,7 +85,7 @@ def export_task_engine_yaml(
 
 def build_task_engine_dict(
     entrypoint: models.EntryPoint,
-    entry_point_plugin_files: list[models.EntryPointPluginFile],
+    entry_point_plugin_files: list[models.PluginPluginFile],
     plugin_parameter_types: list[models.PluginTaskParameterType],
     logger: BoundLogger | None = None,
 ) -> dict[str, Any]:
@@ -147,7 +147,7 @@ def extract_parameters(
 
 
 def extract_tasks(
-    entry_point_plugin_files: list[models.EntryPointPluginFile],
+    entry_point_plugin_files: list[models.PluginPluginFile],
     plugin_parameter_types: list[models.PluginTaskParameterType],
     logger: BoundLogger | None = None,
 ) -> tuple[dict[str, Any], dict[str, Any]]:
diff --git a/src/dioptra/restapi/v1/workflows/lib/package_job_files.py b/src/dioptra/restapi/v1/workflows/lib/package_job_files.py
index b2c904bd0..93eade6b0 100644
--- a/src/dioptra/restapi/v1/workflows/lib/package_job_files.py
+++ b/src/dioptra/restapi/v1/workflows/lib/package_job_files.py
@@ -38,7 +38,7 @@ def package_job_files(
     job_id: int,
     experiment: models.Experiment,
     entry_point: models.EntryPoint,
-    entry_point_plugin_files: list[models.EntryPointPluginFile],
+    entry_point_plugin_files: list[models.PluginPluginFile],
     job_parameter_values: list[models.EntryPointParameterValue],
     plugin_parameter_types: list[models.PluginTaskParameterType],
     file_type: FileTypes,
diff --git a/src/dioptra/restapi/v1/workflows/lib/views.py b/src/dioptra/restapi/v1/workflows/lib/views.py
index d4bf3340d..d52ddd4f6 100644
--- a/src/dioptra/restapi/v1/workflows/lib/views.py
+++ b/src/dioptra/restapi/v1/workflows/lib/views.py
@@ -86,7 +86,7 @@ def get_experiment(job_id: int, logger: BoundLogger | None = None) -> models.Exp
 
 def get_entry_point_plugin_files(
     job_id: int, logger: BoundLogger | None = None
-) -> list[models.EntryPointPluginFile]:
+) -> list[models.PluginPluginFile]:
     """Run a query to get the plugin files for an entrypoint.
 
     Args:
@@ -106,9 +106,15 @@ def get_entry_point_plugin_files(
             models.EntryPointJob.job_resource_id == job_id,
         )
     )
-    entry_point_plugin_files_stmt = select(models.EntryPointPluginFile).where(
-        models.EntryPointPluginFile.entry_point_resource_snapshot_id
-        == entry_point_resource_snapshot_id_stmt.scalar_subquery(),
+
+    # Get plugins linked to the entry point
+    entry_point_plugins_stmt = select(models.EntryPointPlugin.plugin_resource_snapshot_id).where(
+        models.EntryPointPlugin.entry_point_resource_snapshot_id == entry_point_resource_snapshot_id_stmt.scalar_subquery()
+    )
+
+    # Get plugin files linked to these plugins
+    entry_point_plugin_files_stmt = select(models.PluginPluginFile).where(
+        models.PluginPluginFile.plugin_resource_snapshot_id.in_(entry_point_plugins_stmt)
     )
     return list(db.session.scalars(entry_point_plugin_files_stmt).unique().all())
 

From f2ac8263dc00c6d084094c88f5f783ed3d52f376 Mon Sep 17 00:00:00 2001
From: henrychoy <hchoy@mitre.org>
Date: Sat, 23 Nov 2024 20:41:21 -0500
Subject: [PATCH 03/22] fix: updated plugin service

---
 src/dioptra/restapi/db/models/plugins.py      |  12 ++
 src/dioptra/restapi/v1/entrypoints/schema.py  |   7 ++
 src/dioptra/restapi/v1/entrypoints/service.py |   2 +-
 src/dioptra/restapi/v1/plugins/service.py     | 116 +++++++++++++-----
 src/dioptra/restapi/v1/utils.py               |  18 +--
 src/frontend/src/services/dataApi.ts          |   2 +-
 6 files changed, 114 insertions(+), 43 deletions(-)

diff --git a/src/dioptra/restapi/db/models/plugins.py b/src/dioptra/restapi/db/models/plugins.py
index fc6294d12..1f5d09d1b 100644
--- a/src/dioptra/restapi/db/models/plugins.py
+++ b/src/dioptra/restapi/db/models/plugins.py
@@ -40,6 +40,18 @@ class Plugin(ResourceSnapshot):
     resource_id: Mapped[bigint] = mapped_column(init=False, nullable=False, index=True)
     name: Mapped[text_] = mapped_column(nullable=False, index=True)
 
+    # Relationships
+    plugin_plugin_files: Mapped[list["PluginPluginFile"]] = relationship(
+        init=False, back_populates="plugin"
+    )
+    # plugin_files: Mapped[list["PluginFile"]] = relationship(
+    #     "PluginFile",
+    #     secondary="plugin_plugin_files",
+    #     primaryjoin="Plugin.resource_snapshot_id == PluginPluginFile.plugin_resource_snapshot_id",
+    #     secondaryjoin="PluginPluginFile.plugin_file_resource_snapshot_id == PluginFile.resource_snapshot_id",
+    #     init=False
+    # )
+
     # Additional settings
     __table_args__ = (  # type: ignore[assignment]
         Index(None, "resource_snapshot_id", "resource_id", unique=True),
diff --git a/src/dioptra/restapi/v1/entrypoints/schema.py b/src/dioptra/restapi/v1/entrypoints/schema.py
index af0220c11..7b4da170d 100644
--- a/src/dioptra/restapi/v1/entrypoints/schema.py
+++ b/src/dioptra/restapi/v1/entrypoints/schema.py
@@ -66,6 +66,13 @@ class EntrypointPluginSchema(Schema):
         attribute="snapshot_id",
         metadata=dict(description="Snapshot ID for the Plugin resource."),
     )
+    latestSnapshot = fields.Boolean(
+        attribute="latest_snapshot",
+        metadata=dict(
+            description=f"Whether or not the {name} resource is the latest version."
+        ),
+        dump_only=True,
+    )
     url = fields.Url(
         attribute="url",
         metadata=dict(description="URL for accessing the full Plugin snapshot."),
diff --git a/src/dioptra/restapi/v1/entrypoints/service.py b/src/dioptra/restapi/v1/entrypoints/service.py
index 17b583644..80ff2e06d 100644
--- a/src/dioptra/restapi/v1/entrypoints/service.py
+++ b/src/dioptra/restapi/v1/entrypoints/service.py
@@ -1212,7 +1212,7 @@ def _get_entrypoint_plugin_snapshots(
               models.PluginPluginFile.plugin_resource_snapshot_id 
               == entry_point_plugin.plugin.resource_snapshot_id
             )
-        ).all()
+        ).unique().all()
 
         plugins_dict[resource_id]["plugin_files"].extend(plugin_files)
 
diff --git a/src/dioptra/restapi/v1/plugins/service.py b/src/dioptra/restapi/v1/plugins/service.py
index fadb12ec4..fc2976707 100644
--- a/src/dioptra/restapi/v1/plugins/service.py
+++ b/src/dioptra/restapi/v1/plugins/service.py
@@ -226,36 +226,20 @@ def get(
 
         plugins = db.session.scalars(latest_plugins_stmt).all()
 
-        # extract list of plugin ids
-        plugin_ids = [plugin.resource_id for plugin in plugins]
-
-        # Build CTE that retrieves all snapshot ids for the list of plugin files
-        # associated with retrieved plugins
-        parent_plugin = aliased(models.Plugin)
-        plugin_file_snapshot_ids_cte = (
-            select(models.PluginFile.resource_snapshot_id)
-            .join(
-                models.resource_dependencies_table,
-                models.PluginFile.resource_id
-                == models.resource_dependencies_table.c.child_resource_id,
-            )
-            .join(
-                parent_plugin,
-                parent_plugin.resource_id
-                == models.resource_dependencies_table.c.parent_resource_id,
+        plugins_dict: dict[int, utils.PluginWithFilesDict] = {
+            plugin.resource_id: utils.PluginWithFilesDict(
+                plugin=plugin, 
+                plugin_files=[],
+                has_draft=False
             )
-            .where(parent_plugin.resource_id.in_(plugin_ids))
-            .cte()
-        )
+            for plugin in plugins
+        }
 
         # get the latest plugin file snapshots associated with the retrieved plugins
         latest_plugin_files_stmt = (
             select(models.PluginFile)
             .join(models.Resource)
             .where(
-                models.PluginFile.resource_snapshot_id.in_(
-                    select(plugin_file_snapshot_ids_cte)
-                ),
                 models.Resource.latest_snapshot_id
                 == models.PluginFile.resource_snapshot_id,
                 models.Resource.is_deleted == False,  # noqa: E712
@@ -263,13 +247,6 @@ def get(
         )
         plugin_files = db.session.scalars(latest_plugin_files_stmt).unique().all()
 
-        # build a dictionary structure to re-associate plugins and plugin files
-        plugins_dict: dict[int, utils.PluginWithFilesDict] = {
-            plugin.resource_id: utils.PluginWithFilesDict(
-                plugin=plugin, plugin_files=[], has_draft=False
-            )
-            for plugin in plugins
-        }
         for plugin_file in plugin_files:
             plugins_dict[plugin_file.plugin_id]["plugin_files"].append(plugin_file)
 
@@ -359,6 +336,8 @@ def get(
             )
         )
         plugin_files = list(db.session.scalars(latest_plugin_files_stmt).unique().all())
+        # plugin_files = list construction thing
+
 
         drafts_stmt = (
             select(models.DraftResource.draft_resource_id)
@@ -434,6 +413,13 @@ def modify(
         )
         db.session.add(new_plugin)
 
+        for plugin_file in plugin_files:
+            plugin_plugin_file = models.PluginPluginFile(
+                plugin=new_plugin,
+                plugin_file=plugin_file
+            )
+            db.session.add(plugin_plugin_file)
+
         if commit:
             db.session.commit()
             log.debug(
@@ -466,15 +452,29 @@ def delete(self, plugin_id: int, **kwargs) -> dict[str, Any]:
         if plugin_resource is None:
             raise EntityDoesNotExistError(PLUGIN_RESOURCE_TYPE, plugin_id=plugin_id)
 
+
+        from dioptra.restapi.v1.plugins.service import PluginIdFileService
+        plugin_id_file_service = PluginIdFileService(
+            plugin_file_name_service=None,
+            group_id_service=None,
+            plugin_id_service=self,
+        )
+        plugin_file_ids = plugin_id_file_service.delete(plugin_id=plugin_id)["id"]
+
         deleted_resource_lock = models.ResourceLock(
             resource_lock_type=resource_lock_types.DELETE,
             resource=plugin_resource,
         )
         db.session.add(deleted_resource_lock)
         db.session.commit()
-        log.debug("Plugin deleted", plugin_id=plugin_id)
 
-        return {"status": "Success", "id": [plugin_id]}
+        log.debug(
+            "Plugin and associated files deleted",
+            plugin_id=plugin_id,
+            plugin_file_ids=plugin_file_ids,
+        )
+
+        return {"status": "Success", "plugin_id": plugin_id, "file_ids": plugin_file_ids}
 
 
 class PluginIdsService(object):
@@ -776,6 +776,8 @@ def create(
         new_plugin_file.parents.append(plugin.resource)
         db.session.add(new_plugin_file)
 
+        _update_plugin_and_file_snapshots(plugin, new_plugin_file)
+
         _add_plugin_tasks(tasks, plugin_file=new_plugin_file, log=log)
 
         if commit:
@@ -1141,6 +1143,8 @@ def modify(
         )
         db.session.add(updated_plugin_file)
 
+        _update_plugin_and_file_snapshots(plugin, updated_plugin_file)
+
         _add_plugin_tasks(tasks, plugin_file=updated_plugin_file, log=log)
 
         if commit:
@@ -1194,6 +1198,15 @@ def delete(self, plugin_id: int, plugin_file_id: int, **kwargs) -> dict[str, Any
                 plugin_id=plugin_id,
                 plugin_file_id=plugin_file_id,
             )
+        
+        plugin_file_dict = self.get(
+            plugin_id=plugin_id,
+            plugin_file_id=plugin_file_id,
+        )
+
+        plugin = plugin_file_dict["plugin"]
+        
+        _update_plugin_and_file_snapshots(plugin, plugin_file)
 
         plugin_file_id_to_return = plugin_file.resource_id  # to return to user
         db.session.add(
@@ -1333,3 +1346,42 @@ def _add_plugin_tasks(
             log=log,
         )
         db.session.add(plugin_task)
+
+    
+def _update_plugin_and_file_snapshots(
+    plugin: models.Plugin,
+    plugin_file: models.PluginFile,
+    delete: bool = False,
+) -> None:
+
+    # add snapshot for plugin
+    new_plugin = models.Plugin(
+        name=plugin.name,
+        description=plugin.description,
+        resource=plugin.resource,
+        creator=current_user,
+    )
+    db.session.add(new_plugin)
+
+    if delete:
+        return
+
+    # add snapshot for existing plugin_plugin_files
+    for plugin_plugin_file in plugin.plugin_plugin_files:
+        if (
+            plugin_plugin_file.plugin_resource_snapshot_id == plugin.resource_snapshot_id and 
+            plugin_plugin_file.plugin_file.resource_id != plugin_file.resource_id
+        ):
+            existing_plugin_plugin_file = models.PluginPluginFile(
+              plugin=new_plugin,
+              plugin_file=plugin_plugin_file.plugin_file
+            )
+            db.session.add(existing_plugin_plugin_file)
+
+    # add snapshot for new plugin_plugin_file
+    new_plugin_plugin_file = models.PluginPluginFile(
+        plugin=new_plugin,
+        plugin_file=plugin_file
+    )
+    db.session.add(new_plugin_plugin_file)
+
diff --git a/src/dioptra/restapi/v1/utils.py b/src/dioptra/restapi/v1/utils.py
index ac4d1274c..19dc96d7d 100644
--- a/src/dioptra/restapi/v1/utils.py
+++ b/src/dioptra/restapi/v1/utils.py
@@ -257,6 +257,7 @@ def build_entrypoint_plugin(plugin_with_files: PluginWithFilesDict) -> dict[str,
     return {
         "id": plugin.resource_id,
         "snapshot_id": plugin.resource_snapshot_id,
+        "latest_snapshot": plugin.resource.latest_snapshot_id == plugin.resource_snapshot_id,
         "name": plugin.name,
         "url": build_url(
             f"{PLUGINS}/{plugin.resource_id}/snapshots/{plugin.resource_snapshot_id}"
@@ -592,18 +593,17 @@ def build_entrypoint(entrypoint_dict: EntrypointDict) -> dict[str, Any]:
     plugins = [
         PluginWithFilesDict(
             plugin=entry_point_plugin.plugin,
-            plugin_files=db.session.scalars(
-                select(models.PluginFile)
-                .where(
-                    models.PluginFile.plugin_id
-                    == entry_point_plugin.plugin.resource_id
-                )
-            ).unique().all(),
-            has_draft=False,
-        )
+            plugin_files=[plugin_plugin_file.plugin_file for plugin_plugin_file in entry_point_plugin.plugin.plugin_plugin_files])
         for entry_point_plugin in entrypoint.entry_point_plugins
     ]
 
+    # plugins = [
+    #     PluginWithFilesDict(
+    #         plugin=entry_point_plugin.plugin,
+    #         plugin_files=[file for file in entry_point_plugin.plugin.plugin_files])
+    #     for entry_point_plugin in entrypoint.entry_point_plugins
+    # ]
+
     data = {
         "id": entrypoint.resource_id,
         "snapshot_id": entrypoint.resource_snapshot_id,
diff --git a/src/frontend/src/services/dataApi.ts b/src/frontend/src/services/dataApi.ts
index 1566748f0..1850de0d4 100644
--- a/src/frontend/src/services/dataApi.ts
+++ b/src/frontend/src/services/dataApi.ts
@@ -151,7 +151,7 @@ export async function getData<T extends ItemType>(type: T, pagination: Paginatio
       Object.assign(obj, obj.payload)
     })
   }
-  console.log('getData = ', res)
+  console.log('getData = ', res.data.data)
   return res
 }
 

From 45f1c91da1e646845456321df999f3cbab02bb32 Mon Sep 17 00:00:00 2001
From: henrychoy <hchoy@mitre.org>
Date: Tue, 26 Nov 2024 14:30:51 -0500
Subject: [PATCH 04/22] feat: add sync to latest plugin btn

---
 src/dioptra/restapi/v1/entrypoints/schema.py  |  7 ++
 src/dioptra/restapi/v1/plugins/schema.py      | 40 ++++----
 src/dioptra/restapi/v1/plugins/service.py     |  9 +-
 src/dioptra/restapi/v1/utils.py               |  2 +
 .../src/dialogs/AssignPluginsDialog.vue       | 96 +++++++++++--------
 src/frontend/src/views/ArtifactsView.vue      |  9 --
 src/frontend/src/views/CreateEntryPoint.vue   | 88 +++++++++++++----
 src/frontend/src/views/EntryPointsView.vue    | 27 ++----
 src/frontend/src/views/PluginsView.vue        | 39 ++++++--
 9 files changed, 205 insertions(+), 112 deletions(-)

diff --git a/src/dioptra/restapi/v1/entrypoints/schema.py b/src/dioptra/restapi/v1/entrypoints/schema.py
index 7b4da170d..a59739194 100644
--- a/src/dioptra/restapi/v1/entrypoints/schema.py
+++ b/src/dioptra/restapi/v1/entrypoints/schema.py
@@ -18,6 +18,7 @@
 from marshmallow import Schema, fields, validate
 
 from dioptra.restapi.v1.queues.schema import QueueRefSchema
+from dioptra.restapi.v1.plugins.schema import PluginTaskSchema
 from dioptra.restapi.v1.schemas import (
     BasePageSchema,
     GroupIdQueryParametersSchema,
@@ -49,6 +50,12 @@ class EntrypointPluginFileSchema(Schema):
         metadata=dict(description="URL for accessing the full PluginFile snapshot."),
         relative=True,
     )
+    tasks = fields.Nested(
+        PluginTaskSchema,
+        attribute="tasks",
+        metadata=dict(description="Tasks associated with the PluginFile resource."),
+        many=True,
+    )
 
 
 class EntrypointPluginSchema(Schema):
diff --git a/src/dioptra/restapi/v1/plugins/schema.py b/src/dioptra/restapi/v1/plugins/schema.py
index fad908a7e..3a1d8029b 100644
--- a/src/dioptra/restapi/v1/plugins/schema.py
+++ b/src/dioptra/restapi/v1/plugins/schema.py
@@ -62,23 +62,6 @@ class PluginSnapshotRefSchema(PluginSnapshotRefBaseSchema):  # type: ignore
     )
 
 
-PluginFileRefBaseSchema = generate_base_resource_ref_schema("PluginFile")
-
-
-class PluginFileRefSchema(PluginFileRefBaseSchema):  # type: ignore
-    """The reference schema for the data stored in a PluginFile."""
-
-    pluginId = fields.Int(
-        attribute="plugin_id",
-        data_key="plugin",
-        metadata=dict(description="ID for the Plugin resource this file belongs to."),
-    )
-    filename = fields.String(
-        attribute="filename",
-        metadata=dict(description="Filename of the PluginFile resource."),
-    )
-
-
 class PluginTaskParameterSchema(Schema):
     """The schema for the data stored in a PluginTaskParameter"""
 
@@ -168,6 +151,29 @@ class PluginTaskSchema(Schema):
     )
 
 
+PluginFileRefBaseSchema = generate_base_resource_ref_schema("PluginFile")
+
+
+class PluginFileRefSchema(PluginFileRefBaseSchema):  # type: ignore
+    """The reference schema for the data stored in a PluginFile."""
+
+    pluginId = fields.Int(
+        attribute="plugin_id",
+        data_key="plugin",
+        metadata=dict(description="ID for the Plugin resource this file belongs to."),
+    )
+    filename = fields.String(
+        attribute="filename",
+        metadata=dict(description="Filename of the PluginFile resource."),
+    )
+    tasks = fields.Nested(
+        PluginTaskSchema,
+        attribute="tasks",
+        metadata=dict(description="Tasks associated with the PluginFile resource."),
+        many=True,
+    )
+
+
 PluginBaseSchema = generate_base_resource_schema("Plugin", snapshot=True)
 
 
diff --git a/src/dioptra/restapi/v1/plugins/service.py b/src/dioptra/restapi/v1/plugins/service.py
index fc2976707..d537c19da 100644
--- a/src/dioptra/restapi/v1/plugins/service.py
+++ b/src/dioptra/restapi/v1/plugins/service.py
@@ -1206,7 +1206,7 @@ def delete(self, plugin_id: int, plugin_file_id: int, **kwargs) -> dict[str, Any
 
         plugin = plugin_file_dict["plugin"]
         
-        _update_plugin_and_file_snapshots(plugin, plugin_file)
+        _update_plugin_and_file_snapshots(plugin, plugin_file, delete=True)
 
         plugin_file_id_to_return = plugin_file.resource_id  # to return to user
         db.session.add(
@@ -1353,6 +1353,7 @@ def _update_plugin_and_file_snapshots(
     plugin_file: models.PluginFile,
     delete: bool = False,
 ) -> None:
+    # use this method when creating, modifying, or deleting plugin files.
 
     # add snapshot for plugin
     new_plugin = models.Plugin(
@@ -1363,9 +1364,6 @@ def _update_plugin_and_file_snapshots(
     )
     db.session.add(new_plugin)
 
-    if delete:
-        return
-
     # add snapshot for existing plugin_plugin_files
     for plugin_plugin_file in plugin.plugin_plugin_files:
         if (
@@ -1378,6 +1376,9 @@ def _update_plugin_and_file_snapshots(
             )
             db.session.add(existing_plugin_plugin_file)
 
+    if delete:
+        return
+
     # add snapshot for new plugin_plugin_file
     new_plugin_plugin_file = models.PluginPluginFile(
         plugin=new_plugin,
diff --git a/src/dioptra/restapi/v1/utils.py b/src/dioptra/restapi/v1/utils.py
index 19dc96d7d..9b90155d6 100644
--- a/src/dioptra/restapi/v1/utils.py
+++ b/src/dioptra/restapi/v1/utils.py
@@ -271,6 +271,7 @@ def build_entrypoint_plugin(plugin_with_files: PluginWithFilesDict) -> dict[str,
                     f"{PLUGINS}/{plugin.resource_id}/{PLUGIN_FILES}/{plugin_file.resource_id}/"
                     f"snapshots/{plugin_file.resource_snapshot_id}"
                 ),
+                "tasks": [build_plugin_task(task) for task in plugin_file.tasks]
             }
             for plugin_file in plugin_files
         ],
@@ -314,6 +315,7 @@ def build_plugin_file_ref(plugin_file: models.PluginFile) -> dict[str, Any]:
         "url": build_url(
             f"{PLUGINS}/{plugin_id}/{PLUGIN_FILES}/{plugin_file.resource_id}"
         ),
+         "tasks": [build_plugin_task(task) for task in plugin_file.tasks]
     }
 
 
diff --git a/src/frontend/src/dialogs/AssignPluginsDialog.vue b/src/frontend/src/dialogs/AssignPluginsDialog.vue
index a1b11c75e..b090f2985 100644
--- a/src/frontend/src/dialogs/AssignPluginsDialog.vue
+++ b/src/frontend/src/dialogs/AssignPluginsDialog.vue
@@ -26,17 +26,42 @@
         <div class="field-label">Plugins:</div>
       </template>
       <template v-slot:selected>
-        <q-chip
-          v-for="(plugin, i) in selectedPlugins"
-          :key="plugin.id"
-          removable
-          color="secondary"
-          text-color="white"
-          class="q-my-none q-ml-xs q-mr-none"
-          @remove="selectedPlugins.splice(i, 1)"
-        >
-          {{ plugin.name }}
-        </q-chip>
+        <div>
+          <div
+            v-for="(plugin, i) in selectedPlugins"
+            :key="plugin.id"
+            :class="i > 0 ? 'q-mt-xs' : ''"
+            >
+              <q-chip
+                removable
+                color="secondary"
+                text-color="white"
+                class="q-ml-xs "
+                @remove="selectedPlugins.splice(i, 1)"
+              >
+                {{ plugin.name }}
+                <q-badge
+                  v-if="!plugin.latestSnapshot" 
+                  color="red" 
+                  label="outdated" 
+                  rounded
+                  class="q-ml-xs"
+                />
+              </q-chip>
+              <q-btn
+                v-if="!plugin.latestSnapshot"
+                round 
+                color="red" 
+                icon="sync"
+                size="sm"
+                @click.stop="syncPlugin(plugin.id, i)"
+              >
+                <q-tooltip>
+                  Sync to latest version of plugin
+                </q-tooltip>
+              </q-btn>
+          </div>
+        </div>
       </template>
     </q-select>
   </DialogComponent>
@@ -70,7 +95,7 @@
   })
 
   async function submitPlugins() {
-    let pluginsToAdd = []
+    let pluginsToAdd = [...pluginsToUpdate.value]
     let pluginsToRemove = []
 
     selectedPluginIds.value.forEach((plugin) => {
@@ -86,39 +111,20 @@
     })
 
     try {
-      // Wait for all add and remove operations to finish
-      const addPromise = (pluginsToAdd.length > 0) ? addPlugins(pluginsToAdd) : Promise.resolve()
-      const removePromises = pluginsToRemove.map(plugin => removePlugin(plugin))
-      await Promise.all([addPromise, ...removePromises]);
-
-      // Log after both operations are complete
-      emit('refreshTable')
+      if(pluginsToAdd.length > 0) {
+        await api.addPluginsToEntrypoint(props.editObj.id, pluginsToAdd) 
+      }
+      for(const plugin of pluginsToRemove) {
+        await api.removePluginFromEntrypoint(props.editObj.id, plugin)
+      }
       notify.success(`Successfully updated plugins for  '${props.editObj.name}'`)
       showDialog.value = false
+      emit('refreshTable')
     } catch (err) {
       notify.error("Error in processing plugins: " + err.message);
     }
   }
 
-
-  async function addPlugins(pluginsToAdd) {
-    try {
-      await api.addPluginsToEntrypoint(props.editObj.id, pluginsToAdd)
-    } catch(err) {
-      console.log('err =  ', err)
-      notify.error(err.response.data.message);
-    }
-  }
-
-  async function removePlugin(plugin) {
-    try {
-      await api.removePluginFromEntrypoint(props.editObj.id, plugin)
-    } catch(err) {
-      notify.error(err.response.data.message);
-    }
-  }
-
-
   async function getPlugins(val = '', update) {
     update(async () => {
       try {
@@ -127,11 +133,23 @@
           rowsPerPage: 0, // get all
           index: 0
         })
-        pluginOptions.value = res.data.data
+        pluginOptions.value = res.data.data.filter((plugin) => !selectedPluginIds.value.includes(plugin.id))
       } catch(err) {
         notify.error(err.response.data.message)
       } 
     })
   }
 
+  const pluginsToUpdate = ref([])
+
+  async function syncPlugin(pluginID, index) {
+    try {
+      const res = await api.getItem('plugins', pluginID)
+      selectedPlugins.value.splice(index, 1, res.data)
+      pluginsToUpdate.value.push(pluginID)
+    } catch(err) {
+      console.warn(err)
+    }
+  }
+
 </script>
\ No newline at end of file
diff --git a/src/frontend/src/views/ArtifactsView.vue b/src/frontend/src/views/ArtifactsView.vue
index 75a8a6934..a96d50164 100644
--- a/src/frontend/src/views/ArtifactsView.vue
+++ b/src/frontend/src/views/ArtifactsView.vue
@@ -16,14 +16,6 @@
       <div>{{ props.row.group.name }}</div>
     </template>
     <template #expandedSlot="{ row }">
-      <!-- <BasicTable
-        :columns="fileColumns"
-        :rows="row?.versions || []"
-        :hideSearch="true"
-        :hideEditTable="true"
-        class="q-mx-md"
-        :title="`${row.name} Versions`"
-      /> -->
     </template>
   </TableComponent>
 
@@ -48,7 +40,6 @@
 
 <script setup>
 import TableComponent from '@/components/TableComponent.vue'
-import BasicTable from '@/components/BasicTable.vue'
 import ArtifactsDialog from '@/dialogs/ArtifactsDialog.vue'
 import DeleteDialog from '@/dialogs/DeleteDialog.vue'
 import { ref, watch } from 'vue'
diff --git a/src/frontend/src/views/CreateEntryPoint.vue b/src/frontend/src/views/CreateEntryPoint.vue
index 6b4975b1d..f5e151f6c 100644
--- a/src/frontend/src/views/CreateEntryPoint.vue
+++ b/src/frontend/src/views/CreateEntryPoint.vue
@@ -167,6 +167,16 @@
           <template v-slot:before>
             <div class="field-label">Queues:</div>
           </template>  
+          <template v-slot:selected-item="scope">
+            <q-chip
+              :label="scope.opt.name"
+              removable
+              @remove="scope.removeAtIndex(scope.index)"
+              :tabindex="scope.tabindex"
+              color="primary"
+              text-color="white"
+            />
+          </template>
         </q-select>
 
         <q-select
@@ -189,6 +199,44 @@
             <div class="field-label">Plugins:</div>
           </template>  
         </q-select>
+        <div class="row" v-if="route.params.id !== 'new' && entryPoint.plugins.length > 0">
+          <label class="field-label q-pt-xs">Plugins:</label>
+          <div 
+            class="col" 
+            style="border: 1px solid lightgray; border-radius: 4px; padding: 5px 8px; margin-left: 6px;"
+          >
+            <div
+              v-for="(plugin, i) in entryPoint.plugins"
+              :key="i"
+            >
+              <q-chip
+                :label="plugin.name"
+                color="secondary"
+                text-color="white"
+              >
+                <q-badge
+                  v-if="!plugin.latestSnapshot" 
+                  color="red" 
+                  label="outdated" 
+                  rounded
+                  class="q-ml-xs"
+                />
+              </q-chip>
+              <q-btn
+                v-if="!plugin.latestSnapshot"
+                round 
+                color="red" 
+                icon="sync"
+                size="sm"
+                @click="syncPlugin(plugin.id, i)"
+              >
+                <q-tooltip>
+                  Sync to latest version of plugin
+                </q-tooltip>
+              </q-btn>
+            </div>
+          </div>
+        </div>
       </div>
       
       <TableComponent
@@ -334,26 +382,16 @@
 
   watch(() => entryPoint.value.plugins, () => {
     tasks.value = []
-    entryPoint.value.plugins.forEach(async(plugin) => {
-      let pluginID = typeof plugin === 'object' ? plugin.id : plugin
-      try {
-        const res = await api.getFiles(pluginID, {
-          search: '',
-          rowsPerPage: 0, // get all
-          index: 0
+    entryPoint.value.plugins.forEach((plugin) => {
+      if(typeof plugin === 'number') return
+      const pluginName = plugin.name
+      plugin.files.forEach((file) => {
+        file.tasks.forEach((task) => {
+          tasks.value.push({ ...task, pluginName: pluginName })
         })
-        console.log('res = ', res)
-        res.data.data.forEach((file) => {
-          file.tasks.forEach((task) => {
-            task.pluginName = file.plugin.name
-            tasks.value.push(task)
-          })
-        })
-      } catch(err) {
-        console.warn(err)
-      }
+      })
     })
-  })
+  }, { deep: true })
 
   const parameter = reactive({
     name: '',
@@ -504,6 +542,7 @@
           parameters: entryPoint.value.parameters,
           queues: entryPoint.value.queues,
         })
+        await api.addPluginsToEntrypoint(route.params.id, pluginsToUpdate.value)
         notify.success(`Successfully updated '${entryPoint.value.name}'`)
       }
     } catch(err) {
@@ -628,4 +667,17 @@
     confirmLeave.value = true
     router.push(toPath.value)
   }
+
+  const pluginsToUpdate = ref([])
+
+  async function syncPlugin(pluginID, index) {
+    try {
+      const res = await api.getItem('plugins', pluginID)
+      console.log('res = ', res)
+      entryPoint.value.plugins.splice(index, 1, res.data)
+      pluginsToUpdate.value.push(pluginID)
+    } catch(err) {
+      console.warn(err)
+    }
+  }
 </script>
diff --git a/src/frontend/src/views/EntryPointsView.vue b/src/frontend/src/views/EntryPointsView.vue
index 39d17c843..2290967cb 100644
--- a/src/frontend/src/views/EntryPointsView.vue
+++ b/src/frontend/src/views/EntryPointsView.vue
@@ -29,21 +29,6 @@
         EMPTY
       </span>
     </template>
-    <template #body-cell-parameterNames="props">
-      <label v-for="(param, i) in props.row.parameters" :key="i">
-        {{ param.name }} <br>
-      </label>
-    </template>
-    <template #body-cell-parameterTypes="props">
-      <label v-for="(param, i) in props.row.parameters" :key="i">
-        {{ param.parameterType }} <br>
-      </label>
-    </template>
-    <template #body-cell-defaultValues="props">
-      <label v-for="(param, i) in props.row.parameters" :key="i">
-        {{ param.defaultValue }} <br>
-      </label>
-    </template>
     <template #expandedSlot="{ row }">
       <CodeEditor v-model="row.taskGraph" language="yaml" :readOnly="true" />
     </template>
@@ -53,8 +38,17 @@
         :key="i"
         color="secondary" 
         text-color="white"
+        clickable
+        @click.stop="editEntrypoint = props.row; showAssignPluginsDialog = true"
       >
         {{ plugin.name }}
+        <q-badge
+          v-if="!plugin.latestSnapshot" 
+          color="red" 
+          label="outdated" 
+          rounded
+          class="q-ml-xs"
+        />
       </q-chip>
       <q-btn
         round
@@ -113,9 +107,6 @@
     { name: 'name', label: 'Name', align: 'left', field: 'name', sortable: true, },
     { name: 'description', label: 'Description', align: 'left', field: 'description', sortable: true, },
     { name: 'taskGraph', label: 'Task Graph', align: 'left', field: 'taskGraph',sortable: false, },
-    { name: 'parameterNames', label: 'Parameter Name(s)', align: 'left', sortable: false },
-    { name: 'parameterTypes', label: 'Parameter Type(s)', align: 'left', field: 'parameterTypes', sortable: false },
-    { name: 'defaultValues', label: 'Default Values', align: 'left', field: 'defaultValues', sortable: false },
     { name: 'tags', label: 'Tags', align: 'left', field: 'tags', sortable: false },
     { name: 'plugins', label: 'Plugins', align: 'left', field: 'plugins', sortable: false },
   ]
diff --git a/src/frontend/src/views/PluginsView.vue b/src/frontend/src/views/PluginsView.vue
index 03b3c2331..d216f8f00 100644
--- a/src/frontend/src/views/PluginsView.vue
+++ b/src/frontend/src/views/PluginsView.vue
@@ -17,7 +17,21 @@
       <div>{{ props.row.group.name }}</div>
     </template>
     <template #body-cell-files="props">
-      <div>{{ props.row.files?.length }}</div>
+      <div>
+        {{ props.row.files?.length }}
+        <q-btn
+          round
+          icon="folder"
+          size="sm"
+          class="q-ml-sm"
+          color="primary"
+          @click="router.push(`/plugins/${props.row.id}/files`)" 
+        >
+          <q-tooltip>
+            Manage Plugin Files
+          </q-tooltip>
+        </q-btn>
+      </div>
     </template>
     <template #expandedSlot="{ row }">
       <q-btn 
@@ -27,15 +41,27 @@
         class="q-ma-md" 
         @click="router.push(`/plugins/${row.id}/files`)" 
       />
-      <BasicTable
+      <TableComponent
         :columns="fileColumns"
         :rows="row.files"
+        :title="`${row.name} Files`"
         :hideSearch="true"
         :hideEditTable="true"
-        id="fileTable"
-        class="q-mx-md"
-        :title="`${row.name} Files`"
-      />
+        :hideCreateBtn="true"
+        :hideDeleteBtn="true"
+        :hideEditBtn="true"
+        :disableSelect="true"
+        style="margin: 0px 5vw 2vh"
+      >
+        <template #body-cell-filename="props">
+          <RouterLink :to="`/plugins/${row.id}/files/${props.row.id}`">
+            {{ props.row.filename }}
+          </RouterLink>
+        </template>
+        <template #body-cell-tasks="props">
+          <div>{{ props.row.tasks?.length }}</div>
+        </template>
+      </TableComponent>
     </template>
   </TableComponent>
 
@@ -61,7 +87,6 @@
 
 <script setup>
   import TableComponent from '@/components/TableComponent.vue'
-  import BasicTable from '@/components/BasicTable.vue'
   import PluginDialog from '@/dialogs/PluginDialog.vue'
   import DeleteDialog from '@/dialogs/DeleteDialog.vue'
   import { ref, watch } from 'vue'

From ecfe6a76e86fd4c193fe47a93d5c9275e73227a9 Mon Sep 17 00:00:00 2001
From: henrychoy <hchoy@mitre.org>
Date: Tue, 26 Nov 2024 15:43:24 -0500
Subject: [PATCH 05/22] fix: simplify gets in plugins service

---
 src/dioptra/restapi/v1/plugins/service.py | 30 +++++------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/dioptra/restapi/v1/plugins/service.py b/src/dioptra/restapi/v1/plugins/service.py
index d537c19da..882450d1b 100644
--- a/src/dioptra/restapi/v1/plugins/service.py
+++ b/src/dioptra/restapi/v1/plugins/service.py
@@ -235,17 +235,11 @@ def get(
             for plugin in plugins
         }
 
-        # get the latest plugin file snapshots associated with the retrieved plugins
-        latest_plugin_files_stmt = (
-            select(models.PluginFile)
-            .join(models.Resource)
-            .where(
-                models.Resource.latest_snapshot_id
-                == models.PluginFile.resource_snapshot_id,
-                models.Resource.is_deleted == False,  # noqa: E712
-            )
-        )
-        plugin_files = db.session.scalars(latest_plugin_files_stmt).unique().all()
+        plugin_files = [
+          plugin_plugin_file.plugin_file
+          for plugin in plugins
+          for plugin_plugin_file in plugin.plugin_plugin_files
+        ]
 
         for plugin_file in plugin_files:
             plugins_dict[plugin_file.plugin_id]["plugin_files"].append(plugin_file)
@@ -325,19 +319,7 @@ def get(
 
             return None
 
-        latest_plugin_files_stmt = (
-            select(models.PluginFile)
-            .join(models.Resource)
-            .where(
-                models.PluginFile.plugin_id == plugin_id,
-                models.Resource.is_deleted == False,  # noqa: E712
-                models.Resource.latest_snapshot_id
-                == models.PluginFile.resource_snapshot_id,
-            )
-        )
-        plugin_files = list(db.session.scalars(latest_plugin_files_stmt).unique().all())
-        # plugin_files = list construction thing
-
+        plugin_files = [plugin_plugin_file.plugin_file for plugin_plugin_file in plugin.plugin_plugin_files]
 
         drafts_stmt = (
             select(models.DraftResource.draft_resource_id)

From 4a6e2570e406f2b7b06ff38741482e412386e25b Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Mon, 23 Dec 2024 15:10:34 -0500
Subject: [PATCH 06/22] fix: update job tests to use id not snapshot

---
 src/dioptra/restapi/v1/entrypoints/schema.py | 4 ++++
 src/dioptra/restapi/v1/experiments/schema.py | 4 ++++
 src/dioptra/restapi/v1/utils.py              | 2 ++
 tests/unit/restapi/lib/asserts.py            | 4 ++--
 tests/unit/restapi/v1/conftest.py            | 6 +++---
 tests/unit/restapi/v1/test_job.py            | 8 ++++----
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/dioptra/restapi/v1/entrypoints/schema.py b/src/dioptra/restapi/v1/entrypoints/schema.py
index a59739194..401750ded 100644
--- a/src/dioptra/restapi/v1/entrypoints/schema.py
+++ b/src/dioptra/restapi/v1/entrypoints/schema.py
@@ -138,6 +138,10 @@ class EntrypointSnapshotRefSchema(EntrypointSnapshotRefBaseSchema):  # type: ign
         attribute="name",
         metadata=dict(description="Name of the Entrypoint resource."),
     )
+    id = fields.Integer(
+        attribute="id",
+        metadata=dict(description="id of the Entrypoint resource."),
+    )
 
 
 class EntrypointMutableFieldsSchema(Schema):
diff --git a/src/dioptra/restapi/v1/experiments/schema.py b/src/dioptra/restapi/v1/experiments/schema.py
index ce4edc2a8..0836e48ba 100644
--- a/src/dioptra/restapi/v1/experiments/schema.py
+++ b/src/dioptra/restapi/v1/experiments/schema.py
@@ -49,6 +49,10 @@ class ExperimentSnapshotRefSchema(ExperimentSnapshotRefBaseSchema):  # type: ign
         attribute="name",
         metadata=dict(description="Name of the Experiment resource."),
     )
+    id = fields.Integer(
+        attribute="id",
+        metadata=dict(description="id of the Experiment resource."),
+    )
 
 
 class ExperimentMutableFieldsSchema(Schema):
diff --git a/src/dioptra/restapi/v1/utils.py b/src/dioptra/restapi/v1/utils.py
index 9b90155d6..224f7b387 100644
--- a/src/dioptra/restapi/v1/utils.py
+++ b/src/dioptra/restapi/v1/utils.py
@@ -153,6 +153,7 @@ def build_experiment_snapshot_ref(experiment: models.Experiment) -> dict[str, An
         The ExperimentSnapshotRef dictionary.
     """
     return {
+        "id": experiment.resource_id,
         "snapshot_id": experiment.resource_snapshot_id,
         "name": experiment.name,
         "group": build_group_ref(experiment.resource.owner),
@@ -346,6 +347,7 @@ def build_entrypoint_snapshot_ref(entrypoint: models.EntryPoint) -> dict[str, An
         The EntrypointSnapshotRef dictionary.
     """
     return {
+        "id": entrypoint.resource_id,
         "snapshot_id": entrypoint.resource_snapshot_id,
         "name": entrypoint.name,
         "group": build_group_ref(entrypoint.resource.owner),
diff --git a/tests/unit/restapi/lib/asserts.py b/tests/unit/restapi/lib/asserts.py
index 2911eb45e..4be34c503 100644
--- a/tests/unit/restapi/lib/asserts.py
+++ b/tests/unit/restapi/lib/asserts.py
@@ -97,7 +97,7 @@ def assert_experiment_ref_contents_matches_expectations(
     assert_base_resource_ref_contents_matches_expectations(
         resource=experiment, expected_group_id=expected_group_id
     )
-    assert experiment["snapshotId"] == expected_experiment_id
+    assert experiment["id"] == expected_experiment_id
 
 
 def assert_entrypoint_ref_contents_matches_expectations(
@@ -109,7 +109,7 @@ def assert_entrypoint_ref_contents_matches_expectations(
     assert_base_resource_ref_contents_matches_expectations(
         resource=entrypoint, expected_group_id=expected_group_id
     )
-    assert entrypoint["snapshotId"] == expected_entrypoint_id
+    assert entrypoint["id"] == expected_entrypoint_id
 
 
 def assert_draft_response_contents_matches_expectations(
diff --git a/tests/unit/restapi/v1/conftest.py b/tests/unit/restapi/v1/conftest.py
index 676725d26..bb44d339a 100644
--- a/tests/unit/restapi/v1/conftest.py
+++ b/tests/unit/restapi/v1/conftest.py
@@ -646,9 +646,9 @@ def registered_jobs(
 
     monkeypatch.setattr(rq_service, "RQQueue", mock_rq.MockRQQueue)
 
-    queue_id = registered_queues["queue1"]["snapshot"]
-    experiment_id = registered_experiments["experiment1"]["snapshot"]
-    entrypoint_id = registered_entrypoints["entrypoint1"]["snapshot"]
+    queue_id = registered_queues["queue1"]["id"]
+    experiment_id = registered_experiments["experiment1"]["id"]
+    entrypoint_id = registered_entrypoints["entrypoint1"]["id"]
     values = {
         registered_entrypoints["entrypoint1"]["parameters"][0]["name"]: "new_value",
     }
diff --git a/tests/unit/restapi/v1/test_job.py b/tests/unit/restapi/v1/test_job.py
index e55451d71..341a4c9ee 100644
--- a/tests/unit/restapi/v1/test_job.py
+++ b/tests/unit/restapi/v1/test_job.py
@@ -367,9 +367,9 @@ def test_create_job(
     monkeypatch.setattr(rq_service, "RQQueue", mock_rq.MockRQQueue)
 
     description = "The new job."
-    queue_id = registered_queues["queue1"]["snapshot"]
-    experiment_id = registered_experiments["experiment1"]["snapshot"]
-    entrypoint_id = registered_entrypoints["entrypoint1"]["snapshot"]
+    queue_id = registered_queues["queue1"]["id"]
+    experiment_id = registered_experiments["experiment1"]["id"]
+    entrypoint_id = registered_entrypoints["entrypoint1"]["id"]
     values = {
         registered_entrypoints["entrypoint1"]["parameters"][0]["name"]: "new_value",
     }
@@ -731,7 +731,7 @@ def test_modify_job_status(
     """
     job_to_change_status = registered_jobs["job1"]
     job_id = job_to_change_status["id"]
-    experiment_id = job_to_change_status["experiment"]["snapshotId"]
+    experiment_id = job_to_change_status["experiment"]["id"]
     new_status = "started"
     dioptra_client.experiments.jobs.set_status(
         experiment_id=experiment_id, job_id=job_id, status=new_status

From b1bfd050f743935b9810d737554820f0922bfa40 Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Thu, 12 Dec 2024 17:48:36 -0500
Subject: [PATCH 07/22] refactor: use Plugin -> PluginFiles relationship

---
 src/dioptra/restapi/db/models/plugins.py      | 15 ++---
 src/dioptra/restapi/v1/entrypoints/schema.py  |  2 +-
 src/dioptra/restapi/v1/entrypoints/service.py | 52 +++++----------
 src/dioptra/restapi/v1/plugins/service.py     | 65 +++++++------------
 src/dioptra/restapi/v1/utils.py               | 22 +++----
 src/dioptra/restapi/v1/workflows/lib/views.py | 11 +++-
 6 files changed, 62 insertions(+), 105 deletions(-)

diff --git a/src/dioptra/restapi/db/models/plugins.py b/src/dioptra/restapi/db/models/plugins.py
index 1f5d09d1b..1d36c74e3 100644
--- a/src/dioptra/restapi/db/models/plugins.py
+++ b/src/dioptra/restapi/db/models/plugins.py
@@ -41,16 +41,13 @@ class Plugin(ResourceSnapshot):
     name: Mapped[text_] = mapped_column(nullable=False, index=True)
 
     # Relationships
-    plugin_plugin_files: Mapped[list["PluginPluginFile"]] = relationship(
-        init=False, back_populates="plugin"
+    plugin_files: Mapped[list["PluginFile"]] = relationship(
+        "PluginFile",
+        secondary="plugin_plugin_files",
+        primaryjoin="Plugin.resource_snapshot_id == PluginPluginFile.plugin_resource_snapshot_id",
+        secondaryjoin="PluginPluginFile.plugin_file_resource_snapshot_id == PluginFile.resource_snapshot_id",
+        init=False,
     )
-    # plugin_files: Mapped[list["PluginFile"]] = relationship(
-    #     "PluginFile",
-    #     secondary="plugin_plugin_files",
-    #     primaryjoin="Plugin.resource_snapshot_id == PluginPluginFile.plugin_resource_snapshot_id",
-    #     secondaryjoin="PluginPluginFile.plugin_file_resource_snapshot_id == PluginFile.resource_snapshot_id",
-    #     init=False
-    # )
 
     # Additional settings
     __table_args__ = (  # type: ignore[assignment]
diff --git a/src/dioptra/restapi/v1/entrypoints/schema.py b/src/dioptra/restapi/v1/entrypoints/schema.py
index 401750ded..a27b04f32 100644
--- a/src/dioptra/restapi/v1/entrypoints/schema.py
+++ b/src/dioptra/restapi/v1/entrypoints/schema.py
@@ -17,8 +17,8 @@
 """The schemas for serializing/deserializing Entrypoint resources."""
 from marshmallow import Schema, fields, validate
 
-from dioptra.restapi.v1.queues.schema import QueueRefSchema
 from dioptra.restapi.v1.plugins.schema import PluginTaskSchema
+from dioptra.restapi.v1.queues.schema import QueueRefSchema
 from dioptra.restapi.v1.schemas import (
     BasePageSchema,
     GroupIdQueryParametersSchema,
diff --git a/src/dioptra/restapi/v1/entrypoints/service.py b/src/dioptra/restapi/v1/entrypoints/service.py
index 80ff2e06d..d9082e901 100644
--- a/src/dioptra/restapi/v1/entrypoints/service.py
+++ b/src/dioptra/restapi/v1/entrypoints/service.py
@@ -722,31 +722,20 @@ def get(
             ),
         )["entry_point"]
 
-        plugins = {
+        plugin = {
             entry_point_plugin.plugin.resource_id: entry_point_plugin.plugin
             for entry_point_plugin in entrypoint.entry_point_plugins
-        }
-        if plugin_id not in plugins:
+        }.get(plugin_id, None)
+
+        if plugin is None:
             raise EntityDoesNotExistError(
                 PLUGIN_RESOURCE_TYPE, entrypoint_id=entrypoint_id, plugin_id=plugin_id
             )
 
-        plugin_files_stmt = (
-            select(models.PluginFile)
-            .where(
-                models.PluginFile.plugin_id
-                == plugin_id
-            )
-        )
-        plugin_files = db.session.scalars(plugin_files_stmt).unique().all()
-
-        # Construct the PluginWithFilesDict
-        plugin = utils.PluginWithFilesDict(
-            plugin=plugins[plugin_id], plugin_files=plugin_files, has_draft=None
+        return utils.PluginWithFilesDict(
+            plugin=plugin, plugin_files=plugin.plugin_files, has_draft=None
         )
 
-        return plugin
-
     def delete(
         self,
         entrypoint_id: int,
@@ -1194,26 +1183,15 @@ def get(
 def _get_entrypoint_plugin_snapshots(
     entrypoint: models.EntryPoint,
 ) -> list[utils.PluginWithFilesDict]:
-    plugins_dict = {
-        entry_point_plugin.plugin.resource_id: utils.PluginWithFilesDict(
-            plugin=entry_point_plugin.plugin, plugin_files=[], has_draft=False
+    plugins = [
+        utils.PluginWithFilesDict(
+            plugin=entry_point_plugin.plugin,
+            plugin_files=[
+                plugin_file for plugin_file in entry_point_plugin.plugin.plugin_files
+            ],
+            has_draft=False,
         )
         for entry_point_plugin in entrypoint.entry_point_plugins
-    }
-    for entry_point_plugin in entrypoint.entry_point_plugins:
-        resource_id = entry_point_plugin.plugin.resource_id
-        plugin_files = db.session.scalars(
-            select(models.PluginFile)
-            .join(models.PluginPluginFile, 
-                models.PluginPluginFile.plugin_file_resource_snapshot_id
-                == models.PluginFile.resource_snapshot_id
-            )
-            .where(
-              models.PluginPluginFile.plugin_resource_snapshot_id 
-              == entry_point_plugin.plugin.resource_snapshot_id
-            )
-        ).unique().all()
-
-        plugins_dict[resource_id]["plugin_files"].extend(plugin_files)
+    ]
 
-    return list(plugins_dict.values())
+    return plugins
diff --git a/src/dioptra/restapi/v1/plugins/service.py b/src/dioptra/restapi/v1/plugins/service.py
index 882450d1b..6e635582d 100644
--- a/src/dioptra/restapi/v1/plugins/service.py
+++ b/src/dioptra/restapi/v1/plugins/service.py
@@ -228,22 +228,11 @@ def get(
 
         plugins_dict: dict[int, utils.PluginWithFilesDict] = {
             plugin.resource_id: utils.PluginWithFilesDict(
-                plugin=plugin, 
-                plugin_files=[],
-                has_draft=False
+                plugin=plugin, plugin_files=plugin.plugin_files, has_draft=False
             )
             for plugin in plugins
         }
 
-        plugin_files = [
-          plugin_plugin_file.plugin_file
-          for plugin in plugins
-          for plugin_plugin_file in plugin.plugin_plugin_files
-        ]
-
-        for plugin_file in plugin_files:
-            plugins_dict[plugin_file.plugin_id]["plugin_files"].append(plugin_file)
-
         drafts_stmt = select(
             models.DraftResource.payload["resource_id"].as_string().cast(Integer)
         ).where(
@@ -319,8 +308,6 @@ def get(
 
             return None
 
-        plugin_files = [plugin_plugin_file.plugin_file for plugin_plugin_file in plugin.plugin_plugin_files]
-
         drafts_stmt = (
             select(models.DraftResource.draft_resource_id)
             .where(
@@ -334,7 +321,7 @@ def get(
         has_draft = db.session.scalar(drafts_stmt)
 
         return utils.PluginWithFilesDict(
-            plugin=plugin, plugin_files=plugin_files, has_draft=has_draft
+            plugin=plugin, plugin_files=plugin.plugin_files, has_draft=has_draft
         )
 
     def modify(
@@ -397,8 +384,7 @@ def modify(
 
         for plugin_file in plugin_files:
             plugin_plugin_file = models.PluginPluginFile(
-                plugin=new_plugin,
-                plugin_file=plugin_file
+                plugin=new_plugin, plugin_file=plugin_file
             )
             db.session.add(plugin_plugin_file)
 
@@ -434,8 +420,8 @@ def delete(self, plugin_id: int, **kwargs) -> dict[str, Any]:
         if plugin_resource is None:
             raise EntityDoesNotExistError(PLUGIN_RESOURCE_TYPE, plugin_id=plugin_id)
 
-
         from dioptra.restapi.v1.plugins.service import PluginIdFileService
+
         plugin_id_file_service = PluginIdFileService(
             plugin_file_name_service=None,
             group_id_service=None,
@@ -456,7 +442,11 @@ def delete(self, plugin_id: int, **kwargs) -> dict[str, Any]:
             plugin_file_ids=plugin_file_ids,
         )
 
-        return {"status": "Success", "plugin_id": plugin_id, "file_ids": plugin_file_ids}
+        return {
+            "status": "Success",
+            "plugin_id": plugin_id,
+            "file_ids": plugin_file_ids,
+        }
 
 
 class PluginIdsService(object):
@@ -1180,14 +1170,14 @@ def delete(self, plugin_id: int, plugin_file_id: int, **kwargs) -> dict[str, Any
                 plugin_id=plugin_id,
                 plugin_file_id=plugin_file_id,
             )
-        
+
         plugin_file_dict = self.get(
             plugin_id=plugin_id,
             plugin_file_id=plugin_file_id,
         )
 
         plugin = plugin_file_dict["plugin"]
-        
+
         _update_plugin_and_file_snapshots(plugin, plugin_file, delete=True)
 
         plugin_file_id_to_return = plugin_file.resource_id  # to return to user
@@ -1329,7 +1319,7 @@ def _add_plugin_tasks(
         )
         db.session.add(plugin_task)
 
-    
+
 def _update_plugin_and_file_snapshots(
     plugin: models.Plugin,
     plugin_file: models.PluginFile,
@@ -1347,24 +1337,17 @@ def _update_plugin_and_file_snapshots(
     db.session.add(new_plugin)
 
     # add snapshot for existing plugin_plugin_files
-    for plugin_plugin_file in plugin.plugin_plugin_files:
-        if (
-            plugin_plugin_file.plugin_resource_snapshot_id == plugin.resource_snapshot_id and 
-            plugin_plugin_file.plugin_file.resource_id != plugin_file.resource_id
-        ):
-            existing_plugin_plugin_file = models.PluginPluginFile(
-              plugin=new_plugin,
-              plugin_file=plugin_plugin_file.plugin_file
-            )
-            db.session.add(existing_plugin_plugin_file)
+    for existing_plugin_file in plugin.plugin_files:
+        if existing_plugin_file.resource_id == plugin_file.resource_id:
+            continue
 
-    if delete:
-        return
-
-    # add snapshot for new plugin_plugin_file
-    new_plugin_plugin_file = models.PluginPluginFile(
-        plugin=new_plugin,
-        plugin_file=plugin_file
-    )
-    db.session.add(new_plugin_plugin_file)
+        plugin_plugin_file = models.PluginPluginFile(
+            plugin=new_plugin, plugin_file=existing_plugin_file
+        )
+        db.session.add(plugin_plugin_file)
 
+    if not delete:  # add snapshot for new plugin_plugin_file
+        new_plugin_plugin_file = models.PluginPluginFile(
+            plugin=new_plugin, plugin_file=plugin_file
+        )
+        db.session.add(new_plugin_plugin_file)
diff --git a/src/dioptra/restapi/v1/utils.py b/src/dioptra/restapi/v1/utils.py
index 224f7b387..2baff2730 100644
--- a/src/dioptra/restapi/v1/utils.py
+++ b/src/dioptra/restapi/v1/utils.py
@@ -19,12 +19,11 @@
 from urllib.parse import urlencode, urlunparse
 
 from marshmallow import Schema
+from sqlalchemy import select
 
-from dioptra.restapi.db import models, db
+from dioptra.restapi.db import db, models
 from dioptra.restapi.routes import V1_ROOT
 
-from sqlalchemy import select
-
 ARTIFACTS: Final[str] = "artifacts"
 ENTRYPOINTS: Final[str] = "entrypoints"
 EXPERIMENTS: Final[str] = "experiments"
@@ -258,7 +257,8 @@ def build_entrypoint_plugin(plugin_with_files: PluginWithFilesDict) -> dict[str,
     return {
         "id": plugin.resource_id,
         "snapshot_id": plugin.resource_snapshot_id,
-        "latest_snapshot": plugin.resource.latest_snapshot_id == plugin.resource_snapshot_id,
+        "latest_snapshot": plugin.resource.latest_snapshot_id
+        == plugin.resource_snapshot_id,
         "name": plugin.name,
         "url": build_url(
             f"{PLUGINS}/{plugin.resource_id}/snapshots/{plugin.resource_snapshot_id}"
@@ -272,7 +272,7 @@ def build_entrypoint_plugin(plugin_with_files: PluginWithFilesDict) -> dict[str,
                     f"{PLUGINS}/{plugin.resource_id}/{PLUGIN_FILES}/{plugin_file.resource_id}/"
                     f"snapshots/{plugin_file.resource_snapshot_id}"
                 ),
-                "tasks": [build_plugin_task(task) for task in plugin_file.tasks]
+                "tasks": [build_plugin_task(task) for task in plugin_file.tasks],
             }
             for plugin_file in plugin_files
         ],
@@ -316,7 +316,7 @@ def build_plugin_file_ref(plugin_file: models.PluginFile) -> dict[str, Any]:
         "url": build_url(
             f"{PLUGINS}/{plugin_id}/{PLUGIN_FILES}/{plugin_file.resource_id}"
         ),
-         "tasks": [build_plugin_task(task) for task in plugin_file.tasks]
+        "tasks": [build_plugin_task(task) for task in plugin_file.tasks],
     }
 
 
@@ -597,17 +597,11 @@ def build_entrypoint(entrypoint_dict: EntrypointDict) -> dict[str, Any]:
     plugins = [
         PluginWithFilesDict(
             plugin=entry_point_plugin.plugin,
-            plugin_files=[plugin_plugin_file.plugin_file for plugin_plugin_file in entry_point_plugin.plugin.plugin_plugin_files])
+            plugin_files=[file for file in entry_point_plugin.plugin.plugin_files],
+        )
         for entry_point_plugin in entrypoint.entry_point_plugins
     ]
 
-    # plugins = [
-    #     PluginWithFilesDict(
-    #         plugin=entry_point_plugin.plugin,
-    #         plugin_files=[file for file in entry_point_plugin.plugin.plugin_files])
-    #     for entry_point_plugin in entrypoint.entry_point_plugins
-    # ]
-
     data = {
         "id": entrypoint.resource_id,
         "snapshot_id": entrypoint.resource_snapshot_id,
diff --git a/src/dioptra/restapi/v1/workflows/lib/views.py b/src/dioptra/restapi/v1/workflows/lib/views.py
index d52ddd4f6..1f3b368c3 100644
--- a/src/dioptra/restapi/v1/workflows/lib/views.py
+++ b/src/dioptra/restapi/v1/workflows/lib/views.py
@@ -108,13 +108,18 @@ def get_entry_point_plugin_files(
     )
 
     # Get plugins linked to the entry point
-    entry_point_plugins_stmt = select(models.EntryPointPlugin.plugin_resource_snapshot_id).where(
-        models.EntryPointPlugin.entry_point_resource_snapshot_id == entry_point_resource_snapshot_id_stmt.scalar_subquery()
+    entry_point_plugins_stmt = select(
+        models.EntryPointPlugin.plugin_resource_snapshot_id
+    ).where(
+        models.EntryPointPlugin.entry_point_resource_snapshot_id
+        == entry_point_resource_snapshot_id_stmt.scalar_subquery()
     )
 
     # Get plugin files linked to these plugins
     entry_point_plugin_files_stmt = select(models.PluginPluginFile).where(
-        models.PluginPluginFile.plugin_resource_snapshot_id.in_(entry_point_plugins_stmt)
+        models.PluginPluginFile.plugin_resource_snapshot_id.in_(
+            entry_point_plugins_stmt
+        )
     )
     return list(db.session.scalars(entry_point_plugin_files_stmt).unique().all())
 

From 14ecd01d570bac045cce6bae0a85cb2499d5f2e2 Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Fri, 13 Dec 2024 09:40:42 -0500
Subject: [PATCH 08/22] fix: remove unneeded query

---
 src/dioptra/restapi/v1/plugins/service.py | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/dioptra/restapi/v1/plugins/service.py b/src/dioptra/restapi/v1/plugins/service.py
index 6e635582d..ebcc92079 100644
--- a/src/dioptra/restapi/v1/plugins/service.py
+++ b/src/dioptra/restapi/v1/plugins/service.py
@@ -1143,12 +1143,19 @@ def delete(self, plugin_id: int, plugin_file_id: int, **kwargs) -> dict[str, Any
         """
         log: BoundLogger = kwargs.get("log", LOGGER.new())
 
-        stmt = select(models.Resource).filter_by(
-            resource_id=plugin_id, resource_type=PLUGIN_RESOURCE_TYPE, is_deleted=False
+        plugin_stmt = (
+            select(models.Plugin)
+            .join(models.Resource)
+            .where(
+                models.Plugin.resource_id == plugin_id,
+                models.Resource.is_deleted == False,  # noqa: E712
+                models.Resource.latest_snapshot_id
+                == models.Plugin.resource_snapshot_id,
+            )
         )
+        plugin = db.session.scalar(plugin_stmt)
 
-        plugin_resource = db.session.scalar(stmt)
-        if plugin_resource is None:
+        if plugin is None:
             raise EntityDoesNotExistError(PLUGIN_RESOURCE_TYPE, plugin_id=plugin_id)
 
         plugin_file_stmt = (
@@ -1171,13 +1178,6 @@ def delete(self, plugin_id: int, plugin_file_id: int, **kwargs) -> dict[str, Any
                 plugin_file_id=plugin_file_id,
             )
 
-        plugin_file_dict = self.get(
-            plugin_id=plugin_id,
-            plugin_file_id=plugin_file_id,
-        )
-
-        plugin = plugin_file_dict["plugin"]
-
         _update_plugin_and_file_snapshots(plugin, plugin_file, delete=True)
 
         plugin_file_id_to_return = plugin_file.resource_id  # to return to user

From 5dbf1a321a56ff5fdb10c5df15adaafe9cd6c121 Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Fri, 13 Dec 2024 09:40:57 -0500
Subject: [PATCH 09/22] chore: flake8/mypy

---
 src/dioptra/restapi/db/models/entry_points.py | 2 +-
 src/dioptra/restapi/db/models/plugins.py      | 6 ++++--
 src/dioptra/restapi/v1/utils.py               | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/dioptra/restapi/db/models/entry_points.py b/src/dioptra/restapi/db/models/entry_points.py
index e90f7b617..065ac35a5 100644
--- a/src/dioptra/restapi/db/models/entry_points.py
+++ b/src/dioptra/restapi/db/models/entry_points.py
@@ -25,7 +25,7 @@
 
 if TYPE_CHECKING:
     from .jobs import EntryPointJob
-    from .plugins import Plugin, PluginFile
+    from .plugins import Plugin
     from .resources import Resource
 
 
diff --git a/src/dioptra/restapi/db/models/plugins.py b/src/dioptra/restapi/db/models/plugins.py
index 1d36c74e3..c74db9543 100644
--- a/src/dioptra/restapi/db/models/plugins.py
+++ b/src/dioptra/restapi/db/models/plugins.py
@@ -44,8 +44,10 @@ class Plugin(ResourceSnapshot):
     plugin_files: Mapped[list["PluginFile"]] = relationship(
         "PluginFile",
         secondary="plugin_plugin_files",
-        primaryjoin="Plugin.resource_snapshot_id == PluginPluginFile.plugin_resource_snapshot_id",
-        secondaryjoin="PluginPluginFile.plugin_file_resource_snapshot_id == PluginFile.resource_snapshot_id",
+        primaryjoin="Plugin.resource_snapshot_id == "
+        "PluginPluginFile.plugin_resource_snapshot_id",
+        secondaryjoin="PluginPluginFile.plugin_file_resource_snapshot_id == "
+        "PluginFile.resource_snapshot_id",
         init=False,
     )
 
diff --git a/src/dioptra/restapi/v1/utils.py b/src/dioptra/restapi/v1/utils.py
index 2baff2730..c1c40f8cd 100644
--- a/src/dioptra/restapi/v1/utils.py
+++ b/src/dioptra/restapi/v1/utils.py
@@ -19,9 +19,8 @@
 from urllib.parse import urlencode, urlunparse
 
 from marshmallow import Schema
-from sqlalchemy import select
 
-from dioptra.restapi.db import db, models
+from dioptra.restapi.db import models
 from dioptra.restapi.routes import V1_ROOT
 
 ARTIFACTS: Final[str] = "artifacts"
@@ -598,6 +597,7 @@ def build_entrypoint(entrypoint_dict: EntrypointDict) -> dict[str, Any]:
         PluginWithFilesDict(
             plugin=entry_point_plugin.plugin,
             plugin_files=[file for file in entry_point_plugin.plugin.plugin_files],
+            has_draft=False,
         )
         for entry_point_plugin in entrypoint.entry_point_plugins
     ]

From dbb4f2d7fd15623fcafd02a17e76f48470f6c9de Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Fri, 13 Dec 2024 10:24:09 -0500
Subject: [PATCH 10/22] fix: correct confusion over id/snapshotId in job
 response

---
 src/dioptra/restapi/v1/entrypoints/schema.py  |  4 ----
 src/dioptra/restapi/v1/workflows/lib/views.py |  1 +
 tests/unit/restapi/lib/asserts.py             |  4 ++--
 tests/unit/restapi/v1/test_job.py             | 11 ++++++++---
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/dioptra/restapi/v1/entrypoints/schema.py b/src/dioptra/restapi/v1/entrypoints/schema.py
index a27b04f32..5a6c206d8 100644
--- a/src/dioptra/restapi/v1/entrypoints/schema.py
+++ b/src/dioptra/restapi/v1/entrypoints/schema.py
@@ -138,10 +138,6 @@ class EntrypointSnapshotRefSchema(EntrypointSnapshotRefBaseSchema):  # type: ign
         attribute="name",
         metadata=dict(description="Name of the Entrypoint resource."),
     )
-    id = fields.Integer(
-        attribute="id",
-        metadata=dict(description="id of the Entrypoint resource."),
-    )
 
 
 class EntrypointMutableFieldsSchema(Schema):
diff --git a/src/dioptra/restapi/v1/workflows/lib/views.py b/src/dioptra/restapi/v1/workflows/lib/views.py
index 1f3b368c3..7e5270374 100644
--- a/src/dioptra/restapi/v1/workflows/lib/views.py
+++ b/src/dioptra/restapi/v1/workflows/lib/views.py
@@ -121,6 +121,7 @@ def get_entry_point_plugin_files(
             entry_point_plugins_stmt
         )
     )
+
     return list(db.session.scalars(entry_point_plugin_files_stmt).unique().all())
 
 
diff --git a/tests/unit/restapi/lib/asserts.py b/tests/unit/restapi/lib/asserts.py
index 4be34c503..2911eb45e 100644
--- a/tests/unit/restapi/lib/asserts.py
+++ b/tests/unit/restapi/lib/asserts.py
@@ -97,7 +97,7 @@ def assert_experiment_ref_contents_matches_expectations(
     assert_base_resource_ref_contents_matches_expectations(
         resource=experiment, expected_group_id=expected_group_id
     )
-    assert experiment["id"] == expected_experiment_id
+    assert experiment["snapshotId"] == expected_experiment_id
 
 
 def assert_entrypoint_ref_contents_matches_expectations(
@@ -109,7 +109,7 @@ def assert_entrypoint_ref_contents_matches_expectations(
     assert_base_resource_ref_contents_matches_expectations(
         resource=entrypoint, expected_group_id=expected_group_id
     )
-    assert entrypoint["id"] == expected_entrypoint_id
+    assert entrypoint["snapshotId"] == expected_entrypoint_id
 
 
 def assert_draft_response_contents_matches_expectations(
diff --git a/tests/unit/restapi/v1/test_job.py b/tests/unit/restapi/v1/test_job.py
index 341a4c9ee..941a87739 100644
--- a/tests/unit/restapi/v1/test_job.py
+++ b/tests/unit/restapi/v1/test_job.py
@@ -392,6 +392,11 @@ def test_create_job(
     expected_contents: The raw data passed to actions.py::register_job() as *args
       *Note: group_id is given as an arg for registration in the service layer
     """
+
+    queue_snapshot_id = registered_queues["queue1"]["snapshot"]
+    experiment_snapshot_id = registered_experiments["experiment1"]["snapshot"]
+    entrypoint_snapshot_id = registered_entrypoints["entrypoint1"]["snapshot"]
+
     for param in registered_entrypoints["entrypoint1"]["parameters"][1:]:
         values[param["name"]] = param["defaultValue"]
 
@@ -403,9 +408,9 @@ def test_create_job(
             "values": values,
             "user_id": auth_account["id"],
             "group_id": registered_experiments["experiment1"]["group"]["id"],
-            "queue_id": queue_id,
-            "experiment_id": experiment_id,
-            "entrypoint_id": entrypoint_id,
+            "queue_id": queue_snapshot_id,
+            "experiment_id": experiment_snapshot_id,
+            "entrypoint_id": entrypoint_snapshot_id,
         },
     )
 

From 7c9cef97785b4646cd45afded41f60f1188ba868 Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Fri, 13 Dec 2024 10:47:02 -0500
Subject: [PATCH 11/22] refactor: delete plugin files when parent plugin is
 deleted

---
 src/dioptra/restapi/v1/plugins/service.py | 26 +++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/dioptra/restapi/v1/plugins/service.py b/src/dioptra/restapi/v1/plugins/service.py
index ebcc92079..4f28f26f2 100644
--- a/src/dioptra/restapi/v1/plugins/service.py
+++ b/src/dioptra/restapi/v1/plugins/service.py
@@ -420,20 +420,28 @@ def delete(self, plugin_id: int, **kwargs) -> dict[str, Any]:
         if plugin_resource is None:
             raise EntityDoesNotExistError(PLUGIN_RESOURCE_TYPE, plugin_id=plugin_id)
 
-        from dioptra.restapi.v1.plugins.service import PluginIdFileService
-
-        plugin_id_file_service = PluginIdFileService(
-            plugin_file_name_service=None,
-            group_id_service=None,
-            plugin_id_service=self,
-        )
-        plugin_file_ids = plugin_id_file_service.delete(plugin_id=plugin_id)["id"]
-
         deleted_resource_lock = models.ResourceLock(
             resource_lock_type=resource_lock_types.DELETE,
             resource=plugin_resource,
         )
         db.session.add(deleted_resource_lock)
+
+        plugin_file_resources = [
+            child
+            for child in plugin_resource.children
+            if child.resource_type == PLUGIN_FILE_RESOURCE_TYPE
+        ]
+        plugin_file_ids = [
+            plugin_file_resource.resource_id
+            for plugin_file_resource in plugin_file_resources
+        ]
+        for plugin_file_resource in plugin_file_resources:
+            deleted_resource_lock = models.ResourceLock(
+                resource_lock_type=resource_lock_types.DELETE,
+                resource=plugin_file_resource,
+            )
+            db.session.add(deleted_resource_lock)
+
         db.session.commit()
 
         log.debug(

From d9764ecdfb9f0192582189ac939c8aa9300e620a Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Fri, 13 Dec 2024 10:54:43 -0500
Subject: [PATCH 12/22] fix: minor schema fix

---
 src/dioptra/restapi/v1/entrypoints/schema.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/dioptra/restapi/v1/entrypoints/schema.py b/src/dioptra/restapi/v1/entrypoints/schema.py
index 5a6c206d8..2fb3d04e1 100644
--- a/src/dioptra/restapi/v1/entrypoints/schema.py
+++ b/src/dioptra/restapi/v1/entrypoints/schema.py
@@ -76,9 +76,8 @@ class EntrypointPluginSchema(Schema):
     latestSnapshot = fields.Boolean(
         attribute="latest_snapshot",
         metadata=dict(
-            description=f"Whether or not the {name} resource is the latest version."
+            description=f"Whether or not the Plugin is the latest version."
         ),
-        dump_only=True,
     )
     url = fields.Url(
         attribute="url",

From ceccccc92a81c5dd5edbd7fa0e69bccc5ae10d97 Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Fri, 13 Dec 2024 10:54:53 -0500
Subject: [PATCH 13/22] fix: id not needed in schema

---
 src/dioptra/restapi/v1/experiments/schema.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/dioptra/restapi/v1/experiments/schema.py b/src/dioptra/restapi/v1/experiments/schema.py
index 0836e48ba..ce4edc2a8 100644
--- a/src/dioptra/restapi/v1/experiments/schema.py
+++ b/src/dioptra/restapi/v1/experiments/schema.py
@@ -49,10 +49,6 @@ class ExperimentSnapshotRefSchema(ExperimentSnapshotRefBaseSchema):  # type: ign
         attribute="name",
         metadata=dict(description="Name of the Experiment resource."),
     )
-    id = fields.Integer(
-        attribute="id",
-        metadata=dict(description="id of the Experiment resource."),
-    )
 
 
 class ExperimentMutableFieldsSchema(Schema):

From b8ed8fc9f4d1e39b2b2277ccb16f60d5476eaee1 Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Fri, 13 Dec 2024 14:13:54 -0500
Subject: [PATCH 14/22] feat: add id into snapshot ref schemas

---
 src/dioptra/restapi/v1/schemas.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/dioptra/restapi/v1/schemas.py b/src/dioptra/restapi/v1/schemas.py
index a9a9d2c41..68a5076a2 100644
--- a/src/dioptra/restapi/v1/schemas.py
+++ b/src/dioptra/restapi/v1/schemas.py
@@ -141,7 +141,6 @@ def generate_base_resource_ref_schema(
     }
 
     if keep_snapshot_id:
-        schema.pop("id")
         return Schema.from_dict(schema, name=f"{name}SnapshotRefBaseSchema")
     else:
         schema.pop("snapshotId")

From a12c51b473828b6a4409e98f845e62be4d89ef78 Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Fri, 13 Dec 2024 14:17:28 -0500
Subject: [PATCH 15/22] chore: flake8/mypy

---
 src/dioptra/restapi/v1/entrypoints/schema.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/dioptra/restapi/v1/entrypoints/schema.py b/src/dioptra/restapi/v1/entrypoints/schema.py
index 2fb3d04e1..4fb946f33 100644
--- a/src/dioptra/restapi/v1/entrypoints/schema.py
+++ b/src/dioptra/restapi/v1/entrypoints/schema.py
@@ -75,9 +75,7 @@ class EntrypointPluginSchema(Schema):
     )
     latestSnapshot = fields.Boolean(
         attribute="latest_snapshot",
-        metadata=dict(
-            description=f"Whether or not the Plugin is the latest version."
-        ),
+        metadata=dict(description="Whether or not the Plugin is the latest version."),
     )
     url = fields.Url(
         attribute="url",

From 3bcddad0cbe16ff4072427cb28d89ee0db9248eb Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Tue, 24 Dec 2024 08:40:48 -0500
Subject: [PATCH 16/22] fix: corrected tests where snapshotId was used instead
 of id

---
 tests/unit/restapi/v1/test_job.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/unit/restapi/v1/test_job.py b/tests/unit/restapi/v1/test_job.py
index 941a87739..8046291e7 100644
--- a/tests/unit/restapi/v1/test_job.py
+++ b/tests/unit/restapi/v1/test_job.py
@@ -470,7 +470,7 @@ def test_metrics(
         mlflow.exceptions, "MlflowException", mock_mlflow.MockMlflowException
     )
 
-    experiment_id = registered_experiments["experiment1"]["snapshot"]
+    experiment_id = registered_experiments["experiment1"]["id"]
     job1_id = registered_jobs["job1"]["id"]
     job2_id = registered_jobs["job2"]["id"]
     job3_id = registered_jobs["job3"]["id"]
@@ -768,7 +768,7 @@ def test_manage_job_snapshots(
     job_to_change_status = registered_jobs["job1"]
     job_id = job_to_change_status["id"]
     dioptra_client.experiments.jobs.set_status(
-        experiment_id=job_to_change_status["experiment"]["snapshotId"],
+        experiment_id=job_to_change_status["experiment"]["id"],
         job_id=job_id,
         status="started",
     )

From 5da4f85c4993983c9be58fab594ae4cacefe3358 Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Thu, 30 Jan 2025 15:46:11 -0500
Subject: [PATCH 17/22] refactor: update implementation to avoid creation of
 unecessary dict

---
 src/dioptra/restapi/v1/entrypoints/service.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/dioptra/restapi/v1/entrypoints/service.py b/src/dioptra/restapi/v1/entrypoints/service.py
index d9082e901..d67c46d51 100644
--- a/src/dioptra/restapi/v1/entrypoints/service.py
+++ b/src/dioptra/restapi/v1/entrypoints/service.py
@@ -722,18 +722,19 @@ def get(
             ),
         )["entry_point"]
 
-        plugin = {
-            entry_point_plugin.plugin.resource_id: entry_point_plugin.plugin
+        plugin = [
+            entry_point_plugin.plugin
             for entry_point_plugin in entrypoint.entry_point_plugins
-        }.get(plugin_id, None)
+            if plugin_id == entry_point_plugin.plugin.resource_id
+        ]
 
-        if plugin is None:
+        if not plugin:
             raise EntityDoesNotExistError(
                 PLUGIN_RESOURCE_TYPE, entrypoint_id=entrypoint_id, plugin_id=plugin_id
             )
 
         return utils.PluginWithFilesDict(
-            plugin=plugin, plugin_files=plugin.plugin_files, has_draft=None
+            plugin=plugin[0], plugin_files=plugin[0].plugin_files, has_draft=None
         )
 
     def delete(

From 912a1fcd281eb492fa5b9af138dbf8e741c84dcd Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Thu, 30 Jan 2025 15:47:23 -0500
Subject: [PATCH 18/22] refactor: remove unecessary list comprehension

---
 src/dioptra/restapi/v1/entrypoints/service.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/dioptra/restapi/v1/entrypoints/service.py b/src/dioptra/restapi/v1/entrypoints/service.py
index d67c46d51..0e0bcc28b 100644
--- a/src/dioptra/restapi/v1/entrypoints/service.py
+++ b/src/dioptra/restapi/v1/entrypoints/service.py
@@ -1187,9 +1187,7 @@ def _get_entrypoint_plugin_snapshots(
     plugins = [
         utils.PluginWithFilesDict(
             plugin=entry_point_plugin.plugin,
-            plugin_files=[
-                plugin_file for plugin_file in entry_point_plugin.plugin.plugin_files
-            ],
+            plugin_files=entry_point_plugin.plugin.plugin_files,
             has_draft=False,
         )
         for entry_point_plugin in entrypoint.entry_point_plugins

From 76142b158d4cfdd7a81b002af1295198486834cf Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Thu, 30 Jan 2025 15:48:34 -0500
Subject: [PATCH 19/22] refactor: make plugin snapshot and plugin file
 association clearer

---
 src/dioptra/restapi/v1/plugins/service.py | 101 ++++++++++++----------
 1 file changed, 54 insertions(+), 47 deletions(-)

diff --git a/src/dioptra/restapi/v1/plugins/service.py b/src/dioptra/restapi/v1/plugins/service.py
index 4f28f26f2..0784e7304 100644
--- a/src/dioptra/restapi/v1/plugins/service.py
+++ b/src/dioptra/restapi/v1/plugins/service.py
@@ -726,6 +726,7 @@ def create(
             utils.PluginWithFilesDict,
             self._plugin_id_service.get(plugin_id, error_if_not_found=True),
         )
+        plugin = plugin_dict["plugin"]
 
         # Validate that the proposed filename hasn't already been used in the plugin.
         duplicate = self._plugin_file_name_service.get(
@@ -739,11 +740,17 @@ def create(
                 plugin_id=plugin_id,
             )
 
-        # The owner of the PluginFile resource must match the owner of the Plugin
-        # resource.
-        plugin = plugin_dict["plugin"]
+        # a new plugin file creates a new plugin snapshot
+        new_plugin = models.Plugin(
+            name=plugin.name,
+            description=plugin.description,
+            resource=plugin.resource,
+            creator=current_user,
+        )
+        db.session.add(new_plugin)
+
         resource = models.Resource(
-            resource_type=PLUGIN_FILE_RESOURCE_TYPE, owner=plugin.resource.owner
+            resource_type=PLUGIN_FILE_RESOURCE_TYPE, owner=new_plugin.resource.owner
         )
         new_plugin_file = models.PluginFile(
             filename=filename,
@@ -752,11 +759,11 @@ def create(
             resource=resource,
             creator=current_user,
         )
-
-        new_plugin_file.parents.append(plugin.resource)
+        new_plugin_file.parents.append(new_plugin.resource)
         db.session.add(new_plugin_file)
 
-        _update_plugin_and_file_snapshots(plugin, new_plugin_file)
+        new_plugin_files = plugin.plugin_files + [new_plugin_file]
+        _associate_plugin_with_plugin_files(new_plugin, new_plugin_files)
 
         _add_plugin_tasks(tasks, plugin_file=new_plugin_file, log=log)
 
@@ -1114,6 +1121,15 @@ def modify(
                     plugin_id=plugin_id,
                 )
 
+        # a modification to a plugin file creates a new plugin snapshot
+        new_plugin = models.Plugin(
+            name=plugin.name,
+            description=plugin.description,
+            resource=plugin.resource,
+            creator=current_user,
+        )
+        db.session.add(new_plugin)
+
         updated_plugin_file = models.PluginFile(
             filename=filename,
             contents=contents,
@@ -1123,7 +1139,11 @@ def modify(
         )
         db.session.add(updated_plugin_file)
 
-        _update_plugin_and_file_snapshots(plugin, updated_plugin_file)
+        new_plugin_files = {
+            plugin_file.resource_id: plugin_file for plugin_file in plugin.plugin_files
+        }
+        new_plugin_files[updated_plugin_file.resource_id] = updated_plugin_file
+        _associate_plugin_with_plugin_files(new_plugin, new_plugin_files.values())
 
         _add_plugin_tasks(tasks, plugin_file=updated_plugin_file, log=log)
 
@@ -1186,7 +1206,21 @@ def delete(self, plugin_id: int, plugin_file_id: int, **kwargs) -> dict[str, Any
                 plugin_file_id=plugin_file_id,
             )
 
-        _update_plugin_and_file_snapshots(plugin, plugin_file, delete=True)
+        # a deletion of a plugin file creates a new plugin snapshot
+        new_plugin = models.Plugin(
+            name=plugin.name,
+            description=plugin.description,
+            resource=plugin.resource,
+            creator=current_user,
+        )
+        db.session.add(new_plugin)
+
+        new_plugin_files = [
+            plugin_file
+            for plugin_file in plugin.plugin_files
+            if plugin_file.resource_id != plugin_file_id
+        ]
+        _associate_plugin_with_plugin_files(new_plugin, new_plugin_files)
 
         plugin_file_id_to_return = plugin_file.resource_id  # to return to user
         db.session.add(
@@ -1197,11 +1231,7 @@ def delete(self, plugin_id: int, plugin_file_id: int, **kwargs) -> dict[str, Any
         )
         db.session.commit()
 
-        log.debug(
-            "Plugin file deleted",
-            plugin_id=plugin_id,
-        )
-
+        log.debug("Plugin file deleted", plugin_id=plugin_id)
         return {"status": "Success", "id": [plugin_file_id_to_return]}
 
 
@@ -1307,6 +1337,16 @@ def _get_referenced_parameter_types(
     return {x.resource_id: x for x in parameter_types}
 
 
+def _associate_plugin_with_plugin_files(
+    plugin: models.Plugin, plugin_files: list[models.PluginFile]
+) -> None:
+    for plugin_file in plugin_files:
+        plugin_plugin_file = models.PluginPluginFile(
+            plugin=plugin, plugin_file=plugin_file
+        )
+        db.session.add(plugin_plugin_file)
+
+
 def _add_plugin_tasks(
     tasks: list[dict[str, Any]], plugin_file: models.PluginFile, log: BoundLogger
 ) -> None:
@@ -1326,36 +1366,3 @@ def _add_plugin_tasks(
             log=log,
         )
         db.session.add(plugin_task)
-
-
-def _update_plugin_and_file_snapshots(
-    plugin: models.Plugin,
-    plugin_file: models.PluginFile,
-    delete: bool = False,
-) -> None:
-    # use this method when creating, modifying, or deleting plugin files.
-
-    # add snapshot for plugin
-    new_plugin = models.Plugin(
-        name=plugin.name,
-        description=plugin.description,
-        resource=plugin.resource,
-        creator=current_user,
-    )
-    db.session.add(new_plugin)
-
-    # add snapshot for existing plugin_plugin_files
-    for existing_plugin_file in plugin.plugin_files:
-        if existing_plugin_file.resource_id == plugin_file.resource_id:
-            continue
-
-        plugin_plugin_file = models.PluginPluginFile(
-            plugin=new_plugin, plugin_file=existing_plugin_file
-        )
-        db.session.add(plugin_plugin_file)
-
-    if not delete:  # add snapshot for new plugin_plugin_file
-        new_plugin_plugin_file = models.PluginPluginFile(
-            plugin=new_plugin, plugin_file=plugin_file
-        )
-        db.session.add(new_plugin_plugin_file)

From a4bcffd2d3ff9033d6c6a48a8d23b1a6c07367ae Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Thu, 30 Jan 2025 15:49:00 -0500
Subject: [PATCH 20/22] refactor: rename variables for clarity

---
 .../workflows/lib/export_task_engine_yaml.py  | 22 +++++++++----------
 .../v1/workflows/lib/package_job_files.py     |  2 +-
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/dioptra/restapi/v1/workflows/lib/export_task_engine_yaml.py b/src/dioptra/restapi/v1/workflows/lib/export_task_engine_yaml.py
index 92c377a82..adbaa6a75 100644
--- a/src/dioptra/restapi/v1/workflows/lib/export_task_engine_yaml.py
+++ b/src/dioptra/restapi/v1/workflows/lib/export_task_engine_yaml.py
@@ -50,7 +50,7 @@
 
 def export_task_engine_yaml(
     entrypoint: models.EntryPoint,
-    entry_point_plugin_files: list[models.PluginPluginFile],
+    plugin_plugin_files: list[models.PluginPluginFile],
     plugin_parameter_types: list[models.PluginTaskParameterType],
     base_dir: Path,
     logger: BoundLogger | None = None,
@@ -59,7 +59,7 @@ def export_task_engine_yaml(
 
     Args:
         entrypoint: The entrypoint to export.
-        entry_point_plugin_files: The entrypoint's plugin files.
+        plugin_plugin_files: The entrypoint's plugin files.
         plugin_parameter_types: The latest snapshots of the plugin parameter types
             accessible to the entrypoint.
         base_dir: The directory to export the task engine YAML file to.
@@ -73,7 +73,7 @@ def export_task_engine_yaml(
     task_yaml_path = Path(base_dir, entrypoint.name).with_suffix(".yml")
     task_engine_dict = build_task_engine_dict(
         entrypoint=entrypoint,
-        entry_point_plugin_files=entry_point_plugin_files,
+        plugin_plugin_files=plugin_plugin_files,
         plugin_parameter_types=plugin_parameter_types,
     )
 
@@ -85,7 +85,7 @@ def export_task_engine_yaml(
 
 def build_task_engine_dict(
     entrypoint: models.EntryPoint,
-    entry_point_plugin_files: list[models.PluginPluginFile],
+    plugin_plugin_files: list[models.PluginPluginFile],
     plugin_parameter_types: list[models.PluginTaskParameterType],
     logger: BoundLogger | None = None,
 ) -> dict[str, Any]:
@@ -93,7 +93,7 @@ def build_task_engine_dict(
 
     Args:
         entrypoint: The entrypoint to export.
-        entry_point_plugin_files: The entrypoint's plugin files.
+        plugin_plugin_files: The entrypoint's plugin files.
         plugin_parameter_types: The latest snapshots of the plugin parameter types
             accessible to the entrypoint.
         logger: A structlog logger object to use for logging. A new logger will be
@@ -104,7 +104,7 @@ def build_task_engine_dict(
     """
     log = logger or LOGGER.new()  # noqa: F841
     tasks, parameter_types = extract_tasks(
-        entry_point_plugin_files, plugin_parameter_types=plugin_parameter_types
+        plugin_plugin_files, plugin_parameter_types=plugin_parameter_types
     )
     parameters = extract_parameters(entrypoint)
     graph = extract_graph(entrypoint)
@@ -147,14 +147,14 @@ def extract_parameters(
 
 
 def extract_tasks(
-    entry_point_plugin_files: list[models.PluginPluginFile],
+    plugin_plugin_files: list[models.PluginPluginFile],
     plugin_parameter_types: list[models.PluginTaskParameterType],
     logger: BoundLogger | None = None,
 ) -> tuple[dict[str, Any], dict[str, Any]]:
     """Extract the plugin tasks and parameter types from the entrypoint plugin files.
 
     Args:
-        entry_point_plugin_files: The entrypoint's plugin files.
+        plugin_plugin_files: The entrypoint's plugin files.
         plugin_parameter_types: The latest snapshots of the plugin parameter types
             accessible to the entrypoint.
         logger: A structlog logger object to use for logging. A new logger will be
@@ -168,9 +168,9 @@ def extract_tasks(
 
     tasks: dict[str, Any] = {}
     parameter_types: dict[str, Any] = {}
-    for entry_point_plugin_file in entry_point_plugin_files:
-        plugin = entry_point_plugin_file.plugin
-        plugin_file = entry_point_plugin_file.plugin_file
+    for plugin_plugin_file in plugin_plugin_files:
+        plugin = plugin_plugin_file.plugin
+        plugin_file = plugin_plugin_file.plugin_file
 
         for task in plugin_file.tasks:
             input_parameters = sorted(
diff --git a/src/dioptra/restapi/v1/workflows/lib/package_job_files.py b/src/dioptra/restapi/v1/workflows/lib/package_job_files.py
index 93eade6b0..2815e867b 100644
--- a/src/dioptra/restapi/v1/workflows/lib/package_job_files.py
+++ b/src/dioptra/restapi/v1/workflows/lib/package_job_files.py
@@ -74,7 +74,7 @@ def package_job_files(
         )
         task_engine_yaml_path = export_task_engine_yaml(
             entrypoint=entry_point,
-            entry_point_plugin_files=entry_point_plugin_files,
+            plugin_plugin_files=entry_point_plugin_files,
             plugin_parameter_types=plugin_parameter_types,
             base_dir=base_dir,
             logger=log,

From a5b91b074d49a5ac06d9eefaacdb5ddd061d583b Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Thu, 30 Jan 2025 16:14:18 -0500
Subject: [PATCH 21/22] refactor: simplify query

---
 src/dioptra/restapi/db/models/plugins.py      |  3 +++
 src/dioptra/restapi/v1/workflows/lib/views.py | 26 +++++++------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/src/dioptra/restapi/db/models/plugins.py b/src/dioptra/restapi/db/models/plugins.py
index c74db9543..700a5e859 100644
--- a/src/dioptra/restapi/db/models/plugins.py
+++ b/src/dioptra/restapi/db/models/plugins.py
@@ -41,6 +41,9 @@ class Plugin(ResourceSnapshot):
     name: Mapped[text_] = mapped_column(nullable=False, index=True)
 
     # Relationships
+    plugin_plugin_files: Mapped[list["PluginPluginFile"]] = relationship(
+        init=False, back_populates="plugin_file"
+    )
     plugin_files: Mapped[list["PluginFile"]] = relationship(
         "PluginFile",
         secondary="plugin_plugin_files",
diff --git a/src/dioptra/restapi/v1/workflows/lib/views.py b/src/dioptra/restapi/v1/workflows/lib/views.py
index 7e5270374..94c96a8ea 100644
--- a/src/dioptra/restapi/v1/workflows/lib/views.py
+++ b/src/dioptra/restapi/v1/workflows/lib/views.py
@@ -99,30 +99,22 @@ def get_entry_point_plugin_files(
     """
     log = logger or LOGGER.new()  # noqa: F841
 
-    entry_point_resource_snapshot_id_stmt = (
-        select(models.EntryPoint.resource_snapshot_id)
+    entry_point_resource_snapshot_stmt = (
+        select(models.EntryPoint)
         .join(models.EntryPointJob)
         .where(
             models.EntryPointJob.job_resource_id == job_id,
         )
     )
+    entry_point = db.session.scalar(entry_point_resource_snapshot_stmt)
 
-    # Get plugins linked to the entry point
-    entry_point_plugins_stmt = select(
-        models.EntryPointPlugin.plugin_resource_snapshot_id
-    ).where(
-        models.EntryPointPlugin.entry_point_resource_snapshot_id
-        == entry_point_resource_snapshot_id_stmt.scalar_subquery()
-    )
-
-    # Get plugin files linked to these plugins
-    entry_point_plugin_files_stmt = select(models.PluginPluginFile).where(
-        models.PluginPluginFile.plugin_resource_snapshot_id.in_(
-            entry_point_plugins_stmt
-        )
-    )
+    plugin_plugin_files = [
+        plugin_plugin_file
+        for entry_point_plugin in entry_point.entry_point_plugins
+        for plugin_plugin_file in entry_point_plugin.plugin.plugin_plugin_files
+    ]
 
-    return list(db.session.scalars(entry_point_plugin_files_stmt).unique().all())
+    return plugin_plugin_files
 
 
 def get_job_parameter_values(

From 99396db75d76ecd0aa5e6b78090d22065fa4ebf7 Mon Sep 17 00:00:00 2001
From: Keith Manville <kmanville@mitre.org>
Date: Thu, 30 Jan 2025 16:22:49 -0500
Subject: [PATCH 22/22] test: fix identifier checks

---
 src/dioptra/restapi/v1/utils.py   |  2 ++
 tests/unit/restapi/lib/asserts.py | 12 +++++++++---
 tests/unit/restapi/v1/test_job.py | 15 ++++++++++++---
 3 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/src/dioptra/restapi/v1/utils.py b/src/dioptra/restapi/v1/utils.py
index c1c40f8cd..faf1f7dbd 100644
--- a/src/dioptra/restapi/v1/utils.py
+++ b/src/dioptra/restapi/v1/utils.py
@@ -288,6 +288,7 @@ def build_plugin_snapshot_ref(plugin: models.Plugin) -> dict[str, Any]:
         The PluginSnapshotRef dictionary.
     """
     return {
+        "id": plugin.resource_id,
         "snapshot_id": plugin.resource_snapshot_id,
         "name": plugin.name,
         "group": build_group_ref(plugin.resource.owner),
@@ -401,6 +402,7 @@ def build_queue_snapshot_ref(queue: models.Queue) -> dict[str, Any]:
         The QueueSnapshotRef dictionary.
     """
     return {
+        "id": queue.resource_id,
         "snapshot_id": queue.resource_snapshot_id,
         "name": queue.name,
         "group": build_group_ref(queue.resource.owner),
diff --git a/tests/unit/restapi/lib/asserts.py b/tests/unit/restapi/lib/asserts.py
index 2911eb45e..6e53e8265 100644
--- a/tests/unit/restapi/lib/asserts.py
+++ b/tests/unit/restapi/lib/asserts.py
@@ -79,37 +79,43 @@ def assert_base_resource_ref_contents_matches_expectations(
 def assert_queue_ref_contents_matches_expectations(
     queue: dict[str, Any],
     expected_queue_id: int,
+    expected_queue_snapshot_id: int,
     expected_group_id: int,
 ) -> None:
     assert isinstance(queue["name"], str)
     assert_base_resource_ref_contents_matches_expectations(
         resource=queue, expected_group_id=expected_group_id
     )
-    assert queue["snapshotId"] == expected_queue_id
+    assert queue["id"] == expected_queue_id
+    assert queue["snapshotId"] == expected_queue_snapshot_id
 
 
 def assert_experiment_ref_contents_matches_expectations(
     experiment: dict[str, Any],
     expected_experiment_id: int,
+    expected_experiment_snapshot_id: int,
     expected_group_id: int,
 ) -> None:
     assert isinstance(experiment["name"], str)
     assert_base_resource_ref_contents_matches_expectations(
         resource=experiment, expected_group_id=expected_group_id
     )
-    assert experiment["snapshotId"] == expected_experiment_id
+    assert experiment["id"] == expected_experiment_id
+    assert experiment["snapshotId"] == expected_experiment_snapshot_id
 
 
 def assert_entrypoint_ref_contents_matches_expectations(
     entrypoint: dict[str, Any],
     expected_entrypoint_id: int,
+    expected_entrypoint_snapshot_id: int,
     expected_group_id: int,
 ) -> None:
     assert isinstance(entrypoint["name"], str)
     assert_base_resource_ref_contents_matches_expectations(
         resource=entrypoint, expected_group_id=expected_group_id
     )
-    assert entrypoint["snapshotId"] == expected_entrypoint_id
+    assert entrypoint["id"] == expected_entrypoint_id
+    assert entrypoint["snapshotId"] == expected_entrypoint_snapshot_id
 
 
 def assert_draft_response_contents_matches_expectations(
diff --git a/tests/unit/restapi/v1/test_job.py b/tests/unit/restapi/v1/test_job.py
index 8046291e7..3bb55d892 100644
--- a/tests/unit/restapi/v1/test_job.py
+++ b/tests/unit/restapi/v1/test_job.py
@@ -99,16 +99,19 @@ def assert_job_response_contents_matches_expectations(
     asserts.assert_queue_ref_contents_matches_expectations(
         queue=response["queue"],
         expected_queue_id=expected_contents["queue_id"],
+        expected_queue_snapshot_id=expected_contents["queue_snapshot_id"],
         expected_group_id=expected_contents["group_id"],
     )
     asserts.assert_experiment_ref_contents_matches_expectations(
         experiment=response["experiment"],
         expected_experiment_id=expected_contents["experiment_id"],
+        expected_experiment_snapshot_id=expected_contents["experiment_snapshot_id"],
         expected_group_id=expected_contents["group_id"],
     )
     asserts.assert_entrypoint_ref_contents_matches_expectations(
         entrypoint=response["entrypoint"],
         expected_entrypoint_id=expected_contents["entrypoint_id"],
+        expected_entrypoint_snapshot_id=expected_contents["entrypoint_snapshot_id"],
         expected_group_id=expected_contents["group_id"],
     )
 
@@ -393,6 +396,9 @@ def test_create_job(
       *Note: group_id is given as an arg for registration in the service layer
     """
 
+    queue_id = registered_queues["queue1"]["id"]
+    experiment_id = registered_experiments["experiment1"]["id"]
+    entrypoint_id = registered_entrypoints["entrypoint1"]["id"]
     queue_snapshot_id = registered_queues["queue1"]["snapshot"]
     experiment_snapshot_id = registered_experiments["experiment1"]["snapshot"]
     entrypoint_snapshot_id = registered_entrypoints["entrypoint1"]["snapshot"]
@@ -408,9 +414,12 @@ def test_create_job(
             "values": values,
             "user_id": auth_account["id"],
             "group_id": registered_experiments["experiment1"]["group"]["id"],
-            "queue_id": queue_snapshot_id,
-            "experiment_id": experiment_snapshot_id,
-            "entrypoint_id": entrypoint_snapshot_id,
+            "queue_id": queue_id,
+            "experiment_id": experiment_id,
+            "entrypoint_id": entrypoint_id,
+            "queue_snapshot_id": queue_snapshot_id,
+            "experiment_snapshot_id": experiment_snapshot_id,
+            "entrypoint_snapshot_id": entrypoint_snapshot_id,
         },
     )