zipline_polygon_bundle 0.2.0.dev1__py3-none-any.whl → 0.2.3__py3-none-any.whl

zipline_polygon_bundle/trades.py

@@ -1,29 +1,29 @@
 from .config import PolygonConfig, PARTITION_COLUMN_NAME, to_partition_key
 
-from typing import Iterator, Tuple, Union
+from typing import Iterator, Tuple
 
 import pyarrow as pa
-import pyarrow.dataset as pa_ds
 import pyarrow.compute as pa_compute
 import pyarrow.csv as pa_csv
+import pyarrow.dataset as pa_ds
 import pyarrow.fs as pa_fs
 
 from fsspec.implementations.arrow import ArrowFSWrapper
 
 import os
 import datetime
-import shutil
 
 import numpy as np
 import pandas as pd
-import pandas_ta as ta
 
 
 def trades_schema(raw: bool = False) -> pa.Schema:
     # There is some problem reading the timestamps as timestamps so we have to read as integer then change the schema.
     # Polygon Aggregate flatfile timestamps are in nanoseconds (like trades), not milliseconds as the docs say.
     # I make the timestamp timezone-aware because that's how Unix timestamps work and it may help avoid mistakes.
-    # timestamp_type = pa.timestamp("ns", tz="UTC")
+    # The timezone is America/New_York because that's the US exchanges timezone and the date is a trading day.
+    # timestamp_type = pa.timestamp("ns", tz="America/New_York")
+    # timestamp_type = pa.int64() if raw else pa.timestamp("ns", tz=tz)
     timestamp_type = pa.int64() if raw else pa.timestamp("ns", tz="UTC")
 
     # Polygon price scale is 4 decimal places (i.e. hundredths of a penny), but we'll use 10 because we have precision to spare.
