Skip to content
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.

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

feat: Add tags with prompt version create #6147

Merged
merged 3 commits into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions app/schema.graphql
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,7 @@ input CreateChatPromptInput {
input CreateChatPromptVersionInput {
promptId: GlobalID!
promptVersion: ChatPromptVersionInput!
tags: [SetPromptVersionTagInput!] = null
}

input CreateDatasetInput {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions src/phoenix/server/api/mutations/prompt_mutations.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
PromptVersion,
)
from phoenix.server.api.input_types.PromptVersionInput import ChatPromptVersionInput
from phoenix.server.api.mutations.prompt_version_tag_mutations import (
SetPromptVersionTagInput,
upsert_prompt_version_tag,
)
from phoenix.server.api.queries import Query
from phoenix.server.api.types.Identifier import Identifier
from phoenix.server.api.types.node import from_global_id_with_expected_type
Expand All @@ -39,6 +43,7 @@ class CreateChatPromptInput:
class CreateChatPromptVersionInput:
prompt_id: GlobalID
prompt_version: ChatPromptVersionInput
tags: Optional[list[SetPromptVersionTagInput]] = None


@strawberry.input
Expand Down Expand Up @@ -199,6 +204,16 @@ async def create_chat_prompt_version(
)
session.add(prompt_version)

# ensure prompt_version is flushed to the database before creating tags against the
# prompt_version id
await session.flush()

if input.tags:
for tag in input.tags:
await upsert_prompt_version_tag(
session, prompt_id, prompt_version.id, tag.name, tag.description
)

return to_gql_prompt_from_orm(prompt)

@strawberry.mutation
Expand Down
57 changes: 36 additions & 21 deletions src/phoenix/server/api/mutations/prompt_version_tag_mutations.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import strawberry
from sqlalchemy import select
from sqlalchemy.exc import IntegrityError as PostgreSQLIntegrityError
from sqlalchemy.ext.asyncio import AsyncSession
from sqlean.dbapi2 import IntegrityError as SQLiteIntegrityError # type: ignore[import-untyped]
from strawberry.relay import GlobalID
from strawberry.types import Info
Expand Down Expand Up @@ -96,28 +97,10 @@ async def set_prompt_version_tag(
)
if not prompt:
raise BadRequest("All prompt version tags must belong to a prompt")
name = IdentifierModel.model_validate(str(input.name))
existing_tag = await session.scalar(
select(models.PromptVersionTag).where(
models.PromptVersionTag.prompt_id == prompt_id,
models.PromptVersionTag.name == name,
)
)

if existing_tag:
existing_tag.prompt_version_id = prompt_version_id
if input.description is not None:
existing_tag.description = input.description
updated_tag = existing_tag
else:
new_tag = models.PromptVersionTag(
name=name,
description=input.description,
prompt_id=prompt_id,
prompt_version_id=prompt_version_id,
)
session.add(new_tag)
updated_tag = new_tag
updated_tag = await upsert_prompt_version_tag(
session, prompt_id, prompt_version_id, input.name, input.description
)

if not updated_tag:
raise BadRequest("Failed to create or update PromptVersionTag.")
Expand All @@ -131,3 +114,35 @@ async def set_prompt_version_tag(
return PromptVersionTagMutationPayload(
prompt_version_tag=version_tag, prompt=to_gql_prompt_from_orm(prompt), query=Query()
)


async def upsert_prompt_version_tag(
session: AsyncSession,
prompt_id: int,
prompt_version_id: int,
name_str: str,
description: Optional[str] = None,
) -> models.PromptVersionTag:
name = IdentifierModel.model_validate(name_str)

existing_tag = await session.scalar(
select(models.PromptVersionTag).where(
models.PromptVersionTag.prompt_id == prompt_id,
models.PromptVersionTag.name == name,
)
)

if existing_tag:
existing_tag.prompt_version_id = prompt_version_id
if description is not None:
existing_tag.description = description
return existing_tag
else:
new_tag = models.PromptVersionTag(
name=name,
description=description,
prompt_id=prompt_id,
prompt_version_id=prompt_version_id,
)
session.add(new_tag)
return new_tag
Loading