update

Author: nimarb

langfuse/__init__.py

@@ -2,16 +2,29 @@
 
 from ._client import client as _client_module
 from ._client.attributes import LangfuseOtelSpanAttributes
+from ._client.constants import ObservationTypeLiteral
 from ._client.get_client import get_client
 from ._client.observe import observe
-from ._client.span import LangfuseEvent, LangfuseGeneration, LangfuseSpan, LangfuseAgent, LangfuseTool, LangfuseChain, LangfuseEmbedding, LangfuseRetriever
+from ._client.span import (
+    LangfuseEvent,
+    LangfuseGeneration,
+    LangfuseSpan,
+    LangfuseAgent,
+    LangfuseTool,
+    LangfuseChain,
+    LangfuseEmbedding,
+    LangfuseEvaluator,
+    LangfuseRetriever,
+    LangfuseGuardrail,
+)
 
 Langfuse = _client_module.Langfuse
 
 __all__ = [
     "Langfuse",
     "get_client",
     "observe",
+    "ObservationTypeLiteral",
     "LangfuseSpan",
     "LangfuseGeneration",
     "LangfuseEvent",
@@ -20,5 +33,7 @@
     "LangfuseTool",
     "LangfuseChain",
     "LangfuseEmbedding",
+    "LangfuseEvaluator",
     "LangfuseRetriever",
+    "LangfuseGuardrail",
 ]

langfuse/_client/client.py

@@ -36,6 +36,7 @@
     LANGFUSE_TRACING_ENABLED,
     LANGFUSE_TRACING_ENVIRONMENT,
 )
+from langfuse._client.constants import ObservationTypeLiteral, ObservationTypeLiteralNoEvent
 from langfuse._client.resource_manager import LangfuseResourceManager
 from langfuse._client.span import (
     LangfuseEvent,
@@ -45,7 +46,9 @@
     LangfuseTool,
     LangfuseChain,
     LangfuseRetriever,
+    LangfuseEvaluator,
     LangfuseEmbedding,
+    LangfuseGuardrail,
 )
 from langfuse._utils import _get_timestamp
 from langfuse._utils.parse_error import handle_fern_exception
@@ -355,18 +358,6 @@ def start_as_current_span(
         level: Optional[SpanLevel] = None,
         status_message: Optional[str] = None,
         end_on_exit: Optional[bool] = None,
-        as_type: Optional[
-            Literal[
-                "generation",
-                "span",
-                "event",
-                "agent",
-                "tool",
-                "chain",
-                "retriever",
-                "embedding",
-            ]
-        ] = None,
     ) -> _AgnosticContextManager[LangfuseSpan]:
         """Create a new span and set it as the current span in a context manager.
 
@@ -685,33 +676,33 @@ def start_as_current_generation(
 
     def _get_span_class(
         self,
-        as_type: Literal[
-            "span",
-            "generation",
-            "event",
-            "agent",
-            "tool",
-            "chain",
-            "retriever",
-            "embedding",
-        ],
+        as_type: ObservationTypeLiteral,
     ) -> type:
         """Get the appropriate span class based on as_type."""
-        if as_type == "agent":
+        normalized_type = as_type.upper()
+
+        if normalized_type == "AGENT":
             return LangfuseAgent
-        elif as_type == "tool":
+        elif normalized_type == "TOOL":
             return LangfuseTool
-        elif as_type == "chain":
+        elif normalized_type == "CHAIN":
             return LangfuseChain
-        elif as_type == "retriever":
+        elif normalized_type == "RETRIEVER":
             return LangfuseRetriever
-        elif as_type == "embedding":
+        elif normalized_type == "EVALUATOR":
+            return LangfuseEvaluator
+        elif normalized_type == "EMBEDDING":
             return LangfuseEmbedding
-        elif as_type == "generation":
+        elif normalized_type == "GUARDRAIL":
+            return LangfuseGuardrail
+        elif normalized_type == "GENERATION":
             return LangfuseGeneration
-        elif as_type == "event":
+        elif normalized_type == "EVENT":
             return LangfuseEvent
-        elif as_type == "span":
+        elif normalized_type == "SPAN":
+            return LangfuseSpan
+        else:
+            # Default to LangfuseSpan for unrecognized types
             return LangfuseSpan
 
     @_agnosticcontextmanager
@@ -721,7 +712,7 @@ def _create_span_with_parent_context(
         name: str,
         parent: Optional[otel_trace_api.Span] = None,
         remote_parent_span: Optional[otel_trace_api.Span] = None,
-        as_type: Literal["generation", "span", "agent", "tool", "chain", "retriever"],
+        as_type: ObservationTypeLiteralNoEvent,
         end_on_exit: Optional[bool] = None,
         input: Optional[Any] = None,
         output: Optional[Any] = None,
@@ -768,18 +759,7 @@ def _start_as_current_otel_span_with_processed_media(
         self,
         *,
         name: str,
-        as_type: Optional[
-            Literal[
-                "generation",
-                "span",
-                "event",
-                "agent",
-                "tool",
-                "chain",
-                "retriever",
-                "embedding",
-            ]
-        ] = None,
+        as_type: Optional[ObservationTypeLiteralNoEvent] = None,
         end_on_exit: Optional[bool] = None,
         input: Optional[Any] = None,
         output: Optional[Any] = None,
@@ -798,7 +778,7 @@ def _start_as_current_otel_span_with_processed_media(
             name=name,
             end_on_exit=end_on_exit if end_on_exit is not None else True,
         ) as otel_span:
-            span_class = self._get_span_class(as_type or "generation")
+            span_class = self._get_span_class(as_type or "generation")  # default was "generation"
             common_args = {
                 "otel_span": otel_span,
                 "langfuse_client": self,
@@ -822,13 +802,16 @@ def _start_as_current_otel_span_with_processed_media(
                         "prompt": prompt,
                     }
                 )
+            # TODO: for some, create generation-like classes with those props.
             elif span_class in [
                 LangfuseSpan,
                 LangfuseAgent,
                 LangfuseTool,
                 LangfuseChain,
                 LangfuseRetriever,
+                LangfuseEvaluator,
                 LangfuseEmbedding,
+                LangfuseGuardrail,
             ]:
                 # set their type internally in the class
                 pass

langfuse/_client/constants.py

@@ -55,4 +55,3 @@ class ObservationType(str, enum.Enum):
 ]
 
 ObservationTypeLiteral: TypeAlias = ObservationTypeLiteralNoEvent | Literal["event"]
-]

langfuse/_client/span.py

@@ -1374,5 +1374,23 @@ class LangfuseEmbedding(LangfuseGraphObservation):
 
     def __init__(self, **kwargs: Any) -> None:
         """Initialize a new LangfuseEmbedding span."""
-        kwargs["observation_type"] = "embedding"
+        kwargs["observation_type"] = "EMBEDDING"
+        super().__init__(**kwargs)
+
+
+class LangfuseEvaluator(LangfuseGraphObservation):
+    """Specialized span for evaluator observations in agentic workflows."""
+
+    def __init__(self, **kwargs: Any) -> None:
+        """Initialize a new LangfuseEvaluator span."""
+        kwargs["observation_type"] = "EVALUATOR"
+        super().__init__(**kwargs)
+
+
+class LangfuseGuardrail(LangfuseGraphObservation):
+    """Specialized span for guardrail observations in agentic workflows."""
+
+    def __init__(self, **kwargs: Any) -> None:
+        """Initialize a new LangfuseGuardrail span."""
+        kwargs["observation_type"] = "GUARDRAIL"
         super().__init__(**kwargs)