Merge branch 'main' into link-dataset-observation-by-id

langfuse/api/__init__.py

@@ -16,13 +16,13 @@
     DatasetRunItem,
     DatasetStatus,
     Error,
-    Generations,
     LlmUsage,
     MapValue,
     MethodNotAllowedError,
     NotFoundError,
     Observation,
     ObservationLevel,
+    Observations,
     Score,
     Scores,
     Trace,
@@ -62,13 +62,13 @@
     "DatasetRunItem",
     "DatasetStatus",
     "Error",
-    "Generations",
     "LlmUsage",
     "MapValue",
     "MethodNotAllowedError",
     "NotFoundError",
     "Observation",
     "ObservationLevel",
+    "Observations",
     "Score",
     "Scores",
     "Trace",

langfuse/api/resources/__init__.py

@@ -40,7 +40,8 @@
 from .dataset_items import CreateDatasetItemRequest
 from .dataset_run_items import CreateDatasetRunItemRequest
 from .datasets import CreateDatasetRequest
-from .generations import Generations, UpdateGenerationRequest
+from .generations import UpdateGenerationRequest
+from .observations import Observations
 from .score import CreateScoreRequest, Scores
 from .span import UpdateSpanRequest
 from .trace import CreateTraceRequest, Traces
@@ -61,13 +62,13 @@
     "DatasetRunItem",
     "DatasetStatus",
     "Error",
-    "Generations",
     "LlmUsage",
     "MapValue",
     "MethodNotAllowedError",
     "NotFoundError",
     "Observation",
     "ObservationLevel",
+    "Observations",
     "Score",
     "Scores",
     "Trace",

langfuse/api/resources/generations/__init__.py

@@ -1,5 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from .types import Generations, UpdateGenerationRequest
+from .types import UpdateGenerationRequest
 
-__all__ = ["Generations", "UpdateGenerationRequest"]
+__all__ = ["UpdateGenerationRequest"]

langfuse/api/resources/generations/client.py

@@ -17,7 +17,6 @@
 from ..commons.errors.unauthorized_error import UnauthorizedError
 from ..commons.types.create_generation_request import CreateGenerationRequest
 from ..commons.types.observation import Observation
-from .types.generations import Generations
 from .types.update_generation_request import UpdateGenerationRequest
 
 
