push

Author: hassiebp

langfuse/_client/datasets.py

@@ -4,7 +4,7 @@
 
 from opentelemetry.util._decorator import _agnosticcontextmanager
 
-from langfuse.api.datasets import (
+from langfuse.api import (
     Dataset,
     DatasetItem,
     DatasetStatus,

langfuse/_client/resource_manager.py

@@ -42,7 +42,7 @@
 from langfuse._utils.environment import get_common_release_envs
 from langfuse._utils.prompt_cache import PromptCache
 from langfuse._utils.request import LangfuseClient
-from langfuse.api.client import AsyncLangfuseAPI, LangfuseAPI
+from langfuse.api import AsyncLangfuseAPI, LangfuseAPI
 from langfuse.logger import langfuse_logger
 from langfuse.types import MaskFunction
 

langfuse/_task_manager/media_manager.py

@@ -10,9 +10,8 @@
 
 from langfuse._client.environment_variables import LANGFUSE_MEDIA_UPLOAD_ENABLED
 from langfuse._utils import _get_timestamp
-from langfuse.api.client import LangfuseAPI
+from langfuse.api import LangfuseAPI, MediaContentType
 from langfuse.api.core import ApiError
-from langfuse.api.media import MediaContentType
 from langfuse.media import LangfuseMedia
 
 from .media_upload_queue import UploadMediaJob

langfuse/_utils/parse_error.py

@@ -3,17 +3,17 @@
 
 # our own api errors
 from langfuse._utils.request import APIError, APIErrors
-from langfuse.api.core import ApiError
-from langfuse.api.health import ServiceUnavailableError
 
 # fern api errors
-from langfuse.api.utils import (
+from langfuse.api import (
     AccessDeniedError,
     Error,
     MethodNotAllowedError,
     NotFoundError,
+    ServiceUnavailableError,
     UnauthorizedError,
 )
+from langfuse.api.core import ApiError
 
 SUPPORT_URL = "https://langfuse.com/support"
 API_DOCS_URL = "https://api.reference.langfuse.com"

langfuse/_utils/serializer.py

@@ -1,5 +1,6 @@
 """@private"""
 
+import datetime as dt
 import enum
 import math
 from asyncio import Queue
@@ -14,7 +15,6 @@
 
 from pydantic import BaseModel
 
-from langfuse.api.core import pydantic_utilities, serialize_datetime
 from langfuse.media import LangfuseMedia
 
 # Attempt to import Serializable
@@ -98,17 +98,13 @@ def default(self, obj: Any) -> Any:
                 return obj.isoformat()
 
             if isinstance(obj, BaseModel):
-                obj.model_rebuild() if pydantic_utilities.IS_PYDANTIC_V2 else obj.update_forward_refs()  # This method forces the OpenAI model to instantiate its serializer to avoid errors when serializing
+                obj.model_rebuild()
 
                 # For LlamaIndex models, we need to rebuild the raw model as well if they include OpenAI models
                 if isinstance(raw := getattr(obj, "raw", None), BaseModel):
-                    raw.model_rebuild() if pydantic_utilities.IS_PYDANTIC_V2 else raw.update_forward_refs()
+                    raw.model_rebuild()
 
-                return (
-                    obj.model_dump()
-                    if pydantic_utilities.IS_PYDANTIC_V2
-                    else obj.dict()
-                )
+                return obj.model_dump()
 
             if isinstance(obj, Path):
                 return str(obj)
@@ -188,3 +184,22 @@ def is_js_safe_integer(value: int) -> bool:
         min_safe_int = -(2**53) + 1
 
         return min_safe_int <= value <= max_safe_int
+
+
+def serialize_datetime(v: dt.datetime) -> str:
+    def _serialize_zoned_datetime(v: dt.datetime) -> str:
+        if v.tzinfo is not None and v.tzinfo.tzname(None) == dt.timezone.utc.tzname(
+            None
+        ):
+            # UTC is a special case where we use "Z" at the end instead of "+00:00"
+            return v.isoformat().replace("+00:00", "Z")
+        else:
+            # Delegate to the typical +/- offset format
+            return v.isoformat()
+
+    if v.tzinfo is not None:
+        return _serialize_zoned_datetime(v)
+    else:
+        local_tz = dt.datetime.now().astimezone().tzinfo
+        localized_dt = v.replace(tzinfo=local_tz)
+        return _serialize_zoned_datetime(localized_dt)

langfuse/batch_evaluation.py

@@ -22,7 +22,7 @@
     Union,
 )
 
-from langfuse.api.commons import (
+from langfuse.api import (
     ObservationsView,
     TraceWithFullDetails,
 )

tests/test_datasets.py

@@ -7,8 +7,8 @@
 from langchain_openai import OpenAI
 
 from langfuse import Langfuse, observe
-from langfuse.api.resources.commons.types.dataset_status import DatasetStatus
-from langfuse.api.resources.commons.types.observation import Observation
+from langfuse.api import DatasetStatus
+from langfuse.api import Observation
 from langfuse.langchain import CallbackHandler
 from tests.utils import create_uuid, get_api
 
@@ -220,7 +220,7 @@ def test_get_dataset_runs():
 
     langfuse.flush()
     time.sleep(1)  # Give API time to process
-    runs = langfuse.api.datasets.get_runs(dataset_name)
+    runs = langfuse.api
 
     assert len(runs.data) == 2
     assert runs.data[0].name == run_name_2

tests/test_error_parsing.py

@@ -5,14 +5,14 @@
     generate_error_message_fern,
 )
 from langfuse._utils.request import APIError, APIErrors
-from langfuse.api.core import ApiError
-from langfuse.api.resources.commons.errors import (
+from langfuse.api import (
     AccessDeniedError,
     MethodNotAllowedError,
     NotFoundError,
+    ServiceUnavailableError,
     UnauthorizedError,
 )
-from langfuse.api.resources.health.errors import ServiceUnavailableError
+from langfuse.api.core import ApiError
 
 
 def test_generate_error_message_api_error():

tests/test_json.py

@@ -12,7 +12,7 @@
 
 import langfuse
 from langfuse._utils.serializer import EventSerializer
-from langfuse.api.resources.commons.types.observation_level import ObservationLevel
+from langfuse.api import ObservationLevel
 
 
 class TestModel(BaseModel):

tests/test_prompt.py

@@ -10,8 +10,8 @@
     PromptCache,
     PromptCacheItem,
 )
-from langfuse.api.resources.commons.errors.not_found_error import NotFoundError
-from langfuse.api.resources.prompts import Prompt_Chat, Prompt_Text
+from langfuse.api import NotFoundError
+from langfuse.api import Prompt_Chat, Prompt_Text
 from langfuse.model import ChatPromptClient, TextPromptClient
 from tests.utils import create_uuid, get_api
 
@@ -312,7 +312,7 @@ def test_compile_with_placeholders(
     variables, placeholders, expected_len, expected_contents
 ) -> None:
     """Test compile_with_placeholders with different variable/placeholder combinations."""
-    from langfuse.api.resources.prompts import Prompt_Chat
+    from langfuse.api import Prompt_Chat
     from langfuse.model import ChatPromptClient
 
     mock_prompt = Prompt_Chat(
@@ -706,7 +706,7 @@ def test_get_fresh_prompt(langfuse):
         tags=[],
     )
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result = langfuse.get_prompt(prompt_name, fallback="fallback")
@@ -734,7 +734,7 @@ def test_throw_if_name_unspecified(langfuse):
 def test_throw_when_failing_fetch_and_no_cache(langfuse):
     prompt_name = "failing_fetch_and_no_cache"
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.side_effect = Exception("Prompt not found")
 
     with pytest.raises(Exception) as exc_info:
@@ -755,7 +755,7 @@ def test_using_custom_prompt_timeouts(langfuse):
         tags=[],
     )
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result = langfuse.get_prompt(
@@ -796,7 +796,7 @@ def test_get_valid_cached_prompt(langfuse):
     )
     prompt_client = TextPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name, fallback="fallback")
