Skip to content

Commit 9c3e8a3

Browse files
authored
Make DataSignal construction more flexible (#1303)
1 parent 1a3493a commit 9c3e8a3

File tree

1 file changed

+3
-3
lines changed
  • src/server/endpoints/covidcast_utils

1 file changed

+3
-3
lines changed

src/server/endpoints/covidcast_utils/model.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from dataclasses import asdict, dataclass, field
1+
from dataclasses import asdict, dataclass, field, fields
22
from typing import Callable, Optional, Dict, List, Set, Tuple
33
from enum import Enum
44
from pathlib import Path
@@ -210,8 +210,8 @@ def _load_data_signals(sources: List[DataSource]):
210210
data_signals_df: pd.DataFrame = pd.read_csv(_base_dir / "db_signals.csv")
211211
data_signals_df = data_signals_df.replace({np.nan: None})
212212
data_signals_df.columns = map(_clean_column, data_signals_df.columns)
213-
ignore_columns = {"base_is_other"}
214-
data_signals: List[DataSignal] = [DataSignal(**{k: v for k, v in d.items() if k not in ignore_columns}) for d in data_signals_df.to_dict(orient="records")]
213+
datasignal_fields = {f.name for f in fields(DataSignal)}
214+
data_signals: List[DataSignal] = [DataSignal(**{k: v for k, v in d.items() if k in datasignal_fields}) for d in data_signals_df.to_dict(orient="records")]
215215
data_signals_df.set_index(["source", "signal"])
216216

217217
by_source_id = {d.key: d for d in data_signals}

0 commit comments

Comments
 (0)