@@ -109,48 +108,6 @@ def update(self, *, request: UpdateGenerationRequest) -> Observation:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
-    def get(
-        self,
-        *,
-        page: typing.Optional[int] = None,
-        limit: typing.Optional[int] = None,
-        name: typing.Optional[str] = None,
-        user_id: typing.Optional[str] = None,
-    ) -> Generations:
-        _response = httpx.request(
-            "GET",
-            urllib.parse.urljoin(f"{self._environment}/", "api/public/generations"),
-            params={"page": page, "limit": limit, "name": name, "userId": user_id},
-            headers=remove_none_from_headers(
-                {
-                    "X-Langfuse-Sdk-Name": self.x_langfuse_sdk_name,
-                    "X-Langfuse-Sdk-Version": self.x_langfuse_sdk_version,
-                    "X-Langfuse-Public-Key": self.x_langfuse_public_key,
-                }
-            ),
-            auth=(self._username, self._password)
-            if self._username is not None and self._password is not None
-            else None,
-            timeout=60,
-        )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(Generations, _response.json())  # type: ignore
-        if _response.status_code == 400:
-            raise Error(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        if _response.status_code == 401:
-            raise UnauthorizedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        if _response.status_code == 403:
-            raise AccessDeniedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        if _response.status_code == 405:
-            raise MethodNotAllowedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        if _response.status_code == 404:
-            raise NotFoundError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        try:
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)
-
 
 class AsyncGenerationsClient:
     def __init__(
@@ -241,46 +198,3 @@ async def update(self, *, request: UpdateGenerationRequest) -> Observation:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
-
-    async def get(
-        self,
-        *,
-        page: typing.Optional[int] = None,
-        limit: typing.Optional[int] = None,
-        name: typing.Optional[str] = None,
-        user_id: typing.Optional[str] = None,
-    ) -> Generations:
-        async with httpx.AsyncClient() as _client:
-            _response = await _client.request(
-                "GET",
-                urllib.parse.urljoin(f"{self._environment}/", "api/public/generations"),
-                params={"page": page, "limit": limit, "name": name, "userId": user_id},
-                headers=remove_none_from_headers(
-                    {
-                        "X-Langfuse-Sdk-Name": self.x_langfuse_sdk_name,
-                        "X-Langfuse-Sdk-Version": self.x_langfuse_sdk_version,
-                        "X-Langfuse-Public-Key": self.x_langfuse_public_key,
-                    }
-                ),
-                auth=(self._username, self._password)
-                if self._username is not None and self._password is not None
-                else None,
-                timeout=60,
-            )
-        if 200 <= _response.status_code < 300:
-            return pydantic.parse_obj_as(Generations, _response.json())  # type: ignore
-        if _response.status_code == 400:
-            raise Error(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        if _response.status_code == 401:
-            raise UnauthorizedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        if _response.status_code == 403:
-            raise AccessDeniedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        if _response.status_code == 405:
-            raise MethodNotAllowedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        if _response.status_code == 404:
-            raise NotFoundError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
-        try:
-            _response_json = _response.json()
-        except JSONDecodeError:
-            raise ApiError(status_code=_response.status_code, body=_response.text)
-        raise ApiError(status_code=_response.status_code, body=_response_json)

langfuse/api/resources/generations/types/__init__.py

@@ -1,6 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from .generations import Generations
 from .update_generation_request import UpdateGenerationRequest
 
-__all__ = ["Generations", "UpdateGenerationRequest"]
+__all__ = ["UpdateGenerationRequest"]

langfuse/api/resources/observations/__init__.py

@@ -1,2 +1,5 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from .types import Observations
+
+__all__ = ["Observations"]

langfuse/api/resources/observations/client.py

@@ -15,6 +15,7 @@
 from ..commons.errors.not_found_error import NotFoundError
 from ..commons.errors.unauthorized_error import UnauthorizedError
 from ..commons.types.observation import Observation
+from .types.observations import Observations
 
 
 class ObservationsClient:
@@ -69,6 +70,49 @@ def get(self, observation_id: str) -> Observation:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
 
+    def get_many(
+        self,
+        *,
+        page: typing.Optional[int] = None,
+        limit: typing.Optional[int] = None,
+        name: typing.Optional[str] = None,
+        user_id: typing.Optional[str] = None,
+        type: typing.Optional[str] = None,
+    ) -> Observations:
+        _response = httpx.request(
+            "GET",
+            urllib.parse.urljoin(f"{self._environment}/", "api/public/observations"),
+            params={"page": page, "limit": limit, "name": name, "userId": user_id, "type": type},
+            headers=remove_none_from_headers(
+                {
+                    "X-Langfuse-Sdk-Name": self.x_langfuse_sdk_name,
+                    "X-Langfuse-Sdk-Version": self.x_langfuse_sdk_version,
+                    "X-Langfuse-Public-Key": self.x_langfuse_public_key,
+                }
+            ),
+            auth=(self._username, self._password)
+            if self._username is not None and self._password is not None
+            else None,
+            timeout=60,
+        )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(Observations, _response.json())  # type: ignore
+        if _response.status_code == 400:
+            raise Error(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        if _response.status_code == 401:
+            raise UnauthorizedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        if _response.status_code == 403:
+            raise AccessDeniedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        if _response.status_code == 405:
+            raise MethodNotAllowedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        if _response.status_code == 404:
+            raise NotFoundError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        try:
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)
+
 
 class AsyncObservationsClient:
     def __init__(
@@ -122,3 +166,47 @@ async def get(self, observation_id: str) -> Observation:
         except JSONDecodeError:
             raise ApiError(status_code=_response.status_code, body=_response.text)
         raise ApiError(status_code=_response.status_code, body=_response_json)
+
+    async def get_many(
+        self,
+        *,
+        page: typing.Optional[int] = None,
+        limit: typing.Optional[int] = None,
+        name: typing.Optional[str] = None,
+        user_id: typing.Optional[str] = None,
+        type: typing.Optional[str] = None,
+    ) -> Observations:
+        async with httpx.AsyncClient() as _client:
+            _response = await _client.request(
+                "GET",
+                urllib.parse.urljoin(f"{self._environment}/", "api/public/observations"),
+                params={"page": page, "limit": limit, "name": name, "userId": user_id, "type": type},
+                headers=remove_none_from_headers(
+                    {
+                        "X-Langfuse-Sdk-Name": self.x_langfuse_sdk_name,
+                        "X-Langfuse-Sdk-Version": self.x_langfuse_sdk_version,
+                        "X-Langfuse-Public-Key": self.x_langfuse_public_key,
+                    }
+                ),
+                auth=(self._username, self._password)
+                if self._username is not None and self._password is not None
+                else None,
+                timeout=60,
+            )
+        if 200 <= _response.status_code < 300:
+            return pydantic.parse_obj_as(Observations, _response.json())  # type: ignore
+        if _response.status_code == 400:
+            raise Error(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        if _response.status_code == 401:
+            raise UnauthorizedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        if _response.status_code == 403:
+            raise AccessDeniedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        if _response.status_code == 405:
+            raise MethodNotAllowedError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        if _response.status_code == 404:
+            raise NotFoundError(pydantic.parse_obj_as(str, _response.json()))  # type: ignore
+        try:
+            _response_json = _response.json()
+        except JSONDecodeError:
+            raise ApiError(status_code=_response.status_code, body=_response.text)
+        raise ApiError(status_code=_response.status_code, body=_response_json)

langfuse/api/resources/observations/types/__init__.py

@@ -0,0 +1,5 @@
+# This file was auto-generated by Fern from our API Definition.
+
+from .observations import Observations
+
+__all__ = ["Observations"]

langfuse/api/resources/generations/types/generations.py → langfuse/api/resources/observations/types/observations.py

@@ -10,7 +10,7 @@
 from ...utils.resources.pagination.types.meta_response import MetaResponse
 
 
-class Generations(pydantic.BaseModel):
+class Observations(pydantic.BaseModel):
     data: typing.List[Observation]
     meta: MetaResponse
 

langfuse/client.py

@@ -157,7 +157,9 @@ def get_generations(
     ):
         try:
             self.log.debug(f"Getting generations... {page}, {limit}, {name}, {user_id}")
-            return self.client.generations.get(page=page, limit=limit, name=name, user_id=user_id)
+            return self.client.observations.get_many(
+                page=page, limit=limit, name=name, user_id=user_id, type="GENERATION"
+            )
         except Exception as e:
             self.log.exception(e)
             raise e

langfuse/version.py

@@ -1 +1 @@
-__version__ = "1.0.33"
+__version__ = "1.0.34"