Merge branch 'main' into fix-langchain-gemini-streaming-usage

Author: hassiebp

CONTRIBUTING.md

@@ -21,6 +21,13 @@ poetry install --all-extras
 poetry run pre-commit install
 ```
 
+### Type Checking
+
+To run type checking on the langfuse package, run:
+```sh
+poetry run mypy langfuse --no-error-summary
+```
+
 ### Tests
 
 #### Setup

langfuse/__init__.py

@@ -2,18 +2,38 @@
 
 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
+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",
     "LangfuseOtelSpanAttributes",
+    "LangfuseAgent",
+    "LangfuseTool",
+    "LangfuseChain",
+    "LangfuseEmbedding",
+    "LangfuseEvaluator",
+    "LangfuseRetriever",
+    "LangfuseGuardrail",
 ]

langfuse/_client/attributes.py

@@ -14,6 +14,11 @@
 from datetime import datetime
 from typing import Any, Dict, List, Literal, Optional, Union
 
+from langfuse._client.constants import (
+    ObservationTypeGenerationLike,
+    ObservationTypeSpanLike,
+)
+
 from langfuse._utils.serializer import EventSerializer
 from langfuse.model import PromptClient
 from langfuse.types import MapValue, SpanLevel
@@ -93,9 +98,12 @@ def create_span_attributes(
     level: Optional[SpanLevel] = None,
     status_message: Optional[str] = None,
     version: Optional[str] = None,
+    observation_type: Optional[
+        Union[ObservationTypeSpanLike, Literal["event"]]
+    ] = "span",
 ) -> dict:
     attributes = {
-        LangfuseOtelSpanAttributes.OBSERVATION_TYPE: "span",
+        LangfuseOtelSpanAttributes.OBSERVATION_TYPE: observation_type,
         LangfuseOtelSpanAttributes.OBSERVATION_LEVEL: level,
         LangfuseOtelSpanAttributes.OBSERVATION_STATUS_MESSAGE: status_message,
         LangfuseOtelSpanAttributes.VERSION: version,
@@ -122,9 +130,10 @@ def create_generation_attributes(
     usage_details: Optional[Dict[str, int]] = None,
     cost_details: Optional[Dict[str, float]] = None,
     prompt: Optional[PromptClient] = None,
+    observation_type: Optional[ObservationTypeGenerationLike] = "generation",
 ) -> dict:
     attributes = {
-        LangfuseOtelSpanAttributes.OBSERVATION_TYPE: "generation",
+        LangfuseOtelSpanAttributes.OBSERVATION_TYPE: observation_type,
         LangfuseOtelSpanAttributes.OBSERVATION_LEVEL: level,
         LangfuseOtelSpanAttributes.OBSERVATION_STATUS_MESSAGE: status_message,
         LangfuseOtelSpanAttributes.VERSION: version,