Skip to content

Commit 5dcd6f1

Browse files
committed
feat!: migrate api client to latest fern
1 parent 993d993 commit 5dcd6f1

593 files changed

Lines changed: 42859 additions & 33752 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

langfuse/_client/client.py

Lines changed: 18 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -78,15 +78,15 @@
7878
from langfuse._utils import _get_timestamp
7979
from langfuse._utils.parse_error import handle_fern_exception
8080
from langfuse._utils.prompt_cache import PromptCache
81-
from langfuse.api.resources.commons.errors.error import Error
82-
from langfuse.api.resources.commons.errors.not_found_error import NotFoundError
83-
from langfuse.api.resources.ingestion.types.score_body import ScoreBody
84-
from langfuse.api.resources.prompts.types import (
81+
from langfuse.api.datasets import Dataset, DatasetItem, DatasetStatus
82+
from langfuse.api.ingestion import ScoreBody
83+
from langfuse.api.prompts import (
8584
CreatePromptRequest_Chat,
8685
CreatePromptRequest_Text,
8786
Prompt_Chat,
8887
Prompt_Text,
8988
)
89+
from langfuse.api.utils import Error, NotFoundError
9090
from langfuse.batch_evaluation import (
9191
BatchEvaluationResult,
9292
BatchEvaluationResumeToken,
@@ -112,12 +112,7 @@
112112
ChatMessageDict,
113113
ChatMessageWithPlaceholdersDict,
114114
ChatPromptClient,
115-
CreateDatasetItemRequest,
116-
CreateDatasetRequest,
117115
CreateDatasetRunItemRequest,
118-
Dataset,
119-
DatasetItem,
120-
DatasetStatus,
121116
MapValue,
122117
PromptClient,
123118
TextPromptClient,
@@ -3271,16 +3266,15 @@ def create_dataset(
32713266
Dataset: The created dataset as returned by the Langfuse API.
32723267
"""
32733268
try:
3274-
body = CreateDatasetRequest(
3269+
langfuse_logger.debug(f"Creating datasets {name}")
3270+
3271+
return self.api.datasets.create(
32753272
name=name,
32763273
description=description,
32773274
metadata=metadata,
3278-
inputSchema=input_schema,
3279-
expectedOutputSchema=expected_output_schema,
3275+
input_schema=input_schema,
3276+
expected_output_schema=expected_output_schema,
32803277
)
3281-
langfuse_logger.debug(f"Creating datasets {body}")
3282-
3283-
return self.api.datasets.create(request=body)
32843278

32853279
except Error as e:
32863280
handle_fern_exception(e)
@@ -3331,18 +3325,18 @@ def create_dataset_item(
33313325
```
33323326
"""
33333327
try:
3334-
body = CreateDatasetItemRequest(
3335-
datasetName=dataset_name,
3328+
langfuse_logger.debug(f"Creating dataset item for dataset {dataset_name}")
3329+
3330+
return self.api.dataset_items.create(
3331+
dataset_name=dataset_name,
33363332
input=input,
3337-
expectedOutput=expected_output,
3333+
expected_output=expected_output,
33383334
metadata=metadata,
3339-
sourceTraceId=source_trace_id,
3340-
sourceObservationId=source_observation_id,
3335+
source_trace_id=source_trace_id,
3336+
source_observation_id=source_observation_id,
33413337
status=status,
33423338
id=id,
33433339
)
3344-
langfuse_logger.debug(f"Creating dataset item {body}")
3345-
return self.api.dataset_items.create(request=body)
33463340
except Error as e:
33473341
handle_fern_exception(e)
33483342
raise e
@@ -3711,7 +3705,7 @@ def create_prompt(
37113705
labels=labels,
37123706
tags=tags,
37133707
config=config or {},
3714-
commitMessage=commit_message,
3708+
commit_message=commit_message,
37153709
type="chat",
37163710
)
37173711
)
@@ -3731,7 +3725,7 @@ def create_prompt(
37313725
labels=labels,
37323726
tags=tags,
37333727
config=config or {},
3734-
commitMessage=commit_message,
3728+
commit_message=commit_message,
37353729
type="text",
37363730
)
37373731

langfuse/_client/datasets.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44

55
from opentelemetry.util._decorator import _agnosticcontextmanager
66

7+
from langfuse.api.datasets import (
8+
CreateDatasetRunItemRequest,
9+
Dataset,
10+
DatasetItem,
11+
DatasetStatus,
12+
)
713
from langfuse.batch_evaluation import CompositeEvaluatorFunction
814
from langfuse.experiment import (
915
EvaluatorFunction,
1016
ExperimentResult,
1117
RunEvaluatorFunction,
1218
TaskFunction,
1319
)
14-
from langfuse.model import (
15-
CreateDatasetRunItemRequest,
16-
Dataset,
17-
DatasetItem,
18-
DatasetStatus,
19-
)
2020

2121
from .span import LangfuseSpan
2222

langfuse/_client/resource_manager.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
from langfuse._utils.environment import get_common_release_envs
4343
from langfuse._utils.prompt_cache import PromptCache
4444
from langfuse._utils.request import LangfuseClient
45-
from langfuse.api.client import AsyncFernLangfuse, FernLangfuse
45+
from langfuse.api.client import AsyncLangfuseAPI, LangfuseAPI
4646
from langfuse.logger import langfuse_logger
4747
from langfuse.types import MaskFunction
4848

@@ -213,7 +213,7 @@ def _initialize_instance(
213213
client_headers = additional_headers if additional_headers else {}
214214
self.httpx_client = httpx.Client(timeout=timeout, headers=client_headers)
215215

216-
self.api = FernLangfuse(
216+
self.api = LangfuseAPI(
217217
base_url=base_url,
218218
username=self.public_key,
219219
password=secret_key,
@@ -223,7 +223,7 @@ def _initialize_instance(
223223
httpx_client=self.httpx_client,
224224
timeout=timeout,
225225
)
226-
self.async_api = AsyncFernLangfuse(
226+
self.async_api = AsyncLangfuseAPI(
227227
base_url=base_url,
228228
username=self.public_key,
229229
password=secret_key,

langfuse/_task_manager/media_manager.py

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010

1111
from langfuse._client.environment_variables import LANGFUSE_MEDIA_UPLOAD_ENABLED
1212
from langfuse._utils import _get_timestamp
13-
from langfuse.api import GetMediaUploadUrlRequest, PatchMediaBody
14-
from langfuse.api.client import FernLangfuse
13+
from langfuse.api.client import LangfuseAPI
1514
from langfuse.api.core import ApiError
16-
from langfuse.api.resources.media.types.media_content_type import MediaContentType
15+
from langfuse.api.media import MediaContentType
1716
from langfuse.media import LangfuseMedia
1817

1918
from .media_upload_queue import UploadMediaJob
@@ -28,7 +27,7 @@ class MediaManager:
2827
def __init__(
2928
self,
3029
*,
31-
api_client: FernLangfuse,
30+
api_client: LangfuseAPI,
3231
media_upload_queue: Queue,
3332
max_retries: Optional[int] = 3,
3433
):
@@ -219,14 +218,12 @@ def _process_upload_media_job(
219218
) -> None:
220219
upload_url_response = self._request_with_backoff(
221220
self._api_client.media.get_upload_url,
222-
request=GetMediaUploadUrlRequest(
223-
contentLength=data["content_length"],
224-
contentType=cast(MediaContentType, data["content_type"]),
225-
sha256Hash=data["content_sha256_hash"],
226-
field=data["field"],
227-
traceId=data["trace_id"],
228-
observationId=data["observation_id"],
229-
),
221+
content_length=data["content_length"],
222+
content_type=cast(MediaContentType, data["content_type"]),
223+
sha256hash=data["content_sha256_hash"],
224+
field=data["field"],
225+
trace_id=data["trace_id"],
226+
observation_id=data["observation_id"],
230227
)
231228

232229
upload_url = upload_url_response.upload_url
@@ -266,12 +263,10 @@ def _process_upload_media_job(
266263
self._request_with_backoff(
267264
self._api_client.media.patch,
268265
media_id=data["media_id"],
269-
request=PatchMediaBody(
270-
uploadedAt=_get_timestamp(),
271-
uploadHttpStatus=upload_response.status_code,
272-
uploadHttpError=upload_response.text,
273-
uploadTimeMs=upload_time_ms,
274-
),
266+
uploaded_at=_get_timestamp(),
267+
upload_http_status=upload_response.status_code,
268+
upload_http_error=upload_response.text,
269+
upload_time_ms=upload_time_ms,
275270
)
276271

277272
self._log.debug(

langfuse/_utils/parse_error.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
# our own api errors
55
from langfuse._utils.request import APIError, APIErrors
66
from langfuse.api.core import ApiError
7+
from langfuse.api.health import ServiceUnavailableError
78

89
# fern api errors
9-
from langfuse.api.resources.commons.errors import (
10+
from langfuse.api.utils import (
1011
AccessDeniedError,
1112
Error,
1213
MethodNotAllowedError,
1314
NotFoundError,
1415
UnauthorizedError,
1516
)
16-
from langfuse.api.resources.health.errors import ServiceUnavailableError
1717

1818
SUPPORT_URL = "https://langfuse.com/support"
1919
API_DOCS_URL = "https://api.reference.langfuse.com"

langfuse/api/.fern/metadata.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"cliVersion": "3.24.3",
3+
"generatorName": "fernapi/fern-python-sdk",
4+
"generatorVersion": "4.46.2",
5+
"generatorConfig": {
6+
"client": {
7+
"class_name": "LangfuseAPI"
8+
}
9+
}
10+
}

0 commit comments

Comments
 (0)