From 90034c1c614a959ec3c7963d348217a6927d0142 Mon Sep 17 00:00:00 2001 From: ogabrielluiz Date: Fri, 24 May 2024 09:15:40 -0300 Subject: [PATCH] Refactor validation methods in schema.py for better readability and maintainability --- .../base/langflow/services/monitor/schema.py | 24 ++++--------------- 1 file changed, 4 insertions(+), 20 deletions(-) diff --git a/src/backend/base/langflow/services/monitor/schema.py b/src/backend/base/langflow/services/monitor/schema.py index 7de817198..9cbc86bda 100644 --- a/src/backend/base/langflow/services/monitor/schema.py +++ b/src/backend/base/langflow/services/monitor/schema.py @@ -81,9 +81,8 @@ class MessageModel(BaseModel): from_attributes = True populate_by_name = True - @validator("files", pre=True) - @field_validator("artifacts", mode="before") - def validate_target_args(cls, v): + @field_validator("files", mode="before") + def validate_files(cls, v): if isinstance(v, str): return json.loads(v) return v @@ -108,12 +107,6 @@ class MessageModel(BaseModel): class MessageModelResponse(MessageModel): index: Optional[int] = Field(default=None) - @field_validator("artifacts", mode="before") - def serialize_artifacts(v): - if isinstance(v, str): - return json.loads(v) - return v - @field_validator("index", mode="before") def validate_id(cls, v): if isinstance(v, float): @@ -151,9 +144,8 @@ class VertexBuildModel(BaseModel): return v.model_dump_json() return v - @validator("logs", pre=True) - @field_validator("params", mode="before") - def validate_params(cls, v): + @field_validator("logs", mode="before") + def validate_logs(cls, v): if isinstance(v, str): try: return json.loads(v) @@ -173,14 +165,6 @@ class VertexBuildModel(BaseModel): return json.loads(v) return v - @field_validator("artifacts", mode="before") - def validate_artifacts(cls, v): - if isinstance(v, str): - return json.loads(v) - elif isinstance(v, BaseModel): - return v.model_dump() - return v - class VertexBuildResponseModel(VertexBuildModel): messages: list[MessageModel] = []