refactor: update import paths for OpenClaw services to improve module organization
This commit is contained in:
@@ -44,7 +44,8 @@ from app.schemas.gateway_coordination import (
|
|||||||
from app.schemas.pagination import DefaultLimitOffsetPage
|
from app.schemas.pagination import DefaultLimitOffsetPage
|
||||||
from app.schemas.tasks import TaskCommentCreate, TaskCommentRead, TaskCreate, TaskRead, TaskUpdate
|
from app.schemas.tasks import TaskCommentCreate, TaskCommentRead, TaskCreate, TaskRead, TaskUpdate
|
||||||
from app.services.activity_log import record_activity
|
from app.services.activity_log import record_activity
|
||||||
from app.services.openclaw import AgentLifecycleService, GatewayCoordinationService
|
from app.services.openclaw.agent_service import AgentLifecycleService
|
||||||
|
from app.services.openclaw.coordination_service import GatewayCoordinationService
|
||||||
from app.services.task_dependencies import (
|
from app.services.task_dependencies import (
|
||||||
blocked_by_dependency_ids,
|
blocked_by_dependency_ids,
|
||||||
dependency_status_by_id,
|
dependency_status_by_id,
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ from app.schemas.agents import (
|
|||||||
)
|
)
|
||||||
from app.schemas.common import OkResponse
|
from app.schemas.common import OkResponse
|
||||||
from app.schemas.pagination import DefaultLimitOffsetPage
|
from app.schemas.pagination import DefaultLimitOffsetPage
|
||||||
from app.services.openclaw import AgentLifecycleService, AgentUpdateOptions
|
from app.services.openclaw.agent_service import AgentLifecycleService, AgentUpdateOptions
|
||||||
from app.services.organizations import OrganizationContext
|
from app.services.organizations import OrganizationContext
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
|
|||||||
@@ -34,7 +34,10 @@ from app.models.users import User
|
|||||||
from app.schemas.board_group_memory import BoardGroupMemoryCreate, BoardGroupMemoryRead
|
from app.schemas.board_group_memory import BoardGroupMemoryCreate, BoardGroupMemoryRead
|
||||||
from app.schemas.pagination import DefaultLimitOffsetPage
|
from app.schemas.pagination import DefaultLimitOffsetPage
|
||||||
from app.services.mentions import extract_mentions, matches_agent_mention
|
from app.services.mentions import extract_mentions, matches_agent_mention
|
||||||
from app.services.openclaw import optional_gateway_config_for_board, send_gateway_agent_message
|
from app.services.openclaw.shared import (
|
||||||
|
optional_gateway_config_for_board,
|
||||||
|
send_gateway_agent_message,
|
||||||
|
)
|
||||||
from app.services.organizations import (
|
from app.services.organizations import (
|
||||||
is_org_admin,
|
is_org_admin,
|
||||||
list_accessible_board_ids,
|
list_accessible_board_ids,
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ from app.schemas.common import OkResponse
|
|||||||
from app.schemas.pagination import DefaultLimitOffsetPage
|
from app.schemas.pagination import DefaultLimitOffsetPage
|
||||||
from app.schemas.view_models import BoardGroupSnapshot
|
from app.schemas.view_models import BoardGroupSnapshot
|
||||||
from app.services.board_group_snapshot import build_group_snapshot
|
from app.services.board_group_snapshot import build_group_snapshot
|
||||||
from app.services.openclaw import DEFAULT_HEARTBEAT_CONFIG, sync_gateway_agent_heartbeats
|
from app.services.openclaw.constants import DEFAULT_HEARTBEAT_CONFIG
|
||||||
|
from app.services.openclaw.provisioning import sync_gateway_agent_heartbeats
|
||||||
from app.services.organizations import (
|
from app.services.organizations import (
|
||||||
OrganizationContext,
|
OrganizationContext,
|
||||||
board_access_filter,
|
board_access_filter,
|
||||||
|
|||||||
@@ -30,7 +30,10 @@ from app.models.board_memory import BoardMemory
|
|||||||
from app.schemas.board_memory import BoardMemoryCreate, BoardMemoryRead
|
from app.schemas.board_memory import BoardMemoryCreate, BoardMemoryRead
|
||||||
from app.schemas.pagination import DefaultLimitOffsetPage
|
from app.schemas.pagination import DefaultLimitOffsetPage
|
||||||
from app.services.mentions import extract_mentions, matches_agent_mention
|
from app.services.mentions import extract_mentions, matches_agent_mention
|
||||||
from app.services.openclaw import optional_gateway_config_for_board, send_gateway_agent_message
|
from app.services.openclaw.shared import (
|
||||||
|
optional_gateway_config_for_board,
|
||||||
|
send_gateway_agent_message,
|
||||||
|
)
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from collections.abc import AsyncIterator
|
from collections.abc import AsyncIterator
|
||||||
|
|||||||
@@ -33,13 +33,13 @@ from app.schemas.board_onboarding import (
|
|||||||
BoardOnboardingUserProfile,
|
BoardOnboardingUserProfile,
|
||||||
)
|
)
|
||||||
from app.schemas.boards import BoardRead
|
from app.schemas.boards import BoardRead
|
||||||
from app.services.openclaw import (
|
from app.services.openclaw.onboarding_service import BoardOnboardingMessagingService
|
||||||
BoardOnboardingMessagingService,
|
from app.services.openclaw.provisioning import (
|
||||||
LeadAgentOptions,
|
LeadAgentOptions,
|
||||||
LeadAgentRequest,
|
LeadAgentRequest,
|
||||||
ensure_board_lead_agent,
|
ensure_board_lead_agent,
|
||||||
require_gateway_config_for_board,
|
|
||||||
)
|
)
|
||||||
|
from app.services.openclaw.shared import require_gateway_config_for_board
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from sqlmodel.ext.asyncio.session import AsyncSession
|
from sqlmodel.ext.asyncio.session import AsyncSession
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ from app.schemas.pagination import DefaultLimitOffsetPage
|
|||||||
from app.schemas.view_models import BoardGroupSnapshot, BoardSnapshot
|
from app.schemas.view_models import BoardGroupSnapshot, BoardSnapshot
|
||||||
from app.services.board_group_snapshot import build_board_group_snapshot
|
from app.services.board_group_snapshot import build_board_group_snapshot
|
||||||
from app.services.board_snapshot import build_board_snapshot
|
from app.services.board_snapshot import build_board_snapshot
|
||||||
from app.services.openclaw import cleanup_agent
|
from app.services.openclaw.provisioning import cleanup_agent
|
||||||
from app.services.organizations import OrganizationContext, board_access_filter
|
from app.services.organizations import OrganizationContext, board_access_filter
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
|
|||||||
@@ -24,7 +24,7 @@ from app.schemas.gateway_api import (
|
|||||||
GatewaySessionsResponse,
|
GatewaySessionsResponse,
|
||||||
GatewaysStatusResponse,
|
GatewaysStatusResponse,
|
||||||
)
|
)
|
||||||
from app.services.openclaw import GatewaySessionService
|
from app.services.openclaw.session_service import GatewaySessionService
|
||||||
from app.services.organizations import OrganizationContext
|
from app.services.organizations import OrganizationContext
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ from app.schemas.gateways import (
|
|||||||
GatewayUpdate,
|
GatewayUpdate,
|
||||||
)
|
)
|
||||||
from app.schemas.pagination import DefaultLimitOffsetPage
|
from app.schemas.pagination import DefaultLimitOffsetPage
|
||||||
from app.services.openclaw import GatewayAdminLifecycleService, GatewayTemplateSyncQuery
|
from app.services.openclaw.admin_service import GatewayAdminLifecycleService
|
||||||
|
from app.services.openclaw.session_service import GatewayTemplateSyncQuery
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from fastapi_pagination.limit_offset import LimitOffsetPage
|
from fastapi_pagination.limit_offset import LimitOffsetPage
|
||||||
|
|||||||
@@ -43,7 +43,10 @@ from app.schemas.pagination import DefaultLimitOffsetPage
|
|||||||
from app.schemas.tasks import TaskCommentCreate, TaskCommentRead, TaskCreate, TaskRead, TaskUpdate
|
from app.schemas.tasks import TaskCommentCreate, TaskCommentRead, TaskCreate, TaskRead, TaskUpdate
|
||||||
from app.services.activity_log import record_activity
|
from app.services.activity_log import record_activity
|
||||||
from app.services.mentions import extract_mentions, matches_agent_mention
|
from app.services.mentions import extract_mentions, matches_agent_mention
|
||||||
from app.services.openclaw import optional_gateway_config_for_board, send_gateway_agent_message
|
from app.services.openclaw.shared import (
|
||||||
|
optional_gateway_config_for_board,
|
||||||
|
send_gateway_agent_message,
|
||||||
|
)
|
||||||
from app.services.organizations import require_board_access
|
from app.services.organizations import require_board_access
|
||||||
from app.services.task_dependencies import (
|
from app.services.task_dependencies import (
|
||||||
blocked_by_dependency_ids,
|
blocked_by_dependency_ids,
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ from app.schemas.approvals import ApprovalRead
|
|||||||
from app.schemas.board_memory import BoardMemoryRead
|
from app.schemas.board_memory import BoardMemoryRead
|
||||||
from app.schemas.boards import BoardRead
|
from app.schemas.boards import BoardRead
|
||||||
from app.schemas.view_models import BoardSnapshot, TaskCardRead
|
from app.schemas.view_models import BoardSnapshot, TaskCardRead
|
||||||
from app.services.openclaw import AgentLifecycleService
|
from app.services.openclaw.agent_service import AgentLifecycleService
|
||||||
from app.services.task_dependencies import (
|
from app.services.task_dependencies import (
|
||||||
blocked_by_dependency_ids,
|
blocked_by_dependency_ids,
|
||||||
dependency_ids_by_task_id,
|
dependency_ids_by_task_id,
|
||||||
|
|||||||
@@ -7,8 +7,8 @@ from uuid import UUID, uuid4
|
|||||||
|
|
||||||
import pytest
|
import pytest
|
||||||
|
|
||||||
from app.services.openclaw import GatewayAgentIdentity
|
import app.services.openclaw.provisioning as agent_provisioning
|
||||||
from app.services.openclaw import provisioning as agent_provisioning
|
from app.services.openclaw.shared import GatewayAgentIdentity
|
||||||
|
|
||||||
|
|
||||||
def test_slugify_normalizes_and_trims():
|
def test_slugify_normalizes_and_trims():
|
||||||
|
|||||||
@@ -11,10 +11,10 @@ from uuid import UUID, uuid4
|
|||||||
import pytest
|
import pytest
|
||||||
from fastapi import HTTPException, status
|
from fastapi import HTTPException, status
|
||||||
|
|
||||||
|
import app.services.openclaw.coordination_service as coordination_lifecycle
|
||||||
|
import app.services.openclaw.onboarding_service as onboarding_lifecycle
|
||||||
from app.integrations.openclaw_gateway import GatewayConfig as GatewayClientConfig
|
from app.integrations.openclaw_gateway import GatewayConfig as GatewayClientConfig
|
||||||
from app.integrations.openclaw_gateway import OpenClawGatewayError
|
from app.integrations.openclaw_gateway import OpenClawGatewayError
|
||||||
from app.services.openclaw import coordination_service as coordination_lifecycle
|
|
||||||
from app.services.openclaw import onboarding_service as onboarding_lifecycle
|
|
||||||
from app.services.openclaw.shared import GatewayAgentIdentity
|
from app.services.openclaw.shared import GatewayAgentIdentity
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user