mirror of
https://github.com/Monadical-SAS/reflector.git
synced 2026-02-06 10:46:46 +00:00
Compare commits
12 Commits
brady-bunc
...
fix-daily-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6c88e05423 | ||
|
|
f4803c0d76 | ||
|
|
2b484aec00 | ||
|
|
d3161730ef | ||
|
|
4fd88b2fc1 | ||
|
|
a2694650fd | ||
|
|
238d768499 | ||
|
|
1da687fe13 | ||
|
|
e9e1676409 | ||
| 1ce1c7a910 | |||
|
|
984795357e | ||
| fa3cf5da0f |
@@ -4,3 +4,4 @@ docs/docs/installation/daily-setup.md:curl-auth-header:277
|
|||||||
gpu/self_hosted/DEV_SETUP.md:curl-auth-header:74
|
gpu/self_hosted/DEV_SETUP.md:curl-auth-header:74
|
||||||
gpu/self_hosted/DEV_SETUP.md:curl-auth-header:83
|
gpu/self_hosted/DEV_SETUP.md:curl-auth-header:83
|
||||||
server/reflector/worker/process.py:generic-api-key:465
|
server/reflector/worker/process.py:generic-api-key:465
|
||||||
|
server/reflector/worker/process.py:generic-api-key:594
|
||||||
|
|||||||
@@ -1,5 +1,14 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.32.2](https://github.com/Monadical-SAS/reflector/compare/v0.32.1...v0.32.2) (2026-02-03)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* increase TIMEOUT_MEDIUM from 2m to 5m for LLM tasks ([#843](https://github.com/Monadical-SAS/reflector/issues/843)) ([4acde4b](https://github.com/Monadical-SAS/reflector/commit/4acde4b7fdef88cc02ca12cf38c9020b05ed96ac))
|
||||||
|
* make caddy optional ([#841](https://github.com/Monadical-SAS/reflector/issues/841)) ([a2ed7d6](https://github.com/Monadical-SAS/reflector/commit/a2ed7d60d557b551a5b64e4dfd909b63a791d9fc))
|
||||||
|
* use Daily API recording.duration as master source for transcript duration ([#844](https://github.com/Monadical-SAS/reflector/issues/844)) ([8707c66](https://github.com/Monadical-SAS/reflector/commit/8707c6694a80c939b6214bbc13331741f192e082))
|
||||||
|
|
||||||
## [0.32.1](https://github.com/Monadical-SAS/reflector/compare/v0.32.0...v0.32.1) (2026-01-30)
|
## [0.32.1](https://github.com/Monadical-SAS/reflector/compare/v0.32.0...v0.32.1) (2026-01-30)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -4,27 +4,31 @@ ENV PYTHONUNBUFFERED=1 \
|
|||||||
UV_LINK_MODE=copy \
|
UV_LINK_MODE=copy \
|
||||||
UV_NO_CACHE=1
|
UV_NO_CACHE=1
|
||||||
|
|
||||||
|
# patch until nvidia updates the sha1 repo
|
||||||
|
ADD sequoia.config /etc/crypto-policies/back-ends/sequoia.config
|
||||||
|
|
||||||
WORKDIR /tmp
|
WORKDIR /tmp
|
||||||
RUN apt-get update \
|
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
|
||||||
|
--mount=type=cache,target=/var/lib/apt,sharing=locked \
|
||||||
|
apt-get update \
|
||||||
&& apt-get install -y \
|
&& apt-get install -y \
|
||||||
ffmpeg \
|
ffmpeg \
|
||||||
curl \
|
curl \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
gnupg \
|
gnupg \
|
||||||
wget \
|
wget
|
||||||
&& apt-get clean
|
|
||||||
# Add NVIDIA CUDA repo for Debian 12 (bookworm) and install cuDNN 9 for CUDA 12
|
# Add NVIDIA CUDA repo for Debian 12 (bookworm) and install cuDNN 9 for CUDA 12
|
||||||
ADD https://developer.download.nvidia.com/compute/cuda/repos/debian12/x86_64/cuda-keyring_1.1-1_all.deb /cuda-keyring.deb
|
ADD https://developer.download.nvidia.com/compute/cuda/repos/debian12/x86_64/cuda-keyring_1.1-1_all.deb /cuda-keyring.deb
|
||||||
RUN dpkg -i /cuda-keyring.deb \
|
RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
|
||||||
|
--mount=type=cache,target=/var/lib/apt,sharing=locked \
|
||||||
|
dpkg -i /cuda-keyring.deb \
|
||||||
&& rm /cuda-keyring.deb \
|
&& rm /cuda-keyring.deb \
|
||||||
&& apt-get update \
|
&& apt-get update \
|
||||||
&& apt-get install -y --no-install-recommends \
|
&& apt-get install -y --no-install-recommends \
|
||||||
cuda-cudart-12-6 \
|
cuda-cudart-12-6 \
|
||||||
libcublas-12-6 \
|
libcublas-12-6 \
|
||||||
libcudnn9-cuda-12 \
|
libcudnn9-cuda-12 \
|
||||||
libcudnn9-dev-cuda-12 \
|
libcudnn9-dev-cuda-12
|
||||||
&& apt-get clean \
|
|
||||||
&& rm -rf /var/lib/apt/lists/*
|
|
||||||
ADD https://astral.sh/uv/install.sh /uv-installer.sh
|
ADD https://astral.sh/uv/install.sh /uv-installer.sh
|
||||||
RUN sh /uv-installer.sh && rm /uv-installer.sh
|
RUN sh /uv-installer.sh && rm /uv-installer.sh
|
||||||
ENV PATH="/root/.local/bin/:$PATH"
|
ENV PATH="/root/.local/bin/:$PATH"
|
||||||
@@ -39,6 +43,13 @@ COPY ./app /app/app
|
|||||||
COPY ./main.py /app/
|
COPY ./main.py /app/
|
||||||
COPY ./runserver.sh /app/
|
COPY ./runserver.sh /app/
|
||||||
|
|
||||||
|
# prevent uv failing with too many open files on big cpus
|
||||||
|
ENV UV_CONCURRENT_INSTALLS=16
|
||||||
|
|
||||||
|
# first install
|
||||||
|
RUN --mount=type=cache,target=/root/.cache/uv \
|
||||||
|
uv sync --compile-bytecode --locked
|
||||||
|
|
||||||
EXPOSE 8000
|
EXPOSE 8000
|
||||||
|
|
||||||
CMD ["sh", "/app/runserver.sh"]
|
CMD ["sh", "/app/runserver.sh"]
|
||||||
|
|||||||
2
gpu/self_hosted/sequoia.config
Normal file
2
gpu/self_hosted/sequoia.config
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
[hash_algorithms]
|
||||||
|
sha1 = "always"
|
||||||
@@ -346,6 +346,27 @@ class MeetingController:
|
|||||||
return None
|
return None
|
||||||
return Meeting(**result)
|
return Meeting(**result)
|
||||||
|
|
||||||
|
async def get_by_room_and_time_window(
|
||||||
|
self, room: Room, start_date: datetime, end_date: datetime
|
||||||
|
) -> Meeting | None:
|
||||||
|
"""Check if a meeting already exists for this room with the same time window."""
|
||||||
|
query = (
|
||||||
|
meetings.select()
|
||||||
|
.where(
|
||||||
|
sa.and_(
|
||||||
|
meetings.c.room_id == room.id,
|
||||||
|
meetings.c.start_date == start_date,
|
||||||
|
meetings.c.end_date == end_date,
|
||||||
|
meetings.c.is_active,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.limit(1)
|
||||||
|
)
|
||||||
|
result = await get_database().fetch_one(query)
|
||||||
|
if not result:
|
||||||
|
return None
|
||||||
|
return Meeting(**result)
|
||||||
|
|
||||||
async def update_meeting(self, meeting_id: str, **kwargs):
|
async def update_meeting(self, meeting_id: str, **kwargs):
|
||||||
query = meetings.update().where(meetings.c.id == meeting_id).values(**kwargs)
|
query = meetings.update().where(meetings.c.id == meeting_id).values(**kwargs)
|
||||||
await get_database().execute(query)
|
await get_database().execute(query)
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ from celery import shared_task
|
|||||||
from celery.utils.log import get_task_logger
|
from celery.utils.log import get_task_logger
|
||||||
|
|
||||||
from reflector.asynctask import asynctask
|
from reflector.asynctask import asynctask
|
||||||
from reflector.db.calendar_events import calendar_events_controller
|
from reflector.db.calendar_events import CalendarEvent, calendar_events_controller
|
||||||
from reflector.db.meetings import meetings_controller
|
from reflector.db.meetings import meetings_controller
|
||||||
from reflector.db.rooms import Room, rooms_controller
|
from reflector.db.rooms import Room, rooms_controller
|
||||||
from reflector.redis_cache import RedisAsyncLock
|
from reflector.redis_cache import RedisAsyncLock
|
||||||
@@ -83,10 +83,9 @@ def _should_sync(room) -> bool:
|
|||||||
return time_since_sync.total_seconds() >= room.ics_fetch_interval
|
return time_since_sync.total_seconds() >= room.ics_fetch_interval
|
||||||
|
|
||||||
|
|
||||||
MEETING_DEFAULT_DURATION = timedelta(hours=1)
|
async def create_upcoming_meetings_for_event(
|
||||||
|
event: CalendarEvent, create_window: datetime, room: Room
|
||||||
|
):
|
||||||
async def create_upcoming_meetings_for_event(event, create_window, room: Room):
|
|
||||||
if event.start_time <= create_window:
|
if event.start_time <= create_window:
|
||||||
return
|
return
|
||||||
existing_meeting = await meetings_controller.get_by_calendar_event(event.id, room)
|
existing_meeting = await meetings_controller.get_by_calendar_event(event.id, room)
|
||||||
@@ -94,6 +93,21 @@ async def create_upcoming_meetings_for_event(event, create_window, room: Room):
|
|||||||
if existing_meeting:
|
if existing_meeting:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
# Prevent duplicate meetings from aggregated calendar feeds
|
||||||
|
# (e.g. same event appears with different UIDs from Cal.com and Google Calendar)
|
||||||
|
end_date = event.end_time
|
||||||
|
existing_by_time = await meetings_controller.get_by_room_and_time_window(
|
||||||
|
room, event.start_time, end_date
|
||||||
|
)
|
||||||
|
if existing_by_time:
|
||||||
|
logger.info(
|
||||||
|
"Skipping duplicate calendar event - meeting already exists for this time window",
|
||||||
|
room_id=room.id,
|
||||||
|
event_id=event.id,
|
||||||
|
existing_meeting_id=existing_by_time.id,
|
||||||
|
)
|
||||||
|
return
|
||||||
|
|
||||||
logger.info(
|
logger.info(
|
||||||
"Pre-creating meeting for calendar event",
|
"Pre-creating meeting for calendar event",
|
||||||
room_id=room.id,
|
room_id=room.id,
|
||||||
@@ -102,8 +116,6 @@ async def create_upcoming_meetings_for_event(event, create_window, room: Room):
|
|||||||
)
|
)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
end_date = event.end_time or (event.start_time + MEETING_DEFAULT_DURATION)
|
|
||||||
|
|
||||||
client = create_platform_client(room.platform)
|
client = create_platform_client(room.platform)
|
||||||
|
|
||||||
meeting_data = await client.create_meeting(
|
meeting_data = await client.create_meeting(
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ broadcast messages to all connected websockets.
|
|||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import json
|
import json
|
||||||
import threading
|
|
||||||
|
|
||||||
import redis.asyncio as redis
|
import redis.asyncio as redis
|
||||||
from fastapi import WebSocket
|
from fastapi import WebSocket
|
||||||
@@ -98,6 +97,7 @@ class WebsocketManager:
|
|||||||
|
|
||||||
async def _pubsub_data_reader(self, pubsub_subscriber):
|
async def _pubsub_data_reader(self, pubsub_subscriber):
|
||||||
while True:
|
while True:
|
||||||
|
# timeout=1.0 prevents tight CPU loop when no messages available
|
||||||
message = await pubsub_subscriber.get_message(
|
message = await pubsub_subscriber.get_message(
|
||||||
ignore_subscribe_messages=True
|
ignore_subscribe_messages=True
|
||||||
)
|
)
|
||||||
@@ -109,29 +109,38 @@ class WebsocketManager:
|
|||||||
await socket.send_json(data)
|
await socket.send_json(data)
|
||||||
|
|
||||||
|
|
||||||
|
# Process-global singleton to ensure only one WebsocketManager instance exists.
|
||||||
|
# Multiple instances would cause resource leaks and CPU issues.
|
||||||
|
_ws_manager: WebsocketManager | None = None
|
||||||
|
|
||||||
|
|
||||||
def get_ws_manager() -> WebsocketManager:
|
def get_ws_manager() -> WebsocketManager:
|
||||||
"""
|
"""
|
||||||
Returns the WebsocketManager instance for managing websockets.
|
Returns the global WebsocketManager singleton.
|
||||||
|
|
||||||
This function initializes and returns the WebsocketManager instance,
|
Creates instance on first call, subsequent calls return cached instance.
|
||||||
which is responsible for managing websockets and handling websocket
|
Thread-safe via GIL. Concurrent initialization may create duplicate
|
||||||
connections.
|
instances but last write wins (acceptable for this use case).
|
||||||
|
|
||||||
Returns:
|
Returns:
|
||||||
WebsocketManager: The initialized WebsocketManager instance.
|
WebsocketManager: The global WebsocketManager instance.
|
||||||
|
|
||||||
Raises:
|
|
||||||
ImportError: If the 'reflector.settings' module cannot be imported.
|
|
||||||
RedisConnectionError: If there is an error connecting to the Redis server.
|
|
||||||
"""
|
"""
|
||||||
local = threading.local()
|
global _ws_manager
|
||||||
if hasattr(local, "ws_manager"):
|
|
||||||
return local.ws_manager
|
|
||||||
|
|
||||||
|
if _ws_manager is not None:
|
||||||
|
return _ws_manager
|
||||||
|
|
||||||
|
# No lock needed - GIL makes this safe enough
|
||||||
|
# Worst case: race creates two instances, last assignment wins
|
||||||
pubsub_client = RedisPubSubManager(
|
pubsub_client = RedisPubSubManager(
|
||||||
host=settings.REDIS_HOST,
|
host=settings.REDIS_HOST,
|
||||||
port=settings.REDIS_PORT,
|
port=settings.REDIS_PORT,
|
||||||
)
|
)
|
||||||
ws_manager = WebsocketManager(pubsub_client=pubsub_client)
|
_ws_manager = WebsocketManager(pubsub_client=pubsub_client)
|
||||||
local.ws_manager = ws_manager
|
return _ws_manager
|
||||||
return ws_manager
|
|
||||||
|
|
||||||
|
def reset_ws_manager() -> None:
|
||||||
|
"""Reset singleton for testing. DO NOT use in production."""
|
||||||
|
global _ws_manager
|
||||||
|
_ws_manager = None
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
import os
|
import os
|
||||||
from contextlib import asynccontextmanager
|
from contextlib import asynccontextmanager
|
||||||
from tempfile import NamedTemporaryFile
|
|
||||||
from unittest.mock import patch
|
from unittest.mock import patch
|
||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
@@ -333,10 +332,13 @@ def celery_enable_logging():
|
|||||||
|
|
||||||
@pytest.fixture(scope="session")
|
@pytest.fixture(scope="session")
|
||||||
def celery_config():
|
def celery_config():
|
||||||
with NamedTemporaryFile() as f:
|
redis_host = os.environ.get("REDIS_HOST", "localhost")
|
||||||
|
redis_port = os.environ.get("REDIS_PORT", "6379")
|
||||||
|
# Use db 2 to avoid conflicts with main app
|
||||||
|
redis_url = f"redis://{redis_host}:{redis_port}/2"
|
||||||
yield {
|
yield {
|
||||||
"broker_url": "memory://",
|
"broker_url": redis_url,
|
||||||
"result_backend": f"db+sqlite:///{f.name}",
|
"result_backend": redis_url,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -370,9 +372,12 @@ async def ws_manager_in_memory(monkeypatch):
|
|||||||
def __init__(self, queue: asyncio.Queue):
|
def __init__(self, queue: asyncio.Queue):
|
||||||
self.queue = queue
|
self.queue = queue
|
||||||
|
|
||||||
async def get_message(self, ignore_subscribe_messages: bool = True):
|
async def get_message(
|
||||||
|
self, ignore_subscribe_messages: bool = True, timeout: float | None = None
|
||||||
|
):
|
||||||
|
wait_timeout = timeout if timeout is not None else 0.05
|
||||||
try:
|
try:
|
||||||
return await asyncio.wait_for(self.queue.get(), timeout=0.05)
|
return await asyncio.wait_for(self.queue.get(), timeout=wait_timeout)
|
||||||
except Exception:
|
except Exception:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|||||||
190
server/tests/test_ics_dedup.py
Normal file
190
server/tests/test_ics_dedup.py
Normal file
@@ -0,0 +1,190 @@
|
|||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
from unittest.mock import AsyncMock, patch
|
||||||
|
|
||||||
|
import pytest
|
||||||
|
|
||||||
|
from reflector.db import get_database
|
||||||
|
from reflector.db.calendar_events import CalendarEvent, calendar_events_controller
|
||||||
|
from reflector.db.meetings import meetings
|
||||||
|
from reflector.db.rooms import rooms_controller
|
||||||
|
from reflector.worker.ics_sync import create_upcoming_meetings_for_event
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_duplicate_calendar_event_does_not_create_duplicate_meeting():
|
||||||
|
"""When an aggregated ICS feed contains the same event with different UIDs
|
||||||
|
(e.g. Cal.com UID + Google Calendar UUID), only one meeting should be created."""
|
||||||
|
|
||||||
|
room = await rooms_controller.add(
|
||||||
|
name="dedup-test-room",
|
||||||
|
user_id="test-user",
|
||||||
|
zulip_auto_post=False,
|
||||||
|
zulip_stream="",
|
||||||
|
zulip_topic="",
|
||||||
|
is_locked=False,
|
||||||
|
room_mode="normal",
|
||||||
|
recording_type="cloud",
|
||||||
|
recording_trigger="automatic-2nd-participant",
|
||||||
|
is_shared=False,
|
||||||
|
ics_url="https://calendar.example.com/dedup.ics",
|
||||||
|
ics_enabled=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
|
start_time = now + timedelta(hours=1)
|
||||||
|
end_time = now + timedelta(hours=2)
|
||||||
|
|
||||||
|
# Create first calendar event (Cal.com UID)
|
||||||
|
event1 = await calendar_events_controller.upsert(
|
||||||
|
CalendarEvent(
|
||||||
|
room_id=room.id,
|
||||||
|
ics_uid="abc123@Cal.com",
|
||||||
|
title="Team Standup",
|
||||||
|
start_time=start_time,
|
||||||
|
end_time=end_time,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# create_window must be before start_time for the function to proceed
|
||||||
|
create_window = now - timedelta(minutes=6)
|
||||||
|
|
||||||
|
# Create meeting for event1
|
||||||
|
with patch(
|
||||||
|
"reflector.worker.ics_sync.create_platform_client"
|
||||||
|
) as mock_platform_factory:
|
||||||
|
mock_client = AsyncMock()
|
||||||
|
|
||||||
|
async def mock_create_meeting_1(room_name_prefix, *, end_date, room):
|
||||||
|
return AsyncMock(
|
||||||
|
meeting_id="meeting-1",
|
||||||
|
room_name="dedup-test-room-abc",
|
||||||
|
room_url="https://mock.video/dedup-test-room-abc",
|
||||||
|
host_room_url="https://mock.video/dedup-test-room-abc?host=true",
|
||||||
|
)
|
||||||
|
|
||||||
|
mock_client.create_meeting = mock_create_meeting_1
|
||||||
|
mock_client.upload_logo = AsyncMock()
|
||||||
|
mock_platform_factory.return_value = mock_client
|
||||||
|
|
||||||
|
await create_upcoming_meetings_for_event(event1, create_window, room)
|
||||||
|
|
||||||
|
# Verify meeting was created
|
||||||
|
results = await get_database().fetch_all(
|
||||||
|
meetings.select().where(meetings.c.room_id == room.id)
|
||||||
|
)
|
||||||
|
assert len(results) == 1, f"Expected 1 meeting, got {len(results)}"
|
||||||
|
|
||||||
|
# Create second calendar event with different UID but same time window (Google Calendar UUID)
|
||||||
|
event2 = await calendar_events_controller.upsert(
|
||||||
|
CalendarEvent(
|
||||||
|
room_id=room.id,
|
||||||
|
ics_uid="550e8400-e29b-41d4-a716-446655440000",
|
||||||
|
title="Team Standup",
|
||||||
|
start_time=start_time,
|
||||||
|
end_time=end_time,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Try to create meeting for event2 - should be skipped due to dedup
|
||||||
|
with patch(
|
||||||
|
"reflector.worker.ics_sync.create_platform_client"
|
||||||
|
) as mock_platform_factory:
|
||||||
|
mock_client = AsyncMock()
|
||||||
|
create_meeting_called = False
|
||||||
|
|
||||||
|
async def mock_create_meeting_2(room_name_prefix, *, end_date, room):
|
||||||
|
nonlocal create_meeting_called
|
||||||
|
create_meeting_called = True
|
||||||
|
|
||||||
|
mock_client.create_meeting = mock_create_meeting_2
|
||||||
|
mock_client.upload_logo = AsyncMock()
|
||||||
|
mock_platform_factory.return_value = mock_client
|
||||||
|
|
||||||
|
await create_upcoming_meetings_for_event(event2, create_window, room)
|
||||||
|
|
||||||
|
# Platform client should NOT have been called for the duplicate
|
||||||
|
assert (
|
||||||
|
not create_meeting_called
|
||||||
|
), "create_meeting should not be called for duplicate"
|
||||||
|
|
||||||
|
# Verify still only 1 meeting
|
||||||
|
results = await get_database().fetch_all(
|
||||||
|
meetings.select().where(meetings.c.room_id == room.id)
|
||||||
|
)
|
||||||
|
assert len(results) == 1, f"Expected 1 meeting after dedup, got {len(results)}"
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_different_time_windows_create_separate_meetings():
|
||||||
|
"""Events at different times should create separate meetings, even if titles match."""
|
||||||
|
|
||||||
|
room = await rooms_controller.add(
|
||||||
|
name="dedup-diff-time-room",
|
||||||
|
user_id="test-user",
|
||||||
|
zulip_auto_post=False,
|
||||||
|
zulip_stream="",
|
||||||
|
zulip_topic="",
|
||||||
|
is_locked=False,
|
||||||
|
room_mode="normal",
|
||||||
|
recording_type="cloud",
|
||||||
|
recording_trigger="automatic-2nd-participant",
|
||||||
|
is_shared=False,
|
||||||
|
ics_url="https://calendar.example.com/dedup2.ics",
|
||||||
|
ics_enabled=True,
|
||||||
|
)
|
||||||
|
|
||||||
|
now = datetime.now(timezone.utc)
|
||||||
|
create_window = now - timedelta(minutes=6)
|
||||||
|
|
||||||
|
# Event 1: 1-2pm
|
||||||
|
event1 = await calendar_events_controller.upsert(
|
||||||
|
CalendarEvent(
|
||||||
|
room_id=room.id,
|
||||||
|
ics_uid="event-morning@Cal.com",
|
||||||
|
title="Team Standup",
|
||||||
|
start_time=now + timedelta(hours=1),
|
||||||
|
end_time=now + timedelta(hours=2),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
# Event 2: 3-4pm (different time)
|
||||||
|
event2 = await calendar_events_controller.upsert(
|
||||||
|
CalendarEvent(
|
||||||
|
room_id=room.id,
|
||||||
|
ics_uid="event-afternoon@Cal.com",
|
||||||
|
title="Team Standup",
|
||||||
|
start_time=now + timedelta(hours=3),
|
||||||
|
end_time=now + timedelta(hours=4),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
with patch(
|
||||||
|
"reflector.worker.ics_sync.create_platform_client"
|
||||||
|
) as mock_platform_factory:
|
||||||
|
mock_client = AsyncMock()
|
||||||
|
|
||||||
|
call_count = 0
|
||||||
|
|
||||||
|
async def mock_create_meeting(room_name_prefix, *, end_date, room):
|
||||||
|
nonlocal call_count
|
||||||
|
call_count += 1
|
||||||
|
return AsyncMock(
|
||||||
|
meeting_id=f"meeting-{call_count}",
|
||||||
|
room_name=f"dedup-diff-time-room-{call_count}",
|
||||||
|
room_url=f"https://mock.video/dedup-diff-time-room-{call_count}",
|
||||||
|
host_room_url=f"https://mock.video/dedup-diff-time-room-{call_count}?host=true",
|
||||||
|
)
|
||||||
|
|
||||||
|
mock_client.create_meeting = mock_create_meeting
|
||||||
|
mock_client.upload_logo = AsyncMock()
|
||||||
|
mock_platform_factory.return_value = mock_client
|
||||||
|
|
||||||
|
await create_upcoming_meetings_for_event(event1, create_window, room)
|
||||||
|
await create_upcoming_meetings_for_event(event2, create_window, room)
|
||||||
|
|
||||||
|
results = await get_database().fetch_all(
|
||||||
|
meetings.select().where(meetings.c.room_id == room.id)
|
||||||
|
)
|
||||||
|
assert (
|
||||||
|
len(results) == 2
|
||||||
|
), f"Expected 2 meetings for different times, got {len(results)}"
|
||||||
@@ -115,9 +115,7 @@ def appserver(tmpdir, setup_database, celery_session_app, celery_session_worker)
|
|||||||
settings.DATA_DIR = DATA_DIR
|
settings.DATA_DIR = DATA_DIR
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(scope="session")
|
# Using celery_includes from conftest.py which includes both pipelines
|
||||||
def celery_includes():
|
|
||||||
return ["reflector.pipelines.main_live_pipeline"]
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.usefixtures("setup_database")
|
@pytest.mark.usefixtures("setup_database")
|
||||||
|
|||||||
@@ -56,7 +56,12 @@ def appserver_ws_user(setup_database):
|
|||||||
|
|
||||||
if server_instance:
|
if server_instance:
|
||||||
server_instance.should_exit = True
|
server_instance.should_exit = True
|
||||||
server_thread.join(timeout=30)
|
server_thread.join(timeout=2.0)
|
||||||
|
|
||||||
|
# Reset global singleton for test isolation
|
||||||
|
from reflector.ws_manager import reset_ws_manager
|
||||||
|
|
||||||
|
reset_ws_manager()
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture(autouse=True)
|
@pytest.fixture(autouse=True)
|
||||||
@@ -133,6 +138,8 @@ async def test_user_ws_accepts_valid_token_and_receives_events(appserver_ws_user
|
|||||||
|
|
||||||
# Connect and then trigger an event via HTTP create
|
# Connect and then trigger an event via HTTP create
|
||||||
async with aconnect_ws(base_ws, subprotocols=subprotocols) as ws:
|
async with aconnect_ws(base_ws, subprotocols=subprotocols) as ws:
|
||||||
|
await asyncio.sleep(0.2)
|
||||||
|
|
||||||
# Emit an event to the user's room via a standard HTTP action
|
# Emit an event to the user's room via a standard HTTP action
|
||||||
from httpx import AsyncClient
|
from httpx import AsyncClient
|
||||||
|
|
||||||
@@ -150,6 +157,7 @@ async def test_user_ws_accepts_valid_token_and_receives_events(appserver_ws_user
|
|||||||
"email": "user-abc@example.com",
|
"email": "user-abc@example.com",
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Use in-memory client (global singleton makes it share ws_manager)
|
||||||
async with AsyncClient(app=app, base_url=f"http://{host}:{port}/v1") as ac:
|
async with AsyncClient(app=app, base_url=f"http://{host}:{port}/v1") as ac:
|
||||||
# Create a transcript as this user so that the server publishes TRANSCRIPT_CREATED to user room
|
# Create a transcript as this user so that the server publishes TRANSCRIPT_CREATED to user room
|
||||||
resp = await ac.post("/transcripts", json={"name": "WS Test"})
|
resp = await ac.post("/transcripts", json={"name": "WS Test"})
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import {
|
|||||||
useRef,
|
useRef,
|
||||||
useState,
|
useState,
|
||||||
} from "react";
|
} from "react";
|
||||||
import { Box, Spinner, Center, Text } from "@chakra-ui/react";
|
import { Box, Spinner, Center, Text, Button, VStack } from "@chakra-ui/react";
|
||||||
import { useRouter, useParams } from "next/navigation";
|
import { useRouter, useParams } from "next/navigation";
|
||||||
import DailyIframe, {
|
import DailyIframe, {
|
||||||
DailyCall,
|
DailyCall,
|
||||||
@@ -16,10 +16,13 @@ import DailyIframe, {
|
|||||||
DailyCustomTrayButton,
|
DailyCustomTrayButton,
|
||||||
DailyCustomTrayButtons,
|
DailyCustomTrayButtons,
|
||||||
DailyEventObjectCustomButtonClick,
|
DailyEventObjectCustomButtonClick,
|
||||||
|
DailyEventObjectFatalError,
|
||||||
|
DailyFatalErrorType,
|
||||||
DailyFactoryOptions,
|
DailyFactoryOptions,
|
||||||
DailyParticipantsObject,
|
DailyParticipantsObject,
|
||||||
} from "@daily-co/daily-js";
|
} from "@daily-co/daily-js";
|
||||||
import type { components } from "../../reflector-api";
|
import type { components } from "../../reflector-api";
|
||||||
|
import { printApiError, ApiError } from "../../api/_error";
|
||||||
import { useAuth } from "../../lib/AuthProvider";
|
import { useAuth } from "../../lib/AuthProvider";
|
||||||
import { useConsentDialog } from "../../lib/consent";
|
import { useConsentDialog } from "../../lib/consent";
|
||||||
import {
|
import {
|
||||||
@@ -45,6 +48,63 @@ const RAW_TRACKS_NAMESPACE = "a1b2c3d4-e5f6-7890-abcd-ef1234567890";
|
|||||||
const RECORDING_START_DELAY_MS = 2000;
|
const RECORDING_START_DELAY_MS = 2000;
|
||||||
const RECORDING_START_MAX_RETRIES = 5;
|
const RECORDING_START_MAX_RETRIES = 5;
|
||||||
|
|
||||||
|
const FATAL_ERROR_MESSAGES: Partial<
|
||||||
|
Record<DailyFatalErrorType, { message: string; rejoinable?: boolean }>
|
||||||
|
> = {
|
||||||
|
"connection-error": {
|
||||||
|
message: "Connection lost. Please check your network.",
|
||||||
|
rejoinable: true,
|
||||||
|
},
|
||||||
|
"exp-room": { message: "The meeting time has ended." },
|
||||||
|
"exp-token": { message: "Your session has expired.", rejoinable: true },
|
||||||
|
ejected: { message: "You were removed from this meeting." },
|
||||||
|
"meeting-full": { message: "This meeting is full." },
|
||||||
|
"not-allowed": { message: "You are not allowed to join this meeting." },
|
||||||
|
"nbf-room": { message: "This meeting hasn't started yet." },
|
||||||
|
"nbf-token": { message: "This meeting hasn't started yet." },
|
||||||
|
"no-room": { message: "This room does not exist." },
|
||||||
|
"end-of-life": { message: "This meeting room is no longer available." },
|
||||||
|
};
|
||||||
|
|
||||||
|
function FatalErrorScreen({
|
||||||
|
error,
|
||||||
|
roomName,
|
||||||
|
}: {
|
||||||
|
error: FatalError;
|
||||||
|
roomName: string;
|
||||||
|
}) {
|
||||||
|
const router = useRouter();
|
||||||
|
const info =
|
||||||
|
error.type !== "unknown" ? FATAL_ERROR_MESSAGES[error.type] : undefined;
|
||||||
|
const message = info?.message ?? `Something went wrong: ${error.message}`;
|
||||||
|
const rejoinable = info?.rejoinable ?? false;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Center width="100vw" height="100vh">
|
||||||
|
<VStack gap={4}>
|
||||||
|
<Text color="red.500">{message}</Text>
|
||||||
|
{rejoinable ? (
|
||||||
|
<>
|
||||||
|
<Button onClick={() => window.location.reload()}>
|
||||||
|
Try Rejoining
|
||||||
|
</Button>
|
||||||
|
<Button
|
||||||
|
variant="outline"
|
||||||
|
onClick={() => router.push(`/${roomName}`)}
|
||||||
|
>
|
||||||
|
Leave
|
||||||
|
</Button>
|
||||||
|
</>
|
||||||
|
) : (
|
||||||
|
<Button onClick={() => router.push(`/${roomName}`)}>
|
||||||
|
Back to Room
|
||||||
|
</Button>
|
||||||
|
)}
|
||||||
|
</VStack>
|
||||||
|
</Center>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
type Meeting = components["schemas"]["Meeting"];
|
type Meeting = components["schemas"]["Meeting"];
|
||||||
type Room = components["schemas"]["RoomDetails"];
|
type Room = components["schemas"]["RoomDetails"];
|
||||||
|
|
||||||
@@ -82,6 +142,8 @@ const USE_FRAME_INIT_STATE = {
|
|||||||
joined: false as boolean,
|
joined: false as boolean,
|
||||||
} as const;
|
} as const;
|
||||||
|
|
||||||
|
type FatalError = { type: DailyFatalErrorType | "unknown"; message: string };
|
||||||
|
|
||||||
// Daily js and not Daily react used right now because daily-js allows for prebuild interface vs. -react is customizable but has no nice defaults
|
// Daily js and not Daily react used right now because daily-js allows for prebuild interface vs. -react is customizable but has no nice defaults
|
||||||
const useFrame = (
|
const useFrame = (
|
||||||
container: HTMLDivElement | null,
|
container: HTMLDivElement | null,
|
||||||
@@ -89,6 +151,7 @@ const useFrame = (
|
|||||||
onLeftMeeting: () => void;
|
onLeftMeeting: () => void;
|
||||||
onCustomButtonClick: (ev: DailyEventObjectCustomButtonClick) => void;
|
onCustomButtonClick: (ev: DailyEventObjectCustomButtonClick) => void;
|
||||||
onJoinMeeting: () => void;
|
onJoinMeeting: () => void;
|
||||||
|
onError: (ev: DailyEventObjectFatalError) => void;
|
||||||
},
|
},
|
||||||
) => {
|
) => {
|
||||||
const [{ frame, joined }, setState] = useState(USE_FRAME_INIT_STATE);
|
const [{ frame, joined }, setState] = useState(USE_FRAME_INIT_STATE);
|
||||||
@@ -134,6 +197,7 @@ const useFrame = (
|
|||||||
if (!frame) return;
|
if (!frame) return;
|
||||||
frame.on("left-meeting", cbs.onLeftMeeting);
|
frame.on("left-meeting", cbs.onLeftMeeting);
|
||||||
frame.on("custom-button-click", cbs.onCustomButtonClick);
|
frame.on("custom-button-click", cbs.onCustomButtonClick);
|
||||||
|
frame.on("error", cbs.onError);
|
||||||
const joinCb = () => {
|
const joinCb = () => {
|
||||||
if (!frame) {
|
if (!frame) {
|
||||||
console.error("frame is null in joined-meeting callback");
|
console.error("frame is null in joined-meeting callback");
|
||||||
@@ -145,6 +209,7 @@ const useFrame = (
|
|||||||
return () => {
|
return () => {
|
||||||
frame.off("left-meeting", cbs.onLeftMeeting);
|
frame.off("left-meeting", cbs.onLeftMeeting);
|
||||||
frame.off("custom-button-click", cbs.onCustomButtonClick);
|
frame.off("custom-button-click", cbs.onCustomButtonClick);
|
||||||
|
frame.off("error", cbs.onError);
|
||||||
frame.off("joined-meeting", joinCb);
|
frame.off("joined-meeting", joinCb);
|
||||||
};
|
};
|
||||||
}, [frame, cbs]);
|
}, [frame, cbs]);
|
||||||
@@ -188,6 +253,7 @@ export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
|||||||
const joinMutation = useRoomJoinMeeting();
|
const joinMutation = useRoomJoinMeeting();
|
||||||
const startRecordingMutation = useMeetingStartRecording();
|
const startRecordingMutation = useMeetingStartRecording();
|
||||||
const [joinedMeeting, setJoinedMeeting] = useState<Meeting | null>(null);
|
const [joinedMeeting, setJoinedMeeting] = useState<Meeting | null>(null);
|
||||||
|
const [fatalError, setFatalError] = useState<FatalError | null>(null);
|
||||||
|
|
||||||
// Generate deterministic instanceIds so all participants use SAME IDs
|
// Generate deterministic instanceIds so all participants use SAME IDs
|
||||||
const cloudInstanceId = parseNonEmptyString(meeting.id);
|
const cloudInstanceId = parseNonEmptyString(meeting.id);
|
||||||
@@ -234,8 +300,18 @@ export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
|||||||
const roomUrl = joinedMeeting?.room_url;
|
const roomUrl = joinedMeeting?.room_url;
|
||||||
|
|
||||||
const handleLeave = useCallback(() => {
|
const handleLeave = useCallback(() => {
|
||||||
|
// If a fatal error occurred, don't redirect — let the error UI show
|
||||||
|
if (fatalError) return;
|
||||||
router.push("/browse");
|
router.push("/browse");
|
||||||
}, [router]);
|
}, [router, fatalError]);
|
||||||
|
|
||||||
|
const handleError = useCallback((ev: DailyEventObjectFatalError) => {
|
||||||
|
const error: FatalError = {
|
||||||
|
type: ev.error?.type ?? "unknown",
|
||||||
|
message: ev.errorMsg,
|
||||||
|
};
|
||||||
|
setFatalError(error);
|
||||||
|
}, []);
|
||||||
|
|
||||||
const handleCustomButtonClick = useCallback(
|
const handleCustomButtonClick = useCallback(
|
||||||
(ev: DailyEventObjectCustomButtonClick) => {
|
(ev: DailyEventObjectCustomButtonClick) => {
|
||||||
@@ -324,6 +400,7 @@ export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
|||||||
onLeftMeeting: handleLeave,
|
onLeftMeeting: handleLeave,
|
||||||
onCustomButtonClick: handleCustomButtonClick,
|
onCustomButtonClick: handleCustomButtonClick,
|
||||||
onJoinMeeting: handleFrameJoinMeeting,
|
onJoinMeeting: handleFrameJoinMeeting,
|
||||||
|
onError: handleError,
|
||||||
});
|
});
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@@ -380,13 +457,27 @@ export default function DailyRoom({ meeting, room }: DailyRoomProps) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (joinMutation.isError) {
|
if (joinMutation.isError) {
|
||||||
|
const apiDetail = printApiError(
|
||||||
|
joinMutation.error as /*ref 095959E6-01CC-4CF0-B3A9-F65F12F046D3*/ ApiError,
|
||||||
|
);
|
||||||
return (
|
return (
|
||||||
<Center width="100vw" height="100vh">
|
<Center width="100vw" height="100vh">
|
||||||
<Text color="red.500">Failed to join meeting. Please try again.</Text>
|
<VStack gap={4}>
|
||||||
|
<Text color="red.500">
|
||||||
|
{apiDetail ?? "Failed to join meeting. Please try again."}
|
||||||
|
</Text>
|
||||||
|
<Button onClick={() => router.push(`/${roomName}`)}>
|
||||||
|
Back to Room
|
||||||
|
</Button>
|
||||||
|
</VStack>
|
||||||
</Center>
|
</Center>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (fatalError) {
|
||||||
|
return <FatalErrorScreen error={fatalError} roomName={roomName} />;
|
||||||
|
}
|
||||||
|
|
||||||
if (!roomUrl) {
|
if (!roomUrl) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { MeetingId } from "./types";
|
|||||||
import { NonEmptyString } from "./utils";
|
import { NonEmptyString } from "./utils";
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
* ref 095959E6-01CC-4CF0-B3A9-F65F12F046D3
|
||||||
* XXX error types returned from the hooks are not always correct; declared types are ValidationError but real type could be string or any other
|
* XXX error types returned from the hooks are not always correct; declared types are ValidationError but real type could be string or any other
|
||||||
* this is either a limitation or incorrect usage of Python json schema generator
|
* this is either a limitation or incorrect usage of Python json schema generator
|
||||||
* or, limitation or incorrect usage of .d type generator from json schema
|
* or, limitation or incorrect usage of .d type generator from json schema
|
||||||
|
|||||||
Reference in New Issue
Block a user