feat: short-name resolution via derivation + schema $id index #1783 by KirylKurnosenka · Pull Request #1813 · epam/ai-dial-core

KirylKurnosenka · 2026-08-10T15:28:54Z

Makes every materialized platform-bucket config entity short-name addressed, inbound and outbound, via deterministic derivation (no per-entity flag, no stored alias index), and adds a $id → canonical-id index so blob-stored app-type/catalog schemas resolve by their JSON-Schema $id.

Applicable issues

fixes Slice B+C — Short-name resolution via derivation + schema $id index #1783

Description of changes

Config.java: added resolve(...) derivation helper; rewrote selectDeployment to use it for applications/models/toolsets/interceptors; added getModel/getRole/getInterceptor accessors; added schemaAliasesById/catalogSchemaAliasesById with $id-fallback in getCustomApplicationSchema/getCatalogSchema (refactored into a shared resolveSchema helper).
ConfigPostProcessor.java: entity.setName(lastSegment(...)) everywhere instead of the raw map key; resolve-aware fix for validateCrossReferences (a model referencing a migrated interceptor by short name is no longer wrongly treated as dangling); added validateSingleApplication/validateSingleToolSet.
MergedConfigStore.java: blob-shadows-file removal for models/interceptors/roles/applications/toolsets (gated on successful decryption during full rebuild; immediate on partial-update writes); $id-alias index maintenance for schemas, including shadowing the file entry keyed by the same $id so migrated schemas don't appear twice in $id-keyed listings; fixed a shallowClone gap that would have dropped the schema alias index on every partial update; removed the now-unnecessary AddedEntity wrapper record.
Call-site sweep: ModelController, DeploymentController, RateLimiter, ShareService, CollectResponseAttachmentsFn, ResourceController, BlobEntityValidator, BaseInterceptorController now resolve through the new accessors instead of raw map get/containsKey.
Tests: extended ConfigTest with derivation/accessor/alias coverage; updated ConfigPostProcessorTest, CanonicalIdListingTest, MergedConfigStoreApiTest for short-name outbound behavior; added shadow-removal integration tests for models/interceptors/roles/applications/toolsets/schemas.

Checklist

Title of the pull request follows Conventional Commits specification

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

Makes every materialized platform-bucket config entity short-name addressed, inbound and outbound, via deterministic derivation (no per-entity flag, no stored alias index) for models/interceptors/ roles/applications/toolsets, and adds a $id -> canonical-id index so blob-stored app-type/catalog schemas resolve by their JSON-Schema $id.

APP_TYPE_SCHEMA's urlSegment is "schemas", not "application_type_schemas" (its group and urlSegment differ, unlike CATALOG_SCHEMA), so the test's "canonical id" example didn't match what MergedConfigStore actually generates.

Code-review follow-up on the short-name resolution feature: - Deployment-id uniqueness now dedupes on the derived short name (not the raw map key), and is enforced on the partial-update and /v1/admin/apply paths too, not just full rebuilds. - RateLimiter/ConsentService fall back to a canonical-id match so pre-existing role limits and consent records keep resolving now that deployment names revert to short form. - AnalyticsLogContext normalizes canonical-id interceptor refs before comparing against the (always short-name) execution path. - Added a bucket-scope guard to MergedConfigStore's rebuild shadow step, mirroring the existing replica-event guard. - Deduplicated the several lastSegment implementations into PlatformCanonicalIdUtil. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

…1783 recordSchemaAlias never evicted a schema's previous $id alias when its $id changed, leaving a dangling entry pointing at a body that no longer carries it. Fix by evicting any alias currently held by this canonical id before recording the new one (same removeIf-by-value pattern already used on delete), and add a write-time check rejecting a write whose $id is already claimed by a different canonical id (wired into the single- entity PUT, admin-apply real-apply, and admin-apply precheck paths). Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

astsiapanay · 2026-08-12T09:33:27Z

