Fixes and prompt support

Author: jjmata

app/models/assistant/configurable.rb

@@ -46,8 +46,13 @@ def langfuse_default_instructions(preferred_currency, preferred_date_format)
 
         prompt = langfuse_client.get_prompt("default_instructions")
         return if prompt.nil?
+
+        # TODO: remove after we make the code resilient to chat vs. text types of prompts
+        Rails.logger.warn("Langfuse prompt retrieved: #{prompt.name} #{prompt.version}")
+        Rails.logger.warn("Langfuse prompt retrieved: #{prompt.prompt}")
+
         compiled_prompt = compile_langfuse_prompt(
-          prompt,
+          prompt.prompt.dig(0, "content"),
           preferred_currency: preferred_currency,
           preferred_date_format: preferred_date_format
         )
@@ -56,6 +61,7 @@ def langfuse_default_instructions(preferred_currency, preferred_date_format)
         return if content.blank?
 
         {
+          id: prompt.respond_to?(:id) ? prompt.id : (prompt[:id] rescue nil),
           name: prompt.name,
           version: prompt.version,
           template: prompt.prompt,
@@ -78,7 +84,30 @@ def compile_langfuse_prompt(prompt, preferred_currency:, preferred_date_format:)
           current_date: Date.current
         }.transform_values { |value| value.nil? ? "" : value.to_s }
 
-        prompt.compile(**variables)
+        # If the prompt object supports compilation, use it. Otherwise, perform
+        # a lightweight local interpolation for String/Array/Hash templates.
+        if prompt.respond_to?(:compile)
+          prompt.compile(**variables)
+        else
+          interpolate_template(prompt, variables)
+        end
+      end
+
+      def interpolate_template(template, variables)
+        case template
+        when String
+          # Replace {{ variable }} placeholders with provided variables
+          template.gsub(/\{\{\s*(\w+)\s*\}\}/) do
+            key = Regexp.last_match(1)
+            variables[key] || ""
+          end
+        when Array
+          template.map { |item| interpolate_template(item, variables) }
+        when Hash
+          template.transform_values { |v| interpolate_template(v, variables) }
+        else
+          template
+        end
       end
 
       def extract_prompt_content(compiled_prompt)

app/models/provider/openai.rb

@@ -144,41 +144,45 @@ def langfuse_client
       @langfuse_client = Langfuse.new
     end
 
-  def log_langfuse_generation(name:, model:, input:, output:, usage: nil, session_id: nil, user_identifier: nil, prompt: nil)
-    return unless langfuse_client
-
-    trace = langfuse_client.trace(
-      name: "openai.#{name}",
-      input: input,
-      session_id: session_id,
-      user_id: user_identifier
-    )
-    generation_options = {
-      name: name,
-      model: model,
-      input: input,
-      output: output,
-      usage: usage,
-      session_id: session_id,
-      user_id: user_identifier
-    }
-
-    if prompt.present?
-      generation_options[:version] = prompt[:version] if prompt[:version]
-      metadata = {
-        prompt: {
-          name: prompt[:name],
-          version: prompt[:version],
-          content: prompt[:content],
-          template: prompt[:template]
-        }.compact
+    def log_langfuse_generation(name:, model:, input:, output:, usage: nil, session_id: nil, user_identifier: nil, prompt: nil)
+      return unless langfuse_client
+
+      trace = langfuse_client.trace(
+        name: "openai.#{name}",
+        input: input,
+        session_id: session_id,
+        user_id: user_identifier
+      )
+      generation_options = {
+        name: name,
+        model: model,
+        input: input,
+        output: output,
+        usage: usage,
+        session_id: session_id,
+        user_id: user_identifier
       }
-      generation_options[:metadata] = metadata
-    end
 
-    trace.generation(**generation_options)
-    trace.update(output: output)
-  rescue => e
-    Rails.logger.warn("Langfuse logging failed: #{e.message}")
-  end
+      if prompt.present?
+        generation_options[:prompt_name] = prompt[:name] if prompt[:name]
+        generation_options[:prompt_version] = prompt[:version] if prompt[:version]
+        generation_options[:prompt_id] = prompt[:id] if prompt[:id]
+
+        metadata = {
+          prompt: {
+            id: prompt[:id],
+            name: prompt[:name],
+            version: prompt[:version],
+            content: prompt[:content],
+            template: prompt[:template]
+          }.compact
+        }
+        generation_options[:metadata] = metadata
+      end
+
+      trace.generation(**generation_options)
+      trace.update(output: output)
+    rescue => e
+      Rails.logger.warn("Langfuse logging failed: #{e.message}")
+    end
 end