disagg acc doesn't crash but different results

activitysim/abm/models/disaggregate_accessibility.py

@@ -49,12 +49,12 @@ class DisaggregateAccessibilityAnnotateSettings(PydanticReadable, extra="forbid"
 
 
 class DisaggregateAccessibilitySettings(PydanticReadable, extra="forbid"):
-    suffixes: DisaggregateAccessibilitySuffixes = {"SUFFIX": None, "ROOTS": []}
+    suffixes: DisaggregateAccessibilitySuffixes = DisaggregateAccessibilitySuffixes()
     ORIGIN_SAMPLE_SIZE: int | float = 0
     DESTINATION_SAMPLE_SIZE: int | float = 0
     BASE_RANDOM_SEED: int = 0
     add_size_tables: bool = True
-    zone_id_names: dict[str, str] = {}
+    zone_id_names: dict[str, str] = {"index_col": "zone_id"}
     ORIGIN_SAMPLE_METHOD: Literal[
         None, "full", "uniform", "uniform-taz", "kmeans"
     ] = None
@@ -589,7 +589,7 @@ def annotate_tables(self, state: workflow.State):
                 df=df,
                 model_settings={
                     **annot.annotate.dict(),
-                    **self.model_settings.suffixes,
+                    **self.model_settings.suffixes.dict(),
                 },
                 trace_label=tracing.extend_trace_label("ProtoPop.annotate", tablename),
             )

activitysim/core/util.py

@@ -20,6 +20,7 @@
 import pyarrow.csv as csv
 import pyarrow.parquet as pq
 import yaml
+from pydantic import BaseModel
 
 logger = logging.getLogger(__name__)
 
@@ -466,6 +467,10 @@ def parse_suffix_args(args):
 
 
 def concat_suffix_dict(args):
+    if isinstance(args, BaseModel):
+        args = args.dict()
+        if "source_file_paths" in args:
+            del args["source_file_paths"]
     if isinstance(args, dict):
         args = sum([["--" + k, v] for k, v in args.items()], [])
     if isinstance(args, list):