Commit 73dba89
committed
fix: classify user-package import failures in load_python_modules
`load_python_modules` has three `importlib.import_module(<user-module>)` call
sites. #1168 gave two of them the broad "anything raised inside a user module is
a user error" treatment, but the third — the branch that imports a *directory*
as a package when it contains no top-level `.py` files — kept its original
narrow handler:
except (ValueError, ModuleNotFoundError):
pass
That leaks in both directions:
1. Any other exception from the user's `__init__.py` (`TypeError`, `OSError`,
`SyntaxError`, `PydanticUserError`, yaml `ScannerError`, ...) escapes
`load_python_modules` raw and crash-reports to Sentry, even though it is by
definition a bug in the user's code or one of its third-party imports. This
is the same class the Sentry corpus shows for the other two sites
(FLYTE-SDK-39 and friends), which #1168 already closed.
2. A `ModuleNotFoundError` raised from *inside* the package — a dependency the
user has not installed — is swallowed by the bare `pass`. Deploy then
proceeds with zero environments and no explanation. The silent half is
arguably worse than the crash.
The narrow catch was not wrong when it was written: it is control flow for
"this directory is not an importable package, skip it". This keeps that, and
only that:
- `ValueError` is now scoped to the `relative_to` call that actually raises it,
so a `ValueError` from user code at import time is no longer mistaken for a
path-outside-the-root.
- `ModuleNotFoundError` is skipped only when it names the target module (or a
parent package of it) — i.e. the directory genuinely is not importable here.
`ModuleNotFoundError.name` distinguishes that from a missing inner import.
- Everything else is recorded in `failed_paths`, consistent with the sibling
directory branch, so `flyte deploy` surfaces a clean `ClickException` and
honours `--ignore-load-errors` instead of crash-reporting.
No Sentry issue is currently firing on this branch, so nothing is claimed as
fixed — this closes the site #1168 missed, plus the silent-skip bug next to it.
Six tests; the two that pin the leak and the silent skip fail on main, and the
four that pin the preserved skip-and-continue behaviour pass on both sides by
design.
Signed-off-by: Haytham Abuelfutuh <haytham@afutuh.com>1 parent c86f22d commit 73dba89
2 files changed
Lines changed: 169 additions & 4 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| 16 | + | |
| 17 | + | |
| 18 | + | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
16 | 31 | | |
17 | 32 | | |
18 | 33 | | |
| |||
92 | 107 | | |
93 | 108 | | |
94 | 109 | | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
95 | 114 | | |
96 | | - | |
97 | | - | |
98 | | - | |
99 | | - | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
100 | 135 | | |
101 | 136 | | |
102 | 137 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
366 | 366 | | |
367 | 367 | | |
368 | 368 | | |
| 369 | + | |
| 370 | + | |
| 371 | + | |
| 372 | + | |
| 373 | + | |
| 374 | + | |
| 375 | + | |
| 376 | + | |
| 377 | + | |
| 378 | + | |
| 379 | + | |
| 380 | + | |
| 381 | + | |
| 382 | + | |
| 383 | + | |
| 384 | + | |
| 385 | + | |
| 386 | + | |
| 387 | + | |
| 388 | + | |
| 389 | + | |
| 390 | + | |
| 391 | + | |
| 392 | + | |
| 393 | + | |
| 394 | + | |
| 395 | + | |
| 396 | + | |
| 397 | + | |
| 398 | + | |
| 399 | + | |
| 400 | + | |
| 401 | + | |
| 402 | + | |
| 403 | + | |
| 404 | + | |
| 405 | + | |
| 406 | + | |
| 407 | + | |
| 408 | + | |
| 409 | + | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + | |
| 414 | + | |
| 415 | + | |
| 416 | + | |
| 417 | + | |
| 418 | + | |
| 419 | + | |
| 420 | + | |
| 421 | + | |
| 422 | + | |
| 423 | + | |
| 424 | + | |
| 425 | + | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + | |
| 435 | + | |
| 436 | + | |
| 437 | + | |
| 438 | + | |
| 439 | + | |
| 440 | + | |
| 441 | + | |
| 442 | + | |
| 443 | + | |
| 444 | + | |
| 445 | + | |
| 446 | + | |
| 447 | + | |
| 448 | + | |
| 449 | + | |
| 450 | + | |
| 451 | + | |
| 452 | + | |
| 453 | + | |
| 454 | + | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + | |
| 461 | + | |
| 462 | + | |
| 463 | + | |
| 464 | + | |
| 465 | + | |
| 466 | + | |
| 467 | + | |
| 468 | + | |
| 469 | + | |
| 470 | + | |
| 471 | + | |
| 472 | + | |
| 473 | + | |
| 474 | + | |
| 475 | + | |
| 476 | + | |
| 477 | + | |
| 478 | + | |
| 479 | + | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
0 commit comments