Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
.PHONY: dev stop clean-dev docs-serve docs-build

MKDOCS ?= mkdocs

dev:
echo "Starting dev environment"
supabase start || npx supabase start
docker compose up --watch

stop:
echo "Stopping dev environment"
docker compose down
supabase stop || npx supabase stop

clean-dev:
docker compose down -v --rmi all --remove-orphans
supabase stop --no-backup

docs-serve:
$(MKDOCS) serve --config-file mkdocs.yml

docs-build:
$(MKDOCS) build --config-file mkdocs.yml

docs-clean:
rm -R site/
59 changes: 27 additions & 32 deletions backend/app/session/engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,6 @@ def validate_motion_payload(
payload.debate_type == DebateTypes.UNMODERATED_DEBATE
and payload.total_duration_minutes is None
)
or (
payload.debate_type == DebateTypes.MODERATED_DEBATE
and payload.per_speaker_seconds is None
)
):
raise EventRejectedError(
code=enums.EventErrorCode.INVALID_MESSAGE,
Expand Down Expand Up @@ -309,6 +305,7 @@ def handle_delegate_submit_motion(
debate_type=payload.debate_type,
total_duration_minutes=payload.total_duration_minutes,
per_speaker_seconds=payload.per_speaker_seconds,
speech_count=payload.speech_count,
target_topic=payload.target_topic,
details=payload.details,
)
Expand Down Expand Up @@ -571,48 +568,32 @@ def apply_passed_motion(
message="No Debate Type Provided",
)
state.current_speaker = None
duration_seconds = (
(motion.total_duration_minutes * 60)
if motion.total_duration_minutes is not None
else 600
) # defaults to 10 minutes as fallback

match motion.debate_type:
case DebateTypes.MODERATED_DEBATE:
next_state = States.MODERATED_CAUCUS
state.debate = DebateContext(
debate_type=DebateTypes.MODERATED_DEBATE,
return_state=return_state,
total_duration_seconds=duration_seconds,
per_speaker_seconds=motion.per_speaker_seconds
if motion.per_speaker_seconds is not None
else state.gsl_default_time_seconds,
expires_at=datetime.now(UTC)
+ timedelta(seconds=duration_seconds),
)
reset_timer(
state,
motion.per_speaker_seconds
if motion.per_speaker_seconds is not None
else state.gsl_default_time_seconds,
per_speaker_seconds=motion.per_speaker_seconds if motion.per_speaker_seconds is not None
else state.gsl_default_time_seconds,
total_speeches= motion.speech_count,
)

case DebateTypes.UNMODERATED_DEBATE:
next_state = States.UNMODERATED_CAUCUS
state.debate = DebateContext(
debate_type=DebateTypes.UNMODERATED_DEBATE,
return_state=return_state,
total_duration_seconds=duration_seconds,
per_speaker_seconds=None,
expires_at=datetime.now(UTC)
+ timedelta(seconds=duration_seconds),
total_duration_seconds=motion.total_duration_minutes,
expires_at=datetime.now(UTC) + timedelta(seconds=motion.total_duration_minutes),
)
reset_timer(state) # should not display per_speaker timer
reset_timer(state, motion.total_duration_minutes) # Use this as timer

case DebateTypes.SPEAKERS_LIST:
next_state = States.OPEN_GSL
state.debate = None
reset_timer(state, state.gsl_default_time_seconds)

case Motions.POSTPONE_SESSION:
pass
case Motions.REOPEN_SESSION:
Expand Down Expand Up @@ -799,6 +780,7 @@ def handle_chair_submit_motion(
debate_type=payload.debate_type,
total_duration_minutes=payload.total_duration_minutes,
per_speaker_seconds=payload.per_speaker_seconds,
speech_count=payload.speech_count,
target_topic=payload.target_topic,
details=payload.details,
)
Expand All @@ -821,6 +803,13 @@ def handle_chair_submit_motion(
state.current_state = States.VOTING_EXECUTION
return DispatchOutcome(state=state)

def handle_clear_motions(
state: SessionLiveState, event: schemas.ClearMotionsEvent, actor: SessionActor
) -> DispatchOutcome:
require_chair(actor)
state.submitted_motions = []

return DispatchOutcome(state=state)

def handle_set_agenda(
state: SessionLiveState, event: schemas.SetAgendaEvent, actor: SessionActor
Expand Down Expand Up @@ -1009,9 +998,10 @@ def handle_cede_time(
if state.timer_remaining_seconds <= 0:
raise EventRejectedError(
code=enums.EventErrorCode.INVALID_STATE,
message="Cannot cede time if there's no time",
)

message="Cannot cede time if there's no time"
)

state.previous_speakers.append(state.current_speaker)
state.current_speaker = representation_id

return DispatchOutcome(state=state)
Expand All @@ -1030,9 +1020,13 @@ def handle_end_speech(
if state.timer_is_running:
raise EventRejectedError(
code=enums.EventErrorCode.INVALID_STATE,
message="Cannot end speech while timer is running",
)
message="Cannot end speech while timer is running"
)

if state.current_state == States.MODERATED_CAUCUS and state.debate.total_speeches:
state.debate.total_speeches -= 1

state.previous_speakers.append(state.current_speaker)
state.current_speaker = None
reset_timer(state)

Expand Down Expand Up @@ -1121,6 +1115,7 @@ def handle_close_roll_call(
ChairEvents.FINISH_CAUCUS: handle_finish_caucus,
ChairEvents.RESOLVE_MOTION: handle_resolve_motion,
ChairEvents.LOG_MOTION: handle_chair_submit_motion,
ChairEvents.CLEAR_MOTIONS: handle_clear_motions,
ChairEvents.SET_AGENDA: handle_set_agenda,
ChairEvents.SET_AGENDA_ITEM: handle_set_agenda_item,
ChairEvents.MARK_AGENDA_ITEM: handle_mark_agenda_item,
Expand Down
1 change: 1 addition & 0 deletions backend/app/session/enums.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class ChairEvents(StrEnum):
OPEN_INFORMAL_VOTING = "OpenInformalVotingEvent"
RESOLVE_MOTION = "ResolveMotionEvent"
LOG_MOTION = "LogMotionEvent"
CLEAR_MOTIONS = "ClearMotionEvent"
CLOSE_PROCEDURAL_VOTING = "CloseProceduralVotingEvent"
CLOSE_INFORMAL_VOTING = "CloseInformalVotingEvent"
FINISH_CAUCUS = "FinishCaucusEvent"
Expand Down
10 changes: 6 additions & 4 deletions backend/app/session/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ class MotionContext(BaseModel):
total_duration_minutes: int | None = None
per_speaker_seconds: int | None = None
target_topic: str | None = None
speech_count: int | None = None

details: str | None = None

Expand Down Expand Up @@ -85,7 +86,6 @@ class DebateContext(BaseModel):
total_speeches: int | None = None
per_speaker_seconds: int | None = None
expires_at: datetime | None = None
topic: str | None = None


class RollCallContext(BaseModel):
Expand Down Expand Up @@ -146,13 +146,15 @@ class SessionLiveState(BaseModel):
# present delegations with voting choice
roll_call: RollCallContext # Not None, even if registry is empty

#Temporary Speaker History
previous_speakers: list[int] = [] #temporary list for now

# Additional config
has_veto_power: bool = False


# Add more effect payload shapes as they are introduced.
EffectPayloads = dict[str, Any]

#Add more for other effects (Possibly change the Voting context, when doing that change frontend too)
EffectPayloads = VotingContext

class SessionEffect(BaseModel):
type: enums.SessionEffectType
Expand Down
5 changes: 5 additions & 0 deletions backend/app/session/schemas.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ class MotionPayload(BaseModel):
debate_type: enums.DebateTypes | None = None
total_duration_minutes: int | None = None
per_speaker_seconds: int | None = None
speech_count: int | None = None
target_topic: str | None = None
details: str | None = None

Expand Down Expand Up @@ -159,6 +160,9 @@ class LogMotionEvent(BaseModel):
type: Literal[enums.ChairEvents.LOG_MOTION]
payload: ChairMotionPayload

class ClearMotionsEvent(BaseModel):
type: Literal[enums.ChairEvents.CLEAR_MOTIONS]
payload: EmptyPayload

class OpenSessionEvent(BaseModel):
type: Literal[enums.ChairEvents.OPEN_SESSION]
Expand Down Expand Up @@ -279,6 +283,7 @@ class DeleteAgendaItemEvent(BaseModel):
| JoinQueueEvent
| LeaveQueueEvent
| LogMotionEvent
| ClearMotionsEvent
| OpenSessionEvent
| CloseSessionEvent
| IncreaseTimerEvent
Expand Down
18 changes: 0 additions & 18 deletions backend/app/tests/session/test_engine.py
Original file line number Diff line number Diff line change
Expand Up @@ -298,22 +298,6 @@ def test_generates_independent_sequential_motion_and_question_ids(
assert eng.generate_next_question_id(session_state) == 1
assert eng.generate_next_question_id(session_state) == 2


def test_validate_motion_payload_rejects_moderated_debate_without_speaking_time(
session_state: md.SessionLiveState,
) -> None:
payload = sch.DelegateMotionPayload(
type=enums.Motions.CHANGE_DEBATE_TYPE,
debate_type=enums.DebateTypes.MODERATED_DEBATE,
total_duration_minutes=10,
)

with pytest.raises(eng.EventRejectedError) as exc_info:
eng.validate_motion_payload(payload, session_state)

assert exc_info.value.code is enums.EventErrorCode.INVALID_MESSAGE


def test_count_present_delegations_handles_empty_and_populated_registry(
session_state: md.SessionLiveState,
) -> None:
Expand Down Expand Up @@ -920,7 +904,6 @@ def test_chair_can_close_passed_procedural_vote(
assert state.current_state == enums.States.CLOSED_GSL
assert state.voting is None
assert outcome.effect is not None
assert outcome.effect.data.get("passed") is True


def test_chair_can_close_failed_procedural_vote(
Expand Down Expand Up @@ -951,7 +934,6 @@ def test_chair_can_close_failed_procedural_vote(
assert state.current_state == enums.States.OPEN_GSL
assert state.voting is None
assert outcome.effect is not None
assert outcome.effect.data.get("passed") is False


def test_delegate_cannot_close_procedural_vote(
Expand Down
Loading
Loading