Improved logic

Author: scezen

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

@@ -37,6 +37,7 @@ import ai.tock.genai.orchestratorclient.responses.TextWithFootnotes
 import ai.tock.genai.orchestratorclient.retrofit.GenAIOrchestratorBusinessError
 import ai.tock.genai.orchestratorclient.retrofit.GenAIOrchestratorValidationError
 import ai.tock.genai.orchestratorclient.services.RAGService
+import ai.tock.genai.orchestratorcore.models.observability.LangfuseObservabilitySetting
 import ai.tock.genai.orchestratorcore.utils.VectorStoreUtils
 import ai.tock.shared.*
 import engine.config.AbstractProactiveAnswerHandler
@@ -76,6 +77,35 @@ object RAGAnswerHandler : AbstractProactiveAnswerHandler {
             // Handle the RAG answer
             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
+                    )
+                }
+
                 send(
                     SendSentenceWithFootnotes(
                         botId, applicationId, userId, text = answer.text, footnotes = answer.footnotes.map {
@@ -85,7 +115,7 @@ object RAGAnswerHandler : AbstractProactiveAnswerHandler {
                                 it.score
                             )
                         }.toMutableList(),
-                        metadata = ActionMetadata(isGenAiRagAnswer = true, observabilityInfo = observabilityInfo)
+                        metadata = ActionMetadata(isGenAiRagAnswer = true, observabilityInfo = modifiedObservabilityInfo)
                     )
                 )
             } else {

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

@@ -118,6 +118,9 @@ 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"""

gen-ai/orchestrator-server/src/main/python/server/src/gen_ai_orchestrator/services/langchain/factories/callback_handlers/langfuse_callback_handler_factory.py

@@ -63,10 +63,9 @@ def check_observability_setting(self) -> bool:
         return True
 
     def _fetch_settings(self):
-        host = str(self.setting.public_url or self.setting.url)
-        logger.info(f"Using Langfuse host: {host}")
         return {
-            'host': host,
+            'host': str(self.setting.url),
+            'public_key': self.setting.public_key,
             'secret_key': fetch_secret_key_value(self.setting.secret_key),
             'timeout': application_settings.observability_provider_timeout,
             'max_retries': application_settings.observability_provider_max_retries