feat: implement manifest parity with legacy JSON and fix nested collection#184
feat: implement manifest parity with legacy JSON and fix nested collection#184sushant-suse merged 7 commits intoopenSUSE:mainfrom
Conversation
…collection Signed-off-by: sushant-suse <[email protected]>
Coverage ReportFor commit 3deced6 Click to expand Coverage Report Name Stmts Miss Branch BrPart Cover
--------------------------------------------------------------------------------
+ src/docbuild/models/deliverable.py 180 1 22 0 99.5%
+ src/docbuild/cli/cmd_check/process.py 58 0 22 1 98.8%
+ src/docbuild/cli/cmd_cli.py 93 1 8 1 98.0%
+ src/docbuild/utils/pidlock.py 79 1 14 1 97.8%
+ src/docbuild/config/xml/stitch.py 48 1 12 1 96.7%
+ src/docbuild/cli/cmd_validate/process.py 178 5 52 4 96.1%
+ src/docbuild/cli/callback.py 35 0 10 2 95.6%
- src/docbuild/cli/cmd_config/__init__.py 9 1 0 0 88.9%
- src/docbuild/cli/cmd_metadata/metaprocess.py 209 22 66 13 83.6%
- src/docbuild/cli/cmd_check/__init__.py 18 5 2 0 65.0%
- src/docbuild/cli/cmd_build/__init__.py 13 5 0 0 61.5%
- src/docbuild/cli/cmd_metadata/__init__.py 27 10 2 0 58.6%
- src/docbuild/cli/cmd_config/environment.py 11 6 2 0 38.5%
--------------------------------------------------------------------------------
+ TOTAL 2876 58 668 23 97.3%
47 files skipped due to complete coverage. |
There was a problem hiding this comment.
Thanks Sushant! 👍 Great work as always.
I've tried it with suse-ai/1.0/en-us as doctype and I get errors:
$ docbuild -vvv --env-config=env.devel.toml metadata 'suse-ai/1.0/en-us'
[...]
[2026-02-18 19:16:53] [ERROR] docbuild.cli.cmd_metadata.metaprocess: DAPS Error: ERROR: You either need to specify a DC-file or a MAIN file
[...]
Found 10 failed deliverables:
- suse-ai/1.0/main/en-us:DC-AI-intro
- suse-ai/1.0/main/en-us:DC-AI-requirements
- suse-ai/1.0/main/en-us:DC-AI-deployment
- suse-ai/1.0/main/en-us:DC-AI-deployment-airgapped
- suse-ai/1.0/main/en-us:DC-openwebui-using
- suse-ai/1.0/main/en-us:DC-AI-monitoring
- suse-ai/1.0/main/en-us:DC-openwebui-configuring
- suse-ai/1.0/main/en-us:DC-AI-preventing-hallucinations
- suse-ai/1.0/main/en-us:DC-AI-system-prompts
- suse-ai/1.0/main/en-us:DC-AI-data-integrity
I'm not sure what exactly caused it, but it's late and my brain is exhausted. 😆 So I leave that for another day, but I wanted to report it for you as soon as possible.
See my suggestions below. There is a related issue in regards of docker. You've practically worked on it already. 😄 Maybe we should discuss this personally how to proceed here.
Hi, I’ve investigated the DAPS error you encountered with I've updated the logic to pass an absolute path for the DC-file to the DAPS command. This ensures that even if DAPS is invoked from the worktree root, it can accurately locate the configuration file inside the product subdirectories. This should resolve the failures you saw with the |
…ess per reviewer feedback Signed-off-by: sushant-suse <[email protected]>
Signed-off-by: sushant-suse <[email protected]>
|
Hi @tomschr, thanks for all your suggestions and ideas. I have completed the refactoring based on your suggestions. All paths are now derived directly from the Can you please have a look at the changes? |
|
Thanks Sushant! I see two discrepancies between manual and generated:
|
tomschr
left a comment
There was a problem hiding this comment.
I have some minor suggestions for you. 😊
I think avoiding _ as a prefix in function names are better. We don't need to have them "private".
But overall, I really like the more modular approach. 👍
…ublic Signed-off-by: sushant-suse <[email protected]>
…tool, updated fragment file Signed-off-by: sushant-suse <[email protected]>
Signed-off-by: sushant-suse <[email protected]>
Done Toms, good catch as usual. |
tomschr
left a comment
There was a problem hiding this comment.
Thank you so much and sorry for the hassle.
🚢 it!
Fixes: #183
Key Changes:
hide-productname) to align with existing portal expectations.Verification:
rufflinting.