Skip to content

Fix canonical model output paths #10196

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

Merged
jh-block merged 2 commits into from
Jul 2, 2026
+9 −8
Merged

Fix canonical model output paths #10196

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad3ad79
Fix canonical model output paths
jh-block Jul 2, 2026
c8c847e
Ignore pending quick-xml advisory
jh-block Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,8 +313,8 @@ prepare-release version:
ui/desktop/package.json \
ui/pnpm-lock.yaml \
ui/desktop/openapi.json \
crates/goose-providers/src/canonical/data/canonical_models.json \
crates/goose-providers/src/canonical/data/provider_metadata.json
crates/goose-provider-types/src/canonical/data/canonical_models.json \
crates/goose-provider-types/src/canonical/data/provider_metadata.json

@chatgpt-codex-connector chatgpt-codex-connector Bot Jul 2, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P2 Badge Stage the mapping report in release commits

Because prepare-release runs just build-canonical-models, the default checker also writes the tracked crates/goose-provider-types/src/canonical/data/canonical_mapping_report.json (and refreshes its timestamp) on every release run, but this git add only stages the other two generated files. In that workflow the release commit succeeds while leaving the mapping report dirty and out of the release commit; include the report in this staged file list as well.

Useful? React with 👍 / 👎.

@jh-block jh-block Jul 2, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this file doesn't seem to have ever been committed, we can deal with this separately if necessary.

@git commit --message "chore(release): release version {{ version }}"

set-openapi-version version:
Expand Down
4 changes: 2 additions & 2 deletions crates/goose-provider-types/src/canonical/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ cargo run --bin build_canonical_models --no-check # Build only, skip checker

This script performs two operations by default:
1. **Builds canonical models** - Fetches from OpenRouter API and updates the registry
- Writes to: `crates/goose-providers/src/canonical/data/canonical_models.json`
- Writes to: `crates/goose-provider-types/src/canonical/data/canonical_models.json`
2. **Checks model mappings** (unless `--no-check` is passed) - Tests provider mappings and tracks changes over time
- Reports unmapped models
- Compares with previous runs (like a lock file)
- Shows changed/added/removed mappings
- Writes to: `crates/goose-providers/src/canonical/data/canonical_mapping_report.json`
- Writes to: `crates/goose-provider-types/src/canonical/data/canonical_mapping_report.json`

The script is currently built from `crates/goose/src/bin/build_canonical_models.rs` and writes into this crate's `src/canonical/data` directory.
2 changes: 1 addition & 1 deletion crates/goose/src/bin/build_canonical_models.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ impl MappingReport {

fn data_file_path(filename: &str) -> PathBuf {
PathBuf::from(env!("CARGO_MANIFEST_DIR"))
.join("../goose-providers/src/canonical/data")
.join("../goose-provider-types/src/canonical/data")
.join(filename)
}

Expand Down
7 changes: 4 additions & 3 deletions deny.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ ignore = [
# the reachable path is through jsonwebtoken.
"RUSTSEC-2023-0071",

# quick-xml: quadratic duplicate-attribute checks. Current paths are through
# docx-rs, umya-spreadsheet, and bat/plist, and their latest releases do not
# yet expose a quick-xml >= 0.41.0 upgrade path.
# quick-xml: duplicate-attribute and namespace-declaration allocation issues.
# Current paths are through docx-rs, umya-spreadsheet, and bat/plist, and their
# latest releases do not yet expose a quick-xml >= 0.41.0 upgrade path.
"RUSTSEC-2026-0194",
"RUSTSEC-2026-0195",
]
Loading