Pydantic 2#796

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

Merged
jpn-- merged 5 commits into from
Feb 8, 2024
Merged

Pydantic 2 #796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ef0f0a5
update envs for Pydantic 2
jpn-- Feb 8, 2024
2a12e89
need nbmake
jpn-- Feb 8, 2024
2938fec
model_validate not parse_obj
jpn-- Feb 8, 2024
613126e
update test to use pydantic 2
jpn-- Feb 8, 2024
2a72c2f
remove outdated commented code
jpn-- Feb 8, 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
12 changes: 6 additions & 6 deletions .github/workflows/core_tests.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand Down
4 changes: 2 additions & 2 deletions activitysim/abm/models/util/logsums.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion activitysim/abm/tables/shadow_pricing.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion activitysim/abm/test/test_misc/test_load_cached_accessibility.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion activitysim/core/configuration/base.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
4 changes: 2 additions & 2 deletions activitysim/core/configuration/filesystem.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand DownExpand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion activitysim/core/logit.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down
1 change: 0 additions & 1 deletion activitysim/core/mp_tasks.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
2 changes: 1 addition & 1 deletion activitysim/core/simulate.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down
12 changes: 6 additions & 6 deletions activitysim/core/test/test_input.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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:
Expand All@@ -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")
Expand Down
2 changes: 1 addition & 1 deletion activitysim/core/util.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down
4 changes: 2 additions & 2 deletions activitysim/core/workflow/state.py
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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__)

Expand Down
4 changes: 2 additions & 2 deletions conda-environments/activitysim-dev-base.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand All@@ -75,4 +75,4 @@ dependencies:
- zstandard

- pip:
- autodoc_pydantic >=1.9,<2.0
- autodoc_pydantic
5 changes: 3 additions & 2 deletions conda-environments/activitysim-dev.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- nbmake
- numba = 0.56.*
- numexpr
- numpy = 1.23.*
Expand All@@ -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.*
Expand All@@ -71,5 +72,5 @@ dependencies:
- zstandard

- pip:
- autodoc_pydantic >=1.9,<2.0
- autodoc_pydantic
- -e ..
4 changes: 2 additions & 2 deletions conda-environments/docbuild.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -56,5 +56,5 @@ dependencies:
- zarr

- pip:
- autodoc_pydantic >=1.9,<2.0
- autodoc_pydantic
- -e ..
2 changes: 1 addition & 1 deletion conda-environments/github-actions-tests.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand Down
1 change: 1 addition & 0 deletions setup.cfg
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Pydantic 2#796

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

 Merged

jpn--
merged 5 commits into

from

Feb 8, 2024
 Merged


Pydantic 2
#796
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ef0f0a5

update envs for Pydantic 2


jpn-- Feb 8, 2024
2a12e89

need nbmake


jpn-- Feb 8, 2024
2938fec

model_validate not parse_obj


jpn-- Feb 8, 2024
613126e

update test to use pydantic 2


jpn-- Feb 8, 2024
2a72c2f

remove outdated commented code


jpn-- Feb 8, 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


12 changes: 6 additions & 6 deletions
.github/workflows/core_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/abm/models/util/logsums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/tables/shadow_pricing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/configuration/filesystem.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down

1 change: 0 additions & 1 deletion
activitysim/core/mp_tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

12 changes: 6 additions & 6 deletions
activitysim/core/test/test_input.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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:
Expand All@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/util.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/workflow/state.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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__)

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand All@@ -75,4 +75,4 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic

5 changes: 3 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- nbmake
- numba = 0.56.*
- numexpr
- numpy = 1.23.*
Expand All@@ -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.*
Expand All@@ -71,5 +72,5 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -56,5 +56,5 @@ dependencies:
- zarr

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

2 changes: 1 addition & 1 deletion
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand Down

1 change: 1 addition & 0 deletions
setup.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Pydantic 2#796

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

 Merged

jpn--
merged 5 commits into

from

Feb 8, 2024
 Merged


Pydantic 2
#796
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ef0f0a5

update envs for Pydantic 2


jpn-- Feb 8, 2024
2a12e89

need nbmake


jpn-- Feb 8, 2024
2938fec

model_validate not parse_obj


jpn-- Feb 8, 2024
613126e

update test to use pydantic 2


jpn-- Feb 8, 2024
2a72c2f

