feat: add `catalogSchemas` in Config,`catalog_schema_id` in Model, Application, ToolSet (URI reference to a catalog schema), `catalog_properties` in Model, Application, ToolSet by Katerina-Charakhovich · Pull Request #1111 · epam/ai-dial-admin-backend

Katerina-Charakhovich · 2026-07-30T08:40:05Z

Applicable issues

fixes Add Support for New Configuration Properties Introduced in DIAL Core v0.47.0(catalogSchemaId in Deployment (String reference to a catalog schema), catalogProperties in Deployment (curated marketplace/catalog display metadata, validated against catalogSchemaId) #1097

Description of changes

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.

…SchemaEntity.sql

…talogSchemaEntity.sql

…Entity.sql

KirylKurnosenka · 2026-07-31T10:25:14Z

+        try {
+            return uriString == null ? null : new URI(uriString);
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Invalid application applicationTypeSchemaId: " + uriString);


applicationTypeSchemaId or catalogSchemaId?

KirylKurnosenka · 2026-07-31T10:27:11Z

+    @Mapping(target = "toolSets", ignore = true)
+    public abstract CatalogSchemaEntity update(CatalogSchema catalogSchema, @MappingTarget CatalogSchemaEntity entity);
+
+    @Mapping(target = "createdAt", source = "createdAt")


Looks like those mappings are redundant

KirylKurnosenka · 2026-07-31T10:28:52Z

+        try {
+            return uriString == null ? null : new URI(uriString);
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Invalid application applicationTypeSchemaId: " + uriString);


applicationTypeSchemaId or catalogSchemaId?

KirylKurnosenka · 2026-07-31T10:29:24Z

+        try {
+            return uriString == null ? null : new URI(uriString);
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Invalid application applicationTypeSchemaId: " + uriString);


applicationTypeSchemaId or catalogSchemaId?

KirylKurnosenka · 2026-07-31T10:41:30Z

+    private Long createdAt;
+    private Long updatedAt;
+
+    public enum TypeEnum {


Why is not just Type?

KirylKurnosenka · 2026-07-31T10:52:22Z

        Collection<ExportComponentInfo> interceptors = interceptorExporter.preview(request);
        Collection<ExportComponentInfo> interceptorRunners = interceptorRunnerExporter.preview(request);
        Collection<ExportApplicationTypeSchemaInfo> applicationRunners = applicationTypeSchemaExporter.preview(request);
        var globalSettings = globalSettingsExporter.getGlobalSettings(request);


Shouldn't catalog schemas be previewed?

KirylKurnosenka · 2026-07-31T10:55:04Z

+
+        @Override
+        Set<ExportConfigComponentType> getDirectDependencies(ExportFormat exportFormat) {
+            return Set.of();


As far as I understand catalog schema should be added into direct dependencies of model, application, toolset

KirylKurnosenka · 2026-07-31T11:06:56Z

+        mapper.update(catalogSchema, entity);
+        jpaRepository.save(entity);
+
+        log.info("Created catalog schema with id: {}", schemaId);


Is that really needed, at least under info level? Related to all other logs below

KirylKurnosenka · 2026-07-31T11:08:23Z

+
+    @Transactional
+    public void create(CatalogSchema catalogSchema) {
+        String schemaId = catalogSchema.getSchemaId();


Shouldn't validation similar to app schema be added?

KirylKurnosenka · 2026-07-31T11:09:58Z

+
+    @Transactional
+    public String update(String id, CatalogSchema catalogSchema, String hash) {
+        CatalogSchemaEntity entity = jpaRepository.findById(id)


Shouldn't validation similar to app schema and hash null check be added?

KirylKurnosenka · 2026-07-31T11:12:08Z

+                .orElseThrow(() -> new EntityNotFoundException(NOT_FOUND_MESSAGE_TEMPLATE.formatted(id)));
+
+        CatalogSchema existingSchema = mapper.toDomain(entity);
+        String expectedHash = calculator.calculateHash(existingSchema);


if hash=ANY_HASH there is no need to calculate hash

KirylKurnosenka · 2026-07-31T11:14:49Z

+                .collect(Collectors.toList());
+    }
+
+    public Optional<CatalogSchema> tryGet(String id) {


@Transactional(readOnly = true) is missing

KirylKurnosenka · 2026-07-31T11:21:02Z

            interceptorRunnerService.rollbackInterceptorRunners(revision);
            globalSettingsService.rollbackGlobalSettings(revision);
            adminSettingsService.rollbackAdminSettings(revision);
+            catalogSchemaService.rollbackCatalogSchemas(revision);


I believe models, apps, toolsets should respect catalog schemas during rollback (see applications -> app type schemas as example)

KirylKurnosenka · 2026-07-31T11:23:31Z

+        AGENT,
+        TOOLSET,
+        SKILL,
+        INTERCEPTOR


INTERCEPTOR is listed here but is not supported, is it okay?

KirylKurnosenka · 2026-07-31T11:48:14Z

                .build();
    }

    private void resolveDependencies(SelectedItemsExportRequest request) {


model, app, toolset should respect catalog schema during custom export

KirylKurnosenka · 2026-07-31T11:50:15Z

+        return Collections.emptyList();
+    }
+
+    private CatalogSchema fromJson(String jsonSchema) {


Why is it not done similar to app schemas?

KirylKurnosenka · 2026-07-31T11:54:44Z

+
+        var schema = schemaWithHash.model();
+        var coreCatalogSchema = schemaCoreMapper.mapToCoreString(schema);
+        boolean isSchemaValid = SchemaConformToMetaSchemaValidator.isValid(coreCatalogSchema);


Is that correct validation?

KirylKurnosenka · 2026-07-31T11:57:18Z

+    @Mapping(target = "updatedAt", ignore = true)
+    CatalogSchemaDto toDto(CoreCatalogSchema coreCatalogSchema);
+
+    @Mapping(target = "id", source = "id")


Redundant mapping

KirylKurnosenka · 2026-07-31T11:58:29Z

+import org.mapstruct.Mapping;
+
+@Mapper(componentModel = "spring", uses = {InstantMapper.class})
+public interface CoreCatalogSchemaMapper {


What is the purpose of this mapper?

KirylKurnosenka · 2026-07-31T12:02:36Z

+        return entitySyncStateDtoMapper.toDto(syncState);
+    }
+
+    public void create(@Valid CatalogSchemaDto schemaDto) {


Those @Valid annotations won't have effect

KirylKurnosenka · 2026-07-31T12:05:53Z

+);
+
+CREATE TABLE catalog_schema_entity_aud (
+    schema_id VARCHAR(512) NOT NULL,


Why 512 if main table has 850?

KirylKurnosenka · 2026-07-31T12:06:34Z

+
+    private String title;
+
+    @Column(length = 2048)


Is length limit really needed here?

KirylKurnosenka · 2026-07-31T12:14:03Z


 @Data
 @JsonIgnoreProperties(ignoreUnknown = true)
+@CatalogPropertiesConformToSchemas(message = "All deployments with catalog_schema_id should conform to their catalog schema")


There can be the case when imported deployment refers to already existing catalog schema, which is missing in imported config. See how it was done for schemas c1d1fb1

KirylKurnosenka · 2026-07-31T12:16:19Z

+    title text,
+    description text,
+    catalog_entity_type varchar(50),
+    catalog_display_name varchar(512),


May be also text as for app schemas?

KirylKurnosenka · 2026-07-31T12:18:35Z

+
+ALTER TABLE application_entity ADD COLUMN catalog_schema_id varchar(850);
+ALTER TABLE application_entity ADD COLUMN catalog_properties text;
+ALTER TABLE application_entity ADD CONSTRAINT fk_application_catalog_schema FOREIGN KEY (catalog_schema_id) REFERENCES catalog_schema_entity(schema_id);


Why foreign key name is in lower case here and below whereas above is in upper case?

ai-dial-actions · 2026-08-04T10:39:06Z

Dependency Review

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

Scanned Files

None

initial commit

1050b9b

Katerina-Charakhovich requested a review from siarhei-fedziukovich as a code owner July 30, 2026 08:40

Katerina-Charakhovich and others added 7 commits July 30, 2026 20:06

check tests

cf1e4d9

Merge branch 'development' into feat/add-catalog-shema-config

5d3f13f

tests

289cad1

tests

2a8a791

Delete src/main/resources/db/migration/POSTGRES/V1.118__CreateCatalog…

6fb321e

…SchemaEntity.sql

Delete src/main/resources/db/migration/MS_SQL_SERVER/V1.118__CreateCa…

5315d0b

…talogSchemaEntity.sql

Delete src/main/resources/db/migration/H2/V1.118__CreateCatalogSchema…

aa33d7b

…Entity.sql

Katerina-Charakhovich requested a review from KirylKurnosenka July 31, 2026 06:11

Merge branch 'development' into feat/add-catalog-shema-config

12fcbec

This comment has been minimized.

Sign in to view

KirylKurnosenka reviewed Jul 31, 2026

View reviewed changes

Katerina-Charakhovich and others added 3 commits August 4, 2026 09:26

addressed comments

49736dc

check test

f97470b

Merge branch 'development' into feat/add-catalog-shema-config

2d00573

Uh oh!

Conversation

Katerina-Charakhovich commented Jul 30, 2026

Applicable issues

Description of changes

Checklist

Uh oh!

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!

KirylKurnosenka Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KirylKurnosenka Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KirylKurnosenka Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

KirylKurnosenka Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KirylKurnosenka Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KirylKurnosenka Jul 31, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

KirylKurnosenka Jul 31, 2026 •

edited

Loading

KirylKurnosenka Jul 31, 2026 •

edited

Loading

KirylKurnosenka Jul 31, 2026 •

edited

Loading

KirylKurnosenka Jul 31, 2026 •

edited

Loading

KirylKurnosenka Jul 31, 2026 •

edited

Loading

KirylKurnosenka Jul 31, 2026 •

edited

Loading