Removed logger usage and redundant debug messages from models.py.

This commit is contained in:
2025-08-20 15:25:26 +02:00
parent d47ce8be84
commit a9321888c6
+3 -16
View File
@@ -1,4 +1,3 @@
import logging
from pathlib import Path
import re
from enum import Enum
@@ -10,11 +9,6 @@ from aaredaqlib.coordinate import Coordinate
from aaredaqlib.diffraction_geometry import DiffractionGeometry
from aaredaqlib.sample_geometry import SampleGeometryModel
logging.basicConfig(level=logging.DEBUG)
logger = logging.getLogger(__name__)
class StagePositionEnum(Enum):
MEASURE = 0
PARK = 1
@@ -105,15 +99,10 @@ class DataCollectionParameters(BaseModel):
@field_validator("directory", mode="after")
@classmethod
def directory_characters(cls, v):
logger.debug(f"Validating 'directory' field with initial value: {repr(v)}")
# Default directory value if empty
if not v: # Handles None or empty cases
default_value = "{sgPuck}/{sgPosition}"
logger.warning(
f"'directory' field is empty or None. Assigning default value: "
f"{default_value}"
)
return default_value
# Strip trailing slashes and store original value for comparison
@@ -122,7 +111,6 @@ class DataCollectionParameters(BaseModel):
# Replace spaces with underscores
v = v.replace(" ", "_")
logger.debug(f"Corrected 'directory', spaces replaced: {repr(v)}")
# Validate directory pattern with macros and allowed characters
valid_macros = [
@@ -151,10 +139,6 @@ class DataCollectionParameters(BaseModel):
raise ValueError(
f"'{v}' is not valid. Value must be a valid path or macro."
)
# Log and return corrected value
if v != original_value:
logger.info(f"Directory was corrected from '{original_value}' to '{v}'")
return v
@field_validator("aperture", mode="before")
@@ -417,6 +401,9 @@ class SampleShortInfo(BaseModel):
class SampleShortInfoList(BaseModel):
s: List[SampleShortInfo]
#class ReferencePuckInfo(BaseModel):
# test_sample = SampleShortInfo(db_id=-1, puck_name="test_puck", dewar_name="test_dewar", sample_name="test_sample",
# pin=11, location=DewarAddress(segment="X", pos=1))
class BeamMarkCoeffModel(BaseModel):
"""