arize-phoenix 12.4.0__py3-none-any.whl → 12.6.0__py3-none-any.whl

phoenix/server/api/types/Project.py

@@ -7,7 +7,6 @@ from aioitertools.itertools import groupby, islice
 from openinference.semconv.trace import SpanAttributes
 from sqlalchemy import and_, case, desc, distinct, exists, func, or_, select
 from sqlalchemy.dialects import postgresql, sqlite
-from sqlalchemy.sql.elements import ColumnElement
 from sqlalchemy.sql.expression import tuple_
 from sqlalchemy.sql.functions import percentile_cont
 from strawberry import ID, UNSET, Private, lazy
@@ -21,8 +20,8 @@ from phoenix.db.helpers import SupportedSQLDialect, date_trunc
 from phoenix.server.api.context import Context
 from phoenix.server.api.exceptions import BadRequest
 from phoenix.server.api.input_types.ProjectSessionSort import (
-    ProjectSessionColumn,
     ProjectSessionSort,
+    ProjectSessionSortConfig,
 )
 from phoenix.server.api.input_types.SpanSort import SpanColumn, SpanSort, SpanSortConfig
 from phoenix.server.api.input_types.TimeBinConfig import TimeBinConfig, TimeBinScale
@@ -459,74 +458,31 @@ class Project(Node):
                 end_time=time_range.end if time_range else None,
             )
             stmt = stmt.where(table.id.in_(filtered_session_rowids))
+        sort_config: Optional[ProjectSessionSortConfig] = None
+        cursor_rowid_column: Any = table.id
         if sort:
-            key: ColumnElement[Any]
-            if sort.col is ProjectSessionColumn.startTime:
-                key = table.start_time.label("key")
-            elif sort.col is ProjectSessionColumn.endTime:
-                key = table.end_time.label("key")
-            elif (
-                sort.col is ProjectSessionColumn.tokenCountTotal
-                or sort.col is ProjectSessionColumn.numTraces
-            ):
-                if sort.col is ProjectSessionColumn.tokenCountTotal:
-                    sort_subq = (
-                        select(
-                            models.Trace.project_session_rowid.label("id"),
-                            func.sum(models.Span.cumulative_llm_token_count_total).label("key"),
-                        )
-                        .join_from(models.Trace, models.Span)
-                        .where(models.Span.parent_id.is_(None))
-                        .group_by(models.Trace.project_session_rowid)
-                    ).subquery()
-                elif sort.col is ProjectSessionColumn.numTraces:
-                    sort_subq = (
-                        select(
-                            models.Trace.project_session_rowid.label("id"),
-                            func.count(models.Trace.id).label("key"),
-                        ).group_by(models.Trace.project_session_rowid)
-                    ).subquery()
+            sort_config = sort.update_orm_expr(stmt)
+            stmt = sort_config.stmt
+            if sort_config.dir is SortDir.desc:
+                cursor_rowid_column = desc(cursor_rowid_column)
+        if after:
+            cursor = Cursor.from_string(after)
+            if sort_config and cursor.sort_column:
+                sort_column = cursor.sort_column
+                compare = operator.lt if sort_config.dir is SortDir.desc else operator.gt
+                if sort_column.type is CursorSortColumnDataType.NULL:
+                    stmt = stmt.where(sort_config.orm_expression.is_(None))
+                    stmt = stmt.where(compare(table.id, cursor.rowid))
                 else:
