Skip to content

fix: remove manual prompt interface #275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maxdeichmann merged 1 commit into from
Jan 3, 2024
Merged

fix: remove manual prompt interface #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 3 additions & 9 deletions langfuse/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,8 +591,6 @@ def generation(
output: typing.Optional[typing.Any] = None,
usage: typing.Optional[typing.Union[pydantic.BaseModel, ModelUsage]] = None,
prompt: typing.Optional[PromptClient] = None,
prompt_name: typing.Optional[str] = None,
prompt_version: typing.Optional[str] = None,
**kwargs,
):
try:
Expand Down Expand Up @@ -621,7 +619,7 @@ def generation(
"model_parameters": model_parameters,
"usage": _convert_usage_input(usage) if usage is not None else None,
"trace": {"release": self.release},
**_create_prompt_context(prompt, prompt_name, prompt_version),
**_create_prompt_context(prompt),
}
if kwargs is not None:
generation_body.update(kwargs)
Expand Down Expand Up @@ -760,8 +758,6 @@ def generation(
output: typing.Optional[typing.Any] = None,
usage: typing.Optional[typing.Union[pydantic.BaseModel, ModelUsage]] = None,
prompt: typing.Optional[PromptClient] = None,
prompt_name: typing.Optional[str] = None,
prompt_version: typing.Optional[str] = None,
**kwargs,
):
try:
Expand All @@ -784,7 +780,7 @@ def generation(
"input": input,
"output": output,
"usage": _convert_usage_input(usage) if usage is not None else None,
**_create_prompt_context(prompt, prompt_name, prompt_version),
**_create_prompt_context(prompt),
}

if kwargs is not None:
Expand Down Expand Up @@ -1011,8 +1007,6 @@ def update(
output: typing.Optional[typing.Any] = None,
usage: typing.Optional[typing.Union[pydantic.BaseModel, ModelUsage]] = None,
prompt: typing.Optional[PromptClient] = None,
prompt_name: typing.Optional[str] = None,
prompt_version: typing.Optional[str] = None,
**kwargs,
):
try:
Expand All @@ -1031,7 +1025,7 @@ def update(
"input": input,
"output": output,
"usage": _convert_usage_input(usage) if usage is not None else None,
**_create_prompt_context(prompt, prompt_name, prompt_version),
**_create_prompt_context(prompt),
}

if kwargs is not None:
Expand Down
10 changes: 0 additions & 10 deletions langfuse/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,10 @@ def _get_timestamp():

def _create_prompt_context(
prompt: typing.Optional[PromptClient] = None,
prompt_name: typing.Optional[str] = None,
prompt_version: typing.Optional[str] = None,
):
if prompt is not None:
return {"prompt_version": prompt.version, "prompt_name": prompt.name}

elif prompt_name is not None and prompt_version is not None:
return {"prompt_version": prompt_version, "prompt_name": prompt_name}

elif (prompt_name is not None and prompt_version is None) or (
prompt_version is not None and prompt_name is None
):
log.warning("Expected to get prompt name and prompt version. One was missing.")

return {"prompt_version": None, "prompt_name": None}


Expand Down