diff --git a/app/server/config.py b/app/server/config.py index 7ef4cb1..b580f3e 100644 --- a/app/server/config.py +++ b/app/server/config.py @@ -6,7 +6,7 @@ class Settings(BaseSettings): APP_DEBUG: bool = False # list of valid crops - VALID_CROPS: list = ["coffee", "maize"] + VALID_CROPS: str = "coffee,maize,beans,potatoes" # model fields settings MODEL_ID_ATTRIBUTE: str = "id" diff --git a/app/server/model/risk.py b/app/server/model/risk.py index fddc8ac..8621d87 100644 --- a/app/server/model/risk.py +++ b/app/server/model/risk.py @@ -79,8 +79,8 @@ def config_must_exist(cls, v:str) -> str: def crop_must_be_valid(cls, v: str) -> str: crop = v.strip().lower() - if crop not in settings.VALID_CROPS: - raise_with_log(ValueError, f"crop {crop} invalid, valid crops are {VALID_CROPS}") + if crop not in settings.VALID_CROPS.split(","): + raise_with_log(ValueError, f"crop {crop} invalid, valid crops are {settings.VALID_CROPS}") return crop @@ -163,8 +163,8 @@ def config_must_exist(cls, v:str) -> str: def crop_must_be_valid(cls, v: str) -> str: crop = v.strip().lower() - if crop not in settings.VALID_CROPS: - raise_with_log(ValueError, f"crop {crop} invalid, valid crops are {VALID_CROPS}") + if crop not in settings.VALID_CROPS.split(","): + raise_with_log(ValueError, f"crop {crop} invalid, valid crops are {settings.VALID_CROPS}") return crop diff --git a/script/MockSetup.s.sol b/script/MockSetup.s.sol index 257bc97..d757e29 100644 --- a/script/MockSetup.s.sol +++ b/script/MockSetup.s.sol @@ -22,4 +22,4 @@ contract MocksSetupScript is Script { console.log("Token deployed", address(token)); console.log("Product deployed", address(product)); } -} +} \ No newline at end of file