Merge branch 'main' into dependabot/gradle/ktor-version-3.4.0

Author: patwlan

arc-assistants/src/main/kotlin/filters/MustFeature.kt

@@ -4,22 +4,20 @@
 
 package org.eclipse.lmos.arc.assistants.support.filters
 
-import org.eclipse.lmos.adl.server.agents.extensions.RESPONSE_GUIDE_RETRY_REASON
 import org.eclipse.lmos.arc.agents.conversation.Conversation
 import org.eclipse.lmos.arc.agents.conversation.ConversationMessage
 import org.eclipse.lmos.arc.agents.dsl.AgentOutputFilter
 import org.eclipse.lmos.arc.agents.dsl.OutputFilterContext
 import org.eclipse.lmos.arc.agents.dsl.extensions.getCurrentUseCases
 import org.eclipse.lmos.arc.agents.dsl.extensions.llm
 import org.eclipse.lmos.arc.agents.dsl.get
-import org.eclipse.lmos.arc.agents.retry
 import org.eclipse.lmos.arc.core.getOrThrow
 import org.slf4j.LoggerFactory
 
 /**
  * An [AgentOutputFilter] that extracts "MUST" instructions from processed use cases and verifies compliance.
  */
-class MustFeature(private val keyword: String = "MUST", private val retryMax: Int = 3) : AgentOutputFilter {
+class MustFeature(private val keyword: String = "MUST") : AgentOutputFilter {
 
     private val log = LoggerFactory.getLogger(this::class.java)
 
@@ -144,7 +142,7 @@ class MustFeature(private val keyword: String = "MUST", private val retryMax: In
             return message
         }
 
-        log.warn("MustFeature verification failed: $verificationResult")
+        log.warn("MustFeature verification failed for: ${message.content}")
         val fixedResponse = verificationResult.substringAfter("Fixed Response:")
             .trim()
             .replace("```", "")
@@ -155,12 +153,6 @@ class MustFeature(private val keyword: String = "MUST", private val retryMax: In
             return message.update(fixedResponse)
         }
 
-        context.retry(
-            max = retryMax,
-            details = mapOf("error" to "The following instructions must be followed: $instructionsText"),
-            reason = RESPONSE_GUIDE_RETRY_REASON
-        )
-
         return message
     }
 }

arc-assistants/src/main/kotlin/filters/StaticResponseFeature.kt

@@ -0,0 +1,29 @@
+// SPDX-FileCopyrightText: 2025 Deutsche Telekom AG and others
+//
+// SPDX-License-Identifier: Apache-2.0
+
+package org.eclipse.lmos.arc.assistants.support.filters
+
+import org.eclipse.lmos.arc.agents.conversation.ConversationMessage
+import org.eclipse.lmos.arc.agents.dsl.AgentOutputFilter
+import org.eclipse.lmos.arc.agents.dsl.OutputFilterContext
+import org.eclipse.lmos.arc.agents.dsl.extensions.getCurrentUseCases
+import org.eclipse.lmos.arc.assistants.support.usecases.toUseCases
+
+
+class StaticResponseFeature : AgentOutputFilter {
+
+    override suspend fun filter(
+        message: ConversationMessage,
+        context: OutputFilterContext
+    ): ConversationMessage {
+        val currentUseCaseId = context.getCurrentUseCases()?.currentUseCaseId
+        context.getCurrentUseCases()?.processedUseCaseMap?.get(currentUseCaseId)?.let { uc ->
+            val solution = uc.toUseCases().first().solution.joinToString("\n").trim()
+            if ((solution.startsWith("\"") || solution.startsWith("- \"")) && solution.endsWith("\"")) {
+                return message.update(solution.substringAfter("\"").substringBeforeLast("\""))
+            }
+        }
+        return message
+    }
+}

arc-assistants/src/main/kotlin/usecases/UseCaseFormatter.kt

@@ -61,6 +61,10 @@ suspend fun List<UseCase>.formatToString(
             temp.append("#### Solution\n")
             useCase.fallbackSolution.output(allConditions, temp, codeBlockProcessor)
         }
