refactor: clean up imports and improve session key assertion formatting
This commit is contained in:
@@ -32,8 +32,8 @@ from app.schemas.board_onboarding import (
|
|||||||
BoardOnboardingUserProfile,
|
BoardOnboardingUserProfile,
|
||||||
)
|
)
|
||||||
from app.schemas.boards import BoardRead
|
from app.schemas.boards import BoardRead
|
||||||
from app.services.openclaw.gateway_resolver import get_gateway_for_board
|
|
||||||
from app.services.openclaw.gateway_dispatch import GatewayDispatchService
|
from app.services.openclaw.gateway_dispatch import GatewayDispatchService
|
||||||
|
from app.services.openclaw.gateway_resolver import get_gateway_for_board
|
||||||
from app.services.openclaw.onboarding_service import BoardOnboardingMessagingService
|
from app.services.openclaw.onboarding_service import BoardOnboardingMessagingService
|
||||||
from app.services.openclaw.policies import OpenClawAuthorizationPolicy
|
from app.services.openclaw.policies import OpenClawAuthorizationPolicy
|
||||||
from app.services.openclaw.provisioning_db import (
|
from app.services.openclaw.provisioning_db import (
|
||||||
|
|||||||
@@ -20,19 +20,9 @@ from app.core.time import utcnow
|
|||||||
from app.db import crud
|
from app.db import crud
|
||||||
from app.db.pagination import paginate
|
from app.db.pagination import paginate
|
||||||
from app.db.session import get_session
|
from app.db.session import get_session
|
||||||
from app.models.activity_events import ActivityEvent
|
|
||||||
from app.models.agents import Agent
|
|
||||||
from app.models.approvals import Approval
|
|
||||||
from app.models.board_groups import BoardGroup
|
from app.models.board_groups import BoardGroup
|
||||||
from app.models.board_memory import BoardMemory
|
|
||||||
from app.models.board_onboarding import BoardOnboardingSession
|
|
||||||
from app.models.boards import Board
|
from app.models.boards import Board
|
||||||
from app.models.gateways import Gateway
|
from app.models.gateways import Gateway
|
||||||
from app.models.organization_board_access import OrganizationBoardAccess
|
|
||||||
from app.models.organization_invite_board_access import OrganizationInviteBoardAccess
|
|
||||||
from app.models.task_dependencies import TaskDependency
|
|
||||||
from app.models.task_fingerprints import TaskFingerprint
|
|
||||||
from app.models.tasks import Task
|
|
||||||
from app.schemas.boards import BoardCreate, BoardRead, BoardUpdate
|
from app.schemas.boards import BoardCreate, BoardRead, BoardUpdate
|
||||||
from app.schemas.common import OkResponse
|
from app.schemas.common import OkResponse
|
||||||
from app.schemas.pagination import DefaultLimitOffsetPage
|
from app.schemas.pagination import DefaultLimitOffsetPage
|
||||||
|
|||||||
@@ -109,4 +109,3 @@ async def delete_board(session: AsyncSession, *, board: Board) -> OkResponse:
|
|||||||
await session.delete(board)
|
await session.delete(board)
|
||||||
await session.commit()
|
await session.commit()
|
||||||
return OkResponse()
|
return OkResponse()
|
||||||
|
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ from app.models.boards import Board
|
|||||||
from app.models.gateways import Gateway
|
from app.models.gateways import Gateway
|
||||||
from app.services.openclaw.db_service import OpenClawDBService
|
from app.services.openclaw.db_service import OpenClawDBService
|
||||||
from app.services.openclaw.gateway_resolver import (
|
from app.services.openclaw.gateway_resolver import (
|
||||||
get_gateway_for_board,
|
|
||||||
gateway_client_config,
|
gateway_client_config,
|
||||||
|
get_gateway_for_board,
|
||||||
optional_gateway_client_config,
|
optional_gateway_client_config,
|
||||||
require_gateway_for_board,
|
require_gateway_for_board,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -16,7 +16,9 @@ from app.services.openclaw.shared import GatewayAgentIdentity
|
|||||||
|
|
||||||
def test_gateway_main_session_key_matches_gateway_identity() -> None:
|
def test_gateway_main_session_key_matches_gateway_identity() -> None:
|
||||||
gateway_id = UUID("00000000-0000-0000-0000-000000000123")
|
gateway_id = UUID("00000000-0000-0000-0000-000000000123")
|
||||||
assert gateway_main_session_key(gateway_id) == GatewayAgentIdentity.session_key_for_id(gateway_id)
|
assert gateway_main_session_key(gateway_id) == GatewayAgentIdentity.session_key_for_id(
|
||||||
|
gateway_id
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def test_board_lead_session_key_format() -> None:
|
def test_board_lead_session_key_format() -> None:
|
||||||
@@ -32,16 +34,14 @@ def test_board_agent_session_key_format() -> None:
|
|||||||
def test_board_scoped_session_key_selects_lead() -> None:
|
def test_board_scoped_session_key_selects_lead() -> None:
|
||||||
agent_id = UUID("00000000-0000-0000-0000-000000000001")
|
agent_id = UUID("00000000-0000-0000-0000-000000000001")
|
||||||
board_id = UUID("00000000-0000-0000-0000-000000000002")
|
board_id = UUID("00000000-0000-0000-0000-000000000002")
|
||||||
assert (
|
assert board_scoped_session_key(
|
||||||
board_scoped_session_key(agent_id=agent_id, board_id=board_id, is_board_lead=True)
|
agent_id=agent_id, board_id=board_id, is_board_lead=True
|
||||||
== board_lead_session_key(board_id)
|
) == board_lead_session_key(board_id)
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def test_board_scoped_session_key_selects_non_lead() -> None:
|
def test_board_scoped_session_key_selects_non_lead() -> None:
|
||||||
agent_id = UUID("00000000-0000-0000-0000-000000000001")
|
agent_id = UUID("00000000-0000-0000-0000-000000000001")
|
||||||
board_id = UUID("00000000-0000-0000-0000-000000000002")
|
board_id = UUID("00000000-0000-0000-0000-000000000002")
|
||||||
assert (
|
assert board_scoped_session_key(
|
||||||
board_scoped_session_key(agent_id=agent_id, board_id=board_id, is_board_lead=False)
|
agent_id=agent_id, board_id=board_id, is_board_lead=False
|
||||||
== board_agent_session_key(agent_id)
|
) == board_agent_session_key(agent_id)
|
||||||
)
|
|
||||||
|
|||||||
Reference in New Issue
Block a user