MAINT: address second round of PR feedback

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Author: rlundeen2

pyrit/memory/memory_models.py

@@ -723,8 +723,8 @@ class AttackResultEntry(Base):
         String, nullable=False, default="undetermined"
     )
     outcome_reason = mapped_column(String, nullable=True)
-    attack_metadata: Mapped[dict[str, str | int | float | bool]] = mapped_column(JSON, nullable=True)
-    labels: Mapped[dict[str, str]] = mapped_column(JSON, nullable=True)
+    attack_metadata: Mapped[dict[str, str | int | float | bool] | None] = mapped_column(JSON, nullable=True)
+    labels: Mapped[dict[str, str] | None] = mapped_column(JSON, nullable=True)
     pruned_conversation_ids: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
     adversarial_chat_conversation_ids: Mapped[list[str] | None] = mapped_column(JSON, nullable=True)
     timestamp = mapped_column(DateTime, nullable=False)

pyrit/models/scenario_result.py

@@ -58,7 +58,7 @@ def to_dict(self) -> dict[str, Any]:
         return {
             "name": self.name,
             "description": self.description,
-            "version": self.version,
+            "scenario_version": self.version,
             "pyrit_version": self.pyrit_version,
             "init_data": self.init_data,
         }
@@ -77,7 +77,7 @@ def from_dict(cls, data: dict[str, Any]) -> ScenarioIdentifier:
         return cls(
             name=data["name"],
             description=data.get("description", ""),
-            scenario_version=data.get("version", 1),
+            scenario_version=data.get("scenario_version", 1),
             init_data=data.get("init_data"),
             pyrit_version=data.get("pyrit_version"),
         )

pyrit/models/score.py

@@ -215,7 +215,11 @@ def from_dict(cls, data: dict[str, Any]) -> Score:
             score_category=data.get("score_category"),
             score_rationale=data["score_rationale"],
             score_metadata=data.get("score_metadata"),
-            scorer_class_identifier=ComponentIdentifier.from_dict(data["scorer_class_identifier"]),
+            scorer_class_identifier=(  # type: ignore[ty:invalid-argument-type]
+                ComponentIdentifier.from_dict(data["scorer_class_identifier"])
+                if data.get("scorer_class_identifier")
+                else None
+            ),
             message_piece_id=data["message_piece_id"],
             timestamp=datetime.fromisoformat(data["timestamp"]) if data.get("timestamp") else None,
             objective=data.get("objective"),