PR Reviewed

Author: scezen

bot/engine/src/main/kotlin/engine/config/RAGAnswerHandler.kt

@@ -72,33 +72,7 @@ object RAGAnswerHandler : AbstractProactiveAnswerHandler {
             if (noAnswerStory == null && answer != null) {
                 logger.info { "Send RAG answer." }
 
-                val publicTraceUrl = observabilityInfo?.let {
-                    // Get observability configuration
-                    val observabilityConfig = botDefinition.observabilityConfiguration
-                    // If observability configuration exists and contain a public URL, replace the trace URL
-                    if (observabilityConfig?.enabled == true && observabilityConfig.setting is LangfuseObservabilitySetting<*>) {
-                        val publicUrl = (observabilityConfig.setting as LangfuseObservabilitySetting<*>).publicUrl
-                        if (!publicUrl.isNullOrBlank()) {
-                            it.traceUrl.replace(
-                                (observabilityConfig.setting as LangfuseObservabilitySetting<*>).url,
-                                publicUrl
-                            )
-                        } else {
-                            it.traceUrl
-                        }
-                    } else {
-                        it.traceUrl
-                    }
-                }
-
-                // Modified ObservabilityInfo
-                val modifiedObservabilityInfo = observabilityInfo?.let {
-                    ObservabilityInfo(
-                        traceId = it.traceId,
-                        traceName = it.traceName,
-                        traceUrl = publicTraceUrl ?: it.traceUrl
-                    )
-                }
+                val modifiedObservabilityInfo = observabilityInfo?.let { updateObservabilityInfo(this, it) }
 
                 send(
                     SendSentenceWithFootnotes(
@@ -120,6 +94,20 @@ object RAGAnswerHandler : AbstractProactiveAnswerHandler {
         }
     }
 
+    private fun updateObservabilityInfo(botBus: BotBus, info: ObservabilityInfo): ObservabilityInfo {
+        val config = botBus.botDefinition.observabilityConfiguration
+        if (config?.enabled == true && config.setting is LangfuseObservabilitySetting<*>) {
+            val setting = config.setting as LangfuseObservabilitySetting<*>
+            // Stockage dans une variable locale pour éviter le smart cast impossible sur une propriété déclarée dans un autre module
+            val publicUrl = setting.publicUrl
+            if (!publicUrl.isNullOrBlank()) {
+                // Remplace l'URL interne par l'URL publique configurée
+                return info.copy(traceUrl = info.traceUrl.replace(setting.url, publicUrl))
+            }
+        }
+        return info
+    }
+
     /**
      * Manage story redirection when no answer redirection is filled
      * Use the handler of the configured story otherwise launch default unknown story

gen-ai/orchestrator-core/src/main/kotlin/ai/tock/genai/orchestratorcore/mappers/ObservabilitySettingMapper.kt

@@ -54,7 +54,7 @@ object ObservabilitySettingMapper {
             when (this) {
                 is LangfuseObservabilitySetting -> {
                     val secretKey = SecurityUtils.createSecretKey(namespace, botId, feature, secretKey)
-                    return LangfuseObservabilitySetting(secretKey, publicKey, url, publicUrl)
+                    return LangfuseObservabilitySetting(secretKey, publicKey, url, publicUrl.takeIf {!it.isNullOrBlank()})
                 }
                 else ->
                     throw IllegalArgumentException("Unsupported Observability Setting")

gen-ai/orchestrator-server/src/main/python/server/src/gen_ai_orchestrator/routers/responses/responses.py

@@ -118,9 +118,6 @@ class ObservabilityInfo(BaseModel):
     trace_url: str = Field(
         description='The observability trace url.'
     )
-    public_trace_url: Optional[str] = Field(
-        None, description="The public observability trace url."
-    )
 
 class RagResponse(BaseModel):
     """The RAG response model"""