+        if (outputOptions.outputSolution != false && useCase.context.isNotEmpty()) {
+            temp.append("#### Context\n")
+            useCase.context.output(allConditions, temp, codeBlockProcessor)
+        }
         if (useCase.examples.isNotEmpty() && outputOptions.outputExamples != false) {
             temp.append("#### Examples\n")
             useCase.examples.split("\n").take(exampleLimit).forEach { example ->

arc-assistants/src/main/kotlin/usecases/UseCaseParser.kt

@@ -20,7 +20,7 @@ fun String.toUseCases(): List<UseCase> {
 
     forEachLine { line ->
         if (line.trimStart().startsWith("#")) {
-            if (line.contains("# UseCase") || line.contains("# Case")) {
+            if (line.contains("# UseCase") || line.contains("# Case") || line.contains("# Skill")) {
                 currentUseCase?.let { useCases.add(it) }
                 val (lineWithoutConditions, conditions) = line.parseConditions()
                 val useCaseHeader = lineWithoutConditions.substringAfter(":").trim()
@@ -46,6 +46,7 @@ fun String.toUseCases(): List<UseCase> {
                     line.contains("# Fallback") -> FALLBACK_SOLUTION
                     line.contains("# Step") -> STEPS
                     line.contains("# Example") -> EXAMPLES
+                    line.contains("# Context") -> CONTEXT
                     else -> error("Unknown UseCase section: ${line.trim()}")
                 }
                 return@forEachLine
@@ -62,6 +63,10 @@ fun String.toUseCases(): List<UseCase> {
                 goal = (currentUseCase?.goal ?: emptyList()) + line.asConditional(),
             )
 
+            CONTEXT -> currentUseCase?.copy(
+                context = (currentUseCase?.context ?: emptyList()) + line.asConditional(),
+            )
+
             STEPS -> currentUseCase?.copy(steps = (currentUseCase?.steps ?: emptyList()) + line.asConditional())
             EXAMPLES -> currentUseCase?.copy(examples = (currentUseCase?.examples ?: "") + line)
             DESCRIPTION -> currentUseCase?.copy(
@@ -202,6 +207,7 @@ enum class Section {
     FALLBACK_SOLUTION,
     STEPS,
     EXAMPLES,
+    CONTEXT,
 }
 
 @Serializable
@@ -219,6 +225,7 @@ data class UseCase(
     val goal: List<Conditional> = emptyList(),
     val subUseCase: Boolean = false,
     val category: String? = null,
+    val context: List<Conditional> = emptyList(),
 ) {
     fun matches(allConditions: Set<String>, input: String? = null): Boolean = conditions.matches(allConditions, input)
 
@@ -294,20 +301,20 @@ fun Set<String>.matches(conditions: Set<String>, input: String? = null): Boolean
         conditions
     }
     return isEmpty() || (
-        positiveConditionals().all { allConditions.contains(it) } &&
-            negativeConditionals().none { allConditions.contains(it) } &&
-            orConditionals().all { ors ->
-                ors.any {
-                    if (it.startsWith("!")) {
-                        !allConditions.contains(
-                            it.removePrefix("!").trim(),
-                        )
-                    } else {
-                        allConditions.contains(it.trim())
+            positiveConditionals().all { allConditions.contains(it) } &&
+                    negativeConditionals().none { allConditions.contains(it) } &&
+                    orConditionals().all { ors ->
+                        ors.any {
+                            if (it.startsWith("!")) {
+                                !allConditions.contains(
+                                    it.removePrefix("!").trim(),
+                                )
+                            } else {
+                                allConditions.contains(it.trim())
+                            }
+                        }
                     }
-                }
-            }
-        )
+            )
 }
 
 /**

gradle.properties

@@ -12,4 +12,4 @@ org.gradle.dependency.verification=lenient
 #org.gradle.configuration-cache=true
 #org.gradle.configuration-cache.problems=warn
 org.gradle.configureondemand=true
-version=0.214.0-SNAPSHOT
+version=0.216.0-SNAPSHOT