@@ -822,7 +822,7 @@ def test_get_valid_cached_chat_prompt_by_label(langfuse):
     )
     prompt_client = ChatPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name, label="test")
@@ -848,7 +848,7 @@ def test_get_valid_cached_chat_prompt_by_version(langfuse):
     )
     prompt_client = ChatPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name, version=1)
@@ -874,7 +874,7 @@ def test_get_valid_cached_production_chat_prompt(langfuse):
     )
     prompt_client = ChatPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name)
@@ -900,7 +900,7 @@ def test_get_valid_cached_chat_prompt(langfuse):
     )
     prompt_client = ChatPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name)
@@ -930,7 +930,7 @@ def test_get_fresh_prompt_when_expired_cache_custom_ttl(mock_time, langfuse: Lan
     )
     prompt_client = TextPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name, cache_ttl_seconds=ttl_seconds)
@@ -995,7 +995,7 @@ def test_disable_caching_when_ttl_zero(mock_time, langfuse: Langfuse):
         tags=[],
     )
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.side_effect = [prompt1, prompt2, prompt3]
 
     # First call
@@ -1037,7 +1037,7 @@ def test_get_stale_prompt_when_expired_cache_default_ttl(mock_time, langfuse: La
     )
     prompt_client = TextPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name)
@@ -1099,7 +1099,7 @@ def test_get_fresh_prompt_when_expired_cache_default_ttl(mock_time, langfuse: La
     )
     prompt_client = TextPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name)
@@ -1143,7 +1143,7 @@ def test_get_expired_prompt_when_failing_fetch(mock_time, langfuse: Langfuse):
     )
     prompt_client = TextPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name)
@@ -1187,7 +1187,7 @@ def test_evict_prompt_cache_entry_when_refresh_returns_not_found(
     prompt_client = TextPromptClient(prompt)
     cache_key = PromptCache.generate_cache_key(prompt_name, version=None, label=None)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     initial_result = langfuse.get_prompt(
@@ -1244,7 +1244,7 @@ def test_get_fresh_prompt_when_version_changes(langfuse: Langfuse):
     )
     prompt_client = TextPromptClient(prompt)
 
-    mock_server_call = langfuse.api.prompts.get
+    mock_server_call = langfuse.api
     mock_server_call.return_value = prompt
 
     result_call_1 = langfuse.get_prompt(prompt_name, version=1)