@@ -94,7 +94,7 @@ def cast_strings_to_list(
     return int_list_array
 
 
-def cast_trades(trades):
+def cast_trades(trades) -> pa.Table:
     trades = trades.cast(trades_schema())
     condition_values = cast_strings_to_list(
         trades.column("conditions").combine_chunks()
@@ -102,220 +102,8 @@ def cast_trades(trades):
     return trades.append_column("condition_values", condition_values)
 
 
-def date_to_path(date, ext=".csv.gz"):
-    # return f"{date.year}/{date.month:02}/{date.isoformat()}{ext}"
-    return date.strftime("%Y/%m/%Y-%m-%d") + ext
-
-
-# def convert_to_custom_aggs_file(
-#     config: PolygonConfig,
-#     overwrite: bool,
-#     timestamp: pd.Timestamp,
-#     start_session: pd.Timestamp,
-#     end_session: pd.Timestamp,
-# ):
-#     date = timestamp.to_pydatetime().date()
-#     aggs_date_path = date_to_path(date, ext=".parquet")
-#     aggs_path = f"{config.custom_aggs_dir}/{aggs_date_path}"
-#     # aggs_by_ticker_path = f"{config.custom_aggs_by_ticker_dir}/{aggs_date_path}"
-#     fsspec = ArrowFSWrapper(config.filesystem)
-#     if fsspec.exists(aggs_path) or fsspec.exists(aggs_by_ticker_path):
-#         if overwrite:
-#             if fsspec.exists(aggs_path):
-#                 config.filesystem.delete_file(aggs_path)
-#             if fsspec.exists(aggs_by_ticker_path):
-#                 config.filesystem.delete_file(aggs_by_ticker_path)
-#         else:
-#             if fsspec.exists(aggs_path):
-#                 print(f"SKIPPING: {date=} File exists {aggs_path=}")
-#             if fsspec.exists(aggs_by_ticker_path):
-#                 print(f"SKIPPING: {date=} File exists {aggs_by_ticker_path=}")
-#             return
-#     fsspec.mkdir(fsspec._parent(aggs_path))
-#     fsspec.mkdir(fsspec._parent(aggs_by_ticker_path))
-#     trades_path = f"{config.trades_dir}/{date_to_path(date)}"
-#     if not fsspec.exists(trades_path):
-#         print(f"ERROR: Trades file missing.  Skipping {date=}.  {trades_path=}")
-#         return
-#     print(f"{trades_path=}")
-#     format = pa_ds.CsvFileFormat()
-#     trades_ds = pa_ds.FileSystemDataset.from_paths(
-#         [trades_path],
-#         format=format,
-#         schema=trades_schema(raw=True),
-#         filesystem=config.filesystem,
-#     )
-#     fragments = trades_ds.get_fragments()
-#     fragment = next(fragments)
-#     try:
-#         next(fragments)
-#         print("ERROR: More than one fragment for {path=}")
-#     except StopIteration:
-#         pass
-#     trades = fragment.to_table(schema=trades_ds.schema)
-#     trades = trades.cast(trades_schema())
-#     min_timestamp = pa.compute.min(trades.column("sip_timestamp")).as_py()
-#     max_timestamp = pa.compute.max(trades.column("sip_timestamp")).as_py()
-#     if min_timestamp < start_session:
-#         print(f"ERROR: {min_timestamp=} < {start_session=}")
-#     if max_timestamp >= end_session:
-#         print(f"ERROR: {max_timestamp=} >= {end_session=}")
-#     trades_df = trades.to_pandas()
-#     trades_df["window_start"] = trades_df["sip_timestamp"].dt.floor(aggregate_timedelta)
-#     aggs_df = trades_df.groupby(["ticker", "window_start"]).agg(
-#         open=("price", "first"),
-#         high=("price", "max"),
-#         low=("price", "min"),
-#         close=("price", "last"),
-#         volume=("size", "sum"),
-#     )
-#     aggs_df["transactions"] = trades_df.groupby(["ticker", "window_start"]).size()
-#     aggs_df.reset_index(inplace=True)
-#     aggs_table = pa.Table.from_pandas(aggs_df).select(
-#         [
-#             "ticker",
-#             "volume",
-#             "open",
-#             "close",
-#             "high",
-#             "low",
-#             "window_start",
-#             "transactions",
-#         ]
-#     )
-#     aggs_table = aggs_table.sort_by(
-#         [("ticker", "ascending"), ("window_start", "ascending")]
-#     )
-#     print(f"{aggs_by_ticker_path=}")
-#     pa_parquet.write_table(
-#         table=aggs_table, where=aggs_by_ticker_path, filesystem=to_config.filesystem
-#     )
-#     aggs_table = aggs_table.sort_by(
-#         [("window_start", "ascending"), ("ticker", "ascending")]
-#     )
-#     print(f"{aggs_path=}")
-#     pa_parquet.write_table(
-#         table=aggs_table, where=aggs_path, filesystem=to_config.filesystem
-#     )
-
-
-# def convert_to_custom_aggs(config: PolygonConfig,
-#                             overwrite: bool,
-#                             timestamp: pd.Timestamp,
-#                             start_session: pd.Timestamp,
-#                             end_session: pd.Timestamp):
-#     date = timestamp.to_pydatetime().date()
-#     aggs_date_path = date_to_path(date, ext=".parquet")
-#     aggs_path = f"{config.custom_aggs_dir}/{aggs_date_path}"
-#     # aggs_by_ticker_path = f"{config.custom_aggs_by_ticker_dir}/{aggs_date_path}"
-#     fsspec = ArrowFSWrapper(config.filesystem)
-#     if fsspec.exists(aggs_path) or fsspec.exists(aggs_by_ticker_path):
-#         if overwrite:
-#             if fsspec.exists(aggs_path):
-#                 config.filesystem.delete_file(aggs_path)
-#             if fsspec.exists(aggs_by_ticker_path):
-#                 config.filesystem.delete_file(aggs_by_ticker_path)
-#         else:
-#             if fsspec.exists(aggs_path):
-#                 print(f"SKIPPING: {date=} File exists {aggs_path=}")
-#             if fsspec.exists(aggs_by_ticker_path):
-#                 print(f"SKIPPING: {date=} File exists {aggs_by_ticker_path=}")
-#             return
-#     fsspec.mkdir(fsspec._parent(aggs_path))
-#     fsspec.mkdir(fsspec._parent(aggs_by_ticker_path))
-#     trades_path = f"{config.trades_dir}/{date_to_path(date)}"
-#     if not fsspec.exists(trades_path):
-#         print(f"ERROR: Trades file missing.  Skipping {date=}.  {trades_path=}")
-#         return
-#     print(f"{trades_path=}")
-#     format = pa_ds.CsvFileFormat()
-#     trades_ds = pa_ds.FileSystemDataset.from_paths([trades_path], format=format, schema=trades_schema(raw=True), filesystem=config.filesystem)
-#     fragments = trades_ds.get_fragments()
-#     fragment = next(fragments)
-#     try:
-#         next(fragments)
-#         print("ERROR: More than one fragment for {path=}")
-#     except StopIteration:
-#         pass
-#     trades = fragment.to_table(schema=trades_ds.schema)
-#     trades = trades.cast(trades_schema())
-#     min_timestamp = pa.compute.min(trades.column('sip_timestamp')).as_py()
-#     max_timestamp = pa.compute.max(trades.column('sip_timestamp')).as_py()
-#     if min_timestamp < start_session:
-#         print(f"ERROR: {min_timestamp=} < {start_session=}")
-#     if max_timestamp >= end_session:
-#         print(f"ERROR: {max_timestamp=} >= {end_session=}")
-#     trades_df = trades.to_pandas()
-#     trades_df["window_start"] = trades_df["sip_timestamp"].dt.floor(aggregate_timedelta)
-#     aggs_df = trades_df.groupby(["ticker", "window_start"]).agg(
-#         open=('price', 'first'),
-#         high=('price', 'max'),
-#         low=('price', 'min'),
-#         close=('price', 'last'),
-#         volume=('size', 'sum'),
-#     )
-#     aggs_df['transactions'] = trades_df.groupby(["ticker", "window_start"]).size()
-#     aggs_df.reset_index(inplace=True)
-#     aggs_table = pa.Table.from_pandas(aggs_df).select(['ticker', 'volume', 'open', 'close', 'high', 'low', 'window_start', 'transactions'])
-#     aggs_table = aggs_table.sort_by([('ticker', 'ascending'), ('window_start', 'ascending')])
-#     print(f"{aggs_by_ticker_path=}")
-#     pa_parquet.write_table(table=aggs_table,
-#                            where=aggs_by_ticker_path, filesystem=to_config.filesystem)
-#     aggs_table = aggs_table.sort_by([('window_start', 'ascending'), ('ticker', 'ascending')])
-#     print(f"{aggs_path=}")
-#     pa_parquet.write_table(table=aggs_table,
-#                            where=aggs_path, filesystem=to_config.filesystem)
-#     pa_ds.write_dataset(
-#         generate_batches_from_tables(tables),
-#         schema=schema,
-#         base_dir=by_ticker_aggs_arrow_dir,
-#         partitioning=partitioning,
-#         format="parquet",
-#         existing_data_behavior="overwrite_or_ignore",
-#     )
-
-
-# def generate_csv_trades_tables(
-#     config: PolygonConfig,
-# ) -> Tuple[datetime.date, Iterator[pa.Table]]:
-#     """Generator for trades tables from flatfile CSVs."""
-#     # Use pandas_market_calendars so we can get extended hours.
-#     # NYSE and NASDAQ have extended hours but XNYS does not.
-#     calendar = pandas_market_calendars.get_calendar(config.calendar_name)
-#     schedule = calendar.schedule(start_date=config.start_timestamp, end_date=config.end_timestamp, start="pre", end="post")
-#     for timestamp, session in schedule.iterrows():
-#         date = timestamp.to_pydatetime().date()
-#         trades_csv_path = f"{config.trades_dir}/{date_to_path(date)}"
-#         format = pa_ds.CsvFileFormat()
-#         trades_ds = pa_ds.FileSystemDataset.from_paths([trades_csv_path], format=format, schema=trades_schema(raw=True), filesystem=config.filesystem)
-#         fragments = trades_ds.get_fragments()
-#         fragment = next(fragments)
-#         try:
-#             next(fragments)
-#             print("ERROR: More than one fragment for {path=}")
-#         except StopIteration:
-#             pass
-#         trades = fragment.to_table(schema=trades_ds.schema)
-#         trades = trades.cast(trades_schema())
-#         min_timestamp = pa.compute.min(trades.column('sip_timestamp')).as_py()
-#         max_timestamp = pa.compute.max(trades.column('sip_timestamp')).as_py()
-#         start_session = session['pre']
-#         end_session = session['post']
-#         # print(f"{start_session=} {end_session=}")
-#         # print(f"{min_timestamp=} {max_timestamp=}")
-#         if min_timestamp < start_session:
-#             print(f"ERROR: {min_timestamp=} < {start_session=}")
-#         # The end_session is supposed to be a limit but there are many with trades at that second.
-#         if max_timestamp >= (end_session + pd.Timedelta(seconds=1)):
-#             # print(f"ERROR: {max_timestamp=} >= {end_session=}")
-#             print(f"ERROR: {max_timestamp=} > {end_session+pd.Timedelta(seconds=1)=}")
-#         yield date, trades
-#         del fragment
-#         del fragments
-#         del trades_ds
-
-
 def custom_aggs_schema(raw: bool = False) -> pa.Schema:
+    # timestamp_type = pa.int64() if raw else pa.timestamp("ns", tz=tz)
     timestamp_type = pa.int64() if raw else pa.timestamp("ns", tz="UTC")
     price_type = pa.float64()
     return pa.schema(
@@ -328,9 +116,11 @@ def custom_aggs_schema(raw: bool = False) -> pa.Schema:
             pa.field("low", price_type, nullable=False),
             pa.field("window_start", timestamp_type, nullable=False),
             pa.field("transactions", pa.int64(), nullable=False),
+            pa.field("vwap", price_type, nullable=False),
             pa.field("date", pa.date32(), nullable=False),
             pa.field("year", pa.uint16(), nullable=False),
             pa.field("month", pa.uint8(), nullable=False),
+            pa.field(PARTITION_COLUMN_NAME, pa.string(), nullable=False),
         ]
     )
 
@@ -344,12 +134,12 @@ def custom_aggs_partitioning() -> pa.Schema:
     )
 
 
