Skip to content

[com1] Add cfg override folder / expert configuration #1230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
fso42 wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[com1] Add cfg override folder / expert configuration #1230

fso42 wants to merge 8 commits into from
+427 −379

Conversation

@fso42
Copy link
Contributor

@fso42 fso42 commented Jan 23, 2026

No description provided.

@fso42 fso42 self-assigned this Jan 23, 2026
@fso42 fso42 added the enhancement New feature or request label Jan 23, 2026
@qltysh
Copy link
Contributor

qltysh bot commented Jan 23, 2026 •
edited
Loading

❌ 1 blocking issue (5 total)

Tool Category Rule Count
black Style Incorrect formatting, autoformat by running qlty fmt. 1 ❌
qlty Duplication Found 55 lines of similar code in 2 locations (mass = 151) 2
qlty Structure Function with many returns (count = 7): getModuleConfig 1
qlty Structure Function with high complexity (count = 29): getModuleConfig 1

@qltysh one-click actions:

  • Auto-fix formatting (qlty fmt && git push)

@qltysh
Copy link
Contributor

qltysh bot commented Jan 23, 2026 •
edited
Loading

Qlty

Coverage Impact

⬇️ Merging this pull request will decrease total coverage on master by 0.04%.

Modified Components (1)

RatingComponent% Diff
Coverage rating: C Coverage rating: C
com1DFA100.0%

Modified Files with Diff Coverage (10)

RatingFile% DiffUncovered Line #s
Coverage rating: C Coverage rating: C
avaframe/ana5Utils/DFAPathGeneration.py0.0%54-67
Coverage rating: B Coverage rating: B
avaframe/com1DFA/com1DFA.py100.0%
Coverage rating: B Coverage rating: B
avaframe/ana1Tests/simiSolTest.py100.0%
Coverage rating: A Coverage rating: A
avaframe/in3Utils/MoTUtils.py100.0%
Coverage rating: F Coverage rating: F
avaframe/com3Hybrid/com3Hybrid.py0.0%56-138
Coverage rating: C Coverage rating: C
avaframe/ana5Utils/distanceTimeAnalysis.py100.0%
Coverage rating: A Coverage rating: A
avaframe/in3Utils/cfgUtils.py93.8%172, 175
Coverage rating: F Coverage rating: F
avaframe/com6RockAvalanche/com6RockAvalanche.py0.0%32
Coverage rating: B Coverage rating: B
avaframe/com7Regional/com7Regional.py100.0%
Coverage rating: A Coverage rating: A
avaframe/com1DFA/com1DFATools.py100.0%
Total80.0%
🤖 Increase coverage with AI coding...

In the `overrideFolder2` branch, add test coverage for this new code:

- `avaframe/ana5Utils/DFAPathGeneration.py` -- Line 54-67
- `avaframe/com3Hybrid/com3Hybrid.py` -- Line 56-138
- `avaframe/com6RockAvalanche/com6RockAvalanche.py` -- Line 32
- `avaframe/in3Utils/cfgUtils.py` -- Lines 172 and 175

🚦 See full report on Qlty Cloud »

🛟 Help

  • Diff Coverage: Coverage for added or modified lines of code (excludes deleted files). Learn more.

  • Total Coverage: Coverage for the whole repository, calculated as the sum of all File Coverage. Learn more.

  • File Coverage: Covered Lines divided by Covered Lines plus Missed Lines. (Excludes non-executable lines including blank lines and comments.)

    • Indirect Changes: Changes to File Coverage for files that were not modified in this PR. Learn more.

@fso42 fso42 requested a review from awirb January 26, 2026 09:40
awirb
awirb requested changes Jan 27, 2026
View reviewed changes
fso42 and others added 6 commits January 29, 2026 14:25
@fso42
[cfg] add expert dir override function for cfgs
75d3a80
@fso42
refactor(cfgUtils): replace positional override parameter with `fileO…
c3857d7 
…verride` keyword argument

- Updated all `cfgUtils.getModuleConfig` calls to use the explicit `fileOverride` parameter
@fso42
refactor(cfgUtils): add avalancheDir parameter to getModuleConfig…
54bb3d4 
… calls

- Updated all instances of `cfgUtils.getModuleConfig` to include the `avalancheDir` parameter
@fso42
refactor(cfgHandling): remove rewriteLocalCfgs and `_removeCfgItems…
b11f6bf 
…NotInOverride` functions along with associated tests
@fso42
refactor(cfgUtils, scripts): remove unused fileOverride and `modInf…
7dc99b5 
…o` parameters from `getModuleConfig` calls

- Cleaned up calls to `cfgUtils.getModuleConfig` by removing redundant `fileOverride` and `modInfo` arguments across multiple scripts and modules.
- Addressed AW comments
@fso42
fix(com1DFA): update module exclusion condition in getModuleNames
22e34cb 
- Adjusted logic to exclude all modules under the `com1DFA` package using `startswith("avaframe.com1DFA")` instead of an exact match
@fso42
refactor(com1DFA, cfgUtils): remove unused checkCfgInfoType and sim…
ee739dd 
…plify config handling

- Removed `checkCfgInfoType` from `com1DFATools.py` and related calls across `com1DFA` modules.
- Replaced redundant type checks with direct handling of `cfgInfo` as `ConfigParser`, `Path`, or string.
- Extennd `getModuleConfig to support `batchCfgDir` for directory-based batch processing.
- Updated related tests
@fso42 fso42 requested a review from awirb January 30, 2026 10:58
@fso42
refactor(tests, com1DFA,com3): simplify config handling and improve s…
ebc0d2a 
…imulation calls

- Replaced redundant `fileOverride` usage in test configurations with direct `cfg` handling.
- Updated multiple test scripts to streamline `com1DFAMain` calls
- Adjusted hybrid module to directly modify config values, removing `ConfigUpdater` dependency.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@awirb awirb Awaiting requested review from awirb

Requested changes must be addressed to merge this pull request.

Assignees

@fso42 fso42

Labels

enhancement New feature or request

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@fso42 @awirb