Repository navigation
fix(timezone): treat zoneinfo's ValueError as an unknown timezone - #1026
Open
lihongyuan99 wants to merge 1 commit into
Open
lihongyuan99 wants to merge 1 commit into
lihongyuan99 wants to merge 1 commit into
Conversation
lihongyuan99
force-pushed
the
fix/zoneinfo-valueerror-not-a-timezone
branch
5 times, most recently
from
September 29, 2026 23:23
cc99fb0 to
594d338
Compare
lihongyuan99
force-pushed
the
fix/zoneinfo-valueerror-not-a-timezone
branch
5 times, most recently
from
October 5, 2026 23:14
ceb0e4e to
a1868e0
Compare
lihongyuan99
force-pushed
the
fix/zoneinfo-valueerror-not-a-timezone
branch
3 times, most recently
from
October 14, 2026 23:18
8d9a06a to
255fca5
Compare
The timezone helpers that fall back to UTC / to a 400 only catch
ZoneInfoNotFoundError, which is a KeyError subclass. zoneinfo raises
plain ValueError for keys it refuses to resolve at all -- absolute
paths, "./" or ".." segments -- so a value like /etc/localtime or
./Asia/Shanghai escaped instead:
- PATCH /api/preferences returned 500 rather than the "timezone must
be a valid IANA timezone" the same block raises for BAD_ZONE
- /status (slash formatting), the usage .xlsx export and the
proactive-care scheduler lost their documented UTC fallback
Widen each of those four catches. The same narrow catch also sits in
infra/db/repos/usage.py:_zoneinfo, left alone because TencentCloud#986 is changing
that file.
lihongyuan99
force-pushed
the
fix/zoneinfo-valueerror-not-a-timezone
branch
from
October 15, 2026 23:15
255fca5 to
597dcbd
Compare
This branch has not been deployed
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
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
Several timezone helpers implement a fallback — "unknown zone → UTC" or "unknown zone → 400" — but only catch
ZoneInfoNotFoundError. That is aKeyErrorsubclass;zoneinforaises a plainValueErrorfor keys it refuses to resolve at all (absolute paths,./or..segments — seezoneinfo/_tzpath.py::_validate_tzfile_path), so those values escape the fallback:src/octop/api/routers/preferences.py:198—PATCH /api/preferences {"timezone": "/etc/localtime"}dies withValueError: ZoneInfo keys may not be absolute pathsinstead of theOctopError(SLASH_BAD_ARGS, "timezone must be a valid IANA timezone")the very same block raises forBAD_ZONE.src/octop/infra/gateway/slash/formatting.py:14—config.default_timezoneis never validated (config.py:607only doesstr(merged.get(...) or "Asia/Shanghai")), so a path-shaped value raises out of the slash/historyhandler (composite.py:167→format_unix_datetime).src/octop/api/common/usage_xlsx.py:30— same, breaksGET /api/usage/export.xlsx(api/routers/usage.py:63readsconfig.default_timezone).src/octop/infra/proactive/scheduler.py:129,393— same, raises inside the proactive-care loop./etc/localtimeis the canonical tzif path on Linux, and the config field is free-form text, so an operator who copies the host path intodefault_timezonegets a crash instead of the fallback the code already implements.Fix: widen the four catches. Behavior for valid zones and for genuinely-missing zone names is unchanged — only the keys that previously crashed now take the fallback that is already written there.
infra/db/repos/usage.py:66-70has the identical narrow catch, and it is whatGET /api/usage/summaryhits throughapi/routers/usage.py:83— so that route keeps crashing on a path-shaped zone. Left alone on purpose because #986 is rewriting that file right now; happy to follow up once it lands.Heads-up on overlap: #604 also edits
patch_preferences, but its last hunk ends at pre-change line 147 and this one is at 156, so the two diffs do not touch the same lines.Target branch
develop(feature / fix — default)main(release/*orhotfix/*only)Type of change
Test plan
Red first on the rebased base: with this branch's tests and
develop@4667bd7b's four sourcefiles (fix temporarily reverted), the same exception escapes each fallback:
Green with the fix, plus the neighbouring file:
Backend gates, re-run after rebasing onto
develop@4667bd7b(equivalent to the CI steps;make allitself was not run — this clone has no dashboardnode_modules, so the build stepit chains cannot run here):
Full suite, same command, base commit vs this branch:
tests/livewas not run; no model API key or PostgreSQL was needed.Checklist
CHANGELOG.md(if user-facing)Rebased onto
develop@ded7adddon 2026-09-30.1.0.2b4and1.0.2b5both shipped since the previous base, and each release commit folded the whole## [Unreleased]list into a version block, which emptied that section ondevelop— it is this branch's only conflict. The resolution keepsdevelop'sCHANGELOG.mdverbatim and re-inserts this PR's single bullet under a fresh### 修复; the rest of the patch is unchanged.Everything below was re-measured on
develop@ded7addd. Backend gates were run by hand, as the equivalents of the CI steps (make lint/make typecheck/make test);make allwas not used because this clone has nodashboard/node_modules.uv run pytest -q tests/integration/test_preferences_api.py tests/unit/gateway/test_slash_history.py tests/unit/proactive/test_scheduler.py tests/unit/api/test_usage_xlsx.py->4 failed, 30 passed in 5.81s34 passed in 6.18suv run ruff check src tests->All checks passed!;uv run ruff format --check src tests->1112 files already formatteduv run mypy src/octop->Success: no issues found in 543 source filesuv run pytest -q -m "not live" -n 6-> 3955 passed, 17 skipped, 1 failed in 214.82s, against 3953 passed, 17 skipped, 1 failed in 225.23s measured on the unmodified base commit in the same virtualenv. The single failure in both runs istests/unit/test_plugin_manager.py::test_install_plugin_importing_legacy_harness_agent:legacy_imports.ensure_legacy_harness_agent_alias()deliberately leaves a realharness_agentdistribution alone, and this local venv has an out-of-lockorcakit-harness-agentinstalled, so the alias assertion cannot hold here. It is pre-existing on the base, not a case this PR adds, and it is green in CI, which installs strictly fromuv.lock(thePython 3.12quality job issuccesson both this branch's pre- and post-rebase heads).tests/livewas not run; no model API key, PostgreSQL or Docker was needed.Rebased onto
develop@83b2ae2e7(2026-10-03).Four commits landed on
developsince this branch's previous base (a02e3e18e): LDAP directory login (#1123), propagating exhausted model retries as failures (#1012), and two dashboard fixes (#1429, #1241) — each appended a bullet to## [Unreleased], soCHANGELOG.mdis this PR's only conflict. The resolution keepsdevelop'sCHANGELOG.mdverbatim and re-inserts this PR's single line into the existing### 修复list:git diff origin/develop 470f1a2ac -- CHANGELOG.mdis+1/-0, andgit diff 1f54c7ffc0 470f1a2acaover every non-CHANGELOG file of the PR is empty, i.e. the code you already reviewed is byte-identical.Re-measured on the new base with the same commands and the same virtualenv as the Test plan above:
ruff check src tests→All checks passed!ruff format --check src tests→1134 files already formattedmypy src/octop→Success: no issues found in 551 source filespytest -q tests/integration/test_preferences_api.py tests/unit/api/test_usage_xlsx.py tests/unit/gateway/test_slash_history.py tests/unit/proactive/test_scheduler.py→34 passed, 2 warnings in 5.65spytest -q -m "not live" -n 3→ 1 failed, 4134 passed, 17 skipped, 13 warnings in 432.89s (0:07:12) (three branches measured concurrently, so the wall time is inflated), against 4132 passed, 17 skipped, 1 failed in 218.55s measured on the unmodified base83b2ae2e7in this same virtualenv: +2 cases against the base, which are exactly this PR's. The single failure in both runs is the pre-existing local artifacttests/unit/test_plugin_manager.py::test_install_plugin_importing_legacy_harness_agent— this venv has an out-of-lockorcakit-harness-agentdistribution installed, and that test deliberately leaves a realharness_agentpackage alone, so its alias assertion cannot hold here. It is red on the untouched base too and green in CI, which installs strictly fromuv.lock.2026-10-06 —
CHANGELOG.mdre-aligned withdevelop. A rebase of this branch had re-introduced other PRs' release-note bullets into the released## [1.0.2b6]block, so this PR's diff carried those foreign lines instead of only its own.CHANGELOG.mdis nowdevelop's file verbatim plus this PR's single bullet under## [Unreleased]→### 修复:git diff --numstat 75c274aef a1868e0ca -- CHANGELOG.md→1\t0\tCHANGELOG.mdgit diff --name-only ceb0e4e0f a1868e0ca→CHANGELOG.mdonly, so every code and test file is byte-identical to the head thatPython 3.12andWindows / Python 3.12both reported success on;the commands and counts under Test plan therefore still describe this diff.
CHANGELOG.mdat75c274aefis identical to today'sdeveloptip, so this does not need a fresh rebase.Rebased onto
develop@97d6e7ff4(2026-10-12); heada1868e0ca->3e0a2ef1b.CHANGELOG.mdis again this branch's only conflict, and the resolution keepsdevelop's fileverbatim and re-inserts only this PR's own bullet under its matching
###subsection — checkedmechanically: the diff against the new base is
1 added / 0 deletedinCHANGELOG.mdand byte-identical (hunk headers aside) for 8 code/test file(s) before and after the
rebase. Gates re-run by hand on the new head (
make allstill does not apply — nodashboard/node_modulesin this clone; the venv is created per worktree so/Users/macos/Documents/Qoder/octop-pr-mining/repos/wt-r-1026/src/octop/__init__.pyis this branch's own code):34 passed, 8 warnings in 9.27s4629 passed, 26 skipped, 17 warnings in 410.59s (0:06:50), againstdevelop@97d6e7ff4measured in the same venv: 4627 passed, 26 skipped, 0 failedAll checks passed!;1180 files already formatted;Success: no issues found in 570 source filesRebased onto
develop@87a8d52c2(2026-10-14);head3e0a2ef1b->8d9a06af9.CHANGELOG.mdis again the only conflict.develop's file is kept verbatim and this PR's ownbullet is re-inserted into the current
## [Unreleased]list, which is now flat (no###subsections), so the diff against the new base is
1 added / 0 deletedthere and the8 code/test file(s) are byte-identical before and after (hunk headers aside) — checked
mechanically, not by eye. Gates re-run by hand on the new head (
make allstill does not apply:no
dashboard/node_modulesin this clone; the venv belongs to this worktree, so/Users/macos/Documents/Qoder/octop-pr-mining/repos/wt-r-1026/src/octop/__init__.pyis this branch's own code):RC ruff=0 format=0 mypy=0 targeted=0 full=034 passed, 8 warnings in 11.11s4681 passed, 26 skipped, 41 warnings in 242.98s (0:04:02), againstdevelop@87a8d52c2measured in the same environment today: 4679 passed, 26 skipped, 0 failedAll checks passed!;1186 files already formatted;Success: no issues found in 571 source filesRebased onto
develop@99e479a6b(2026-10-16); head255fca5bf->597dcbdcb.CHANGELOG.mdwas again the only conflict:develop's file is kept verbatim and this PR's own bullet is re-inserted under its matching###subsection of the current## [Unreleased]block, so the diff against the new base is1 added / 0 deletedthere and the8code/test file(s) are byte-identical before and after the rebase (checked mechanically on the patch hash, not by eye). Gates re-run by hand on the new head (make allstill does not apply — nodashboard/node_modulesin this clone; the venv belongs to this worktree, so the checkout under test is this branch's own code):RC ruff=0 format=0 mypy=0 targeted=0 full=034 passed, 8 warnings in 22.82s4782 passed, 32 skipped, 41 warnings in 448.26s (0:07:28), againstdevelop@99e479a6bmeasured today in its own per-worktree venv on the same machine: 4780 passed, 32 skipped, 0 failed in 495.68sAll checks passed!;1204 files already formatted;Success: no issues found in 581 source files