Smart Integration: Add support for configurable number of mapping retries

Introduce smartIntegrationMappingSuggestionRetryCount parameter to control
how many mapping retries should be executed during mapping
suggestions.

- Default value is 0 (no retry)

Task #11155

Signed-off-by: Michal Zelencik <michal.zelencik@evolveum.com>

Author: Michal Zelencik

config/initial-objects/system-configuration/000-system-configuration.xml

@@ -180,6 +180,8 @@
         <operationExecutionRecording>
             <skipWhenSuccess>true</skipWhenSuccess>
         </operationExecutionRecording>
+        <smartIntegrationMappingSuggestionRetryCount>0</smartIntegrationMappingSuggestionRetryCount>
+        <smartIntegrationStatisticsTtl>P1D</smartIntegrationStatisticsTtl>
     </internals>
     <adminGuiConfiguration>
         <homePage id="21">

infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd

@@ -13877,6 +13877,18 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
+            <xsd:element name="smartIntegrationMappingSuggestionRetryCount" type="xsd:int" minOccurs="0">
+                <xsd:annotation>
+                    <xsd:documentation>
+                        Number of retry attempts for AI mapping suggestion when validation fails.
+                        Default is 0 (no retry). Set to 1 or higher to enable retry mechanism.
+                    </xsd:documentation>
+                    <xsd:appinfo>
+                        <a:since>4.11</a:since>
+                        <a:displayName>InternalsConfigurationType.smartIntegrationMappingSuggestionRetryCount</a:displayName>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:element>
         </xsd:sequence>
         <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>

model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/MappingSuggestionOperationFactory.java

@@ -49,6 +49,7 @@ public MappingsSuggestionOperation create(ServiceClient client, String resourceO
             ResourceObjectTypeIdentification typeIdentification, CurrentActivityState<?> activityState,
             boolean isInbound, boolean useAiService,
             @Nullable ShadowObjectClassStatisticsType objectTypeStatistics,
+            int retryCount,
             Task task, OperationResult parentResult)
             throws SchemaException, ExpressionEvaluationException, SecurityViolationException, CommunicationException,
             ConfigurationException, ObjectNotFoundException {
@@ -62,6 +63,7 @@ public MappingsSuggestionOperation create(ServiceClient client, String resourceO
                 this.categoricalAttributeRegistry,
                 isInbound,
                 useAiService,
-                objectTypeStatistics);
+                objectTypeStatistics,
+                retryCount);
     }
 }

model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/MappingsSuggestionOperation.java

