Add support for data collection parameters across layers

Introduced serialization for `data_collection_parameters` in backend models and processing. Added logic to parse and attach data collection parameters in the frontend. This ensures consistent handling and storage of these parameters throughout the application.
This commit is contained in:
GotthardG
2025-01-08 09:19:23 +01:00
parent 35369fd13c
commit 9b4f8599f3
3 changed files with 60 additions and 4 deletions

View File

@ -8,7 +8,7 @@ from sqlalchemy.orm import Session, joinedload
from typing import List
import logging
from sqlalchemy.exc import SQLAlchemyError
from pydantic import ValidationError
from pydantic import ValidationError, BaseModel
from app.schemas import (
Dewar as DewarSchema,
DewarCreate,
@ -88,6 +88,26 @@ async def create_dewar(
db.refresh(puck)
for sample_data in puck_data.samples:
logging.debug(
f"data_collection_parameters: "
f"{sample_data.data_collection_parameters}"
)
if sample_data.data_collection_parameters is None:
serialized_params = {}
elif hasattr(sample_data.data_collection_parameters, "to_dict"):
serialized_params = sample_data.data_collection_parameters.to_dict()
elif isinstance(sample_data.data_collection_parameters, BaseModel):
serialized_params = sample_data.data_collection_parameters.dict(
exclude_unset=True
)
elif isinstance(sample_data.data_collection_parameters, dict):
serialized_params = sample_data.data_collection_parameters
else:
raise ValueError(
"data_collection_parameters must be a dictionary,"
"have a to_dict method, or be None"
)
sample = SampleModel(
puck_id=puck.id,
sample_name=sample_data.sample_name,
@ -95,7 +115,7 @@ async def create_dewar(
position=sample_data.position,
priority=sample_data.priority,
comments=sample_data.comments,
data_collection_parameters=sample_data.data_collection_parameters,
data_collection_parameters=serialized_params,
)
db.add(sample)
db.commit()