From a3854aee3dd113466eb833ce68868895650b79ec Mon Sep 17 00:00:00 2001 From: Jasper Date: Thu, 2 Jul 2026 13:05:16 +0200 Subject: [PATCH] Fix canonical model output paths (#10196) --- Justfile | 4 ++-- crates/goose-provider-types/src/canonical/README.md | 4 ++-- crates/goose/src/bin/build_canonical_models.rs | 2 +- deny.toml | 7 ++++--- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Justfile b/Justfile index c08148357f..63de5dff3d 100644 --- a/Justfile +++ b/Justfile @@ -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 @git commit --message "chore(release): release version {{ version }}" set-openapi-version version: diff --git a/crates/goose-provider-types/src/canonical/README.md b/crates/goose-provider-types/src/canonical/README.md index f0c682f2ce..231a391205 100644 --- a/crates/goose-provider-types/src/canonical/README.md +++ b/crates/goose-provider-types/src/canonical/README.md @@ -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. diff --git a/crates/goose/src/bin/build_canonical_models.rs b/crates/goose/src/bin/build_canonical_models.rs index 9e8b73fa35..a14034c7b6 100644 --- a/crates/goose/src/bin/build_canonical_models.rs +++ b/crates/goose/src/bin/build_canonical_models.rs @@ -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) } diff --git a/deny.toml b/deny.toml index 52370e3e94..d4dff0d090 100644 --- a/deny.toml +++ b/deny.toml @@ -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", ]