Moved LIF and TIFF registration Pydantic models to the files where they're used

Author: tieneupin

src/murfey/util/models.py

@@ -1,11 +1,10 @@
 from __future__ import annotations
 
-from ast import literal_eval
 from datetime import datetime
 from pathlib import Path
 from typing import Any, Dict, List, Optional
 
-from pydantic import BaseModel, validator
+from pydantic import BaseModel
 
 """
 General Models
@@ -161,40 +160,6 @@ class TIFFSeriesInfo(BaseModel):
     series_metadata: Path
 
 
-class LIFPreprocessingResult(BaseModel):
-    image_stack: Path
-    metadata: Path
-    series_name: str
-    channel: str
-    number_of_members: int
-    parent_lif: Path
-
-
-class TIFFPreprocessingResult(BaseModel):
-    image_stack: Path
-    metadata: Path
-    series_name: str
-    channel: str
-    number_of_members: int
-    parent_tiffs: list[Path]
-
-    @validator(
-        "parent_tiffs",
-        pre=True,
-    )
-    def parse_stringified_list(cls, value):
-        if isinstance(value, str):
-            try:
-                eval_result = literal_eval(value)
-                if isinstance(eval_result, list):
-                    parent_tiffs = [Path(p) for p in eval_result]
-                    return parent_tiffs
-            except (SyntaxError, ValueError):
-                raise ValueError("Unable to parse input")
-        # Return value as-is; if it fails, it fails
-        return value
-
-
 """
 FIB
 ===

src/murfey/workflows/clem/register_preprocessing_results.py

@@ -11,9 +11,11 @@
 import logging
 import re
 import traceback
+from ast import literal_eval
 from pathlib import Path
 from typing import Optional, Type, Union
 
+from pydantic import BaseModel, validator
 from sqlalchemy.exc import NoResultFound
 from sqlmodel import Session, select
 
@@ -27,7 +29,6 @@
     CLEMTIFFFile,
 )
 from murfey.util.db import Session as MurfeySession
-from murfey.util.models import LIFPreprocessingResult, TIFFPreprocessingResult
 from murfey.workflows.clem.align_and_merge import submit_cluster_request
 
 logger = logging.getLogger("murfey.workflows.clem.register_results")
@@ -194,6 +195,15 @@ def get_db_entry(
     return db_entry
 
 
+class LIFPreprocessingResult(BaseModel):
+    image_stack: Path
+    metadata: Path
+    series_name: str
+    channel: str
+    number_of_members: int
+    parent_lif: Path
+
+
 def register_lif_preprocessing_result(
     message: dict, db: Session, demo: bool = False
 ) -> bool:
@@ -362,6 +372,31 @@ def register_lif_preprocessing_result(
         db.close()
 
 
+class TIFFPreprocessingResult(BaseModel):
+    image_stack: Path
+    metadata: Path
+    series_name: str
+    channel: str
+    number_of_members: int
+    parent_tiffs: list[Path]
+
+    @validator(
+        "parent_tiffs",
+        pre=True,
+    )
+    def parse_stringified_list(cls, value):
+        if isinstance(value, str):
+            try:
+                eval_result = literal_eval(value)
+                if isinstance(eval_result, list):
+                    parent_tiffs = [Path(p) for p in eval_result]
+                    return parent_tiffs
+            except (SyntaxError, ValueError):
+                raise ValueError("Unable to parse input")
+        # Return value as-is; if it fails, it fails
+        return value
+
+
 def register_tiff_preprocessing_result(
     message: dict, db: Session, demo: bool = False
 ) -> bool: