Merge pull request #796 from camsys/pydantic-2

jpn-- · web-flow · commit 51419451c733 · 2024-02-08T16:46:40.000-06:00
Pydantic 2
diff --git a/.github/workflows/core_tests.yml b/.github/workflows/core_tests.yml
@@ -49,7 +49,7 @@ jobs:
           mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
           mamba install --yes \
           	"psutil=5.9.5" \
-          	"pydantic=1.10.13" \
+          	"pydantic=2.6.1" \
           	"pypyr=5.8.0" \
           	"pytables=3.6.1" \
           	"pytest-cov" \
@@ -149,7 +149,7 @@ jobs:
           mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
           mamba install --yes \
           	"psutil=5.9.5" \
-          	"pydantic=1.10.13" \
+          	"pydantic=2.6.1" \
           	"pypyr=5.8.0" \
           	"pytables=3.6.1" \
           	"pytest-cov" \
@@ -247,7 +247,7 @@ jobs:
           mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
           mamba install --yes \
           	"psutil=5.9.5" \
-          	"pydantic=1.10.13" \
+          	"pydantic=2.6.1" \
           	"pypyr=5.8.0" \
           	"pytables=3.6.1" \
           	"pytest-cov" \
@@ -344,7 +344,7 @@ jobs:
           mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
           mamba install --yes \
           	"psutil=5.9.5" \
-          	"pydantic=1.10.13" \
+          	"pydantic=2.6.1" \
           	"pypyr=5.8.0" \
           	"pytables=3.6.1" \
           	"pytest-cov" \
@@ -411,7 +411,7 @@ jobs:
           mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
           mamba install --yes \
           	"psutil=5.9.5" \
-          	"pydantic=1.10.13" \
+          	"pydantic=2.6.1" \
           	"pypyr=5.8.0" \
           	"pytables=3.6.1" \
           	"pytest-cov" \
@@ -477,7 +477,7 @@ jobs:
           mamba env update -n asim-test -f conda-environments/github-actions-tests.yml
           mamba install --yes \
           	"psutil=5.9.5" \
-          	"pydantic=1.10.13" \
+          	"pydantic=2.6.1" \
           	"pypyr=5.8.0" \
           	"pytables=3.6.1" \
           	"pytest-cov" \
diff --git a/activitysim/abm/models/util/logsums.py b/activitysim/abm/models/util/logsums.py
@@ -84,9 +84,9 @@ def compute_location_choice_logsums(
         computed logsums with same index as choosers
     """
     if isinstance(model_settings, dict):
-        model_settings = TourLocationComponentSettings.parse_obj(model_settings)
+        model_settings = TourLocationComponentSettings.model_validate(model_settings)
     if isinstance(logsum_settings, dict):
-        logsum_settings = TourModeComponentSettings.parse_obj(logsum_settings)
+        logsum_settings = TourModeComponentSettings.model_validate(logsum_settings)
 
     trace_label = tracing.extend_trace_label(trace_label, "compute_logsums")
     logger.debug(f"Running compute_logsums with {choosers.shape[0]:d} choosers")
diff --git a/activitysim/abm/tables/shadow_pricing.py b/activitysim/abm/tables/shadow_pricing.py
@@ -1233,7 +1233,7 @@ def load_shadow_price_calculator(
     spc : ShadowPriceCalculator
     """
     if not isinstance(model_settings, TourLocationComponentSettings):
-        model_settings = TourLocationComponentSettings.parse_obj(model_settings)
+        model_settings = TourLocationComponentSettings.model_validate(model_settings)
 
     num_processes = state.get_injectable("num_processes", 1)
 
diff --git a/activitysim/abm/test/test_misc/test_load_cached_accessibility.py b/activitysim/abm/test/test_misc/test_load_cached_accessibility.py
@@ -58,7 +58,7 @@ def test_load_cached_accessibility():
     settings = state.settings
     input_table_list = settings.input_table_list
     input_table_list.append(
-        configuration.InputTable.parse_obj(
+        configuration.InputTable.model_validate(
             {
                 "tablename": "accessibility",
                 "filename": "cached_accessibility.csv",
diff --git a/activitysim/core/configuration/base.py b/activitysim/core/configuration/base.py
@@ -118,7 +118,7 @@ class PreprocessorSettings(PydanticBase):
     The preprocessor will emit rows to a temporary table that match the rows
     in this table from the pipeline."""
 
-    TABLES: list[str] | None
+    TABLES: list[str] | None = None
     """Names of the additional tables to be merged for the preprocessor.
 
     Data from these tables will be merged into the primary table, according
diff --git a/activitysim/core/configuration/filesystem.py b/activitysim/core/configuration/filesystem.py
@@ -639,7 +639,7 @@ def read_settings_file(
         include_stack: bool = False,
         configs_dir_list: tuple[Path] | None = None,
         validator_class: type[PydanticBase] | None = None,
-    ) -> dict | PydanticBase:
+    ) -> PydanticBase | dict:
         """
         Load settings from one or more yaml files.
 
@@ -817,7 +817,7 @@ def backfill_settings(settings, backfill):
         settings.pop("include_settings", None)
 
         if validator_class is not None:
-            settings = validator_class.parse_obj(settings)
+            settings = validator_class.model_validate(settings)
 
         if include_stack:
             # if we were called recursively, return an updated list of source_file_paths
diff --git a/activitysim/core/logit.py b/activitysim/core/logit.py
@@ -574,7 +574,7 @@ def each_nest(nest_spec: dict | LogitNestSpec, type=None, post_order=False):
         raise RuntimeError("Unknown nest type '%s' in call to each_nest" % type)
 
     if isinstance(nest_spec, dict):
-        nest_spec = LogitNestSpec.parse_obj(nest_spec)
+        nest_spec = LogitNestSpec.model_validate(nest_spec)
 
     for _node, nest in _each_nest(nest_spec, parent_nest=Nest(), post_order=post_order):
         if type is None or (type == nest.type):
diff --git a/activitysim/core/mp_tasks.py b/activitysim/core/mp_tasks.py
@@ -887,7 +887,6 @@ def setup_injectables_and_logging(injectables, locutor: bool = True) -> workflow
     state = workflow.State()
     state = state.initialize_filesystem(**injectables)
     state.settings = injectables.get("settings", Settings())
-    # state.settings = Settings.parse_obj(injectables.get("settings_package", {}))
 
     # register abm steps and other abm-specific injectables
     # by default, assume we are running activitysim.abm
diff --git a/activitysim/core/simulate.py b/activitysim/core/simulate.py
@@ -467,7 +467,7 @@ def replace_coefficients(nest: LogitNestSpec):
         coefficients = coefficients["value"].to_dict()
 
     if not isinstance(nest_spec, LogitNestSpec):
-        nest_spec = LogitNestSpec.parse_obj(nest_spec)
+        nest_spec = LogitNestSpec.model_validate(nest_spec)
 
     replace_coefficients(nest_spec)
 
diff --git a/activitysim/core/test/test_input.py b/activitysim/core/test/test_input.py
@@ -69,7 +69,7 @@ def test_csv_reader(seed_households, state):
     """
 
     settings = yaml.load(settings_yaml, Loader=yaml.SafeLoader)
-    settings = configuration.Settings.parse_obj(settings)
+    settings = configuration.Settings.model_validate(settings)
     state.settings = settings
 
     hh_file = state.filesystem.get_data_dir()[0].joinpath("households.csv")
@@ -94,7 +94,7 @@ def test_hdf_reader1(seed_households, state):
     """
 
     settings = yaml.load(settings_yaml, Loader=yaml.SafeLoader)
-    settings = configuration.Settings.parse_obj(settings)
+    settings = configuration.Settings.model_validate(settings)
     state.settings = settings
 
     hh_file = state.filesystem.get_data_dir()[0].joinpath("households.h5")
@@ -120,7 +120,7 @@ def test_hdf_reader2(seed_households, state):
     """
 
     settings = yaml.load(settings_yaml, Loader=yaml.SafeLoader)
-    settings = configuration.Settings.parse_obj(settings)
+    settings = configuration.Settings.model_validate(settings)
     state.settings = settings
 
     hh_file = state.filesystem.get_data_dir()[0].joinpath("households.h5")
@@ -145,7 +145,7 @@ def test_hdf_reader3(seed_households, state):
     """
 
     settings = yaml.load(settings_yaml, Loader=yaml.SafeLoader)
-    settings = configuration.Settings.parse_obj(settings)
+    settings = configuration.Settings.model_validate(settings)
     state.settings = settings
 
     hh_file = state.filesystem.get_data_dir()[0].joinpath("input_data.h5")
@@ -169,7 +169,7 @@ def test_missing_filename(seed_households, state):
     """
 
     settings = yaml.load(settings_yaml, Loader=yaml.SafeLoader)
-    settings = configuration.Settings.parse_obj(settings)
+    settings = configuration.Settings.model_validate(settings)
     state.settings = settings
 
     with pytest.raises(AssertionError) as excinfo:
@@ -191,7 +191,7 @@ def test_create_input_store(seed_households, state):
     """
 
     settings = yaml.load(settings_yaml, Loader=yaml.SafeLoader)
-    settings = configuration.Settings.parse_obj(settings)
+    settings = configuration.Settings.model_validate(settings)
     state.settings = settings
 
     hh_file = state.filesystem.get_data_dir()[0].joinpath("households.csv")
diff --git a/activitysim/core/util.py b/activitysim/core/util.py
@@ -443,7 +443,7 @@ def suffix_tables_in_settings(
         model_settings = recursive_replace(model_settings, k, suffix + k)
 
     if model_settings_type is not None:
-        model_settings = model_settings_type.parse_obj(model_settings)
+        model_settings = model_settings_type.model_validate(model_settings)
 
     return model_settings
 
diff --git a/activitysim/core/workflow/state.py b/activitysim/core/workflow/state.py
@@ -437,7 +437,7 @@ def initialize_filesystem(
         if cache_dir is not None:
             fs["cache_dir"] = cache_dir
         try:
-            self.filesystem: FileSystem = FileSystem.parse_obj(fs)
+            self.filesystem: FileSystem = FileSystem.model_validate(fs)
         except Exception as err:
             print(err)
             raise
@@ -485,7 +485,7 @@ def load_settings(self) -> State:
                 logger.warning(f"settings file changes cache_dir to {cache_dir}")
                 self.filesystem.cache_dir = cache_dir
         settings_class = self.__class__.settings.member_type
-        self.settings: Settings = settings_class.parse_obj(raw_settings)
+        self.settings: Settings = settings_class.model_validate(raw_settings)
 
         extra_settings = set(self.settings.__dict__) - set(settings_class.__fields__)
 
diff --git a/conda-environments/activitysim-dev-base.yml b/conda-environments/activitysim-dev-base.yml
@@ -49,7 +49,7 @@ dependencies:
 - psutil = 5.9.*
 - pyarrow = 11.*
 - pycodestyle
-- pydantic = 1.10.*
+- pydantic = 2.6.*
 - pydata-sphinx-theme
 - pyinstrument = 4.4
 - pypyr = 5.8.*
@@ -75,4 +75,4 @@ dependencies:
 - zstandard
 
 - pip:
-  - autodoc_pydantic >=1.9,<2.0
+  - autodoc_pydantic
diff --git a/conda-environments/activitysim-dev.yml b/conda-environments/activitysim-dev.yml
@@ -31,6 +31,7 @@ dependencies:
 - myst-parser  # allows markdown in sphinx
 - nbconvert
 - nbformat
+- nbmake
 - numba = 0.56.*
 - numexpr
 - numpy = 1.23.*
@@ -44,7 +45,7 @@ dependencies:
 - psutil = 5.9.*
 - pyarrow = 11.*
 - pycodestyle
-- pydantic = 1.10.*
+- pydantic = 2.6.*
 - pydata-sphinx-theme
 - pyinstrument = 4.4
 - pypyr = 5.8.*
@@ -71,5 +72,5 @@ dependencies:
 - zstandard
 
 - pip:
-  - autodoc_pydantic >=1.9,<2.0
+  - autodoc_pydantic
   - -e ..
diff --git a/conda-environments/docbuild.yml b/conda-environments/docbuild.yml
@@ -36,7 +36,7 @@ dependencies:
 - platformdirs
 - psutil >= 4.1
 - pyarrow >= 2.0
-- pydantic = 1.10.*
+- pydantic = 2.6.*
 - pypyr >= 5.3
 - pytables >=3.7
 - pytest
@@ -56,5 +56,5 @@ dependencies:
 - zarr
 
 - pip:
-  - autodoc_pydantic >=1.9,<2.0
+  - autodoc_pydantic
   - -e ..
diff --git a/conda-environments/github-actions-tests.yml b/conda-environments/github-actions-tests.yml
@@ -22,7 +22,7 @@ dependencies:
 - platformdirs = 3.2.*
 - psutil = 5.9.*
 - pyarrow = 11.*
-- pydantic = 1.10.*
+- pydantic = 2.6.*
 - pypyr = 5.8.*
 - pytables >= 3.7
 - pytest = 7.2.*
diff --git a/setup.cfg b/setup.cfg
@@ -33,6 +33,7 @@ install_requires =
     platformdirs
     psutil >= 4.1
     pyarrow >= 2.0
+    pydantic >= 2.6
     pypyr >= 5.3
     pyyaml >= 5.1
     requests >= 2.7

Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ def test_load_cached_accessibility():`
`58`	`58`	`settings = state.settings`
`59`	`59`	`input_table_list = settings.input_table_list`
`60`	`60`	`input_table_list.append(`
`61`		`- configuration.InputTable.parse_obj(`
	`61`	`+ configuration.InputTable.model_validate(`
`62`	`62`	`{`
`63`	`63`	`"tablename": "accessibility",`
`64`	`64`	`"filename": "cached_accessibility.csv",`