@@ -81,6 +81,7 @@ class MappingsSuggestionOperation {
     private final boolean isInbound;
     private final boolean useAiService;
     @Nullable private final ShadowObjectClassStatisticsType objectTypeStatistics;
+    private final int retryCount;
 
     private MappingsSuggestionOperation(
             TypeOperationContext ctx,
@@ -92,7 +93,8 @@ private MappingsSuggestionOperation(
             CategoricalAttributeRegistry categoricalAttributeRegistry,
             boolean isInbound,
             boolean useAiService,
-            @Nullable ShadowObjectClassStatisticsType objectTypeStatistics) {
+            @Nullable ShadowObjectClassStatisticsType objectTypeStatistics,
+            int retryCount) {
         this.ctx = ctx;
         this.qualityAssessor = qualityAssessor;
         this.scriptValidator = scriptValidator;
@@ -103,6 +105,7 @@ private MappingsSuggestionOperation(
         this.isInbound = isInbound;
         this.useAiService = useAiService;
         this.objectTypeStatistics = objectTypeStatistics;
+        this.retryCount = retryCount;
     }
 
     static MappingsSuggestionOperation init(
@@ -115,7 +118,8 @@ static MappingsSuggestionOperation init(
             CategoricalAttributeRegistry categoricalAttributeRegistry,
             boolean isInbound,
             boolean useAiService,
-            @Nullable ShadowObjectClassStatisticsType objectTypeStatistics)
+            @Nullable ShadowObjectClassStatisticsType objectTypeStatistics,
+            int retryCount)
             throws SchemaException, ExpressionEvaluationException, SecurityViolationException, CommunicationException,
             ConfigurationException, ObjectNotFoundException {
         return new MappingsSuggestionOperation(
@@ -128,7 +132,8 @@ static MappingsSuggestionOperation init(
                 categoricalAttributeRegistry,
                 isInbound,
                 useAiService,
-                objectTypeStatistics);
+                objectTypeStatistics,
+                retryCount);
     }
 
     private MappingDirection resolveDirection() {
@@ -641,7 +646,7 @@ private ExpressionType evaluateAiMappingWithRetry(
         String errorLog = null;
         String retryScript = null;
 
-        for (int attempt = 1; attempt <= 2; attempt++) {
+        for (int attempt = 0; attempt <= retryCount; attempt++) {
             var mappingResponse = askMicroserviceAsync(matchPair, valuePairsForLLM, errorLog, retryScript);
             retryScript = mappingResponse != null ? mappingResponse.getTransformationScript() : null;
             var aiExpression = buildScriptExpression(mappingResponse);
@@ -653,11 +658,11 @@ private ExpressionType evaluateAiMappingWithRetry(
                 }
                 break;
             } catch (ExpressionEvaluationException | SecurityViolationException e) {
-                if (attempt == 1) {
+                if (attempt < retryCount) {
                     errorLog = e.getMessage();
-                    LOGGER.warn("Validation issues found on attempt 1; retrying.");
+                    LOGGER.warn("Validation issues found on attempt {}; retrying.", attempt);
                 } else {
-                    LOGGER.warn("Validation issues persist after retry; giving up.");
+                    LOGGER.warn("Validation issues found in mapping script; giving up.");
                     throw e;
                 }
             }

model/smart-impl/src/main/java/com/evolveum/midpoint/smart/impl/SmartIntegrationServiceImpl.java

@@ -32,6 +32,7 @@
 import com.evolveum.midpoint.prism.query.ObjectQuery;
 import com.evolveum.midpoint.prism.xml.XmlTypeConverter;
 import com.evolveum.midpoint.repo.api.RepositoryService;
+import com.evolveum.midpoint.repo.common.SystemObjectCache;
 import com.evolveum.midpoint.repo.common.activity.ActivityInterruptedException;
 import com.evolveum.midpoint.repo.common.activity.run.state.CurrentActivityState;
 import com.evolveum.midpoint.schema.GetOperationOptions;
@@ -112,13 +113,15 @@ public class SmartIntegrationServiceImpl implements SmartIntegrationService {
     private final ObjectTypesSuggestionOperationFactory objectTypesSuggestionOperationFactory;
     private final StatisticsService statisticsService;
     private final SchemaMatchService schemaMatchService;
+    private final SystemObjectCache systemObjectCache;
 
     public SmartIntegrationServiceImpl(ModelService modelService,
             TaskService taskService, ModelInteractionServiceImpl modelInteractionService, TaskManager taskManager,
             @Qualifier("cacheRepositoryService") RepositoryService repositoryService,
             ServiceClientFactory clientFactory, MappingSuggestionOperationFactory mappingSuggestionOperationFactory,
             ObjectTypesSuggestionOperationFactory objectTypesSuggestionOperationFactory,
-            StatisticsService statisticsService, SchemaMatchService schemaMatchService) {
+            StatisticsService statisticsService, SchemaMatchService schemaMatchService,
+            SystemObjectCache systemObjectCache) {
         this.modelService = modelService;
         this.taskService = taskService;
         this.modelInteractionService = modelInteractionService;
@@ -129,6 +132,7 @@ public SmartIntegrationServiceImpl(ModelService modelService,
         this.objectTypesSuggestionOperationFactory = objectTypesSuggestionOperationFactory;
         this.statisticsService = statisticsService;
         this.schemaMatchService = schemaMatchService;
+        this.systemObjectCache = systemObjectCache;
     }
 
     @Override
@@ -661,8 +665,9 @@ public MappingsSuggestionType suggestMappings(
                 .addArbitraryObjectAsParam("typeIdentification", typeIdentification)
                 .build();
         try (var serviceClient = this.clientFactory.getServiceClient(result)) {
+            int retryCount = getConfiguredRetryCount(result);
             var mappings = this.mappingSuggestionOperationFactory.create(serviceClient, resourceOid,
-                    typeIdentification, activityState, isInbound, useAiService, objectTypeStatistics, task, result)
+                    typeIdentification, activityState, isInbound, useAiService, objectTypeStatistics, retryCount, task, result)
                     .suggestMappings(result, schemaMatch, targetPathsToIgnore);
             LOGGER.debug("Suggested mappings:\n{}", mappings.debugDumpLazily(1));
             return mappings;
@@ -674,6 +679,26 @@ public MappingsSuggestionType suggestMappings(
         }
     }
 
+    /**
+     * Retrieves the configured retry count for AI mapping suggestions from system configuration.
+     * Falls back to default of 0 (no retry) if not configured.
+     */
+    private int getConfiguredRetryCount(OperationResult result) {
+        try {
+            SystemConfigurationType systemConfig = systemObjectCache.getSystemConfigurationBean(result);
+            if (systemConfig != null && systemConfig.getInternals() != null) {
+                Integer configuredRetryCount = systemConfig.getInternals().getSmartIntegrationMappingSuggestionRetryCount();
+                if (configuredRetryCount != null && configuredRetryCount >= 0) {
+                    LOGGER.debug("Using configured retry count for mapping suggestions: {}", configuredRetryCount);
+                    return configuredRetryCount;
+                }
+            }
+        } catch (SchemaException e) {
+            LOGGER.warn("Failed to retrieve configured retry count, using default: {}", e.getMessage());
+        }
+        return 0;
+    }
+
     @Override
     public String submitSuggestCorrelationOperation(
             String resourceOid, ResourceObjectTypeIdentification typeIdentification,