chore: sync upstream OpenBB-finance/OpenBB develop (10 commits, 2 conflicts resolved) - #895
Open
prajoria wants to merge 11 commits into
Open
chore: sync upstream OpenBB-finance/OpenBB develop (10 commits, 2 conflicts resolved)#895prajoria wants to merge 11 commits into
prajoria wants to merge 11 commits into
Conversation
…Tag 6-K in XBRL Facts (OpenBB-finance#7547) * fix period detection in 40-F filers that only tag 6-K in XBRL * clean up comment * black
…nance#7531) * bump minimum version of fastapi to get starlette > 1 * fix test fixture broken by newer version of vitest * another round of lock file syncs * need to pin fastapi until breaking changes in 0.137 can be dealt with * relock cli * cli needs to run openbb-build before running test suite * wrong solution, cli needs fastapi pin until handled. revert nox
…OpenBB-finance#7563) Co-authored-by: dhruvv16-hash <200462256+dhruvv16-hash@users.noreply.github.com>
…sion for Loans/Credit Losses) (OpenBB-finance#7572) * fix IFRS financial template to catch new provisions for credit/loans tags and correct the order of items in the income statement * cash flow shuffle * version bump * move none check up in detect block * black
Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: Danglewood <85772166+deeleeramone@users.noreply.github.com>
* add handling for XOM's new CIK and populating results including the legacy * update a couple of lock files for dependabot
… of Clippy - useless_borrows_in_formatting (OpenBB-finance#7590)
Merge upstream/develop into fork's develop. 10 upstream commits integrated; 2 conflicts resolved. ## Upstream commits integrated - ebee248 fix desktop Clippy useless_borrows_in_formatting (OpenBB-finance#7590) - c78488d [BugFix] openbb-sec: Handle XOM's CIK Transition (OpenBB-finance#7588) - 1c74893 docs: fix apps.json provider docstrings (OpenBB-finance#7568) - 1f1ebdd [BugFix] openbb-sec: Fix IFRS Mapping in Financials Template (OpenBB-finance#7572) - 52a446c fix(platform): resolve openbb + openbb-core packaging file conflict (OpenBB-finance#7563) - 1a7cb61 update lock files for devtools, charting, desktop (OpenBB-finance#7553) - f6ad868 fix app startup event (OpenBB-finance#7554) <-- overlaps with our #874 - 3160a84 [Release] openbb-core: Pin FastAPI to 0.136.3 (OpenBB-finance#7531) - f04f2fc fix nasdaq app startup event (OpenBB-finance#7532) - d0acbd2 [BugFix] openbb-sec: Fix Period Detection in 40-F Filers (OpenBB-finance#7547) ## Conflict resolutions ### openbb_platform/providers/cftc/openbb_cftc/cftc_router.py Best-of-both merge: - KEPT fork's try/except graceful-degrade around build_choices() so upstream 503 doesn't crash uvicorn startup (from PR #882 / #874) - KEPT fork's ERROR logging + empty COT_CHOICES fallback - ACCEPTED upstream's getattr fallback fields for label/value/ subcategory/commodity_name (safer against schema drift) - ACCEPTED upstream's `router.api_router.lifespan_context = _cot_router_lifespan` (the newer FastAPI lifespan pattern, replacing the deprecated add_event_handler("startup", ...) that upstream also had) - Regression tests from PR #882 (test_cftc_router_startup.py) still pass on the merged code: 2 passed. ### openbb_platform/pyproject.toml - KEPT fork's `python = ">=3.10,<3.14"` (NOT upstream's `<4`). Rationale: 6 fork extensions (backtest, financialtoolkit, fmp_trading, portfolio, techtrade, fmp_cached) all pin `<3.14`; taking upstream's `<4` would trip Poetry's solver and break `python dev_install.py -e`. Guarded by `test_no_subpackage_narrower_than_platform` from PR #483. - ACCEPTED upstream's `openbb-core = "^1.6.13"` (was `^1.6.10`). Matches in-tree core/pyproject.toml version (1.6.13). ## Verification - test_python_constraint_regression.py: 2 passed - test_pyproject_toml.py: 2 passed - test_cftc_router_startup.py: 2 passed - cftc_router imports cleanly Co-Authored-By: Claude <noreply@anthropic.com>
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
4 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.
Pulls in 10 upstream commits from
OpenBB-finance/OpenBB@develop. Ranges: SEC bugfixes, CFTC/nasdaq startup lifespan modernization, FastAPI pin to 0.136.3, packaging conflict resolution, lock-file bumps.Upstream commits merged
Conflict resolutions
1.
providers/cftc/openbb_cftc/cftc_router.py— best-of-bothBoth fork (PR #882 / #874) and upstream (OpenBB-finance#7554) touched this file. Merged so:
try/exceptaroundbuild_choices()— prevents upstream 503 from killing uvicorn startupCOT_CHOICESfallbackgetattr(d, 'name', '').strip()defensive extraction (safer vs schema drift)router.api_router.lifespan_context = _cot_router_lifespan(modern FastAPI lifespan pattern replacing deprecatedadd_event_handler("startup", ...))Regression tests from PR #882 (
test_cftc_router_startup.py) still pass on the merged code — verified 2/2 green.2.
openbb_platform/pyproject.tomlpython = ">=3.10,<3.14"— NOT upstream's<4. Six fork extensions (backtest, financialtoolkit, fmp_trading, portfolio, techtrade, fmp_cached) all pin<3.14; taking upstream's<4would break the Poetry solver anddev_install.py -e. Guarded bytest_no_subpackage_narrower_than_platformfrom PR fix(platform): narrow python range to <3.14 to unblock dev_install.py -e #483.openbb-core = "^1.6.13"(was^1.6.10) — matches in-treecore/pyproject.tomlversion.Verification
test_python_constraint_regression.pytest_pyproject_toml.pytest_cftc_router_startup.py(my #874 regression tests)from openbb_cftc.cftc_router import build_choicesFiles changed (auto-merged, no review needed)
Lock files: cli, cookiecutter, core, and ~25 extension/provider poetry.lock files (upstream FastAPI 0.136.3 pin + transitive updates).
Desktop: package-lock.json, package.json, tauri startup.rs Clippy fix, tests/setup.ts.
SEC: income_statement/growth models, statement_schema updates, company_facts XOM CIK transition handling.
🤖 Generated with Claude Code