Remove unnecessary str input for ForceOutput and StoppingCriterion

Author: angranl-flex

flow360/component/simulation/outputs/outputs.py

@@ -689,7 +689,7 @@ class ForceOutput(_OutputBase):
         description="List of force coefficients. Including CL, CD, CFx, CFy, CFz, CMx, CMy, CMz. "
         "For surface forces, their SkinFriction/Pressure is also supported, such as CLSkinFriction and CLPressure."
     )
-    models: List[Union[ForceOutputModelType, str]] = pd.Field(
+    models: List[ForceOutputModelType] = pd.Field(
         description="List of surface/volume models whose force contribution will be calculated.",
     )
     moving_statistic: Optional[MovingStatistic] = pd.Field(
@@ -740,7 +740,7 @@ def _check_duplicate_models(cls, value):
         """Ensure no duplicate models are specified."""
         model_ids = []
         for model in value:
-            model_id = model if isinstance(model, str) else model.private_attribute_id
+            model_id = model.private_attribute_id
             if model_id not in model_ids:
                 model_ids.append(model_id)
                 continue

flow360/component/simulation/run_control/stopping_criterion.py

@@ -69,9 +69,7 @@ class StoppingCriterion(Flow360BaseModel):
         description="The field to be monitored. This field must be "
         "present in the `output_fields` of `monitor_output`."
     )
-    monitor_output: Union[MonitorOutputType, str] = pd.Field(
-        description="The output to be monitored."
-    )
+    monitor_output: MonitorOutputType = pd.Field(description="The output to be monitored.")
     tolerance: ValueOrExpression[Union[UnytQuantity, float]] = pd.Field(
         description="The tolerance threshold of this criterion."
     )
@@ -150,8 +148,6 @@ def _check_single_point_in_probe_output(cls, v):
     @classmethod
     def _check_field_exists_in_monitor_output(cls, v, info: pd.ValidationInfo):
         """Ensure the monitor field exist in the monitor output."""
-        if isinstance(v, str):
-            return v
         monitor_field = info.data.get("monitor_field", None)
         if monitor_field not in v.output_fields.items:
             raise ValueError("The monitor field does not exist in the monitor output.")