generated from mathias/template-go-web
feat(multipair): G10 multi-pair pipeline + USE_MULTIPAIR knob (Option C)
- prepare_hourly.py: parameterize PAIR env var; OUT_DEFAULT per-pair; load_m1_from_zips(pair=)
- prepare_multipair.py: inner-join 5-pair hourly parquets on datetime → wide parquet
cols: datetime, {pair}_ret, {pair}_rv × n_pairs; eurusd_rv = target
- fetch_multipair.py: download GBPUSD/USDJPY/USDCHF/AUDUSD M1 2008-2023 from histdata
- train.py: USE_MULTIPAIR knob (JEPA_USE_MULTIPAIR=1); build() reads multipair parquet
with n_channels = n_pairs × 2; target = eurusd_rv
- Taskfile: data:fetch:multipair, data:prepare:pair, data:prepare:multipair, data:test updated
- 7 new tests in test_multipair.py; 34/35 pass (1 SKIP until multipair parquet built)
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,48 @@
|
||||
"""Fetch G10 FX M1 data from histdata.com for all pairs except EURUSD (already fetched).
|
||||
|
||||
Each pair's zips go into data/raw/{pair}/ to avoid collisions.
|
||||
Output: data/raw/gbpusd/DAT_ASCII_GBPUSD_M1_YYYY.zip etc.
|
||||
|
||||
python scripts/fetch_multipair.py
|
||||
PAIRS=gbpusd,usdjpy YEARS=2020,2021 python scripts/fetch_multipair.py
|
||||
"""
|
||||
import os
|
||||
import time
|
||||
|
||||
from histdata import download_hist_data
|
||||
from histdata.api import Platform as P, TimeFrame as T
|
||||
|
||||
PAIRS_DEFAULT = ["gbpusd", "usdjpy", "usdchf", "audusd"]
|
||||
YEARS_DEFAULT = list(range(2008, 2024))
|
||||
|
||||
|
||||
def main():
|
||||
pairs_env = os.environ.get("PAIRS", "")
|
||||
pairs = [p.strip() for p in pairs_env.split(",")] if pairs_env else PAIRS_DEFAULT
|
||||
|
||||
years_env = os.environ.get("YEARS", "")
|
||||
years = [int(y.strip()) for y in years_env.split(",")] if years_env else YEARS_DEFAULT
|
||||
|
||||
for pair in pairs:
|
||||
out_dir = f"data/raw/{pair}"
|
||||
os.makedirs(out_dir, exist_ok=True)
|
||||
print(f"\n=== {pair.upper()} ===")
|
||||
for yr in years:
|
||||
out_path = os.path.join(out_dir, f"DAT_ASCII_{pair.upper()}_M1_{yr}.zip")
|
||||
if os.path.exists(out_path):
|
||||
print(f" {yr} already present, skip")
|
||||
continue
|
||||
try:
|
||||
f = download_hist_data(
|
||||
year=str(yr), month=None, pair=pair,
|
||||
platform=P.GENERIC_ASCII, time_frame=T.ONE_MINUTE,
|
||||
output_directory=out_dir,
|
||||
)
|
||||
print(f" fetched {yr} → {f}")
|
||||
except Exception as e:
|
||||
print(f" {yr} FAILED: {e}")
|
||||
time.sleep(2)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
@@ -18,8 +18,9 @@ import zipfile
|
||||
import numpy as np
|
||||
import pandas as pd
|
||||
|
||||
PAIR = os.environ.get("PAIR", "EURUSD").upper()
|
||||
RAW_DEFAULT = "data/raw"
|
||||
OUT_DEFAULT = "data/processed/eurusd_hourly.parquet"
|
||||
OUT_DEFAULT = f"data/processed/{PAIR.lower()}_hourly.parquet"
|
||||
MIN_BARS = 30 # drop hours thinner than this (holidays, DST boundary artefacts)
|
||||
|
||||
|
||||
@@ -70,9 +71,10 @@ def resample_to_hourly(m1: pd.DataFrame) -> pd.DataFrame:
|
||||
return agg[cols]
|
||||
|
||||
|
||||
def load_m1_from_zips(raw_dir: str) -> pd.DataFrame:
|
||||
def load_m1_from_zips(raw_dir: str, pair: str = None) -> pd.DataFrame:
|
||||
"""Load and concatenate all M1 zips from raw_dir (histdata format)."""
|
||||
pattern = os.path.join(raw_dir, "DAT_ASCII_EURUSD_M1_*.zip")
|
||||
p = (pair or PAIR).upper()
|
||||
pattern = os.path.join(raw_dir, f"DAT_ASCII_{p}_M1_*.zip")
|
||||
zips = sorted(glob.glob(pattern))
|
||||
if not zips:
|
||||
raise FileNotFoundError(f"No M1 zips found at {pattern}")
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
"""Merge per-pair hourly parquets into a single wide multipair parquet.
|
||||
|
||||
Each pair contributes two features: {pair}_ret and {pair}_rv (realized vol).
|
||||
The merge is an INNER JOIN on datetime — only hours present in ALL pairs are kept.
|
||||
The target for train.py remains eurusd_rv.
|
||||
|
||||
Output: data/processed/eurusd_multipair.parquet
|
||||
|
||||
python scripts/prepare_multipair.py
|
||||
PROCESSED=data/processed python scripts/prepare_multipair.py
|
||||
"""
|
||||
import os
|
||||
import pandas as pd
|
||||
|
||||
PAIRS = ["eurusd", "gbpusd", "usdjpy", "usdchf", "audusd"]
|
||||
|
||||
PROCESSED_DEFAULT = "data/processed"
|
||||
OUT_DEFAULT = "data/processed/eurusd_multipair.parquet"
|
||||
|
||||
|
||||
def merge_pair_parquets(pair_dfs: dict) -> pd.DataFrame:
|
||||
"""Inner-join hourly DataFrames from multiple pairs on datetime.
|
||||
|
||||
Args:
|
||||
pair_dfs: dict mapping pair name (e.g. "eurusd") to hourly DataFrame
|
||||
with columns [datetime, close, ret, realized_vol, ...].
|
||||
Returns:
|
||||
Wide DataFrame with columns:
|
||||
datetime, {pair}_ret, {pair}_rv for each pair.
|
||||
"""
|
||||
merged = None
|
||||
for pair, df in pair_dfs.items():
|
||||
sub = df[["datetime", "ret", "realized_vol"]].copy()
|
||||
sub = sub.rename(columns={"ret": f"{pair}_ret", "realized_vol": f"{pair}_rv"})
|
||||
sub = sub.set_index("datetime")
|
||||
if merged is None:
|
||||
merged = sub
|
||||
else:
|
||||
merged = merged.join(sub, how="inner")
|
||||
|
||||
return merged.reset_index()
|
||||
|
||||
|
||||
def build_multipair_parquet(
|
||||
processed_dir: str = PROCESSED_DEFAULT,
|
||||
out_path: str = OUT_DEFAULT,
|
||||
pairs: list = None,
|
||||
) -> None:
|
||||
if pairs is None:
|
||||
pairs = PAIRS
|
||||
pair_dfs = {}
|
||||
for pair in pairs:
|
||||
path = os.path.join(processed_dir, f"{pair}_hourly.parquet")
|
||||
if not os.path.exists(path):
|
||||
raise FileNotFoundError(
|
||||
f"{pair}_hourly.parquet not found at {path} — run prepare_hourly.py for this pair first"
|
||||
)
|
||||
df = pd.read_parquet(path)
|
||||
pair_dfs[pair] = df
|
||||
|
||||
merged = merge_pair_parquets(pair_dfs)
|
||||
merged.to_parquet(out_path, index=False)
|
||||
n_pairs = len(pairs)
|
||||
n_ch = n_pairs * 2
|
||||
print(f"Multipair parquet: {len(merged):,} rows × {n_ch} feature channels ({n_pairs} pairs)")
|
||||
print(f"Date range: {merged['datetime'].min()} → {merged['datetime'].max()}")
|
||||
print(f"Written: {out_path}")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
processed_dir = os.environ.get("PROCESSED", PROCESSED_DEFAULT)
|
||||
build_multipair_parquet(processed_dir=processed_dir)
|
||||
Reference in New Issue
Block a user