+     * in {@link #applicationTypeSchemas}, since a schema's $id is not derivable from its path.
+     */
+    @JsonIgnore
+    private Map<String, String> schemaAliasesById = Map.of();


applicationSchemaAliasesById

Renamed to applicationSchemaAliasesById (field/getter/setter, and all call sites).

astsiapanay · 2026-08-12T09:34:52Z

+     * migrated blob entry. A schema's $id is not derivable from its path, so unlike {@link
+     * #resolve}, the alias index must be maintained explicitly (see {@code MergedConfigStore}).
+     */
+    private static String resolveSchema(Map<String, String> schemas, Map<String, String> aliasesById, URI schemaId) {


javax.annotation.Nullable isn't on the config module's classpath (only pulled in transitively by server), and adding a direct dependency just for this annotation felt disproportionate. Documented nullability via @return ... or {@code null} if ... javadoc on getCustomApplicationSchema/getCatalogSchema/resolveSchema instead.

astsiapanay · 2026-08-12T09:36:25Z

    private List<String> globalInterceptors = List.of();

+    /**
+     * $id → canonical-id index for {@code platform}-bucket schema entities, built at rebuild


The javadoc is not clear what key is and what value is.

Reworded to explicitly state key = schema $id, value = canonical id, and added a concrete example.

astsiapanay · 2026-08-12T09:41:50Z

        ShareResourceLimit limit = null;
        for (String userRole : userRoles) {
-            ShareResourceLimit candidate = Optional.ofNullable(roles.get(userRole)).map(Role::getShare).map(limits -> limits.get(resourceType.name())).orElse(null);
+            ShareResourceLimit candidate = Optional.ofNullable(config.getRole(userRole)).map(Role::getShare).map(limits -> limits.get(resourceType.name())).orElse(null);


why do we need these changes?

Blob-stored Role entities are now short-name addressed via canonical id (e.g. roles/platform/<name>), same as models/applications/toolsets/interceptors in this PR. A raw roles.get(userRole) map lookup would miss a role migrated to the blob store, since its map key is the canonical id, not the short name. Config.getRole(id) goes through the new resolve() helper (short-name-first, canonical-id fallback), so this swap is part of the same call-site sweep as the other accessors — not unrelated churn.

astsiapanay · 2026-08-12T09:47:15Z

+    }
+
+    /**
+     * Records the {@code $id → canonicalId} alias read from a schema's body, and removes the


Who will read a such long javadoc?
The method has 5 lines the doc is more than 10 long lines?

Trimmed both this method's javadoc and removeEntityInPlace's down to their essential contract.

rejectSchemaIdCollision silently treated any non-APP_TYPE_SCHEMA type as CATALOG_SCHEMA via a fallback ternary. Switch to an explicit type check that throws for anything other than the two supported schema types. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

recordSchemaAlias evicted a stale alias via aliasesById.values().removeIf, an O(index size) scan on every schema write/delete (and, since it was always a guaranteed no-op mid-rebuild, effectively O(n^2) extra work across a full rebuild for no benefit). Map.put/remove already return the previous value at a key, so callers now pass that previous body through and recordSchemaAlias reads its $id directly and evicts by that key - O(1) instead of a full index scan for every schema mutation. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

Rename schemaAliasesById to applicationSchemaAliasesById to disambiguate from catalogSchemaAliasesById, clarify its key/value semantics with an example, document nullability on schema accessors, and trim the recordSchemaAlias/removeEntityInPlace javadocs to their essential contract. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>

ai-dial-actions · 2026-08-12T14:36:33Z

Dependency Review

✅ No vulnerabilities or license issues or OpenSSF Scorecard issues found.

Scanned Files

None

KirylKurnosenka requested review from Oleksii-Klimov and astsiapanay as code owners August 10, 2026 15:28

This comment has been minimized.

Sign in to view

KirylKurnosenka requested a review from siarhei-fedziukovich August 10, 2026 15:42

This comment has been minimized.

Sign in to view

Merge branch 'development' into feat/issue-1783

68c9584

This comment has been minimized.

Sign in to view

astsiapanay reviewed Aug 12, 2026

View reviewed changes

KirylKurnosenka and others added 3 commits August 12, 2026 17:24

KirylKurnosenka mentioned this pull request Aug 12, 2026

feat: add config-file migration endpoint #1784 #1830

Open

1 task

Uh oh!

Conversation

KirylKurnosenka commented Aug 10, 2026

Applicable issues

Description of changes

Checklist

Uh oh!

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ai-dial-actions commented Aug 12, 2026

Dependency Review

Scanned Files

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants