fix: remove exp from jwt (#4729)

* fix: remove exp from jwt

* clean up

integration_tests/_helpers.py

@@ -527,14 +527,18 @@ def handle_request(self, request: httpx.Request) -> httpx.Response:
             _HTTPX_OP_IDX.set(op_idx + 1)
             info.write(f"({op_idx})".encode())
             info.write(f"{test_name}\n".encode())
-        response = self._transport.handle_request(request)
-        info.write(f"{response.status_code} {request.method} {request.url}\n".encode())
+        info.write(f"{request.method} {request.url}\n".encode())
         if token_ids := _decode_token_ids(request.headers):
             info.write(f"{' '.join(token_ids)}\n".encode())
         info.write(f"{request.headers}\n".encode())
         info.write(request.read())
         info.write(b"\n")
-        info.write(f"{response.headers}\n".encode())
+        try:
+            response = self._transport.handle_request(request)
+        except BaseException:
+            print(info.getvalue().decode())
+            raise
+        info.write(f"{response.status_code} {response.headers}\n".encode())
         if returned_token_ids := _decode_token_ids(response.headers, "set-cookie"):
             info.write(f"{' '.join(returned_token_ids)}\n".encode())
         return _LogResponse(

integration_tests/auth/conftest.py

@@ -22,20 +22,22 @@
     get_env_smtp_port,
     get_env_smtp_username,
 )
-from portpicker import pick_unused_port  # type: ignore[import-untyped]
 from smtpdfix import AuthController, Config, SMTPDFix
 from smtpdfix.certs import _generate_certs
 
 from .._helpers import _Secret, _server
 
 
 @pytest.fixture(scope="module")
-def _secret() -> _Secret:
+def _secret(
+    _env_phoenix_sql_database_url: Any,
+) -> _Secret:
     return secrets.token_hex(DEFAULT_SECRET_LENGTH)
 
 
 @pytest.fixture(autouse=True, scope="module")
 def _app(
+    _ports: Iterator[int],
     _secret: _Secret,
     _env_phoenix_sql_database_url: Any,
     _fake: Faker,
@@ -45,7 +47,7 @@ def _app(
         (ENV_PHOENIX_DISABLE_RATE_LIMIT, "true"),
         (ENV_PHOENIX_SECRET, _secret),
         (ENV_PHOENIX_SMTP_HOSTNAME, "127.0.0.1"),
-        (ENV_PHOENIX_SMTP_PORT, str(pick_unused_port())),
+        (ENV_PHOENIX_SMTP_PORT, str(next(_ports))),
         (ENV_PHOENIX_SMTP_USERNAME, "test"),
         (ENV_PHOENIX_SMTP_PASSWORD, "test"),
         (ENV_PHOENIX_SMTP_MAIL_FROM, _fake.email()),

integration_tests/conftest.py

@@ -2,7 +2,7 @@
 from contextlib import ExitStack
 from dataclasses import asdict
 from itertools import count, starmap
-from typing import Generator, Iterator, Optional, Tuple, cast
+from typing import Generator, Iterator, List, Optional, Tuple, cast
 from unittest import mock
 
 import pytest
@@ -46,6 +46,19 @@
 )
 
 
+@pytest.fixture(scope="session")
+def _ports() -> Iterator[int]:
+    def _(used: List[int]) -> Iterator[int]:
+        while True:
+            port = pick_unused_port()
+            if port not in used:
+                print("PORT", port)
+                used.append(port)
+                yield port
+
+    return _([])
+
+
 @pytest.fixture(
     scope="session",
     params=[
@@ -75,11 +88,15 @@ def _fake() -> Faker:
 
 
 @pytest.fixture(autouse=True, scope="module")
-def _env(tmp_path_factory: TempPathFactory) -> Iterator[None]:
+def _env(
+    _sql_database_url: URL,
+    _ports: Iterator[int],
+    tmp_path_factory: TempPathFactory,
+) -> Iterator[None]:
     tmp = tmp_path_factory.getbasetemp()
     values = (
-        (ENV_PHOENIX_PORT, str(pick_unused_port())),
-        (ENV_PHOENIX_GRPC_PORT, str(pick_unused_port())),
+        (ENV_PHOENIX_PORT, str(next(_ports))),
+        (ENV_PHOENIX_GRPC_PORT, str(next(_ports))),
         (ENV_PHOENIX_WORKING_DIR, str(tmp)),
     )
     with mock.patch.dict(os.environ, values):

src/phoenix/server/jwt_store.py

@@ -245,8 +245,6 @@ def __init__(
 
     def _encode(self, claim: ClaimSet) -> str:
         payload: Dict[str, Any] = dict(jti=claim.token_id)
-        if claim.expiration_time:
-            payload["exp"] = int(claim.expiration_time.timestamp())
         header = {"alg": self._algorithm}
         jwt_bytes: bytes = jwt.encode(header=header, payload=payload, key=self._secret)
         return jwt_bytes.decode()