Merge pull request #72 from Ridealist/develop

Develop

Author: Ridealist

README.md

@@ -596,7 +596,7 @@ sudo nginx -t
 
 세션 시작 시 자동으로 LiveKit Egress API가 호출되어 모든 참가자(학생 + AI) 음성이 혼합된 MP3 파일이 S3에 저장됩니다.
 
-- **저장 경로**: `s3://tblt-agent-recordings/recordings/{룸명}--{타임스탬프}.mp3`
+- **저장 경로**: `s3://tblt-agent-recordings/recordings/{룸명}-{LiveKit room SID}-{타임스탬프}.mp3`
 - **트리거**: `session.start()` 직후 자동 시작
 - **종료**: 룸 `disconnected` 이벤트 발생 시 자동 종료
 - **관련 코드**: `agent/egress_recorder.py`
@@ -651,7 +651,7 @@ SINCE_YYYYMMDD=20260701 scripts/download_s3_recordings.sh
 SINCE_YYYYMMDD=20260601 scripts/download_s3_recordings.sh ./tmp/recordings
 ```
 
-이 필터는 S3 `LastModified`가 아니라 파일명 규칙 `recordings/{룸명}--YYYYMMDD_HHMMSS.mp3`의 날짜 부분을 기준으로 동작한다.
+이 필터는 S3 `LastModified`가 아니라 파일명 규칙 `recordings/{룸명}-{LiveKit room SID}-YYYYMMDD_HHMMSS.mp3`의 날짜 부분을 기준으로 동작한다.
 
 사용 가능한 환경변수:
 

agent/egress_recorder.py

@@ -25,7 +25,7 @@ def __init__(self, room_name: str, session_id: str) -> None:
         self.session_id = session_id
         self.egress_id: str | None = None
         ts = datetime.now().strftime("%Y%m%d_%H%M%S")
-        self._filepath = f"recordings/{room_name}--{ts}.mp3"
+        self._filepath = f"recordings/{room_name}-{session_id}-{ts}.mp3"
 
     @property
     def filepath(self) -> str:

agent/main.py

@@ -331,7 +331,9 @@ def _resolve_realtime_activity_context(ctx: JobContext) -> dict:
             return _normalize_activity_context(activity_context)
 
     room_name = getattr(ctx.room, "name", "")
-    if isinstance(room_name, str) and room_name.startswith("eval-"):
+    if isinstance(room_name, str) and (
+        room_name.startswith("eval-") or room_name.startswith("eval_")
+    ):
         return {
             "activity_type": "free_conversation",
             "evaluation_id": "pretest_6_10",

agent/tests/test_egress_recorder.py

@@ -0,0 +1,21 @@
+import re
+import sys
+from types import SimpleNamespace
+
+sys.modules.setdefault(
+    "livekit",
+    SimpleNamespace(api=SimpleNamespace(LiveKitAPI=object, S3Upload=object)),
+)
+from egress_recorder import EgressRecorder
+
+
+def test_egress_recording_filepath_includes_room_sid_and_timestamp() -> None:
+    recorder = EgressRecorder(
+        "task_11_17_yujeong_jeong_202315c",
+        "RM_NzGHwKNz7iAu",
+    )
+
+    assert re.fullmatch(
+        r"recordings/task_11_17_yujeong_jeong_202315c-RM_NzGHwKNz7iAu-\d{8}_\d{6}\.mp3",
+        recorder.filepath,
+    )

agent/tests/test_logger.py

@@ -135,7 +135,7 @@ def test_conversation_logger_dual_writes_pending_events_to_mock_writer(tmp_path)
     logger.update_metadata(
         {
             "egress_id": "egress-123",
-            "recording_path": "recordings/realtime-minji--20260612_010101.mp3",
+            "recording_path": "recordings/realtime_minji-RM_livekit-20260612_010101.mp3",
         }
     )
     logger.close()
@@ -348,7 +348,7 @@ def opener(request, timeout):
 
     writer = SupabaseConversationWriter(
         "livekit-room-sid",
-        "eval-9-minji-12345678",
+        "eval_9_2_minji_12345678",
         {
             "activity_type": "free_conversation",
             "agent_mode": "realtime",
@@ -408,7 +408,7 @@ def opener(request, timeout):
     }
     writer = SupabaseConversationWriter(
         "livekit-room-sid",
-        "eval-9-minji-12345678",
+        "eval_9_2_minji_12345678",
         metadata,
         SupabaseConversationConfig(url="http://supabase.test", key="secret"),
         opener=opener,
@@ -523,7 +523,7 @@ def opener(request, timeout):
     metadata = {
         "agent_mode": "pipeline",
         "egress_id": "egress-123",
-        "recording_path": "recordings/9-1--20260612_010101.mp3",
+        "recording_path": "recordings/9-1-RM_livekit-20260612_010101.mp3",
     }
     writer.sync_session_metadata(metadata)
     writer.end_session(metadata)

client/app/admin/page.tsx

@@ -295,8 +295,8 @@ function inferRoomSessionPurpose(room: RealtimeRoomStatus): SessionPurpose | und
   if (room.sessionPurpose === 'evaluation' || room.sessionPurpose === 'practice') {
     return room.sessionPurpose;
   }
-  if (room.name.startsWith('eval-')) return 'evaluation';
-  if (room.name.startsWith('task-')) return 'practice';
+  if (room.name.startsWith('eval-') || room.name.startsWith('eval_')) return 'evaluation';
+  if (room.name.startsWith('task-') || room.name.startsWith('task_')) return 'practice';
   return undefined;
 }
 

client/app/api/rooms/route.ts

@@ -96,7 +96,13 @@ function parseRealtimeRoomMetadata(metadata?: string): {
 }
 
 function isRealtimeRoomName(name: string) {
-  return name.startsWith('realtime-') || name.startsWith('eval-') || name.startsWith('task-');
+  return (
+    name.startsWith('realtime-') ||
+    name.startsWith('eval-') ||
+    name.startsWith('eval_') ||
+    name.startsWith('task-') ||
+    name.startsWith('task_')
+  );
 }
 
 async function getRoomCounts(svc: RoomServiceClient, roomName: string): Promise<RoomCounts> {

client/app/api/token/route.ts

@@ -127,23 +127,27 @@ export async function POST(req: Request) {
       typeof body?.display_name === 'string' && body.display_name.trim()
         ? body.display_name.trim()
         : studentDefaultDisplayName(student);
-    const roomName = typeof body?.room_name === 'string' ? body.room_name.trim() : '';
-    if (!displayName || !roomName) {
+    const requestedRoomName = typeof body?.room_name === 'string' ? body.room_name.trim() : '';
+    if (!displayName || !requestedRoomName) {
       return NextResponse.json(
         { error: 'display_name and room_name are required.' },
         { status: 400, headers: { 'Cache-Control': 'no-store' } }
       );
     }
     const participantIdentity = createStudentParticipantIdentity(student);
     const config = await readRuntimeConfig();
-    const agentMode = inferAgentMode(body?.agent_mode, roomName, config.agentMode);
+    const agentMode = inferAgentMode(body?.agent_mode, requestedRoomName, config.agentMode);
     const sessionActivity =
       agentMode === 'realtime'
-        ? await readSessionActivityContext(body, roomName, config.sessionPurpose)
+        ? await readSessionActivityContext(body, requestedRoomName, config.sessionPurpose)
         : undefined;
+    const roomName =
+      agentMode === 'realtime' && sessionActivity
+        ? canonicalRealtimeRoomName(requestedRoomName, displayName, student, sessionActivity)
+        : requestedRoomName;
     if (agentMode === 'realtime' && config.realtimeResetting) {
       logTokenEvent('rejected realtime token during reset', {
-        roomName,
+        roomName: requestedRoomName,
         studentNumber: student.studentNumber,
         requestedAgentMode: body?.agent_mode ?? null,
         requestedActivityType: body?.activity_type ?? null,
@@ -178,6 +182,7 @@ export async function POST(req: Request) {
 
     logTokenEvent('issuing participant token', {
       roomName,
+      requestedRoomName,
       displayName,
       studentId: student.id,
       studentNumber: student.studentNumber,
@@ -279,6 +284,53 @@ function safeIdentityPart(value: string) {
   );
 }
 
+function safeRoomNamePart(value: string) {
+  return (
+    value
+      .trim()
+      .toLowerCase()
+      .replace(/[^a-z0-9]+/g, '_')
+      .replace(/^_+|_+$/g, '')
+      .slice(0, 40) || 'student'
+  );
+}
+
+function isActivityRoomName(roomName: string) {
+  return (
+    roomName.startsWith('eval-') ||
+    roomName.startsWith('eval_') ||
+    roomName.startsWith('task-') ||
+    roomName.startsWith('task_')
+  );
+}
+
+function roomSuffixFromRequested(roomName: string) {
+  const match = roomName.match(/[_-]([a-zA-Z0-9]{8})$/);
+  return match?.[1] ?? String(Date.now()).slice(-8);
+}
+
+function canonicalRealtimeRoomName(
+  requestedRoomName: string,
+  displayName: string,
+  student: StudentSession,
+  sessionActivity: SessionActivityContext
+) {
+  if (!isActivityRoomName(requestedRoomName)) return requestedRoomName;
+
+  const prefix =
+    sessionActivity.sessionPurpose === 'evaluation' ||
+    sessionActivity.activityType === 'free_conversation'
+      ? 'eval'
+      : 'task';
+  return [
+    prefix,
+    student.classNumber,
+    student.rollNumber,
+    safeRoomNamePart(displayName),
+    roomSuffixFromRequested(requestedRoomName),
+  ].join('_');
+}
+
 function createStudentParticipantIdentity(student: StudentSession) {
   return `student-${safeIdentityPart(student.studentNumber)}-${Math.floor(Math.random() * 10_000)}`;
 }
@@ -295,7 +347,14 @@ async function readRuntimeConfig(): Promise<RuntimeConfig> {
 }
 
 function inferAgentMode(value: unknown, roomName: string, fallback: AgentMode): AgentMode {
-  if (roomName.startsWith('eval-') || roomName.startsWith('task-')) return 'realtime';
+  if (
+    roomName.startsWith('eval-') ||
+    roomName.startsWith('eval_') ||
+    roomName.startsWith('task-') ||
+    roomName.startsWith('task_')
+  ) {
+    return 'realtime';
+  }
   if (roomName.startsWith('realtime-')) return 'realtime';
   return normalizeAgentMode(value ?? fallback);
 }
@@ -310,8 +369,8 @@ type SessionPurposeSignal = {
 };
 
 function parseRoomSessionPurpose(roomName: string): SessionPurpose | undefined {
-  if (roomName.startsWith('eval-')) return 'evaluation';
-  if (roomName.startsWith('task-')) return 'practice';
+  if (roomName.startsWith('eval-') || roomName.startsWith('eval_')) return 'evaluation';
+  if (roomName.startsWith('task-') || roomName.startsWith('task_')) return 'practice';
   return undefined;
 }
 

client/components/app/lobby-view.tsx

@@ -98,8 +98,8 @@ export function LobbyView({
     return (
       name
         .toLowerCase()
-        .replace(/[^a-z0-9]+/g, '-')
-        .replace(/^-+|-+$/g, '')
+        .replace(/[^a-z0-9]+/g, '_')
+        .replace(/^_+|_+$/g, '')
         .slice(0, 40) || 'student'
     );
   }
@@ -113,7 +113,8 @@ export function LobbyView({
   function makeActivityRoomName(name: string, activityType: ActivityType) {
     const prefix = activityType === 'free_conversation' ? 'eval' : 'task';
     const slug = name ? makeStudentSlug(name) : 'student';
-    return `${prefix}-${activeClass ?? 'class'}-${slug}-${makeRoomSuffix()}`;
+    // Realtime rooms identify one logged-in student; pipeline rooms use the active class/group.
+    return `${prefix}_${student.classNumber}_${student.rollNumber}_${slug}_${makeRoomSuffix()}`;
   }
 
   function handleJoin() {

client/lib/conversation-dashboard.ts

@@ -56,7 +56,7 @@ function textNumber(value: unknown): string | undefined {
 function parseRoomClass(room: string): string | undefined {
   const pipelineMatch = room.match(/^(\d+)반-/);
   if (pipelineMatch) return pipelineMatch[1];
-  const realtimeMatch = room.match(/^(?:eval|task)-([^-]+)-/);
+  const realtimeMatch = room.match(/^(?:eval|task)[-_]([^-_]+)[-_]/);
   return realtimeMatch?.[1];
 }
 
@@ -68,7 +68,13 @@ function parsePipelineRoom(room: string): { cls: string; grp: string } {
 }
 
 function isRealtimeRoomName(room: string) {
-  return room.startsWith('realtime-') || room.startsWith('eval-') || room.startsWith('task-');
+  return (
+    room.startsWith('realtime-') ||
+    room.startsWith('eval-') ||
+    room.startsWith('eval_') ||
+    room.startsWith('task-') ||
+    room.startsWith('task_')
+  );
 }
 
 export function buildLogSessionsQuery(filters: DashboardFilters): string {
@@ -89,8 +95,8 @@ export function inferDashboardSessionPurpose(
   if (rawActivity === 'free_conversation' || rawActivity === 'task_solution') {
     return getSessionPurposeForActivity(rawActivity);
   }
-  if (session.room.startsWith('eval-')) return 'evaluation';
-  if (session.room.startsWith('task-')) return 'practice';
+  if (session.room.startsWith('eval-') || session.room.startsWith('eval_')) return 'evaluation';
+  if (session.room.startsWith('task-') || session.room.startsWith('task_')) return 'practice';
   return undefined;
 }