remove outdated commented code


jpn-- Feb 8, 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


12 changes: 6 additions & 6 deletions
.github/workflows/core_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/abm/models/util/logsums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/tables/shadow_pricing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/configuration/filesystem.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down

1 change: 0 additions & 1 deletion
activitysim/core/mp_tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

12 changes: 6 additions & 6 deletions
activitysim/core/test/test_input.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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:
Expand All@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/util.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/workflow/state.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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__)

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand All@@ -75,4 +75,4 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic

5 changes: 3 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- nbmake
- numba = 0.56.*
- numexpr
- numpy = 1.23.*
Expand All@@ -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.*
Expand All@@ -71,5 +72,5 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -56,5 +56,5 @@ dependencies:
- zarr

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

2 changes: 1 addition & 1 deletion
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand Down

1 change: 1 addition & 0 deletions
setup.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Pydantic 2#796

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

 Merged

jpn--
merged 5 commits into

from

Feb 8, 2024
 Merged


Pydantic 2
#796
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ef0f0a5

update envs for Pydantic 2


jpn-- Feb 8, 2024
2a12e89

need nbmake


jpn-- Feb 8, 2024
2938fec

model_validate not parse_obj


jpn-- Feb 8, 2024
613126e

update test to use pydantic 2


jpn-- Feb 8, 2024
2a72c2f

remove outdated commented code


jpn-- Feb 8, 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


12 changes: 6 additions & 6 deletions
.github/workflows/core_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/abm/models/util/logsums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/tables/shadow_pricing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/configuration/filesystem.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down

1 change: 0 additions & 1 deletion
activitysim/core/mp_tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

12 changes: 6 additions & 6 deletions
activitysim/core/test/test_input.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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:
Expand All@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/util.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/workflow/state.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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__)

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand All@@ -75,4 +75,4 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic

5 changes: 3 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- nbmake
- numba = 0.56.*
- numexpr
- numpy = 1.23.*
Expand All@@ -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.*
Expand All@@ -71,5 +72,5 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -56,5 +56,5 @@ dependencies:
- zarr

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

2 changes: 1 addition & 1 deletion
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand Down

1 change: 1 addition & 0 deletions
setup.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Pydantic 2#796

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

 Merged

jpn--
merged 5 commits into

from

Feb 8, 2024
 Merged


Pydantic 2
#796
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ef0f0a5

update envs for Pydantic 2


jpn-- Feb 8, 2024
2a12e89

need nbmake


jpn-- Feb 8, 2024
2938fec

model_validate not parse_obj


jpn-- Feb 8, 2024
613126e

update test to use pydantic 2


jpn-- Feb 8, 2024
2a72c2f

remove outdated commented code


jpn-- Feb 8, 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


12 changes: 6 additions & 6 deletions
.github/workflows/core_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/abm/models/util/logsums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/tables/shadow_pricing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/configuration/filesystem.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down

1 change: 0 additions & 1 deletion
activitysim/core/mp_tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

12 changes: 6 additions & 6 deletions
activitysim/core/test/test_input.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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:
Expand All@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/util.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/workflow/state.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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__)

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand All@@ -75,4 +75,4 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic

5 changes: 3 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- nbmake
- numba = 0.56.*
- numexpr
- numpy = 1.23.*
Expand All@@ -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.*
Expand All@@ -71,5 +72,5 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -56,5 +56,5 @@ dependencies:
- zarr

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

2 changes: 1 addition & 1 deletion
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand Down

1 change: 1 addition & 0 deletions
setup.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Pydantic 2#796

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

 Merged

jpn--
merged 5 commits into

from

Feb 8, 2024
 Merged


Pydantic 2
#796
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ef0f0a5

update envs for Pydantic 2


jpn-- Feb 8, 2024
2a12e89

need nbmake


jpn-- Feb 8, 2024
2938fec

model_validate not parse_obj


jpn-- Feb 8, 2024
613126e

update test to use pydantic 2


jpn-- Feb 8, 2024
2a72c2f

remove outdated commented code


jpn-- Feb 8, 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


12 changes: 6 additions & 6 deletions
.github/workflows/core_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/abm/models/util/logsums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/tables/shadow_pricing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/configuration/filesystem.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down

1 change: 0 additions & 1 deletion
activitysim/core/mp_tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

