Merge branch 'main' into add-multimodal-support

Author: hassiebp

langfuse/openai.py

@@ -22,7 +22,8 @@
 from collections import defaultdict
 from dataclasses import dataclass
 from inspect import isclass
-from typing import Optional
+from typing import List, Optional
+
 
 import openai.resources
 from openai._types import NotGiven
@@ -408,12 +409,15 @@ def _get_langfuse_data_from_kwargs(
         else None
     )
 
+    parsed_n = kwargs.get("n", 1) if not isinstance(kwargs.get("n", 1), NotGiven) else 1
+
     modelParameters = {
         "temperature": parsed_temperature,
         "max_tokens": parsed_max_tokens,  # casing?
         "top_p": parsed_top_p,
         "frequency_penalty": parsed_frequency_penalty,
         "presence_penalty": parsed_presence_penalty,
+        "n": parsed_n,
     }
     if parsed_seed is not None:
         modelParameters["seed"] = parsed_seed
@@ -583,12 +587,21 @@ def _get_langfuse_data_from_default_response(resource: OpenAiDefinition, respons
     elif resource.type == "chat":
         choices = response.get("choices", [])
         if len(choices) > 0:
-            choice = choices[-1]
-            completion = (
-                _extract_chat_response(choice.message.__dict__)
-                if _is_openai_v1()
-                else choice.get("message", None)
-            )
+            # If multiple choices were generated, we'll show all of them in the UI as a list.
+            if len(choices) > 1:
+                completion = [
+                    _extract_chat_response(choice.message.__dict__)
+                    if _is_openai_v1()
+                    else choice.get("message", None)
+                    for choice in choices
+                ]
+            else:
+                choice = choices[0]
+                completion = (
+                    _extract_chat_response(choice.message.__dict__)
+                    if _is_openai_v1()
+                    else choice.get("message", None)
+                )
 
     usage = response.get("usage", None)