arize-phoenix 10.2.1__tar.gz → 10.3.0__tar.gz

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: arize-phoenix
-Version: 10.2.1
+Version: 10.3.0
 Summary: AI Observability and Evaluation
 Project-URL: Documentation, https://docs.arize.com/phoenix/
 Project-URL: Issues, https://github.com/Arize-ai/phoenix/issues
@@ -158,6 +158,9 @@ Description-Content-Type: text/markdown
     <a target="_blank" href="https://hub.docker.com/r/arizephoenix/phoenix/tags">
         <img src="https://img.shields.io/docker/v/arizephoenix/phoenix?sort=semver&logo=docker&label=image&color=blue">
     </a>
+    <a target="_blank" href="https://hub.docker.com/r/arizephoenix/phoenix-helm">
+        <img src="https://img.shields.io/badge/Helm-blue?style=flat&logo=helm&labelColor=grey"/>
+    </a>
     <a target="_blank" href="https://github.com/Arize-ai/phoenix/tree/main/js/packages/phoenix-mcp">
         <img src="https://badge.mcpx.dev?status=on" title="MCP Enabled"/>
     </a>
@@ -226,6 +229,9 @@ Phoenix is built on top of OpenTelemetry and is vendor, language, and framework
 | [Smolagents](https://huggingface.co/docs/smolagents/en/tutorials/inspect_runs) | `openinference-instrumentation-smolagents` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-smolagents.svg)](https://pypi.python.org/pypi/openinference-instrumentation-smolagents) |
 | [Agno](https://docs.arize.com/phoenix/tracing/integrations-tracing/agno) | `openinference-instrumentation-agno` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-agno.svg)](https://pypi.python.org/pypi/openinference-instrumentation-agno) |
 | [MCP](https://docs.arize.com/phoenix/tracing/integrations-tracing/model-context-protocol-mcp) | `openinference-instrumentation-mcp` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-mcp.svg)](https://pypi.python.org/pypi/openinference-instrumentation-mcp) |
+| [Pydantic AI](https://docs.arize.com/phoenix/integrations/pydantic) | `openinference-instrumentation-pydantic-ai` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-pydantic-ai.svg)](https://pypi.python.org/pypi/openinference-instrumentation-pydantic-ai) |
+| [Autogen AgentChat](https://docs.arize.com/phoenix/integrations/frameworks/autogen/autogen-tracing) | `openinference-instrumentation-autogen-agentchat` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-autogen-agentchat.svg)](https://pypi.python.org/pypi/openinference-instrumentation-autogen-agentchat) |
+| [Portkey](https://docs.arize.com/phoenix/integrations/portkey) | `openinference-instrumentation-portkey` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-portkey.svg)](https://pypi.python.org/pypi/openinference-instrumentation-portkey) |
 
 ### JavaScript Integrations
 
@@ -235,6 +241,7 @@ Phoenix is built on top of OpenTelemetry and is vendor, language, and framework
 | [LangChain.js](https://docs.arize.com/phoenix/tracing/integrations-tracing/langchain.js)   | `@arizeai/openinference-instrumentation-langchain` | [![NPM Version](https://img.shields.io/npm/v/@arizeai/openinference-instrumentation-langchain.svg)](https://www.npmjs.com/package/@arizeai/openinference-instrumentation-langchain) |
 | [Vercel AI SDK](https://docs.arize.com/phoenix/tracing/integrations-tracing/vercel-ai-sdk) | `@arizeai/openinference-vercel`                    | [![NPM Version](https://img.shields.io/npm/v/@arizeai/openinference-vercel)](https://www.npmjs.com/package/@arizeai/openinference-vercel)                                           |
 | [BeeAI](https://docs.arize.com/phoenix/tracing/integrations-tracing/beeai)                 | `@arizeai/openinference-instrumentation-beeai`     | [![NPM Version](https://img.shields.io/npm/v/@arizeai/openinference-vercel)](https://www.npmjs.com/package/@arizeai/openinference-instrumentation-beeai)                            |
+| [Mastra](https://docs.arize.com/phoenix/integrations/mastra)                               | `@arizeai/openinference-mastra`                    | [![NPM Version](https://img.shields.io/npm/v/@arizeai/openinference-mastra.svg)](https://www.npmjs.com/package/@arizeai/openinference-mastra)                                       |
 
 ### Platforms
 

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/README.md

@@ -28,6 +28,9 @@
     <a target="_blank" href="https://hub.docker.com/r/arizephoenix/phoenix/tags">
         <img src="https://img.shields.io/docker/v/arizephoenix/phoenix?sort=semver&logo=docker&label=image&color=blue">
     </a>
+    <a target="_blank" href="https://hub.docker.com/r/arizephoenix/phoenix-helm">
+        <img src="https://img.shields.io/badge/Helm-blue?style=flat&logo=helm&labelColor=grey"/>
+    </a>
     <a target="_blank" href="https://github.com/Arize-ai/phoenix/tree/main/js/packages/phoenix-mcp">
         <img src="https://badge.mcpx.dev?status=on" title="MCP Enabled"/>
     </a>
@@ -96,6 +99,9 @@ Phoenix is built on top of OpenTelemetry and is vendor, language, and framework
 | [Smolagents](https://huggingface.co/docs/smolagents/en/tutorials/inspect_runs) | `openinference-instrumentation-smolagents` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-smolagents.svg)](https://pypi.python.org/pypi/openinference-instrumentation-smolagents) |
 | [Agno](https://docs.arize.com/phoenix/tracing/integrations-tracing/agno) | `openinference-instrumentation-agno` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-agno.svg)](https://pypi.python.org/pypi/openinference-instrumentation-agno) |
 | [MCP](https://docs.arize.com/phoenix/tracing/integrations-tracing/model-context-protocol-mcp) | `openinference-instrumentation-mcp` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-mcp.svg)](https://pypi.python.org/pypi/openinference-instrumentation-mcp) |
+| [Pydantic AI](https://docs.arize.com/phoenix/integrations/pydantic) | `openinference-instrumentation-pydantic-ai` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-pydantic-ai.svg)](https://pypi.python.org/pypi/openinference-instrumentation-pydantic-ai) |
+| [Autogen AgentChat](https://docs.arize.com/phoenix/integrations/frameworks/autogen/autogen-tracing) | `openinference-instrumentation-autogen-agentchat` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-autogen-agentchat.svg)](https://pypi.python.org/pypi/openinference-instrumentation-autogen-agentchat) |
+| [Portkey](https://docs.arize.com/phoenix/integrations/portkey) | `openinference-instrumentation-portkey` | [![PyPI Version](https://img.shields.io/pypi/v/openinference-instrumentation-portkey.svg)](https://pypi.python.org/pypi/openinference-instrumentation-portkey) |
 
 ### JavaScript Integrations
 
@@ -105,6 +111,7 @@ Phoenix is built on top of OpenTelemetry and is vendor, language, and framework
 | [LangChain.js](https://docs.arize.com/phoenix/tracing/integrations-tracing/langchain.js)   | `@arizeai/openinference-instrumentation-langchain` | [![NPM Version](https://img.shields.io/npm/v/@arizeai/openinference-instrumentation-langchain.svg)](https://www.npmjs.com/package/@arizeai/openinference-instrumentation-langchain) |
 | [Vercel AI SDK](https://docs.arize.com/phoenix/tracing/integrations-tracing/vercel-ai-sdk) | `@arizeai/openinference-vercel`                    | [![NPM Version](https://img.shields.io/npm/v/@arizeai/openinference-vercel)](https://www.npmjs.com/package/@arizeai/openinference-vercel)                                           |
 | [BeeAI](https://docs.arize.com/phoenix/tracing/integrations-tracing/beeai)                 | `@arizeai/openinference-instrumentation-beeai`     | [![NPM Version](https://img.shields.io/npm/v/@arizeai/openinference-vercel)](https://www.npmjs.com/package/@arizeai/openinference-instrumentation-beeai)                            |
+| [Mastra](https://docs.arize.com/phoenix/integrations/mastra)                               | `@arizeai/openinference-mastra`                    | [![NPM Version](https://img.shields.io/npm/v/@arizeai/openinference-mastra.svg)](https://www.npmjs.com/package/@arizeai/openinference-mastra)                                       |
 
 ### Platforms
 

arize_phoenix-10.3.0/src/phoenix/db/enums.py

@@ -0,0 +1,10 @@
+from sqlalchemy.orm import InstrumentedAttribute
+
+from phoenix.db import models
+
+__all__ = ["ENUM_COLUMNS"]
+
+
+ENUM_COLUMNS: set[InstrumentedAttribute[str]] = {
+    models.UserRole.name,
+}

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/db/facilitator.py

@@ -7,12 +7,7 @@ from asyncio import gather
 from functools import partial
 from typing import Optional
 
-from sqlalchemy import (
-    distinct,
-    exists,
-    insert,
-    select,
-)
+import sqlalchemy as sa
 
 from phoenix import config
 from phoenix.auth import (
@@ -30,7 +25,8 @@ from phoenix.config import (
 )
 from phoenix.db import models
 from phoenix.db.constants import DEFAULT_PROJECT_TRACE_RETENTION_POLICY_ID
-from phoenix.db.enums import COLUMN_ENUMS, UserRole
+from phoenix.db.enums import ENUM_COLUMNS
+from phoenix.db.models import UserRoleName
 from phoenix.db.types.trace_retention import (
     MaxDaysRule,
     TraceRetentionCronExpression,
@@ -76,18 +72,17 @@ async def _ensure_enums(db: DbSessionFactory) -> None:
     they will be added. If any values are present in the database but not in the enum, an error will
     be raised. This function is idempotent: it will not add duplicate values to the database.
     """
-    for column, enum in COLUMN_ENUMS.items():
+    for column in ENUM_COLUMNS:
         table = column.class_
+        assert isinstance(column.type, sa.Enum)
         async with db() as session:
-            existing = set(
-                [_ async for _ in await session.stream_scalars(select(distinct(column)))]
-            )
-            expected = set(e.value for e in enum)
+            existing = set(await session.scalars(sa.select(column)))
+            expected = set(column.type.enums)
             if unexpected := existing - expected:
                 raise ValueError(f"Unexpected values in {table.name}.{column.key}: {unexpected}")
             if not (missing := expected - existing):
                 continue
-            await session.execute(insert(table), [{column.key: v} for v in missing])
+            await session.execute(sa.insert(table), [{column.key: v} for v in missing])
 
 
 async def _ensure_user_roles(db: DbSessionFactory) -> None:
@@ -97,21 +92,22 @@ async def _ensure_user_roles(db: DbSessionFactory) -> None:
     the email "admin@localhost".
     """
     async with db() as session:
-        role_ids = {
+        role_ids: dict[UserRoleName, int] = {
             name: id_
             async for name, id_ in await session.stream(
-                select(models.UserRole.name, models.UserRole.id)
+                sa.select(models.UserRole.name, models.UserRole.id)
             )
         }
-        existing_roles = [
+        existing_roles: list[UserRoleName] = [
             name
             async for name in await session.stream_scalars(
-                select(distinct(models.UserRole.name)).join_from(models.User, models.UserRole)
+                sa.select(sa.distinct(models.UserRole.name)).join_from(models.User, models.UserRole)
             )
         ]
-        if (system_role := UserRole.SYSTEM.value) not in existing_roles and (
-            system_role_id := role_ids.get(system_role)
-        ) is not None:
+        if (
+            "SYSTEM" not in existing_roles
+            and (system_role_id := role_ids.get("SYSTEM")) is not None
+        ):
             system_user = models.LocalUser(
                 user_role_id=system_role_id,
                 username=DEFAULT_SYSTEM_USERNAME,
@@ -121,9 +117,7 @@ async def _ensure_user_roles(db: DbSessionFactory) -> None:
                 password_hash=secrets.token_bytes(DEFAULT_SECRET_LENGTH),
             )
             session.add(system_user)
-        if (admin_role := UserRole.ADMIN.value) not in existing_roles and (
-            admin_role_id := role_ids.get(admin_role)
-        ) is not None:
+        if "ADMIN" not in existing_roles and (admin_role_id := role_ids.get("ADMIN")) is not None:
             salt = secrets.token_bytes(DEFAULT_SECRET_LENGTH)
             password = get_env_default_admin_initial_password()
             compute = partial(compute_password_hash, password=password, salt=salt)
@@ -147,9 +141,9 @@ async def _get_system_user_id(db: DbSessionFactory) -> None:
     """
     async with db() as session:
         system_user_id = await session.scalar(
-            select(models.User.id)
+            sa.select(models.User.id)
             .join(models.UserRole)
-            .where(models.UserRole.name == UserRole.SYSTEM.value)
+            .where(models.UserRole.name == "SYSTEM")
             .order_by(models.User.id)
             .limit(1)
         )
@@ -173,7 +167,7 @@ async def _ensure_admins(
     async with db() as session:
         existing_emails = set(
             await session.scalars(
-                select(models.User.email).where(models.User.email.in_(admins.keys()))
+                sa.select(models.User.email).where(models.User.email.in_(admins.keys()))
             )
         )
         admins = {
@@ -183,7 +177,7 @@ async def _ensure_admins(
             return
         existing_usernames = set(
             await session.scalars(
-                select(models.User.username).where(models.User.username.in_(admins.values()))
+                sa.select(models.User.username).where(models.User.username.in_(admins.values()))
             )
         )
         admins = {
@@ -193,9 +187,7 @@ async def _ensure_admins(
         }
         if not admins:
             return
-        admin_role_id = await session.scalar(
-            select(models.UserRole.id).filter_by(name=UserRole.ADMIN.value)
-        )
+        admin_role_id = await session.scalar(sa.select(models.UserRole.id).filter_by(name="ADMIN"))
         assert admin_role_id is not None, "Admin role not found in database"
         user: models.User
         for email, username in admins.items():
@@ -248,8 +240,8 @@ async def _ensure_default_project_trace_retention_policy(db: DbSessionFactory) -
     assert DEFAULT_PROJECT_TRACE_RETENTION_POLICY_ID == 0
     async with db() as session:
         if await session.scalar(
-            select(
-                exists().where(
+            sa.select(
+                sa.exists().where(
                     models.ProjectTraceRetentionPolicy.id
                     == DEFAULT_PROJECT_TRACE_RETENTION_POLICY_ID
                 )
@@ -259,7 +251,7 @@ async def _ensure_default_project_trace_retention_policy(db: DbSessionFactory) -
         cron_expression = TraceRetentionCronExpression(root="0 0 * * 0")
         rule = TraceRetentionRule(root=MaxDaysRule(max_days=0))
         await session.execute(
-            insert(models.ProjectTraceRetentionPolicy),
+            sa.insert(models.ProjectTraceRetentionPolicy),
             [
                 {
                     "id": DEFAULT_PROJECT_TRACE_RETENTION_POLICY_ID,

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/db/models.py

@@ -146,6 +146,7 @@ def render_values_w_union(
     return compiler.process(subquery, from_linter=from_linter, **kw)
 
 
+UserRoleName: TypeAlias = Literal["SYSTEM", "ADMIN", "MEMBER"]
 AuthMethod: TypeAlias = Literal["LOCAL", "OAUTH2"]
 
 
@@ -1132,7 +1133,7 @@ class ExperimentRunAnnotation(Base):
 
 class UserRole(Base):
     __tablename__ = "user_roles"
-    name: Mapped[str] = mapped_column(unique=True, index=True)
+    name: Mapped[UserRoleName] = mapped_column(unique=True, index=True)
     users: Mapped[list["User"]] = relationship("User", back_populates="role")
 
 
@@ -1231,6 +1232,8 @@ class OAuth2User(User):
         *,
         email: str,
         username: str,
+        oauth2_client_id: Optional[str] = None,
+        oauth2_user_id: Optional[str] = None,
         user_role_id: Optional[int] = None,
     ) -> None:
         super().__init__(
@@ -1239,6 +1242,8 @@ class OAuth2User(User):
             user_role_id=user_role_id,
             reset_password=False,
             auth_method="OAUTH2",
+            oauth2_client_id=oauth2_client_id,
+            oauth2_user_id=oauth2_user_id,
         )
 
 

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/db/types/trace_retention.py

@@ -5,6 +5,7 @@ from typing import Annotated, Iterable, Literal, Optional, Union
 
 import sqlalchemy as sa
 from pydantic import AfterValidator, BaseModel, Field, RootModel
+from sqlalchemy import func
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from phoenix.utilities import hour_of_week
@@ -25,19 +26,25 @@ class _MaxDays(BaseModel):
 class _MaxCount(BaseModel):
     max_count: Annotated[int, Field(ge=0)]
 
-    @property
-    def max_count_filter(self) -> sa.ColumnElement[bool]:
+    def max_count_filter(
+        self,
+        project_rowids: Union[Iterable[int], sa.ScalarSelect[int]],
+    ) -> sa.ColumnElement[bool]:
         if self.max_count <= 0:
             return sa.literal(False)
         from phoenix.db.models import Trace
 
-        return Trace.start_time < (
-            sa.select(Trace.start_time)
-            .order_by(Trace.start_time.desc())
-            .offset(self.max_count - 1)
-            .limit(1)
-            .scalar_subquery()
+        ranked = (
+            sa.select(
+                Trace.id,
+                func.row_number()
+                .over(partition_by=Trace.project_rowid, order_by=Trace.start_time.desc())
+                .label("rn"),
+            )
+            .where(Trace.project_rowid.in_(project_rowids))
+            .cte("ranked")
         )
+        return Trace.id.in_(sa.select(ranked.c.id).where(ranked.c.rn > self.max_count))
 
 
 class MaxDaysRule(_MaxDays, BaseModel):
@@ -82,7 +89,7 @@ class MaxCountRule(_MaxCount, BaseModel):
         stmt = (
             sa.delete(Trace)
             .where(Trace.project_rowid.in_(project_rowids))
-            .where(self.max_count_filter)
+            .where(self.max_count_filter(project_rowids))
             .returning(Trace.project_rowid)
         )
         return set(await session.scalars(stmt))
@@ -106,7 +113,7 @@ class MaxDaysOrCountRule(_MaxDays, _MaxCount, BaseModel):
         stmt = (
             sa.delete(Trace)
             .where(Trace.project_rowid.in_(project_rowids))
-            .where(sa.or_(self.max_days_filter, self.max_count_filter))
+            .where(sa.or_(self.max_days_filter, self.max_count_filter(project_rowids)))
             .returning(Trace.project_rowid)
         )
         return set(await session.scalars(stmt))

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/server/api/mutations/api_key_mutations.py

@@ -7,7 +7,8 @@ from strawberry import UNSET
 from strawberry.relay import GlobalID
 from strawberry.types import Info
 
-from phoenix.db import enums, models
+from phoenix.db import models
+from phoenix.db.models import UserRoleName
 from phoenix.server.api.auth import IsAdmin, IsLocked, IsNotReadOnly
 from phoenix.server.api.context import Context
 from phoenix.server.api.exceptions import Unauthorized
@@ -65,13 +66,13 @@ class ApiKeyMutationMixin:
         self, info: Info[Context, None], input: CreateApiKeyInput
     ) -> CreateSystemApiKeyMutationPayload:
         assert (token_store := info.context.token_store) is not None
-        user_role = enums.UserRole.SYSTEM
+        user_role: UserRoleName = "SYSTEM"
         async with info.context.db() as session:
             # Get the system user - note this could be pushed into a dataloader
             system_user = await session.scalar(
                 select(models.User)
                 .join(models.UserRole)  # Join User with UserRole
-                .where(models.UserRole.name == user_role.value)  # Filter where role is SYSTEM
+                .where(models.UserRole.name == user_role)  # Filter where role is SYSTEM
                 .order_by(models.User.id)
                 .limit(1)
             )
@@ -117,7 +118,7 @@ class ApiKeyMutationMixin:
             issued_at=issued_at,
             expiration_time=input.expires_at or None,
             attributes=ApiKeyAttributes(
-                user_role=enums.UserRole.MEMBER,
+                user_role="ADMIN" if user.is_admin else "MEMBER",
                 name=input.name,
                 description=input.description,
             ),

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/server/api/mutations/user_mutations.py

@@ -25,7 +25,7 @@ from phoenix.auth import (
     validate_password_format,
 )
 from phoenix.config import get_env_disable_basic_auth
-from phoenix.db import enums, models
+from phoenix.db import models
 from phoenix.server.api.auth import IsAdmin, IsLocked, IsNotReadOnly
 from phoenix.server.api.context import Context
 from phoenix.server.api.exceptions import BadRequest, Conflict, NotFound, Unauthorized
@@ -256,16 +256,8 @@ class UserMutationMixin:
                 set(input.user_ids),
             )
         )
-        system_user_role_id = (
-            select(models.UserRole.id)
-            .where(models.UserRole.name == enums.UserRole.SYSTEM.value)
-            .scalar_subquery()
-        )
-        admin_user_role_id = (
-            select(models.UserRole.id)
-            .where(models.UserRole.name == enums.UserRole.ADMIN.value)
-            .scalar_subquery()
-        )
+        system_user_role_id = select(models.UserRole.id).filter_by(name="SYSTEM").scalar_subquery()
+        admin_user_role_id = select(models.UserRole.id).filter_by(name="ADMIN").scalar_subquery()
         default_admin_user_id = (
             select(models.User.id)
             .where(

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/server/api/queries.py

@@ -18,7 +18,7 @@ from phoenix.config import (
     get_env_database_allocated_storage_capacity_gibibytes,
     getenv,
 )
-from phoenix.db import enums, models
+from phoenix.db import models
 from phoenix.db.constants import DEFAULT_PROJECT_TRACE_RETENTION_POLICY_ID
 from phoenix.db.helpers import SupportedSQLDialect, exclude_experiment_projects
 from phoenix.db.models import DatasetExample as OrmExample
@@ -165,7 +165,7 @@ class Query:
         stmt = (
             select(models.User)
             .join(models.UserRole)
-            .where(models.UserRole.name != enums.UserRole.SYSTEM.value)
+            .where(models.UserRole.name != "SYSTEM")
             .order_by(models.User.email)
             .options(joinedload(models.User.role))
         )
@@ -181,7 +181,7 @@ class Query:
     ) -> list[UserRole]:
         async with info.context.db() as session:
             roles = await session.scalars(
-                select(models.UserRole).where(models.UserRole.name != enums.UserRole.SYSTEM.value)
+                select(models.UserRole).where(models.UserRole.name != "SYSTEM")
             )
         return [
             UserRole(
@@ -197,7 +197,7 @@ class Query:
             select(models.ApiKey)
             .join(models.User)
             .join(models.UserRole)
-            .where(models.UserRole.name != enums.UserRole.SYSTEM.value)
+            .where(models.UserRole.name != "SYSTEM")
         )
         async with info.context.db() as session:
             api_keys = await session.scalars(stmt)
@@ -209,7 +209,7 @@ class Query:
             select(models.ApiKey)
             .join(models.User)
             .join(models.UserRole)
-            .where(models.UserRole.name == enums.UserRole.SYSTEM.value)
+            .where(models.UserRole.name == "SYSTEM")
         )
         async with info.context.db() as session:
             api_keys = await session.scalars(stmt)

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/server/api/routers/oauth2.py

@@ -37,7 +37,6 @@ from phoenix.config import (
     get_env_disable_rate_limit,
 )
 from phoenix.db import models
-from phoenix.db.enums import UserRole
 from phoenix.server.bearer_auth import create_access_and_refresh_tokens
 from phoenix.server.oauth2 import OAuth2Client
 from phoenix.server.rate_limiters import (
@@ -457,9 +456,7 @@ async def _create_user(
     if email_exists:
         raise EmailAlreadyInUse(f"An account for {email} is already in use.")
     member_role_id = (
-        select(models.UserRole.id)
-        .where(models.UserRole.name == UserRole.MEMBER.value)
-        .scalar_subquery()
+        select(models.UserRole.id).where(models.UserRole.name == "MEMBER").scalar_subquery()
     )
     user_id = await session.scalar(
         insert(models.User)

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/server/api/routers/v1/__init__.py

@@ -15,6 +15,7 @@ from .projects import router as projects_router
 from .prompts import router as prompts_router
 from .spans import router as spans_router
 from .traces import router as traces_router
+from .users import router as users_router
 from .utils import add_errors_to_responses
 
 REST_API_VERSION = "1.0"
@@ -69,4 +70,5 @@ def create_v1_router(authentication_enabled: bool) -> APIRouter:
     router.include_router(evaluations_router)
     router.include_router(prompts_router)
     router.include_router(projects_router)
+    router.include_router(users_router)
     return router

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/server/api/routers/v1/models.py

@@ -1,7 +1,10 @@
 from datetime import datetime
+from typing import Any
 
 from pydantic import BaseModel, ConfigDict
 
+from phoenix.db.types.db_models import UNDEFINED
+
 
 def datetime_encoder(dt: datetime) -> str:
     """
@@ -43,3 +46,7 @@ class V1RoutesBaseModel(BaseModel):
             []
         ),  # suppress warnings about protected namespaces starting with `model_` on pydantic 2.9
     )
+
+    def __init__(self, *args: Any, **kwargs: Any) -> None:
+        kwargs = {k: v for k, v in kwargs.items() if v is not UNDEFINED}
+        super().__init__(*args, **kwargs)

{arize_phoenix-10.2.1 → arize_phoenix-10.3.0}/src/phoenix/server/api/routers/v1/projects.py

@@ -14,7 +14,6 @@ from strawberry.relay import GlobalID
 
 from phoenix.config import DEFAULT_PROJECT_NAME
 from phoenix.db import models
-from phoenix.db.enums import UserRole
 from phoenix.db.helpers import exclude_experiment_projects
 from phoenix.server.api.routers.v1.models import V1RoutesBaseModel
 from phoenix.server.api.routers.v1.utils import (
@@ -257,7 +256,7 @@ async def update_project(
                 .where(models.User.id == int(request.user.identity))
             )
             role_name = await session.scalar(stmt)
-        if role_name != UserRole.ADMIN.value:
+        if role_name != "ADMIN":
             raise HTTPException(
                 status_code=HTTP_403_FORBIDDEN,
                 detail="Only admins can update projects",
@@ -317,7 +316,7 @@ async def delete_project(
                 .where(models.User.id == int(request.user.identity))
             )
             role_name = await session.scalar(stmt)
-        if role_name != UserRole.ADMIN.value:
+        if role_name != "ADMIN":
             raise HTTPException(
                 status_code=HTTP_403_FORBIDDEN,
                 detail="Only admins can delete projects",