12 changes: 6 additions & 6 deletions
activitysim/core/test/test_input.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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:
Expand All@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/util.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/workflow/state.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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__)

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand All@@ -75,4 +75,4 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic

5 changes: 3 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- nbmake
- numba = 0.56.*
- numexpr
- numpy = 1.23.*
Expand All@@ -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.*
Expand All@@ -71,5 +72,5 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -56,5 +56,5 @@ dependencies:
- zarr

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

2 changes: 1 addition & 1 deletion
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand Down

1 change: 1 addition & 0 deletions
setup.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Pydantic 2#796

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

 Merged

jpn--
merged 5 commits into

from

Feb 8, 2024
 Merged


Pydantic 2
#796
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ef0f0a5

update envs for Pydantic 2


jpn-- Feb 8, 2024
2a12e89

need nbmake


jpn-- Feb 8, 2024
2938fec

model_validate not parse_obj


jpn-- Feb 8, 2024
613126e

update test to use pydantic 2


jpn-- Feb 8, 2024
2a72c2f

remove outdated commented code


jpn-- Feb 8, 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


12 changes: 6 additions & 6 deletions
.github/workflows/core_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/abm/models/util/logsums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/tables/shadow_pricing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/configuration/filesystem.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down

1 change: 0 additions & 1 deletion
activitysim/core/mp_tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

12 changes: 6 additions & 6 deletions
activitysim/core/test/test_input.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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:
Expand All@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/util.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/workflow/state.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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__)

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand All@@ -75,4 +75,4 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic

5 changes: 3 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- nbmake
- numba = 0.56.*
- numexpr
- numpy = 1.23.*
Expand All@@ -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.*
Expand All@@ -71,5 +72,5 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -56,5 +56,5 @@ dependencies:
- zarr

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

2 changes: 1 addition & 1 deletion
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand Down

1 change: 1 addition & 0 deletions
setup.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Pydantic 2#796

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

 Merged

jpn--
merged 5 commits into

from

Feb 8, 2024
 Merged


Pydantic 2
#796
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
ef0f0a5

update envs for Pydantic 2


jpn-- Feb 8, 2024
2a12e89

need nbmake


jpn-- Feb 8, 2024
2938fec

model_validate not parse_obj


jpn-- Feb 8, 2024
613126e

update test to use pydantic 2


jpn-- Feb 8, 2024
2a72c2f

remove outdated commented code


jpn-- Feb 8, 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


12 changes: 6 additions & 6 deletions
.github/workflows/core_tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand DownExpand Up@@ -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" \
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/abm/models/util/logsums.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/tables/shadow_pricing.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

2 changes: 1 addition & 1 deletion
activitysim/abm/test/test_misc/test_load_cached_accessibility.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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",
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/configuration/base.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/configuration/filesystem.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.

Expand DownExpand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/logit.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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):
Expand Down

1 change: 0 additions & 1 deletion
activitysim/core/mp_tasks.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/simulate.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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)

Expand Down

12 changes: 6 additions & 6 deletions
activitysim/core/test/test_input.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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")
Expand All@@ -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:
Expand All@@ -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")
Expand Down

2 changes: 1 addition & 1 deletion
activitysim/core/util.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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

Expand Down

4 changes: 2 additions & 2 deletions
activitysim/core/workflow/state.py

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand DownExpand Up@@ -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__)

Expand Down

4 changes: 2 additions & 2 deletions
conda-environments/activitysim-dev-base.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand All@@ -75,4 +75,4 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic

5 changes: 3 additions & 2 deletions
conda-environments/activitysim-dev.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -31,6 +31,7 @@ dependencies:
- myst-parser # allows markdown in sphinx
- nbconvert
- nbformat
- nbmake
- numba = 0.56.*
- numexpr
- numpy = 1.23.*
Expand All@@ -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.*
Expand All@@ -71,5 +72,5 @@ dependencies:
- zstandard

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

4 changes: 2 additions & 2 deletions
conda-environments/docbuild.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -56,5 +56,5 @@ dependencies:
- zarr

- pip:
 - autodoc_pydantic >=1.9,<2.0
 - autodoc_pydantic
 - -e ..

2 changes: 1 addition & 1 deletion
conda-environments/github-actions-tests.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.*
Expand Down

1 change: 1 addition & 0 deletions
setup.cfg

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand Down