Sync: absorb allan-fork prod commits (baseline look-ahead fix, agent editor) + conflict resolution#73
Merged
Merged
Conversation
…stream main Reconciles the diverged prod branch (Allan-Feng/AgenticTrading@main) with Open-Finance-Lab main (PR #71 lifecycle fixes + PR #72 Claude leaderboard entries). Conflict resolutions: - backtest.db (binary): took allan-fork's DB (baselines recomputed with the reference_start_date look-ahead fix) and re-injected the two verified Claude contest runs (161 equity points each) via SQL. - alpaca_bars.py: kept PR #71's MarketDataUnavailableError contract (raise on missing creds/SDK, no silent disabled-loader state); preserved Allan's AlpacaCredentialsError as a subclass so both exception names work. - baseline_generator.py: union of both sides' imports; strategies._common import made lazy to break the circular import baseline_generator -> strategies/__init__ -> buy_hold -> baseline_generator. Full backend suite green on the merged tree: 843 passed / 0 failed. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01SVGFyxaNN4VPyAxn2hgsiu
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Prod (Render) deploys from
Allan-Feng/AgenticTrading@main, which diverged from this repo's main today: Allan pushed the baseline look-ahead fix (reference_start_date) + agent-editor UI directly to his fork while PR #71/#72 merged here. This PR reconciles both lines so main is a superset and Allan's fork can sync cleanly.Conflict resolutions
MarketDataUnavailableErrorraise-on-construct contract kept; Allan'sAlpacaCredentialsErrorpreserved as a subclass (both exception names work; no silent disabled-loader state).strategies._commonimport made lazy to break a circular import Allan's fork carries latently (baseline_generator → strategies/__init__ → buy_hold → baseline_generator).Verification
Full backend suite on the merged tree: 843 passed / 0 failed.
🤖 Generated with Claude Code
https://claude.ai/code/session_01SVGFyxaNN4VPyAxn2hgsiu