-def get_custom_aggs_dates(config: PolygonConfig) -> set[datetime.date]:
-    file_info = config.filesystem.get_file_info(config.custom_aggs_dir)
+def get_aggs_dates(config: PolygonConfig) -> set[datetime.date]:
+    file_info = config.filesystem.get_file_info(config.aggs_dir)
     if file_info.type == pa_fs.FileType.NotFound:
         return set()
     aggs_ds = pa_ds.dataset(
-        config.custom_aggs_dir,
+        config.aggs_dir,
         format="parquet",
         schema=custom_aggs_schema(),
         partitioning=custom_aggs_partitioning(),
@@ -366,17 +156,17 @@ def generate_csv_trades_tables(
     config: PolygonConfig, overwrite: bool = False
 ) -> Iterator[Tuple[datetime.date, pa.Table]]:
     """Generator for trades tables from flatfile CSVs."""
-    custom_aggs_dates = set()
+    existing_aggs_dates = set()
     if not overwrite:
-        custom_aggs_dates = get_custom_aggs_dates(config)
+        existing_aggs_dates = get_aggs_dates(config)
     schedule = config.calendar.trading_index(
         start=config.start_timestamp, end=config.end_timestamp, period="1D"
     )
     for timestamp in schedule:
-        date = timestamp.to_pydatetime().date()
-        if date in custom_aggs_dates:
+        date: datetime.date = timestamp.to_pydatetime().date()
+        if date in existing_aggs_dates:
             continue
-        trades_csv_path = f"{config.trades_dir}/{date_to_path(date)}"
+        trades_csv_path = config.date_to_csv_file_path(date)
         convert_options = pa_csv.ConvertOptions(column_types=trades_schema(raw=True))
         trades = pa_csv.read_csv(trades_csv_path, convert_options=convert_options)
         trades = trades.cast(trades_schema())
@@ -402,7 +192,8 @@ def trades_to_custom_aggs(
     table: pa.Table,
     include_trf: bool = False,
 ) -> pa.Table:
-    print(f"{datetime.datetime.now()=} {date=} {pa.default_memory_pool()=}")
+    print(f"{date=} {pa.default_memory_pool()=}")
+    # print(f"{datetime.datetime.now()=} {date=} {pa.default_memory_pool()=}")
     # print(f"{resource.getrusage(resource.RUSAGE_SELF).ru_maxrss=}")
     table = table.filter(pa_compute.greater(table["size"], 0))
     table = table.filter(pa_compute.equal(table["correction"], "0"))
@@ -452,37 +243,25 @@ def trades_to_custom_aggs(
     table = table.append_column(
         "month", pa.array(np.full(len(table), date.month), type=pa.uint8())
     )
+    table = table.append_column(
+        PARTITION_COLUMN_NAME,
+        pa.array(
+            [to_partition_key(ticker) for ticker in table.column("ticker").to_pylist()]
+        ),
+    )
     table = table.sort_by([("window_start", "ascending"), ("ticker", "ascending")])
+    # print(f"aggs {date=} {table.to_pandas().head()=}")
     return table
 
 
-# def generate_custom_agg_batches_from_tables(config: PolygonConfig) -> pa.RecordBatch:
+# def generate_custom_agg_batches_from_tables(config: PolygonConfig):
 #     for date, trades_table in generate_csv_trades_tables(config):
-#         for batch in trades_to_custom_aggs(config, date, trades_table).to_batches():
-#             yield batch
+#         aggs_table = trades_to_custom_aggs(config, date, trades_table)
+#         yield aggs_table
+#         del aggs_table
 #         del trades_table
 
 
-# def generate_custom_agg_tables(config: PolygonConfig) -> pa.Table:
-#     for date, trades_table in generate_csv_trades_tables(config):
-#         yield trades_to_custom_aggs(config, date, trades_table)
-
-
-# def configure_write_custom_aggs_to_dataset(config: PolygonConfig):
-#     def write_custom_aggs_to_dataset(args: Tuple[datetime.date, pa.Table]):
-#         date, table = args
-#         pa_ds.write_dataset(
-#             trades_to_custom_aggs(config, date, table),
-#             filesystem=config.filesystem,
-#             base_dir=config.custom_aggs_dir,
-#             partitioning=custom_aggs_partitioning(),
-#             format="parquet",
-#             existing_data_behavior="overwrite_or_ignore",
-#         )
-
-#     return write_custom_aggs_to_dataset
-
-
 def file_visitor(written_file):
     print(f"{written_file.path=}")
 
@@ -504,26 +283,25 @@ def convert_trades_to_custom_aggs(
     #     generate_custom_agg_batches_from_tables(config),
     #     schema=custom_aggs_schema(),
     #     filesystem=config.filesystem,
-    #     base_dir=config.custom_aggs_dir,
+    #     base_dir=config.aggs_dir,
     #     partitioning=custom_aggs_partitioning(),
     #     format="parquet",
     #     existing_data_behavior="overwrite_or_ignore",
-    #     max_open_files = MAX_FILES_OPEN,
-    #     min_rows_per_group = MIN_ROWS_PER_GROUP,
+    #     # max_open_files = MAX_FILES_OPEN,
+    #     # min_rows_per_group = MIN_ROWS_PER_GROUP,
     # )
 
     for date, trades_table in generate_csv_trades_tables(config):
         aggs_table = trades_to_custom_aggs(config, date, trades_table)
         pa_ds.write_dataset(
             aggs_table,
-            # schema=custom_aggs_schema(),
             filesystem=config.filesystem,
             base_dir=config.aggs_dir,
             partitioning=custom_aggs_partitioning(),
             format="parquet",
             existing_data_behavior="overwrite_or_ignore",
             file_visitor=file_visitor,
-            # max_open_files=MAX_FILES_OPEN,
+            # max_open_files=10,
             # min_rows_per_group=MIN_ROWS_PER_GROUP,
         )
         del aggs_table
@@ -559,386 +337,199 @@ def convert_trades_to_custom_aggs(
 #     return mfi
 
 
-# def generate_custom_agg_tables(
-#     config: PolygonConfig,
-# ) -> Tuple[pa.Schema, Iterator[pa.Table]]:
-#     """zipline does bundle ingestion one ticker at a time."""
-
-#     # Polygon Aggregate flatfile timestamps are in nanoseconds (like trades), not milliseconds as the docs say.
-#     # I make the timestamp timezone-aware because that's how Unix timestamps work and it may help avoid mistakes.
-#     timestamp_type = pa.timestamp("ns", tz="UTC")
-
-#     # But we can't use the timestamp type in the schema here because it's not supported by the CSV reader.
-#     # So we'll use int64 and cast it after reading the CSV file.
-#     # https://github.com/apache/arrow/issues/44030
-
-#     # strptime(3) (used by CSV reader for timestamps in ConvertOptions.timestamp_parsers) supports Unix timestamps (%s) and milliseconds (%f) but not nanoseconds.
-#     # https://www.geeksforgeeks.org/how-to-use-strptime-with-milliseconds-in-python/
-#     # Actually that's the wrong strptime (it's Python's).  C++ strptime(3) doesn't even support %f.
-#     # https://github.com/apache/arrow/issues/39839#issuecomment-1915981816
-#     # Also I don't think you can use those in a format string without a separator.
-
-#     # Polygon price scale is 4 decimal places (i.e. hundredths of a penny), but we'll use 10 because we have precision to spare.
-#     # price_type = pa.decimal128(precision=38, scale=10)
-#     # 64bit float a little overkill but avoids any plausible truncation error.
-#     price_type = pa.float64()
-
-#     custom_aggs_schema = pa.schema(
-#         [
-#             pa.field("ticker", pa.string(), nullable=False),
-#             pa.field("volume", pa.int64(), nullable=False),
-#             pa.field("open", price_type, nullable=False),
-#             pa.field("close", price_type, nullable=False),
-#             pa.field("high", price_type, nullable=False),
-#             pa.field("low", price_type, nullable=False),
-#             pa.field("window_start", timestamp_type, nullable=False),
-#             pa.field("transactions", pa.int64(), nullable=False),
-#             pa.field(PARTITION_COLUMN_NAME, pa.string(), nullable=False),
-#         ]
-#     )
+def get_by_ticker_aggs_dates(config: PolygonConfig) -> set[datetime.date]:
+    file_info = config.filesystem.get_file_info(config.by_ticker_aggs_arrow_dir)
+    if file_info.type == pa_fs.FileType.NotFound:
+        return set()
+    by_ticker_aggs_ds = pa_ds.dataset(
+        config.by_ticker_aggs_arrow_dir,
+        format="parquet",
+        schema=custom_aggs_schema(),
+        partitioning=custom_aggs_partitioning(),
+    )
+    return set(
+        [
+            pa_ds.get_partition_keys(fragment.partition_expression).get("date")
+            for fragment in by_ticker_aggs_ds.get_fragments()
+        ]
+    )
 
-#     # TODO: Use generator like os.walk for paths.
-#     return (
-#         custom_aggs_schema,
-#         generate_tables_from_custom_aggs(
-#             paths=config.csv_paths(),
-#             schema=custom_aggs_schema,
-#             start_timestamp=config.start_timestamp,
-#             limit_timestamp=config.end_timestamp + pd.to_timedelta(1, unit="day"),
-#         ),
-#     )
 
-# def get_custom_aggs_dates(config: PolygonConfig) -> set[datetime.date]:
-#     file_info = config.filesystem.get_file_info(config.custom_aggs_dir)
-#     if file_info.type == pa_fs.FileType.NotFound:
-#         return set()
-#     aggs_ds = pa_ds.dataset(
-#         config.custom_aggs_dir,
-#         format="parquet",
-#         schema=custom_aggs_schema(),
-#         partitioning=custom_aggs_partitioning(),
-#     )
-#     return set(
-#         [
-#             pa_ds.get_partition_keys(fragment.partition_expression).get("date")
-#             for fragment in aggs_ds.get_fragments()
-#         ]
-#     )
+def batches_for_date(aggs_ds: pa_ds.Dataset, date: pd.Timestamp):
+    date_filter_expr = (
+        (pa_compute.field("year") == date.year)
+        & (pa_compute.field("month") == date.month)
+        & (pa_compute.field("date") == date.date())
+    )
+    print(f"table for {date=}")
+    # return aggs_ds.scanner(filter=date_filter_expr).to_batches()
+    table = aggs_ds.scanner(filter=date_filter_expr).to_table()
+    table = table.sort_by([("part", "ascending"), ("ticker", "ascending"), ("window_start", "ascending"), ])
+    return table.to_batches()
 
 
-def generate_batches_from_custom_aggs_ds(
-    aggs_ds: pa_ds.Dataset, schedule: pd.DatetimeIndex
-) -> Iterator[pa.RecordBatch]:
+def generate_batches_for_schedule(config, aggs_ds):
+    schedule = config.calendar.trading_index(
+        start=config.start_timestamp, end=config.end_timestamp, period="1D"
+    )
     for timestamp in schedule:
-        date = timestamp.to_pydatetime().date()
-        date_filter_expr = (
-            (pa_compute.field("year") == date.year)
-            & (pa_compute.field("month") == date.month)
-            & (pa_compute.field("date") == date)
-        )
-        for batch in aggs_ds.to_batches(filter=date_filter_expr):
-            # TODO: Check that these rows are within range for this file's date (not just the whole session).
-            # And if we're doing that (figuring date for each file), we can just skip reading the file.
-            # Might able to do a single comparison using compute.days_between.
-            # https://arrow.apache.org/docs/python/generated/pyarrow.compute.days_between.html
-            batch = batch.append_column(
-                PARTITION_COLUMN_NAME,
-                pa.array(
-                    [
-                        to_partition_key(ticker)
-                        for ticker in batch.column("ticker").to_pylist()
-                    ]
-                ),
-            )
-            yield batch
+        # print(f"{timestamp=}")
+        yield from batches_for_date(aggs_ds=aggs_ds, date=timestamp)
+
+
+# def scatter_custom_aggs_to_by_ticker(
+#     config: PolygonConfig,
+#     overwrite: bool = False,
+# ) -> str:
+#     lock = FileLock(config.lock_file_path, blocking=False)
+#     with lock:
+#         if not lock.is_locked:
+#             raise IOError("Failed to acquire lock for updating custom assets.")
+#         with open(config.by_ticker_dates_path, "a") as f:
+#             f.write("I have a bad feeling about this.")
+#             by_ticker_aggs_arrow_dir = scatter_custom_aggs_to_by_ticker_(config, overwrite)
+
+#             print(f"Scattered custom aggregates by ticker to {by_ticker_aggs_arrow_dir=}")
+#             return by_ticker_aggs_arrow_dir
+
+
+def filter_by_date(config: PolygonConfig) -> pa_compute.Expression:
+    start_date = config.start_timestamp.tz_localize(config.calendar.tz.key).date()
+    limit_date = (
+        (config.end_timestamp + pd.Timedelta(days=1))
+        .tz_localize(config.calendar.tz.key)
+        .date()
+    )
+    return (pa_compute.field("date") >= start_date) & (
+        pa_compute.field("date") <= limit_date
+    )
 
 
-def scatter_custom_aggs_to_by_ticker(
+# def generate_batches_with_partition(
+#     config: PolygonConfig,
+#     aggs_ds: pa_ds.Dataset,
+# ) -> Iterator[pa.Table]:
+#     for fragment in aggs_ds.sort_by("date").get_fragments(
+#         filter=filter_by_date(config),
+#     ):
+#         for batch in fragment.to_batches():
+#             # batch = batch.append_column(
+#             #     PARTITION_COLUMN_NAME,
+#             #     pa.array(
+#             #         [
+#             #             to_partition_key(ticker)
+#             #             for ticker in batch.column("ticker").to_pylist()
+#             #         ]
+#             #     ),
+#             # )
+#             yield batch.sort_by(
+#                 [("ticker", "ascending"), ("window_start", "ascending")]
+#             )
+#             del batch
+#         del fragment
+
+
+def generate_batches_with_partition(
     config: PolygonConfig,
-    overwrite: bool = False,
-) -> str:
-    file_info = config.filesystem.get_file_info(config.custom_aggs_dir)
-    if file_info.type == pa_fs.FileType.NotFound:
-        raise FileNotFoundError(f"{config.custom_aggs_dir=} not found.")
+    aggs_ds: pa_ds.Dataset,
+) -> Iterator[pa.Table]:
+    for fragment in (
+        aggs_ds.filter(filter_by_date(config))
+        .sort_by([(PARTITION_COLUMN_NAME, "ascending"), ("date", "ascending")])
+        .get_fragments()
+    ):
+        for batch in fragment.to_batches():
+            yield batch.sort_by(
+                [("ticker", "ascending"), ("window_start", "ascending")]
+            )
+            del batch
+        del fragment
 
-    by_ticker_aggs_arrow_dir = config.by_ticker_aggs_arrow_dir
-    if os.path.exists(by_ticker_aggs_arrow_dir):
-        if overwrite:
-            print(f"Removing {by_ticker_aggs_arrow_dir=}")
-            shutil.rmtree(by_ticker_aggs_arrow_dir)
-        else:
-            print(f"Found existing {by_ticker_aggs_arrow_dir=}")
-            return by_ticker_aggs_arrow_dir
 
+def scatter_custom_aggs_to_by_ticker(config, overwrite=False) -> str:
     aggs_ds = pa_ds.dataset(
-        config.custom_aggs_dir,
+        config.aggs_dir,
         format="parquet",
         schema=custom_aggs_schema(),
         partitioning=custom_aggs_partitioning(),
     )
-    schedule = config.calendar.trading_index(
-        start=config.start_timestamp, end=config.end_timestamp, period="1D"
-    )
-    assert type(schedule) is pd.DatetimeIndex
+    by_ticker_schema = aggs_ds.schema
     partitioning = pa_ds.partitioning(
-        pa.schema([(PARTITION_COLUMN_NAME, pa.string())]), flavor="hive"
+        pa.schema([(PARTITION_COLUMN_NAME, pa.string())]),
+        flavor="hive",
     )
-    schema = aggs_ds.schema
-    schema = schema.append(pa.field(PARTITION_COLUMN_NAME, pa.string(), nullable=False))
-
+    by_ticker_aggs_arrow_dir = config.by_ticker_aggs_arrow_dir
+    print(f"Scattering custom aggregates by ticker to {by_ticker_aggs_arrow_dir=}")
     pa_ds.write_dataset(
-        generate_batches_from_custom_aggs_ds(aggs_ds, schedule),
-        schema=schema,
+        # generate_batches_with_partition(config=config, aggs_ds=aggs_ds),
+        generate_batches_for_schedule(config=config, aggs_ds=aggs_ds),
+        schema=by_ticker_schema,
         base_dir=by_ticker_aggs_arrow_dir,
         partitioning=partitioning,
         format="parquet",
         existing_data_behavior="overwrite_or_ignore",
     )
-    print(f"Scattered custom aggregates by ticker to {by_ticker_aggs_arrow_dir=}")
+    print(f"Scattered aggregates by ticker to {by_ticker_aggs_arrow_dir=}")
     return by_ticker_aggs_arrow_dir
 
 
-def calculate_mfi(typical_price: pd.Series, money_flow: pd.Series, period: int):
-    mf_sign = np.where(typical_price > np.roll(typical_price, shift=1), 1, -1)
-    signed_mf = money_flow * mf_sign
-
-    # Calculate gain and loss using vectorized operations
-    positive_mf = np.maximum(signed_mf, 0)
-    negative_mf = np.maximum(-signed_mf, 0)
-
-    mf_avg_gain = (
-        np.convolve(positive_mf, np.ones(period), mode="full")[: len(positive_mf)]
-        / period
-    )
-    mf_avg_loss = (
-        np.convolve(negative_mf, np.ones(period), mode="full")[: len(negative_mf)]
-        / period
-    )
-
-    epsilon = 1e-10  # Small epsilon value to avoid division by zero
-    mfi = 100 - (100 / (1 + mf_avg_gain / (mf_avg_loss + epsilon)))
-    return mfi
-
-
-# https://github.com/twopirllc/pandas-ta/blob/main/pandas_ta/momentum/stoch.py
-# https://github.com/twopirllc/pandas-ta/blob/development/pandas_ta/momentum/stoch.py
-# `k` vs `fast_k` arg names.
-# https://github.com/twopirllc/pandas-ta/issues/726
-# Results affected by values outside range
-# https://github.com/twopirllc/pandas-ta/issues/535
-
-
-def calculate_stoch(
-    high: pd.Series,
-    low: pd.Series,
-    close: pd.Series,
-    k: int = 14,
-    d: int = 3,
-    smooth_k: int = 3,
-    mamode: str = "sma",
-):
-    """Indicator: Stochastic Oscillator (STOCH)"""
-    lowest_low = low.rolling(k).min()
-    highest_high = high.rolling(k).max()
+# def scatter_custom_aggs_to_by_ticker(config, overwrite=False) -> str:
+#     file_info = config.filesystem.get_file_info(config.aggs_dir)
+#     if file_info.type == pa_fs.FileType.NotFound:
+#         raise FileNotFoundError(f"{config.aggs_dir=} not found.")
 
-    stoch = 100 * (close - lowest_low)
-    stoch /= ta.utils.non_zero_range(highest_high, lowest_low)
+#     by_ticker_aggs_arrow_dir = config.by_ticker_aggs_arrow_dir
+#     if os.path.exists(by_ticker_aggs_arrow_dir):
+#         if overwrite:
+#             print(f"Removing {by_ticker_aggs_arrow_dir=}")
+#             shutil.rmtree(by_ticker_aggs_arrow_dir)
 
-    stoch_k = ta.overlap.ma(
-        mamode, stoch.loc[stoch.first_valid_index() :,], length=smooth_k
-    )
-    stoch_d = (
-        ta.overlap.ma(mamode, stoch_k.loc[stoch_k.first_valid_index() :,], length=d)
-        if stoch_k is not None
-        else None
-    )
-    # Histogram
-    stoch_h = stoch_k - stoch_d if stoch_d is not None else None
+#     schedule = config.calendar.trading_index(
+#         start=config.start_timestamp, end=config.end_timestamp, period="1D"
+#     )
+#     assert type(schedule) is pd.DatetimeIndex
 
-    return stoch_k, stoch_d, stoch_h
+#     print(f"Scattering custom aggregates by ticker to {by_ticker_aggs_arrow_dir=}")
+#     aggs_ds = pa_ds.dataset(
+#         config.aggs_dir,
+#         format="parquet",
+#         schema=custom_aggs_schema(),
+#         partitioning=custom_aggs_partitioning(),
+#     )
+#     by_ticker_partitioning = pa_ds.partitioning(
+#         pa.schema([(PARTITION_COLUMN_NAME, pa.string())]),
+#         # pa.schema(
+#         #     [
+#         #         (PARTITION_COLUMN_NAME, pa.string()),
+#         #         ("year", pa.uint16()),
+#         #         ("month", pa.uint8()),
+#         #         ("date", pa.date32()),
+#         #     ]
+#         # ),
+#         flavor="hive",
+#     )
+#     by_ticker_schema = custom_aggs_schema()
+#     by_ticker_schema = by_ticker_schema.append(
+#         pa.field(PARTITION_COLUMN_NAME, pa.string(), nullable=False),
+#     )
 
+#     # TODO: Collect the dates we've scattered and write a special partition key with them.
+#     pa_ds.write_dataset(
+#         generate_batches_for_schedule(schedule, aggs_ds),
+#         schema=by_ticker_schema,
+#         base_dir=by_ticker_aggs_arrow_dir,
+#         partitioning=by_ticker_partitioning,
+#         format="parquet",
+#         existing_data_behavior="overwrite_or_ignore",
+#         # max_open_files=250,
+#         # file_visitor=file_visitor,
+#     )
 
-def compute_per_ticker_signals(df: pd.DataFrame, period: int = 14) -> pd.DataFrame:
-    df = df.set_index("window_start").sort_index()
-    session_index = pd.date_range(
-        start=df.index[0], end=df.index[-1], freq=pd.Timedelta(seconds=60)
-    )
-    df = df.reindex(session_index)
-    df.index.rename("window_start", inplace=True)
-
-    # df["minute_of_day"] = (df.index.hour * 60) + df.index.minute
-    # df["day_of_week"] = df.index.day_of_week
-
-    df.transactions = df.transactions.fillna(0)
-    df.volume = df.volume.fillna(0)
-    df.total = df.total.fillna(0)
-    df.close = df.close.ffill()
-    close = df.close
-    df.vwap = df.vwap.fillna(close)
-    df.high = df.high.fillna(close)
-    df.low = df.low.fillna(close)
-    df.open = df.open.fillna(close)
-    price_open = df.open
-    high = df.high
-    low = df.low
-    vwap = df.vwap
-    # volume = df.volume
-    total = df.total
-    next_close = close.shift()
-
-    # TODO: Odometer rollover signal.  Relative difference to nearest power of 10.
-    # Something about log10 being a whole number?  When is $50 the rollover vs $100 or $10?
-
-    # "True (Typical?) Price" which I think is an approximation of VWAP.
-    # Trouble with both is that if there are no trades in a bar we get NaN.
-    # That then means we get NaN for averages for the next period-1 bars too.
-    # Question is whether to ffill the price for these calculations.
-    df["TP"] = (high + low + close) / 3
-
-    # Gain/loss in this bar.
-    df["ret1bar"] = close.div(price_open).sub(1)
-
-    for t in range(2, period):
-        df[f"ret{t}bar"] = close.div(price_open.shift(t - 1)).sub(1)
-
-    # Average True Range (ATR)
-    true_range = pd.concat(
-        [high.sub(low), high.sub(next_close).abs(), low.sub(next_close).abs()], axis=1
-    ).max(1)
-    # Normalized ATR (NATR) or Average of Normalized TR.
-    # Choice of NATR operations ordering discussion: https://www.macroption.com/normalized-atr/
-    # He doesn't talk about VWAP but I think that is a better normalizing price for a bar.
-    # atr = true_range.ewm(span=period).mean()
-    # df["natr_c"] = atr / close
-    # df["antr_c"] = (true_range / close).ewm(span=period).mean()
-    # df["natr_v"] = atr / vwap
-    # df["antr_v"] = (true_range / vwap).ewm(span=period).mean()
-    df["NATR"] = (true_range / vwap).ewm(span=period).mean()
-
-    # True Price as HLC average VS VWAP.
-    # VWAP is better I think but is quite different than standard CCI.
-    # Three ways to compute CCI, all give the same value using TP.
-    # tp = (high + low + close) / 3
-    # df['SMA'] = ta.sma(tp, length=period)
-    # df['sma_r'] = tp.rolling(period).mean()
-    # df['MAD'] = ta.mad(tp, length=period)
-    # # Series.mad deprecated. mad = (s - s.mean()).abs().mean()
-    # df['mad_r'] = tp.rolling(period).apply(lambda x: (pd.Series(x) - pd.Series(x).mean()).abs().mean())
-
-    # df['cci_r'] = (tp - df['sma_r']) / (0.015 * df['mad_r'])
-    # df['CCI'] = (tp - df['SMA']) / (0.015 * df['MAD'])
-    # df['cci_ta'] = ta.cci(high=high, low=low, close=close, length=period)
-
-    df["taCCI"] = ta.cci(high=high, low=low, close=close, length=period)
-
-    # https://gist.github.com/quantra-go-algo/1b37bfb74d69148f0dfbdb5a2c7bdb25
-    # https://medium.com/@huzaifazahoor654/how-to-calculate-cci-in-python-a-step-by-step-guide-9a3f61698be6
-    sma = pd.Series(ta.sma(vwap, length=period))
-    mad = pd.Series(ta.mad(vwap, length=period))
-    df["CCI"] = (vwap - sma) / (0.015 * mad)
-
-    # df['MFI'] = calculate_mfi(high=high, low=low, close=close, volume=volume, period=period)
-    df["MFI"] = calculate_mfi(typical_price=vwap, money_flow=total, period=period)
-
-    # We use Stochastic (rather than MACD because we need a ticker independent indicator.
-    # IOW a percentage price oscillator (PPO) rather than absolute price oscillator (APO).
-    # https://www.alpharithms.com/moving-average-convergence-divergence-macd-031217/
-    # We're using 14/3 currently rather than the usual 26/12 popular for MACD though.
-    stoch_k, stoch_d, stoch_h = calculate_stoch(high, low, close, k=period)
-    df["STOCHk"] = stoch_k
-    df["STOCHd"] = stoch_d
-    df["STOCHh"] = stoch_h
-
-    return df
-
-
-def iterate_all_aggs_tables(
-    config: PolygonConfig,
-    valid_tickers: pa.Array,
-):
-    schedule = config.calendar.trading_index(
-        start=config.start_timestamp, end=config.end_timestamp, period="1D"
-    )
-    for timestamp in schedule:
-        date = timestamp.to_pydatetime().date()
-        aggs_ds = pa_ds.dataset(
-            config.custom_aggs_dir,
-            format="parquet",
-            schema=custom_aggs_schema(),
-            partitioning=custom_aggs_partitioning(),
-        )
-        date_filter_expr = (
-            (pa_compute.field("year") == date.year)
-            & (pa_compute.field("month") == date.month)
-            & (pa_compute.field("date") == date)
-        )
-        # print(f"{date_filter_expr=}")
-        for fragment in aggs_ds.get_fragments(filter=date_filter_expr):
-            session_filter = (
-                (pa_compute.field("window_start") >= start_dt)
-                & (pa_compute.field("window_start") < end_dt)
-                & pa_compute.is_in(pa_compute.field("ticker"), valid_tickers)
-            )
-            # Sorting table doesn't seem to avoid needing to sort the df.  Maybe use_threads=False on to_pandas would help?
-            # table = fragment.to_table(filter=session_filter).sort_by([('ticker', 'ascending'), ('window_start', 'descending')])
-            table = fragment.to_table(filter=session_filter)
-            if table.num_rows > 0:
-                metadata = (
-                    dict(table.schema.metadata) if table.schema.metadata else dict()
-                )
-                metadata["date"] = date.isoformat()
-                table = table.replace_schema_metadata(metadata)
-                yield table
-
-
-# def iterate_all_aggs_with_signals(config: PolygonConfig):
-#     for table in iterate_all_aggs_tables(config):
-#         df = table.to_pandas()
-#         df = df.groupby("ticker").apply(
-#             compute_per_ticker_signals, include_groups=False
-#         )
-#         yield pa.Table.from_pandas(df)
-
-
-def compute_signals_for_all_custom_aggs(
-    from_config: PolygonConfig,
-    to_config: PolygonConfig,
-    valid_tickers: pa.Array,
-    overwrite: bool = False,
-) -> str:
-    if overwrite:
-        print("WARNING: overwrite not implemented/ignored.")
+#     return by_ticker_aggs_arrow_dir
 
-    print(f"{to_config.custom_aggs_dir=}")
 
-    for aggs_table in iterate_all_aggs_tables(from_config, valid_tickers):
-        metadata = aggs_table.schema.metadata
-        date = datetime.date.fromisoformat(metadata[b"date"].decode("utf-8"))
-        print(f"{date=}")
-        df = aggs_table.to_pandas()
-        df = df.groupby("ticker").apply(
-            compute_per_ticker_signals, include_groups=False
-        )
-        table = pa.Table.from_pandas(df)
-        if table.num_rows > 0:
-            table = table.replace_schema_metadata(metadata)
-            table = table.append_column("date", pa.array(np.full(len(table), date)))
-            table = table.append_column(
-                "year", pa.array(np.full(len(table), date.year), type=pa.uint16())
-            )
-            table = table.append_column(
-                "month", pa.array(np.full(len(table), date.month), type=pa.uint8())
-            )
-            table = table.sort_by(
-                [("ticker", "ascending"), ("window_start", "ascending")]
-            )
-            pa_ds.write_dataset(
-                table,
-                filesystem=to_config.filesystem,
-                base_dir=to_config.custom_aggs_dir,
-                partitioning=custom_aggs_partitioning(),
-                format="parquet",
-                existing_data_behavior="overwrite_or_ignore",
-                file_visitor=file_visitor,
-            )
-    return to_config.custom_aggs_dir
+# def generate_tables_from_custom_aggs_ds(
+#     aggs_ds: pa_ds.Dataset, schedule: pd.DatetimeIndex
+# ):
+#     for timestamp in schedule:
+#         yield table_for_date(aggs_ds=aggs_ds, date=timestamp.to_pydatetime().date())