Spaces:
Running
Running
File size: 15,961 Bytes
f381be8 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 | """
Patch notebooks 04-09 for v2:
- Replace battery-grouped split with intra-battery chronological split
- Update import lines to include get_version_paths
- Update artifact save/load paths to use v2 directories
"""
import json
import re
from pathlib import Path
NB_DIR = Path(__file__).resolve().parent.parent / "notebooks"
# ββββββββββββββββββββββββββββ helpers ββββββββββββββββββββββββββββ
def load_nb(name):
with open(NB_DIR / name, encoding="utf-8") as f:
return json.load(f)
def save_nb(nb, name):
with open(NB_DIR / name, "w", encoding="utf-8") as f:
json.dump(nb, f, indent=1, ensure_ascii=False)
print(f" β Saved {name}")
def get_code_cells(nb):
return [(i, c) for i, c in enumerate(nb["cells"]) if c["cell_type"] == "code"]
def set_source(cell, new_src):
"""Replace cell source, splitting into line-per-element list."""
lines = new_src.split("\n")
cell["source"] = [l + "\n" for l in lines[:-1]] + [lines[-1]]
def src(cell):
return "".join(cell["source"])
# ββββββββββββ v2 intra-battery split (sequence version) ββββββββββββ
V2_SPLIT_SEQ = """\
# ββ v2: intra-battery chronological split ββ
# For each battery, first 80% of sequences β train, last 20% β test
train_idx, test_idx = [], []
for bid in np.unique(bids):
idxs = np.where(bids == bid)[0]
n = len(idxs)
cut = int(0.8 * n)
train_idx.extend(idxs[:cut].tolist())
test_idx.extend(idxs[cut:].tolist())
train_idx = np.array(train_idx)
test_idx = np.array(test_idx)
X_train, y_train = X_multi[train_idx], y_multi[train_idx]
X_test, y_test = X_multi[test_idx], y_multi[test_idx]
print(f"Train: {X_train.shape[0]} | Test: {X_test.shape[0]} | Batteries in both: {len(np.unique(bids))}")"""
# ββββββββββββββββββββββββββββ NB 04 ββββββββββββββββββββββββββββ
def patch_04():
print("Patching 04_lstm_rnn.ipynb ...")
nb = load_nb("04_lstm_rnn.ipynb")
cc = get_code_cells(nb)
# Cell 0: imports β add get_version_paths, ensure_version_dirs
s = src(cc[0][1])
s = s.replace(
"from src.utils.config import (\n ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR,",
"from src.utils.config import (\n ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR,\n get_version_paths, ensure_version_dirs,"
)
# Add v2 paths setup at end
s += "\n\n# v2 paths\nv2 = get_version_paths('v2')\nensure_version_dirs('v2')"
set_source(cc[0][1], s)
# Cell 1: replace battery-grouped split with intra-battery chrono split
s = src(cc[1][1])
# Replace everything between "# Battery-grouped split" and the scaler code
old_split = """# Battery-grouped split
unique_bids = np.unique(bids)
rng = np.random.RandomState(42)
rng.shuffle(unique_bids)
n_train = int(0.8 * len(unique_bids))
train_bats = set(unique_bids[:n_train])
test_bats = set(unique_bids[n_train:])
train_mask = np.isin(bids, list(train_bats))
test_mask = np.isin(bids, list(test_bats))
X_train, y_train = X_multi[train_mask], y_multi[train_mask]
X_test, y_test = X_multi[test_mask], y_multi[test_mask]
print(f"Train: {X_train.shape[0]} | Test: {X_test.shape[0]}")"""
s = s.replace(old_split, V2_SPLIT_SEQ)
set_source(cc[1][1], s)
# Cell 2: model save path
s = src(cc[2][1])
s = s.replace(
'MODELS_DIR / "deep" / f"{name.lower().replace(\' \', \'_\')}.pt"',
'v2["models_deep"] / f"{name.lower().replace(\' \', \'_\')}.pt"'
)
set_source(cc[2][1], s)
# Cells 3,4,5: save_fig β add v2 figures dir via FIGURES_DIR override
for idx in [3, 4, 5]:
s = src(cc[idx][1])
s = s.replace('save_fig(fig, "', 'save_fig(fig, "v2_')
set_source(cc[idx][1], s)
# Cell 6: results save path
s = src(cc[6][1])
s = s.replace(
'ARTIFACTS_DIR / "lstm_soh_results.csv"',
'v2["results"] / "v2_lstm_soh_results.csv"'
)
s = s.replace(
'Saved to artifacts/lstm_soh_results.csv',
'Saved to v2 results'
)
set_source(cc[6][1], s)
save_nb(nb, "04_lstm_rnn.ipynb")
# ββββββββββββββββββββββββββββ NB 05 ββββββββββββββββββββββββββββ
def patch_05():
print("Patching 05_transformer.ipynb ...")
nb = load_nb("05_transformer.ipynb")
cc = get_code_cells(nb)
# Cell 0: imports
s = src(cc[0][1])
s = s.replace(
"from src.utils.config import (\n ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR,",
"from src.utils.config import (\n ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR,\n get_version_paths, ensure_version_dirs,"
)
s += "\n\n# v2 paths\nv2 = get_version_paths('v2')\nensure_version_dirs('v2')"
set_source(cc[0][1], s)
# Cell 1: data + split
s = src(cc[1][1])
old_split = """# Battery-grouped split
unique_bids = np.unique(bids)
rng = np.random.RandomState(42)
rng.shuffle(unique_bids)
n_train = int(0.8 * len(unique_bids))
train_bats = set(unique_bids[:n_train])
test_bats = set(unique_bids[n_train:])
train_mask = np.isin(bids, list(train_bats))
test_mask = np.isin(bids, list(test_bats))
X_train, y_train = X_multi[train_mask], y_multi[train_mask]
X_test, y_test = X_multi[test_mask], y_multi[test_mask]
print(f"Train: {X_train.shape[0]} | Test: {X_test.shape[0]}")"""
s = s.replace(old_split, V2_SPLIT_SEQ)
set_source(cc[1][1], s)
# Cell 2: BatteryGPT save
s = src(cc[2][1])
s = s.replace('MODELS_DIR / "deep" / "batterygpt.pt"', 'v2["models_deep"] / "batterygpt.pt"')
set_source(cc[2][1], s)
# Cell 3: TFT save
s = src(cc[3][1])
s = s.replace('MODELS_DIR / "deep" / "tft.pt"', 'v2["models_deep"] / "tft.pt"')
set_source(cc[3][1], s)
# Cell 4: iTransformer save
s = src(cc[4][1])
s = s.replace('MODELS_DIR / "deep" / "itransformer.keras"', 'v2["models_deep"] / "itransformer.keras"')
set_source(cc[4][1], s)
# Cell 5: Physics iTransformer save
s = src(cc[5][1])
s = s.replace('MODELS_DIR / "deep" / "physics_itransformer.keras"', 'v2["models_deep"] / "physics_itransformer.keras"')
set_source(cc[5][1], s)
# Cell 6: save_fig calls
s = src(cc[6][1])
s = s.replace('save_fig(fig, "', 'save_fig(fig, "v2_')
set_source(cc[6][1], s)
# Cell 7: results save
s = src(cc[7][1])
s = s.replace('ARTIFACTS_DIR / "transformer_soh_results.csv"', 'v2["results"] / "v2_transformer_soh_results.csv"')
set_source(cc[7][1], s)
save_nb(nb, "05_transformer.ipynb")
# ββββββββββββββββββββββββββββ NB 06 ββββββββββββββββββββββββββββ
def patch_06():
print("Patching 06_dynamic_graph.ipynb ...")
nb = load_nb("06_dynamic_graph.ipynb")
cc = get_code_cells(nb)
# Cell 0: imports
s = src(cc[0][1])
s = s.replace(
"from src.utils.config import (\n ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR,",
"from src.utils.config import (\n ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR,\n get_version_paths, ensure_version_dirs,"
)
s += "\n\n# v2 paths\nv2 = get_version_paths('v2')\nensure_version_dirs('v2')"
set_source(cc[0][1], s)
# Cell 1: data + split
s = src(cc[1][1])
old_split = """# Battery-grouped split
unique_bids = np.unique(bids)
rng = np.random.RandomState(42)
rng.shuffle(unique_bids)
n_train = int(0.8 * len(unique_bids))
train_bats = set(unique_bids[:n_train])
test_bats = set(unique_bids[n_train:])
train_mask = np.isin(bids, list(train_bats))
test_mask = np.isin(bids, list(test_bats))
X_train, y_train = X_multi[train_mask], y_multi[train_mask]
X_test, y_test = X_multi[test_mask], y_multi[test_mask]
print(f"Train: {X_train.shape[0]} | Test: {X_test.shape[0]}")"""
s = s.replace(old_split, V2_SPLIT_SEQ)
set_source(cc[1][1], s)
# Cell 4: model save
s = src(cc[4][1])
s = s.replace('MODELS_DIR / "deep" / "dynamic_graph_itransformer.keras"',
'v2["models_deep"] / "dynamic_graph_itransformer.keras"')
set_source(cc[4][1], s)
# Cells 5,6,7: save_fig
for idx in [5, 6, 7]:
s = src(cc[idx][1])
s = s.replace('save_fig(fig, "', 'save_fig(fig, "v2_')
set_source(cc[idx][1], s)
# Cell 7: results json save
s = src(cc[7][1])
s = s.replace('ARTIFACTS_DIR / "dg_itransformer_results.json"',
'v2["results"] / "v2_dg_itransformer_results.json"')
set_source(cc[7][1], s)
save_nb(nb, "06_dynamic_graph.ipynb")
# ββββββββββββββββββββββββββββ NB 07 ββββββββββββββββββββββββββββ
def patch_07():
print("Patching 07_vae_lstm.ipynb ...")
nb = load_nb("07_vae_lstm.ipynb")
cc = get_code_cells(nb)
# Cell 0: imports
s = src(cc[0][1])
s = s.replace(
"from src.utils.config import (\n ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR,",
"from src.utils.config import (\n ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR,\n get_version_paths, ensure_version_dirs,"
)
s += "\n\n# v2 paths\nv2 = get_version_paths('v2')\nensure_version_dirs('v2')"
set_source(cc[0][1], s)
# Cell 1: data + split
s = src(cc[1][1])
old_split = """# Battery-grouped split
unique_bids = np.unique(bids)
rng = np.random.RandomState(42)
rng.shuffle(unique_bids)
n_train = int(0.8 * len(unique_bids))
train_bats = set(unique_bids[:n_train])
test_bats = set(unique_bids[n_train:])
train_mask = np.isin(bids, list(train_bats))
test_mask = np.isin(bids, list(test_bats))
X_train, y_train = X_multi[train_mask], y_multi[train_mask]
X_test, y_test = X_multi[test_mask], y_multi[test_mask]
print(f"Train: {X_train.shape[0]} | Test: {X_test.shape[0]}")"""
s = s.replace(old_split, V2_SPLIT_SEQ)
set_source(cc[1][1], s)
# Cell 2: model save
s = src(cc[2][1])
s = s.replace('MODELS_DIR / "deep" / "vae_lstm.pt"', 'v2["models_deep"] / "vae_lstm.pt"')
set_source(cc[2][1], s)
# Cells 4,5,6: save_fig
for idx in [4, 5, 6]:
s = src(cc[idx][1])
s = s.replace('save_fig(fig, "', 'save_fig(fig, "v2_')
set_source(cc[idx][1], s)
# Cell 6: results json save
s = src(cc[6][1])
s = s.replace('ARTIFACTS_DIR / "vae_lstm_results.json"',
'v2["results"] / "v2_vae_lstm_results.json"')
set_source(cc[6][1], s)
save_nb(nb, "07_vae_lstm.ipynb")
# ββββββββββββββββββββββββββββ NB 08 ββββββββββββββββββββββββββββ
def patch_08():
print("Patching 08_ensemble.ipynb ...")
nb = load_nb("08_ensemble.ipynb")
cc = get_code_cells(nb)
# Cell 0: imports
s = src(cc[0][1])
s = s.replace(
"from src.utils.config import ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR",
"from src.utils.config import ARTIFACTS_DIR, FIGURES_DIR, MODELS_DIR, get_version_paths, ensure_version_dirs"
)
s += "\n\n# v2 paths\nv2 = get_version_paths('v2')\nensure_version_dirs('v2')"
set_source(cc[0][1], s)
# Cell 1: data + split
s = src(cc[1][1])
old_split = """# Battery-grouped split
unique_bids = np.unique(bids)
rng = np.random.RandomState(42)
rng.shuffle(unique_bids)
n_train = int(0.8 * len(unique_bids))
train_bats = set(unique_bids[:n_train])
test_bats = set(unique_bids[n_train:])
train_mask = np.isin(bids, list(train_bats))
test_mask = np.isin(bids, list(test_bats))
X_train, y_train = X_multi[train_mask], y_multi[train_mask]
X_test, y_test = X_multi[test_mask], y_multi[test_mask]
print(f"Train: {X_train.shape[0]} | Test: {X_test.shape[0]}")"""
s = s.replace(old_split, V2_SPLIT_SEQ)
set_source(cc[1][1], s)
# Cell 2: model loading paths β load from v2 deep models
s = src(cc[2][1])
s = s.replace('MODELS_DIR / "deep" / f"{name}.pt"', 'v2["models_deep"] / f"{name}.pt"')
set_source(cc[2][1], s)
# Cells 4,5,6: save_fig
for idx in [4, 5, 6]:
s = src(cc[idx][1])
s = s.replace('save_fig(fig, "', 'save_fig(fig, "v2_')
set_source(cc[idx][1], s)
# Cell 5: results save
s = src(cc[5][1])
s = s.replace('ARTIFACTS_DIR / "ensemble_results.csv"',
'v2["results"] / "v2_ensemble_results.csv"')
set_source(cc[5][1], s)
save_nb(nb, "08_ensemble.ipynb")
# ββββββββββββββββββββββββββββ NB 09 ββββββββββββββββββββββββββββ
def patch_09():
print("Patching 09_evaluation.ipynb ...")
nb = load_nb("09_evaluation.ipynb")
cc = get_code_cells(nb)
# Cell 0: imports
s = src(cc[0][1])
s = s.replace(
"from src.utils.config import ARTIFACTS_DIR, FIGURES_DIR",
"from src.utils.config import ARTIFACTS_DIR, FIGURES_DIR, get_version_paths"
)
s += "\n\n# v2 paths\nv2 = get_version_paths('v2')"
set_source(cc[0][1], s)
# Cell 1: result loading paths β v2
s = src(cc[1][1])
s = s.replace('ARTIFACTS_DIR / "classical_soh_results.csv"',
'v2["results"] / "v2_classical_soh_results.csv"')
s = s.replace('ARTIFACTS_DIR / "lstm_soh_results.csv"',
'v2["results"] / "v2_lstm_soh_results.csv"')
s = s.replace('ARTIFACTS_DIR / "transformer_soh_results.csv"',
'v2["results"] / "v2_transformer_soh_results.csv"')
s = s.replace('ARTIFACTS_DIR / "dg_itransformer_results.json"',
'v2["results"] / "v2_dg_itransformer_results.json"')
s = s.replace('ARTIFACTS_DIR / "vae_lstm_results.json"',
'v2["results"] / "v2_vae_lstm_results.json"')
s = s.replace('ARTIFACTS_DIR / "ensemble_results.csv"',
'v2["results"] / "v2_ensemble_results.csv"')
set_source(cc[1][1], s)
# Cell 2: unified results save
s = src(cc[2][1])
s = s.replace('ARTIFACTS_DIR / "unified_results.csv"',
'v2["results"] / "v2_unified_results.csv"')
set_source(cc[2][1], s)
# Cell 3: save_fig
s = src(cc[3][1])
s = s.replace('save_fig(fig, "', 'save_fig(fig, "v2_')
set_source(cc[3][1], s)
# Cell 5: CED split β replace battery-grouped with chrono split
s = src(cc[5][1])
old_split_09 = """unique_bids = np.unique(bids)
rng = np.random.RandomState(42)
rng.shuffle(unique_bids)
n_train = int(0.8 * len(unique_bids))
train_bats = set(unique_bids[:n_train])
test_mask = ~np.isin(bids, list(train_bats))
y_test = y_all[test_mask]
bids_test = bids[test_mask]"""
new_split_09 = """# v2: intra-battery chronological split for CED
test_idx = []
for bid in np.unique(bids):
idxs = np.where(bids == bid)[0]
cut = int(0.8 * len(idxs))
test_idx.extend(idxs[cut:].tolist())
test_idx = np.array(test_idx)
y_test = y_all[test_idx]
bids_test = bids[test_idx]"""
s = s.replace(old_split_09, new_split_09)
# Also update save_fig if present
s = s.replace('save_fig(fig, "', 'save_fig(fig, "v2_')
set_source(cc[5][1], s)
# Cell 7: final rankings save
s = src(cc[7][1])
s = s.replace('ARTIFACTS_DIR / "final_rankings.csv"',
'v2["results"] / "v2_final_rankings.csv"')
set_source(cc[7][1], s)
save_nb(nb, "09_evaluation.ipynb")
# ββββββββββββββββββββββββββββ main ββββββββββββββββββββββββββββ
if __name__ == "__main__":
patch_04()
patch_05()
patch_06()
patch_07()
patch_08()
patch_09()
print("\nAll 6 notebooks patched for v2!")
|