corrects error with unpack_results argument (#589)

* corrects error with unpack_results argument

* update bootstrap pydantic models

---------

Co-authored-by: samlamont <sam.lamont@gmail.com>

Author: samland1116

src/teehr/models/metrics/basemodels.py

@@ -1,5 +1,5 @@
 """Enums and Basemodels for metric classes."""
-from typing import Union, Callable
+from typing import Union, Callable, List
 
 from teehr.models.str_enum import StrEnum
 from teehr.querying.utils import unpack_sdf_dict_columns
@@ -38,9 +38,20 @@ def update_return_type(cls, values):
         return values
 
 
-class BootstrapBasemodel(MetricsBasemodel):
+class BootstrapBasemodel(PydanticBaseModel):
     """Bootstrap Basemodel configuration."""
 
+    return_type: Union[str, T.ArrayType, T.MapType] = Field(default=None)
+    reps: int = 1000
+    seed: Union[int, None] = None
+    quantiles: Union[List[float], None] = None
+
+    model_config = ConfigDict(
+        arbitrary_types_allowed=True,
+        validate_assignment=True,
+        extra='forbid'  # raise an error if extra fields are passed
+    )
+
     @model_validator(mode="before")
     def update_return_type(cls, values):
         """Update the return type based on the quantiles."""

src/teehr/models/metrics/bootstrap_models.py

@@ -56,9 +56,6 @@ class Gumboot(BootstrapBasemodel):
 
     """
 
-    reps: int = 1000
-    seed: Union[int, None] = None
-    quantiles: Union[List[float], None] = None
     boot_year_file: Union[str, Path, None] = None
     water_year_month: int = 10
     name: str = Field(default="Gumboot")
@@ -92,11 +89,8 @@ class CircularBlock(BootstrapBasemodel):
         The wrapper to generate the bootstrapping function.
     """
 
-    seed: Union[int, None] = None
     random_state: Union[RandomState, None] = None
-    reps: int = 1000
     block_size: int = 365
-    quantiles: Union[List[float], None] = None
     name: str = Field(default="CircularBlock")
     include_value_time: bool = Field(False, frozen=True)
     func: Callable = Field(
@@ -131,11 +125,8 @@ class Stationary(BootstrapBasemodel):
         The wrapper to generate the bootstrapping function.
     """
 
-    seed: Union[int, None] = None
     random_state: Union[RandomState, None] = None
-    reps: int = 1000
     block_size: int = 365
-    quantiles: Union[List[float], None] = None
     name: str = Field(default="Stationary")
     include_value_time: bool = Field(False, frozen=True)
     func: Callable = Field(