Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue#35: check if the title in GuaranteedAnalysis is minimal #47

Merged
merged 8 commits into from
Oct 9, 2024
Merged

Issue#35: check if the title in GuaranteedAnalysis is minimal #47

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
36f7217
feat: check if the title is minimal in GuaranteedAnalysis
saratavakoli77 Oct 7, 2024
5bb5d13
fix: change variable name and change the variable type from bool to n…
saratavakoli77 Oct 8, 2024
85dca7a
fix: change var name
saratavakoli77 Oct 8, 2024
6b10a65
feat: add unit test for set_is_minimal function in GuaranteedAnalysis
saratavakoli77 Oct 8, 2024
d43d56f
fix: refactor setting the value for is_minimal
saratavakoli77 Oct 8, 2024
2d31a8f
Merge branch 'main' into 35-minimal-guaranteed-analysis
saratavakoli77 Oct 9, 2024
2afeb65
fix: change setting the value for is_minimal
saratavakoli77 Oct 9, 2024
39e19fb
fix: reverse is_minimal setting to what is was before and updating th…
saratavakoli77 Oct 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion pipeline/inspection.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import re
from typing import List, Optional
from pydantic import BaseModel, Field, field_validator
from pydantic import BaseModel, Field, field_validator, model_validator

class npkError(ValueError):
pass
Expand Down Expand Up @@ -44,6 +44,7 @@ def convert_value(cls, v):
class GuaranteedAnalysis(BaseModel):
title: Optional[str] = None
nutrients: List[NutrientValue] = []
title_is_minimal: bool = False
k-allagbe marked this conversation as resolved.
Show resolved Hide resolved

@field_validator(
"nutrients",
Expand All @@ -53,6 +54,13 @@ def replace_none_with_empty_list(cls, v):
if v is None:
v = []
return v

@model_validator(mode="after")
def set_title_is_minimal(self):
k-allagbe marked this conversation as resolved.
Show resolved Hide resolved
pattern = r'\bminim\w*\b'
if self.title and re.search(pattern, self.title, re.IGNORECASE):
self.title_is_minimal = True
return self

class Specification(BaseModel):
humidity: Optional[float] = Field(..., alias='humidity')
Expand Down
Loading