-                    assert_never(sort.col)
-                key = sort_subq.c.key
-                stmt = stmt.join(sort_subq, table.id == sort_subq.c.id)
-            elif sort.col is ProjectSessionColumn.costTotal:
-                sort_subq = (
-                    select(
-                        models.Trace.project_session_rowid.label("id"),
-                        func.sum(models.SpanCost.total_cost).label("key"),
-                    )
-                    .join_from(
-                        models.Trace,
-                        models.SpanCost,
-                        models.Trace.id == models.SpanCost.trace_rowid,
+                    stmt = stmt.where(
+                        compare(
+                            tuple_(sort_config.orm_expression, table.id),
+                            (sort_column.value, cursor.rowid),
+                        )
                     )
-                    .group_by(models.Trace.project_session_rowid)
-                ).subquery()
-                key = sort_subq.c.key
-                stmt = stmt.join(sort_subq, table.id == sort_subq.c.id)
-            else:
-                assert_never(sort.col)
-            stmt = stmt.add_columns(key)
-            if sort.dir is SortDir.asc:
-                stmt = stmt.order_by(key.asc(), table.id.asc())
             else:
-                stmt = stmt.order_by(key.desc(), table.id.desc())
-            if after:
-                cursor = Cursor.from_string(after)
-                assert cursor.sort_column is not None
-                compare = operator.lt if sort.dir is SortDir.desc else operator.gt
-                stmt = stmt.where(
-                    compare(
-                        tuple_(key, table.id),
-                        (cursor.sort_column.value, cursor.rowid),
-                    )
-                )
-        else:
-            stmt = stmt.order_by(table.id.desc())
-            if after:
-                cursor = Cursor.from_string(after)
                 stmt = stmt.where(table.id < cursor.rowid)
+        stmt = stmt.order_by(cursor_rowid_column)
         if first:
             stmt = stmt.limit(
                 first + 1  # over-fetch by one to determine whether there's a next page
@@ -537,10 +493,10 @@ class Project(Node):
             async for record in islice(records, first):
                 project_session = record[0]
                 cursor = Cursor(rowid=project_session.id)
-                if sort:
+                if sort_config:
                     assert len(record) > 1
                     cursor.sort_column = CursorSortColumn(
-                        type=sort.col.data_type,
+                        type=sort_config.column_data_type,
                         value=record[1],
                     )
                 cursors_and_nodes.append((cursor, to_gql_project_session(project_session)))
@@ -724,7 +680,7 @@ class Project(Node):
             stmt = span_filter(select(models.Span))
             dialect = info.context.db.dialect
             if dialect is SupportedSQLDialect.POSTGRESQL:
-                str(stmt.compile(dialect=sqlite.dialect()))  # type: ignore[no-untyped-call]
+                str(stmt.compile(dialect=sqlite.dialect()))
             elif dialect is SupportedSQLDialect.SQLITE:
                 str(stmt.compile(dialect=postgresql.dialect()))  # type: ignore[no-untyped-call]
             else:

phoenix/server/app.py

@@ -88,6 +88,7 @@ from phoenix.server.api.dataloaders import (
     AverageExperimentRepeatedRunGroupLatencyDataLoader,
     AverageExperimentRunLatencyDataLoader,
     CacheForDataLoaders,
+    DatasetDatasetSplitsDataLoader,
     DatasetExampleRevisionsDataLoader,
     DatasetExamplesAndVersionsByExperimentRunDataLoader,
     DatasetExampleSpansDataLoader,
@@ -709,6 +710,7 @@ def create_graphql_router(
                     db
                 ),
                 average_experiment_run_latency=AverageExperimentRunLatencyDataLoader(db),
+                dataset_dataset_splits=DatasetDatasetSplitsDataLoader(db),
                 dataset_example_revisions=DatasetExampleRevisionsDataLoader(db),
                 dataset_example_spans=DatasetExampleSpansDataLoader(db),
                 dataset_examples_and_versions_by_experiment_run=DatasetExamplesAndVersionsByExperimentRunDataLoader(

phoenix/server/authorization.py

@@ -42,8 +42,10 @@ def require_admin(request: Request) -> None:
     Behavior:
         - Allows access if the authenticated user is an admin or a system user.
         - Raises HTTP 403 Forbidden if the user is not authorized.
-        - Expects authentication to be enabled and request.user to be set by the authentication.
+        - Allows access if authentication is not enabled.
     """
+    if not request.app.state.authentication_enabled:
+        return
     user = getattr(request, "user", None)
     # System users have all privileges
     if not (isinstance(user, PhoenixUser) and user.is_admin):

phoenix/server/bearer_auth.py

@@ -75,11 +75,18 @@ class PhoenixUser(BaseUser):
         self._is_admin = (
             claims.status is ClaimSetStatus.VALID and claims.attributes.user_role == "ADMIN"
         )
+        self._is_viewer = (
+            claims.status is ClaimSetStatus.VALID and claims.attributes.user_role == "VIEWER"
+        )
 
     @cached_property
     def is_admin(self) -> bool:
         return self._is_admin
 
+    @cached_property
+    def is_viewer(self) -> bool:
+        return self._is_viewer
+
     @cached_property
     def identity(self) -> UserId:
         return self._user_id
@@ -92,6 +99,8 @@ class PhoenixUser(BaseUser):
 class PhoenixSystemUser(PhoenixUser):
     def __init__(self, user_id: UserId) -> None:
         self._user_id = user_id
+        self._is_admin = True  # System users have admin privileges
+        self._is_viewer = False  # System users are not viewers
 
     @property
     def is_admin(self) -> bool:

phoenix/server/jwt_store.py

@@ -164,7 +164,7 @@ class JwtStore:
         for token_id in token_ids:
             if isinstance(token_id, PasswordResetTokenId):
                 password_reset_token_ids.append(token_id)
-            if isinstance(token_id, AccessTokenId):
+            elif isinstance(token_id, AccessTokenId):
                 access_token_ids.append(token_id)
             elif isinstance(token_id, RefreshTokenId):
                 refresh_token_ids.append(token_id)
@@ -182,10 +182,10 @@ class JwtStore:
         await gather(*coroutines)
 
     async def log_out(self, user_id: UserId) -> None:
-        for cls in (AccessTokenId, RefreshTokenId):
-            table = cls.table
-            stmt = delete(table).where(table.user_id == int(user_id)).returning(table.id)
-            async with self._db() as session:
+        async with self._db() as session:
+            for cls in (AccessTokenId, RefreshTokenId):
+                table = cls.table
+                stmt = delete(table).where(table.user_id == int(user_id)).returning(table.id)
                 async for id_ in await session.stream_scalars(stmt):
                     await self._evict(cls(id_))
 
@@ -314,7 +314,9 @@ class _Store(DaemonTask, Generic[_ClaimSetT, _TokenT, _TokenIdT, _RecordT], ABC)
 
     async def _delete_expired_tokens(self, session: Any) -> None:
         now = datetime.now(timezone.utc)
-        await session.execute(delete(self._table).where(self._table.expires_at < now))
+        # Per JWT RFC 7519 Section 4.1.4, tokens expire "on or after" the expiration time.
+        # Use <= to include tokens expiring at exactly this moment.
+        await session.execute(delete(self._table).where(self._table.expires_at <= now))
 
     async def _run(self) -> None:
         while self._running:

phoenix/server/static/.vite/manifest.json

@@ -1,93 +1,93 @@
 {
-  "_components-BvsExS75.js": {
-    "file": "assets/components-BvsExS75.js",
+  "_components-CboqzKQ9.js": {
+    "file": "assets/components-CboqzKQ9.js",
     "name": "components",
     "imports": [
-      "_vendor-D2eEI-6h.js",
-      "_pages-Ckg4SLQ9.js",
-      "_vendor-arizeai-kfOei7nf.js",
-      "_vendor-codemirror-1bq_t1Ec.js",
-      "_vendor-three-BLWp5bic.js"
+      "_vendor-CQ4tN9P7.js",
+      "_pages-DdlUeKi2.js",
+      "_vendor-arizeai-Cb1ncvYH.js",
+      "_vendor-codemirror-CckmKopH.js",
+      "_vendor-three-BtCyLs1w.js"
     ]
   },
-  "_pages-Ckg4SLQ9.js": {
-    "file": "assets/pages-Ckg4SLQ9.js",
+  "_pages-DdlUeKi2.js": {
+    "file": "assets/pages-DdlUeKi2.js",
     "name": "pages",
     "imports": [
-      "_vendor-D2eEI-6h.js",
-      "_components-BvsExS75.js",
-      "_vendor-arizeai-kfOei7nf.js",
-      "_vendor-codemirror-1bq_t1Ec.js",
-      "_vendor-recharts-DQ4xfrf4.js"
+      "_vendor-CQ4tN9P7.js",
+      "_components-CboqzKQ9.js",
+      "_vendor-arizeai-Cb1ncvYH.js",
+      "_vendor-codemirror-CckmKopH.js",
+      "_vendor-recharts-BC1ysIKu.js"
     ]
   },
   "_vendor-BGzfc4EU.css": {
     "file": "assets/vendor-BGzfc4EU.css",
     "src": "_vendor-BGzfc4EU.css"
   },
-  "_vendor-D2eEI-6h.js": {
-    "file": "assets/vendor-D2eEI-6h.js",
+  "_vendor-CQ4tN9P7.js": {
+    "file": "assets/vendor-CQ4tN9P7.js",
     "name": "vendor",
     "imports": [
-      "_vendor-three-BLWp5bic.js"
+      "_vendor-three-BtCyLs1w.js"
     ],
     "css": [
       "assets/vendor-BGzfc4EU.css"
     ]
   },
-  "_vendor-arizeai-kfOei7nf.js": {
-    "file": "assets/vendor-arizeai-kfOei7nf.js",
+  "_vendor-arizeai-Cb1ncvYH.js": {
+    "file": "assets/vendor-arizeai-Cb1ncvYH.js",
     "name": "vendor-arizeai",
     "imports": [
-      "_vendor-D2eEI-6h.js"
+      "_vendor-CQ4tN9P7.js"
     ]
   },
-  "_vendor-codemirror-1bq_t1Ec.js": {
-    "file": "assets/vendor-codemirror-1bq_t1Ec.js",
+  "_vendor-codemirror-CckmKopH.js": {
+    "file": "assets/vendor-codemirror-CckmKopH.js",
     "name": "vendor-codemirror",
     "imports": [
-      "_vendor-D2eEI-6h.js",
-      "_vendor-shiki-GGmcIQxA.js"
+      "_vendor-CQ4tN9P7.js",
+      "_vendor-shiki-B45T-YxN.js"
     ],
     "dynamicImports": [
-      "_vendor-shiki-GGmcIQxA.js",
-      "_vendor-shiki-GGmcIQxA.js",
-      "_vendor-shiki-GGmcIQxA.js"
+      "_vendor-shiki-B45T-YxN.js",
+      "_vendor-shiki-B45T-YxN.js",
+      "_vendor-shiki-B45T-YxN.js"
     ]
   },
-  "_vendor-recharts-DQ4xfrf4.js": {
-    "file": "assets/vendor-recharts-DQ4xfrf4.js",
+  "_vendor-recharts-BC1ysIKu.js": {
+    "file": "assets/vendor-recharts-BC1ysIKu.js",
     "name": "vendor-recharts",
     "imports": [
-      "_vendor-D2eEI-6h.js"
+      "_vendor-CQ4tN9P7.js"
     ]
   },
-  "_vendor-shiki-GGmcIQxA.js": {
-    "file": "assets/vendor-shiki-GGmcIQxA.js",
+  "_vendor-shiki-B45T-YxN.js": {
+    "file": "assets/vendor-shiki-B45T-YxN.js",
     "name": "vendor-shiki",
     "isDynamicEntry": true,
     "imports": [
-      "_vendor-D2eEI-6h.js"
+      "_vendor-CQ4tN9P7.js"
     ]
   },
-  "_vendor-three-BLWp5bic.js": {
-    "file": "assets/vendor-three-BLWp5bic.js",
+  "_vendor-three-BtCyLs1w.js": {
+    "file": "assets/vendor-three-BtCyLs1w.js",
     "name": "vendor-three"
   },
   "index.tsx": {
-    "file": "assets/index-iq8WDxat.js",
+    "file": "assets/index-CYYGI5-x.js",
     "name": "index",
     "src": "index.tsx",
     "isEntry": true,
     "imports": [
-      "_vendor-D2eEI-6h.js",
-      "_vendor-arizeai-kfOei7nf.js",
-      "_pages-Ckg4SLQ9.js",
-      "_components-BvsExS75.js",
-      "_vendor-three-BLWp5bic.js",
-      "_vendor-codemirror-1bq_t1Ec.js",
-      "_vendor-shiki-GGmcIQxA.js",
-      "_vendor-recharts-DQ4xfrf4.js"
+      "_vendor-CQ4tN9P7.js",
+      "_vendor-arizeai-Cb1ncvYH.js",
+      "_pages-DdlUeKi2.js",
+      "_components-CboqzKQ9.js",
+      "_vendor-three-BtCyLs1w.js",
+      "_vendor-codemirror-CckmKopH.js",
+      "_vendor-shiki-B45T-YxN.js",
+      "_vendor-recharts-BC1ysIKu.js"
     ]
   }
 }