mirror of
https://github.com/dograh-hq/dograh.git
synced 2026-07-25 12:01:04 +02:00
feat: make vici configurable from UI
This commit is contained in:
parent
cf80b20be1
commit
8628e576ca
46 changed files with 2277 additions and 618 deletions
|
|
@ -257,6 +257,26 @@ class WorkflowRunClient(BaseDBClient):
|
|||
)
|
||||
return result.scalars().first()
|
||||
|
||||
async def get_workflow_run_configurations(
|
||||
self, run_id: int, organization_id: int
|
||||
) -> dict:
|
||||
"""Load the immutable workflow configuration snapshot for one run."""
|
||||
|
||||
async with self.async_session() as session:
|
||||
result = await session.execute(
|
||||
select(WorkflowDefinitionModel.workflow_configurations)
|
||||
.join(
|
||||
WorkflowRunModel,
|
||||
WorkflowRunModel.definition_id == WorkflowDefinitionModel.id,
|
||||
)
|
||||
.join(WorkflowModel, WorkflowRunModel.workflow_id == WorkflowModel.id)
|
||||
.where(
|
||||
WorkflowRunModel.id == run_id,
|
||||
WorkflowModel.organization_id == organization_id,
|
||||
)
|
||||
)
|
||||
return result.scalar_one_or_none() or {}
|
||||
|
||||
async def get_organization_id_by_workflow_run_id(
|
||||
self, run_id: int | None
|
||||
) -> int | None:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
from typing import List, Optional
|
||||
from copy import deepcopy
|
||||
from typing import Any, List, Optional
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||||
from loguru import logger
|
||||
|
|
@ -74,6 +75,7 @@ from api.services.organization_context import (
|
|||
get_organization_context,
|
||||
)
|
||||
from api.services.organization_preferences import (
|
||||
external_pbx_integrations_enabled,
|
||||
get_organization_preferences,
|
||||
upsert_organization_preferences,
|
||||
)
|
||||
|
|
@ -101,14 +103,24 @@ def _sensitive_fields(provider_name: str) -> List[str]:
|
|||
|
||||
def _mask_sensitive(provider_name: str, value: dict) -> dict:
|
||||
"""Return a copy of ``value`` with sensitive fields masked for display."""
|
||||
out = dict(value)
|
||||
out = deepcopy(value)
|
||||
for field_name in _sensitive_fields(provider_name):
|
||||
v = out.get(field_name)
|
||||
v = _get_nested_field(out, field_name)
|
||||
if v:
|
||||
out[field_name] = mask_key(v)
|
||||
_set_nested_field(out, field_name, mask_key(str(v)))
|
||||
return out
|
||||
|
||||
|
||||
class TelephonyProviderUIOption(BaseModel):
|
||||
value: str
|
||||
label: str
|
||||
|
||||
|
||||
class TelephonyProviderUICondition(BaseModel):
|
||||
field: str
|
||||
equals: Any
|
||||
|
||||
|
||||
class TelephonyProviderUIField(BaseModel):
|
||||
"""One form field on a telephony provider's configuration UI."""
|
||||
|
||||
|
|
@ -119,6 +131,9 @@ class TelephonyProviderUIField(BaseModel):
|
|||
sensitive: bool
|
||||
description: Optional[str] = None
|
||||
placeholder: Optional[str] = None
|
||||
options: Optional[List[TelephonyProviderUIOption]] = None
|
||||
visible_when: Optional[TelephonyProviderUICondition] = None
|
||||
section: Optional[str] = None
|
||||
|
||||
|
||||
class TelephonyProviderMetadata(BaseModel):
|
||||
|
|
@ -184,6 +199,9 @@ async def get_telephony_providers_metadata(user: UserModel = Depends(get_user)):
|
|||
if not user.selected_organization_id:
|
||||
raise HTTPException(status_code=400, detail="No organization selected")
|
||||
|
||||
external_pbx_enabled = await external_pbx_integrations_enabled(
|
||||
user.selected_organization_id
|
||||
)
|
||||
providers = []
|
||||
for spec in telephony_registry.all_specs():
|
||||
if spec.ui_metadata is None:
|
||||
|
|
@ -201,8 +219,30 @@ async def get_telephony_providers_metadata(user: UserModel = Depends(get_user)):
|
|||
sensitive=f.sensitive,
|
||||
description=f.description,
|
||||
placeholder=f.placeholder,
|
||||
options=(
|
||||
[
|
||||
{"value": option.value, "label": option.label}
|
||||
for option in f.options
|
||||
]
|
||||
if f.options
|
||||
else None
|
||||
),
|
||||
visible_when=(
|
||||
{
|
||||
"field": f.visible_when.field,
|
||||
"equals": f.visible_when.equals,
|
||||
}
|
||||
if f.visible_when
|
||||
else None
|
||||
),
|
||||
section=f.section,
|
||||
)
|
||||
for f in spec.ui_metadata.fields
|
||||
if not f.feature_gate
|
||||
or (
|
||||
f.feature_gate == "external_pbx_integrations"
|
||||
and external_pbx_enabled
|
||||
)
|
||||
],
|
||||
docs_url=spec.ui_metadata.docs_url,
|
||||
)
|
||||
|
|
@ -511,9 +551,59 @@ async def save_model_configuration_preferences_legacy(
|
|||
def preserve_masked_fields(provider: str, request_dict: dict, existing: dict):
|
||||
"""If the client re-submitted a masked sensitive field, restore the original."""
|
||||
for field_name in _sensitive_fields(provider):
|
||||
v = request_dict.get(field_name)
|
||||
if v and is_mask_of(v, existing.get(field_name, "")):
|
||||
request_dict[field_name] = existing[field_name]
|
||||
v = _get_nested_field(request_dict, field_name)
|
||||
existing_value = _get_nested_field(existing, field_name)
|
||||
if v and is_mask_of(v, existing_value or ""):
|
||||
_set_nested_field(request_dict, field_name, existing_value)
|
||||
|
||||
|
||||
def _get_nested_field(value: dict, dotted_path: str):
|
||||
current = value
|
||||
for part in dotted_path.split("."):
|
||||
if not isinstance(current, dict):
|
||||
return None
|
||||
current = current.get(part)
|
||||
return current
|
||||
|
||||
|
||||
def _set_nested_field(value: dict, dotted_path: str, field_value) -> None:
|
||||
current = value
|
||||
parts = dotted_path.split(".")
|
||||
for part in parts[:-1]:
|
||||
child = current.get(part)
|
||||
if not isinstance(child, dict):
|
||||
child = {}
|
||||
current[part] = child
|
||||
current = child
|
||||
current[parts[-1]] = field_value
|
||||
|
||||
|
||||
async def _enforce_external_pbx_feature(
|
||||
organization_id: int,
|
||||
provider: str,
|
||||
credentials: dict,
|
||||
*,
|
||||
existing_credentials: Optional[dict] = None,
|
||||
) -> None:
|
||||
if provider != "ari":
|
||||
return
|
||||
if await external_pbx_integrations_enabled(organization_id):
|
||||
return
|
||||
requested_external_pbx = credentials.get("external_pbx")
|
||||
existing_external_pbx = (existing_credentials or {}).get("external_pbx")
|
||||
if not requested_external_pbx and not existing_external_pbx:
|
||||
return
|
||||
# Disabling the feature hides and disables the integration, but does not
|
||||
# destroy saved credentials. Allow only an unchanged masked round-trip.
|
||||
if requested_external_pbx == existing_external_pbx:
|
||||
return
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=(
|
||||
"External PBX integrations are disabled for this organization. "
|
||||
"Enable them in Platform Settings before changing this configuration."
|
||||
),
|
||||
)
|
||||
|
||||
|
||||
def _credentials_from_payload(config: TelephonyConfigRequest) -> dict:
|
||||
|
|
@ -612,6 +702,9 @@ async def create_telephony_configuration(
|
|||
raise HTTPException(status_code=400, detail="No organization selected")
|
||||
|
||||
credentials = _credentials_from_payload(request.config)
|
||||
await _enforce_external_pbx_feature(
|
||||
user.selected_organization_id, request.config.provider, credentials
|
||||
)
|
||||
credentials = await _run_preprocess_hook(request.config.provider, credentials)
|
||||
|
||||
try:
|
||||
|
|
@ -694,6 +787,12 @@ async def update_telephony_configuration(
|
|||
preserve_masked_fields(
|
||||
existing.provider, credentials, existing.credentials or {}
|
||||
)
|
||||
await _enforce_external_pbx_feature(
|
||||
user.selected_organization_id,
|
||||
existing.provider,
|
||||
credentials,
|
||||
existing_credentials=existing.credentials or {},
|
||||
)
|
||||
credentials = await _run_preprocess_hook(existing.provider, credentials)
|
||||
|
||||
row = await db_client.update_telephony_configuration(
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ from api.services.tool_management import (
|
|||
build_tool_response,
|
||||
create_tool_for_user,
|
||||
refresh_mcp_tool_for_user,
|
||||
validate_external_pbx_tool_definition,
|
||||
validate_tool_credential_references,
|
||||
)
|
||||
from api.services.tool_management import (
|
||||
|
|
@ -223,6 +224,18 @@ async def update_tool(
|
|||
if request.definition:
|
||||
definition = request.definition.model_dump()
|
||||
try:
|
||||
existing_tool = await db_client.get_tool_by_uuid(
|
||||
tool_uuid,
|
||||
user.selected_organization_id,
|
||||
include_archived=True,
|
||||
)
|
||||
await validate_external_pbx_tool_definition(
|
||||
definition,
|
||||
organization_id=user.selected_organization_id,
|
||||
existing_definition=(
|
||||
existing_tool.definition if existing_tool else None
|
||||
),
|
||||
)
|
||||
await validate_tool_credential_references(
|
||||
definition,
|
||||
organization_id=user.selected_organization_id,
|
||||
|
|
|
|||
|
|
@ -41,6 +41,7 @@ from api.services.configuration.resolve import (
|
|||
resolve_effective_config,
|
||||
)
|
||||
from api.services.mps_service_key_client import mps_service_key_client
|
||||
from api.services.organization_preferences import external_pbx_integrations_enabled
|
||||
from api.services.posthog_client import capture_event
|
||||
from api.services.reports import generate_workflow_report_csv
|
||||
from api.services.storage import storage_fs
|
||||
|
|
@ -1050,6 +1051,41 @@ async def update_workflow(
|
|||
if request.workflow_configurations is not None
|
||||
else None
|
||||
)
|
||||
if workflow_configurations is not None and not (
|
||||
await external_pbx_integrations_enabled(user.selected_organization_id)
|
||||
):
|
||||
existing_workflow = await db_client.get_workflow(
|
||||
workflow_id, organization_id=user.selected_organization_id
|
||||
)
|
||||
if existing_workflow is None:
|
||||
raise HTTPException(
|
||||
status_code=404, detail=f"Workflow with id {workflow_id} not found"
|
||||
)
|
||||
existing_draft = await db_client.get_draft_version(workflow_id)
|
||||
existing_configs = (
|
||||
existing_draft.workflow_configurations
|
||||
if existing_draft
|
||||
else existing_workflow.released_definition.workflow_configurations
|
||||
)
|
||||
existing_mappings = (existing_configs or {}).get(
|
||||
"external_pbx_field_mappings", []
|
||||
)
|
||||
incoming_mappings = workflow_configurations.get(
|
||||
"external_pbx_field_mappings", existing_mappings
|
||||
)
|
||||
if incoming_mappings != existing_mappings:
|
||||
raise HTTPException(
|
||||
status_code=403,
|
||||
detail=(
|
||||
"External PBX integrations are disabled for this organization. "
|
||||
"Enable them in Platform Settings before changing field "
|
||||
"mappings."
|
||||
),
|
||||
)
|
||||
if existing_mappings:
|
||||
workflow_configurations["external_pbx_field_mappings"] = (
|
||||
existing_mappings
|
||||
)
|
||||
if workflow_configurations and workflow_configurations.get(
|
||||
WORKFLOW_MODEL_CONFIGURATION_V2_OVERRIDE_KEY
|
||||
):
|
||||
|
|
|
|||
|
|
@ -4,3 +4,4 @@ from pydantic import BaseModel
|
|||
class OrganizationPreferences(BaseModel):
|
||||
test_phone_number: str | None = None
|
||||
timezone: str | None = None
|
||||
external_pbx_integrations_enabled: bool = False
|
||||
|
|
|
|||
|
|
@ -223,12 +223,67 @@ class HttpTransferResolverConfig(BaseModel):
|
|||
return v
|
||||
|
||||
|
||||
class ContextDestinationRoute(BaseModel):
|
||||
"""Map one gathered-context value to an external-PBX destination."""
|
||||
|
||||
context_value: str = Field(min_length=1, max_length=255)
|
||||
destination: str = Field(min_length=1, max_length=255)
|
||||
|
||||
@field_validator("context_value", "destination")
|
||||
@classmethod
|
||||
def strip_non_empty(cls, value: str) -> str:
|
||||
stripped = value.strip()
|
||||
if not stripped:
|
||||
raise ValueError("mapping values cannot be blank")
|
||||
return stripped
|
||||
|
||||
|
||||
class ContextDestinationMappingConfig(BaseModel):
|
||||
"""Resolve an external-PBX destination from gathered context."""
|
||||
|
||||
context_path: str = Field(
|
||||
min_length=1,
|
||||
max_length=255,
|
||||
description=(
|
||||
"Gathered-context path or extracted-variable name used for routing."
|
||||
),
|
||||
)
|
||||
routes: List[ContextDestinationRoute] = Field(min_length=1, max_length=100)
|
||||
fallback_destination: Optional[str] = Field(
|
||||
default=None,
|
||||
max_length=255,
|
||||
description="Optional provider-native fallback destination.",
|
||||
)
|
||||
|
||||
@field_validator("context_path")
|
||||
@classmethod
|
||||
def strip_context_path(cls, value: str) -> str:
|
||||
return value.strip()
|
||||
|
||||
@field_validator("fallback_destination")
|
||||
@classmethod
|
||||
def normalize_fallback(cls, value: Optional[str]) -> Optional[str]:
|
||||
if value is None:
|
||||
return None
|
||||
return value.strip() or None
|
||||
|
||||
@model_validator(mode="after")
|
||||
def validate_unique_values(self):
|
||||
values = [route.context_value.casefold() for route in self.routes]
|
||||
if len(values) != len(set(values)):
|
||||
raise ValueError("context mapping values must be unique")
|
||||
return self
|
||||
|
||||
|
||||
class TransferCallConfig(BaseModel):
|
||||
"""Configuration for Transfer Call tools."""
|
||||
|
||||
destination_source: Literal["static", "dynamic"] = Field(
|
||||
destination_source: Literal["static", "dynamic", "context_mapping"] = Field(
|
||||
default="static",
|
||||
description="Whether transfer destination is static/template or resolved by HTTP.",
|
||||
description=(
|
||||
"Whether the destination is static/template, resolved by HTTP, or "
|
||||
"mapped from gathered context to an external-PBX destination."
|
||||
),
|
||||
)
|
||||
destination: str = Field(
|
||||
default="",
|
||||
|
|
@ -263,6 +318,10 @@ class TransferCallConfig(BaseModel):
|
|||
default=None,
|
||||
description="Optional resolver that determines transfer routing at call time.",
|
||||
)
|
||||
context_mapping: Optional[ContextDestinationMappingConfig] = Field(
|
||||
default=None,
|
||||
description="Optional gathered-context to external-PBX destination mapping.",
|
||||
)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def validate_destination_source_config(self):
|
||||
|
|
@ -270,6 +329,14 @@ class TransferCallConfig(BaseModel):
|
|||
raise ValueError(
|
||||
"config.resolver is required when destination_source is dynamic"
|
||||
)
|
||||
if (
|
||||
self.destination_source == "context_mapping"
|
||||
and self.context_mapping is None
|
||||
):
|
||||
raise ValueError(
|
||||
"config.context_mapping is required when destination_source is "
|
||||
"context_mapping"
|
||||
)
|
||||
return self
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
from typing import Literal
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field, model_validator
|
||||
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
|
||||
|
||||
DEFAULT_MAX_CALL_DURATION_SECONDS = 300
|
||||
# Hard ceiling on configurable call duration. Must stay <= the concurrency
|
||||
|
|
@ -16,6 +16,23 @@ DEFAULT_TURN_STOP_STRATEGY = "transcription"
|
|||
DEFAULT_CONTEXT_COMPACTION_ENABLED = False
|
||||
|
||||
|
||||
class ExternalPBXFieldMapping(BaseModel):
|
||||
"""Map one gathered-context value to a provider-native field."""
|
||||
|
||||
context_path: str = Field(min_length=1, max_length=255)
|
||||
destination_field: str = Field(pattern=r"^[A-Za-z][A-Za-z0-9_]{0,63}$")
|
||||
|
||||
@field_validator("context_path")
|
||||
@classmethod
|
||||
def strip_context_path(cls, value: str) -> str:
|
||||
return value.strip()
|
||||
|
||||
@field_validator("destination_field")
|
||||
@classmethod
|
||||
def strip_destination_field(cls, value: str) -> str:
|
||||
return value.strip()
|
||||
|
||||
|
||||
class AmbientNoiseConfigurationDefaults(BaseModel):
|
||||
model_config = ConfigDict(extra="allow")
|
||||
|
||||
|
|
@ -56,6 +73,10 @@ class WorkflowConfigurationDefaults(BaseModel):
|
|||
)
|
||||
dictionary: str = ""
|
||||
context_compaction_enabled: bool = DEFAULT_CONTEXT_COMPACTION_ENABLED
|
||||
external_pbx_field_mappings: list[ExternalPBXFieldMapping] = Field(
|
||||
default_factory=list,
|
||||
max_length=100,
|
||||
)
|
||||
|
||||
|
||||
def get_default_workflow_configurations() -> WorkflowConfigurationDefaults:
|
||||
|
|
|
|||
|
|
@ -42,6 +42,16 @@ async def upsert_organization_preferences(
|
|||
return preferences
|
||||
|
||||
|
||||
async def external_pbx_integrations_enabled(
|
||||
organization_id: int | None,
|
||||
db=None,
|
||||
) -> bool:
|
||||
"""Return whether the organization opted into external-PBX integrations."""
|
||||
|
||||
preferences = await get_organization_preferences(organization_id, db=db)
|
||||
return preferences.external_pbx_integrations_enabled
|
||||
|
||||
|
||||
async def _get_configuration(db, organization_id: int, key: str):
|
||||
row = db.get_configuration(organization_id, key)
|
||||
if isawaitable(row):
|
||||
|
|
|
|||
|
|
@ -30,8 +30,10 @@ from api.services.call_concurrency import (
|
|||
CallConcurrencyLimitError,
|
||||
call_concurrency,
|
||||
)
|
||||
from api.services.organization_preferences import external_pbx_integrations_enabled
|
||||
from api.services.quota_service import authorize_workflow_run_start
|
||||
from api.services.telephony.call_transfer_manager import get_call_transfer_manager
|
||||
from api.services.telephony.providers.ari.external_pbx import create_adapter
|
||||
from api.services.telephony.transfer_event_protocol import (
|
||||
TransferEvent,
|
||||
TransferEventType,
|
||||
|
|
@ -56,6 +58,7 @@ class ARIConnection:
|
|||
app_name: str,
|
||||
app_password: str,
|
||||
ws_client_name: str = "",
|
||||
external_pbx_config: Optional[dict] = None,
|
||||
):
|
||||
self.organization_id = organization_id
|
||||
self.telephony_configuration_id = telephony_configuration_id
|
||||
|
|
@ -63,6 +66,8 @@ class ARIConnection:
|
|||
self.app_name = app_name
|
||||
self.app_password = app_password
|
||||
self.ws_client_name = ws_client_name
|
||||
self.external_pbx_config = external_pbx_config
|
||||
self.external_pbx_adapter = create_adapter(external_pbx_config)
|
||||
|
||||
self._ws: Optional[websockets.ClientConnection] = None
|
||||
self._task: Optional[asyncio.Task] = None
|
||||
|
|
@ -287,7 +292,7 @@ class ARIConnection:
|
|||
channel_state = channel.get("state", "unknown")
|
||||
|
||||
# Log all events for each channel
|
||||
logger.debug(
|
||||
logger.trace(
|
||||
f"[ARI EVENT org={self.organization_id}] {event_type}: channel={channel_id}, state={channel_state}"
|
||||
)
|
||||
|
||||
|
|
@ -413,7 +418,7 @@ class ARIConnection:
|
|||
)
|
||||
|
||||
else:
|
||||
logger.debug(
|
||||
logger.trace(
|
||||
f"[ARI org={self.organization_id}] Event: {event_type} "
|
||||
f"channel={channel_id}"
|
||||
)
|
||||
|
|
@ -428,9 +433,9 @@ class ARIConnection:
|
|||
async with session.request(method, url, auth=auth, **kwargs) as response:
|
||||
response_text = await response.text()
|
||||
if response.status not in (200, 201, 204):
|
||||
logger.error(
|
||||
logger.warning(
|
||||
f"[ARI org={self.organization_id}] REST API error: "
|
||||
f"{method} {path} -> {response.status}: {response_text}"
|
||||
f"{method} {path} {kwargs} -> {response.status}: {response_text}"
|
||||
)
|
||||
return {}
|
||||
if response_text:
|
||||
|
|
@ -451,82 +456,33 @@ class ARIConnection:
|
|||
)
|
||||
return (result or {}).get("value", "") or ""
|
||||
|
||||
async def _capture_upstream_pbx(
|
||||
async def _capture_external_pbx_call(
|
||||
self, channel_id: str, channel_name: str = ""
|
||||
) -> Optional[dict]:
|
||||
"""Capture upstream-PBX identity from the inbound SIP headers.
|
||||
|
||||
The customer's real call leg lives on the upstream PBX, not on dograh, so
|
||||
dograh drives hangup/transfer via the upstream's API using a captured
|
||||
handle. Two providers are supported:
|
||||
* FreeSWITCH — bridges in with ``X-PBX-*`` headers; the handle is the
|
||||
channel UUID (``X-PBX-UUID``), driven over ESL (uuid_kill/transfer).
|
||||
* VICIdial — patches in with ``X-VICIDIAL-*`` headers; the handle is the
|
||||
callerid + remote-agent user, driven over ``ra_call_control``.
|
||||
Returns None for non-upstream (direct) calls.
|
||||
"""
|
||||
"""Capture adapter-defined identity from inbound SIP headers."""
|
||||
if self.external_pbx_adapter is None:
|
||||
return None
|
||||
# PJSIP_HEADER() only works on a PJSIP channel; on any other technology
|
||||
# (Local, WebSocket, etc.) Asterisk returns a 500 ("This function
|
||||
# requires a PJSIP channel"). Non-PJSIP legs carry no SIP headers to
|
||||
# capture anyway, so skip the reads quietly instead of spamming errors.
|
||||
if not channel_name.startswith("PJSIP/"):
|
||||
logger.debug(
|
||||
f"[ARI org={self.organization_id}] Skipping upstream_pbx capture "
|
||||
f"[ARI org={self.organization_id}] Skipping external PBX capture "
|
||||
f"for non-PJSIP channel {channel_id} ({channel_name or 'unknown'})"
|
||||
)
|
||||
return None
|
||||
|
||||
# FreeSWITCH: X-PBX-Provider marks the call; X-PBX-UUID is the ESL handle.
|
||||
if (
|
||||
await self._get_channel_var(channel_id, "PJSIP_HEADER(read,X-PBX-Provider)")
|
||||
) == "freeswitch":
|
||||
upstream = {
|
||||
"provider": "freeswitch",
|
||||
"uuid": await self._get_channel_var(
|
||||
channel_id, "PJSIP_HEADER(read,X-PBX-UUID)"
|
||||
),
|
||||
"lead_id": await self._get_channel_var(
|
||||
channel_id, "PJSIP_HEADER(read,X-PBX-Lead-ID)"
|
||||
),
|
||||
"campaign_id": await self._get_channel_var(
|
||||
channel_id, "PJSIP_HEADER(read,X-PBX-Campaign)"
|
||||
),
|
||||
}
|
||||
logger.info(
|
||||
f"[ARI org={self.organization_id}] Captured upstream_pbx for channel "
|
||||
f"{channel_id}: {upstream}"
|
||||
)
|
||||
return upstream
|
||||
async def read_header(name: str) -> str:
|
||||
return await self._get_channel_var(channel_id, f"PJSIP_HEADER(read,{name})")
|
||||
|
||||
# VICIdial: X-VICIDIAL-callerid + user is the ra_call_control handle.
|
||||
callerid = await self._get_channel_var(
|
||||
channel_id, "PJSIP_HEADER(read,X-VICIDIAL-callerid)"
|
||||
)
|
||||
if not callerid:
|
||||
return None
|
||||
upstream = {
|
||||
"provider": "vicidial",
|
||||
"callerid": callerid,
|
||||
"agent_user": await self._get_channel_var(
|
||||
channel_id, "PJSIP_HEADER(read,X-VICIDIAL-user)"
|
||||
),
|
||||
"lead_id": await self._get_channel_var(
|
||||
channel_id, "PJSIP_HEADER(read,X-VICIDIAL-lead_id)"
|
||||
),
|
||||
"campaign_id": await self._get_channel_var(
|
||||
channel_id, "PJSIP_HEADER(read,X-VICIDIAL-campaign_id)"
|
||||
),
|
||||
# The in-group the call arrived on, so a transfer can bounce it back
|
||||
# to the same queue via INGROUPTRANSFER (destination "ingroup:source").
|
||||
"ingroup_id": await self._get_channel_var(
|
||||
channel_id, "PJSIP_HEADER(read,X-VICIDIAL-ingroup_id)"
|
||||
),
|
||||
}
|
||||
logger.info(
|
||||
f"[ARI org={self.organization_id}] Captured upstream_pbx for channel "
|
||||
f"{channel_id}: {upstream}"
|
||||
)
|
||||
return upstream
|
||||
identity = await self.external_pbx_adapter.capture_call_identity(read_header)
|
||||
if identity:
|
||||
logger.info(
|
||||
f"[ARI org={self.organization_id}] Captured "
|
||||
f"{self.external_pbx_adapter.type} call identity for channel {channel_id} identity: {identity}"
|
||||
)
|
||||
return identity
|
||||
|
||||
async def _create_external_media(
|
||||
self,
|
||||
|
|
@ -677,10 +633,8 @@ class ARIConnection:
|
|||
|
||||
# 3. Create workflow run
|
||||
call_id = channel_id
|
||||
# Capture the upstream-PBX (VICIdial) identity off the SIP headers so
|
||||
# the hangup/transfer strategies can drive VICIdial's API. The
|
||||
# customer's real leg lives on VICIdial; this is the handle for it.
|
||||
upstream_pbx = await self._capture_upstream_pbx(
|
||||
# Capture the configured external PBX identity from SIP headers.
|
||||
external_pbx_call = await self._capture_external_pbx_call(
|
||||
channel_id, channel.get("name", "")
|
||||
)
|
||||
workflow_run = await db_client.create_workflow_run(
|
||||
|
|
@ -695,7 +649,7 @@ class ARIConnection:
|
|||
"direction": "inbound",
|
||||
"provider": "ari",
|
||||
"telephony_configuration_id": self.telephony_configuration_id,
|
||||
"upstream_pbx": upstream_pbx,
|
||||
"external_pbx_call": external_pbx_call,
|
||||
},
|
||||
gathered_context={
|
||||
"call_id": call_id,
|
||||
|
|
@ -1242,6 +1196,7 @@ class ARIManager:
|
|||
app_name = config["app_name"]
|
||||
app_password = config["app_password"]
|
||||
ws_client_name = config["ws_client_name"]
|
||||
external_pbx_config = config.get("external_pbx")
|
||||
|
||||
conn = ARIConnection(
|
||||
org_id,
|
||||
|
|
@ -1250,6 +1205,7 @@ class ARIManager:
|
|||
app_name,
|
||||
app_password,
|
||||
ws_client_name,
|
||||
external_pbx_config,
|
||||
)
|
||||
key = conn.connection_key
|
||||
|
||||
|
|
@ -1274,6 +1230,7 @@ class ARIManager:
|
|||
or existing.app_name != app_name
|
||||
or existing.app_password != app_password
|
||||
or existing.ws_client_name != ws_client_name
|
||||
or existing.external_pbx_config != external_pbx_config
|
||||
):
|
||||
logger.info(
|
||||
f"[ARI Manager] Config {telephony_configuration_id} "
|
||||
|
|
@ -1311,6 +1268,11 @@ class ARIManager:
|
|||
app_name = credentials.get("app_name")
|
||||
app_password = credentials.get("app_password")
|
||||
ws_client_name = credentials.get("ws_client_name", "")
|
||||
external_pbx = credentials.get("external_pbx")
|
||||
if external_pbx and not await external_pbx_integrations_enabled(
|
||||
row.organization_id
|
||||
):
|
||||
external_pbx = None
|
||||
|
||||
if not all([ari_endpoint, app_name, app_password]):
|
||||
logger.warning(
|
||||
|
|
@ -1333,6 +1295,7 @@ class ARIManager:
|
|||
"app_name": app_name,
|
||||
"app_password": app_password,
|
||||
"ws_client_name": ws_client_name,
|
||||
"external_pbx": external_pbx,
|
||||
}
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -446,3 +446,18 @@ class TelephonyProvider(ABC):
|
|||
True if provider supports call transfers, False otherwise
|
||||
"""
|
||||
pass
|
||||
|
||||
async def transfer_external_pbx_call(
|
||||
self,
|
||||
*,
|
||||
identity: Dict[str, Any],
|
||||
destination: str,
|
||||
field_updates: Optional[Dict[str, str]] = None,
|
||||
) -> Optional[Dict[str, Any]]:
|
||||
"""Handle an external-PBX-owned customer leg when one is present.
|
||||
|
||||
Providers without an external PBX return ``None`` so the ordinary
|
||||
telephony transfer path continues unchanged.
|
||||
"""
|
||||
|
||||
return None
|
||||
|
|
|
|||
43
api/services/telephony/external_pbx.py
Normal file
43
api/services/telephony/external_pbx.py
Normal file
|
|
@ -0,0 +1,43 @@
|
|||
"""Provider-neutral helpers for external-PBX workflow mappings."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from typing import Any, Iterable, Mapping
|
||||
|
||||
|
||||
def _read_path(context: Mapping[str, Any], path: str) -> Any:
|
||||
normalized = path.strip()
|
||||
if normalized.startswith("gathered_context."):
|
||||
normalized = normalized.removeprefix("gathered_context.")
|
||||
current: Any = context
|
||||
for part in normalized.split("."):
|
||||
if not isinstance(current, Mapping):
|
||||
return None
|
||||
current = current.get(part)
|
||||
if current is None and "." not in normalized:
|
||||
extracted = context.get("extracted_variables")
|
||||
if isinstance(extracted, Mapping):
|
||||
current = extracted.get(normalized)
|
||||
return current
|
||||
|
||||
|
||||
def resolve_external_pbx_field_mappings(
|
||||
gathered_context: Mapping[str, Any] | None,
|
||||
mappings: Iterable[Mapping[str, Any]] | None,
|
||||
) -> dict[str, str]:
|
||||
"""Return provider field -> non-empty gathered-context value."""
|
||||
|
||||
context = gathered_context or {}
|
||||
resolved: dict[str, str] = {}
|
||||
for mapping in mappings or []:
|
||||
context_path = str(mapping.get("context_path", "")).strip()
|
||||
destination_field = str(mapping.get("destination_field", "")).strip()
|
||||
if not context_path or not destination_field:
|
||||
continue
|
||||
value = _read_path(context, context_path)
|
||||
if value is None:
|
||||
continue
|
||||
text = str(value).strip()
|
||||
if text:
|
||||
resolved[destination_field] = text
|
||||
return resolved
|
||||
|
|
@ -4,8 +4,10 @@ from typing import Any, Dict
|
|||
|
||||
from api.services.telephony.registry import (
|
||||
ProviderSpec,
|
||||
ProviderUICondition,
|
||||
ProviderUIField,
|
||||
ProviderUIMetadata,
|
||||
ProviderUIOption,
|
||||
register,
|
||||
)
|
||||
|
||||
|
|
@ -20,6 +22,7 @@ def _config_loader(value: Dict[str, Any]) -> Dict[str, Any]:
|
|||
"ari_endpoint": value.get("ari_endpoint"),
|
||||
"app_name": value.get("app_name"),
|
||||
"app_password": value.get("app_password"),
|
||||
"external_pbx": value.get("external_pbx"),
|
||||
"from_numbers": value.get("from_numbers", []),
|
||||
}
|
||||
|
||||
|
|
@ -58,6 +61,92 @@ _UI_METADATA = ProviderUIMetadata(
|
|||
type="string-array",
|
||||
description="SIP extensions/numbers for outbound calls",
|
||||
),
|
||||
ProviderUIField(
|
||||
name="external_pbx.type",
|
||||
label="External PBX Type",
|
||||
type="select",
|
||||
required=False,
|
||||
description=(
|
||||
"Enable PBX-specific call control for calls patched into Dograh "
|
||||
"through this Asterisk configuration."
|
||||
),
|
||||
options=[ProviderUIOption(value="vicidial", label="VICIdial")],
|
||||
section="External PBX",
|
||||
feature_gate="external_pbx_integrations",
|
||||
),
|
||||
ProviderUIField(
|
||||
name="external_pbx.agent_api.url",
|
||||
label="Agent API URL",
|
||||
type="text",
|
||||
description="Full VICIdial remote-agent API URL, ending in agc/api.php",
|
||||
placeholder="https://vici.example.com/agc/api.php",
|
||||
visible_when=ProviderUICondition(
|
||||
field="external_pbx.type", equals="vicidial"
|
||||
),
|
||||
section="External PBX",
|
||||
feature_gate="external_pbx_integrations",
|
||||
),
|
||||
ProviderUIField(
|
||||
name="external_pbx.agent_api.username",
|
||||
label="Agent API User",
|
||||
type="text",
|
||||
sensitive=True,
|
||||
visible_when=ProviderUICondition(
|
||||
field="external_pbx.type", equals="vicidial"
|
||||
),
|
||||
section="External PBX",
|
||||
feature_gate="external_pbx_integrations",
|
||||
),
|
||||
ProviderUIField(
|
||||
name="external_pbx.agent_api.password",
|
||||
label="Agent API Password",
|
||||
type="password",
|
||||
sensitive=True,
|
||||
visible_when=ProviderUICondition(
|
||||
field="external_pbx.type", equals="vicidial"
|
||||
),
|
||||
section="External PBX",
|
||||
feature_gate="external_pbx_integrations",
|
||||
),
|
||||
ProviderUIField(
|
||||
name="external_pbx.non_agent_api.url",
|
||||
label="Non-Agent API URL",
|
||||
type="text",
|
||||
required=False,
|
||||
description=(
|
||||
"Optional. Required only when a workflow updates VICIdial lead fields."
|
||||
),
|
||||
placeholder="https://vici.example.com/vicidial/non_agent_api.php",
|
||||
visible_when=ProviderUICondition(
|
||||
field="external_pbx.type", equals="vicidial"
|
||||
),
|
||||
section="External PBX",
|
||||
feature_gate="external_pbx_integrations",
|
||||
),
|
||||
ProviderUIField(
|
||||
name="external_pbx.non_agent_api.username",
|
||||
label="Non-Agent API User",
|
||||
type="text",
|
||||
required=False,
|
||||
sensitive=True,
|
||||
visible_when=ProviderUICondition(
|
||||
field="external_pbx.type", equals="vicidial"
|
||||
),
|
||||
section="External PBX",
|
||||
feature_gate="external_pbx_integrations",
|
||||
),
|
||||
ProviderUIField(
|
||||
name="external_pbx.non_agent_api.password",
|
||||
label="Non-Agent API Password",
|
||||
type="password",
|
||||
required=False,
|
||||
sensitive=True,
|
||||
visible_when=ProviderUICondition(
|
||||
field="external_pbx.type", equals="vicidial"
|
||||
),
|
||||
section="External PBX",
|
||||
feature_gate="external_pbx_integrations",
|
||||
),
|
||||
],
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,8 +1,69 @@
|
|||
"""ARI (Asterisk REST Interface) telephony configuration schemas."""
|
||||
|
||||
from typing import List, Literal
|
||||
from typing import List, Literal, Optional
|
||||
|
||||
from pydantic import BaseModel, Field
|
||||
from pydantic import BaseModel, Field, field_validator, model_validator
|
||||
|
||||
|
||||
class VicidialAgentAPIConfiguration(BaseModel):
|
||||
"""VICIdial remote-agent call-control API configuration."""
|
||||
|
||||
url: str = Field(..., min_length=1, description="Full URL to agc/api.php")
|
||||
username: str = Field(..., min_length=1, description="VICIdial agent API user")
|
||||
password: str = Field(..., min_length=1, description="VICIdial agent API password")
|
||||
source: str = Field(default="dograh", description="VICIdial API source tag")
|
||||
|
||||
@field_validator("url")
|
||||
@classmethod
|
||||
def validate_http_url(cls, value: str) -> str:
|
||||
stripped = value.strip()
|
||||
if not stripped.startswith(("http://", "https://")):
|
||||
raise ValueError("VICIdial agent API URL must use http:// or https://")
|
||||
return stripped
|
||||
|
||||
|
||||
class VicidialNonAgentAPIConfiguration(BaseModel):
|
||||
"""Optional VICIdial non-agent API configuration for lead updates."""
|
||||
|
||||
url: Optional[str] = Field(default=None, description="Full non_agent_api.php URL")
|
||||
username: Optional[str] = Field(default=None, description="Non-agent API user")
|
||||
password: Optional[str] = Field(default=None, description="Non-agent API password")
|
||||
source: str = Field(default="dograh", description="Non-agent API source tag")
|
||||
|
||||
@field_validator("url")
|
||||
@classmethod
|
||||
def validate_http_url(cls, value: Optional[str]) -> Optional[str]:
|
||||
if value is None:
|
||||
return None
|
||||
stripped = value.strip()
|
||||
if stripped and not stripped.startswith(("http://", "https://")):
|
||||
raise ValueError("VICIdial non-agent API URL must use http:// or https://")
|
||||
return stripped or None
|
||||
|
||||
@model_validator(mode="after")
|
||||
def validate_complete_credentials(self):
|
||||
supplied = [self.url, self.username, self.password]
|
||||
if any(supplied) and not all(supplied):
|
||||
raise ValueError(
|
||||
"VICIdial non-agent API URL, username, and password must be "
|
||||
"configured together"
|
||||
)
|
||||
return self
|
||||
|
||||
|
||||
class VicidialExternalPBXConfiguration(BaseModel):
|
||||
"""External-PBX configuration used by the VICIdial strategy adapter."""
|
||||
|
||||
type: Literal["vicidial"] = Field(default="vicidial")
|
||||
agent_api: VicidialAgentAPIConfiguration
|
||||
non_agent_api: Optional[VicidialNonAgentAPIConfiguration] = None
|
||||
timeout_seconds: int = Field(default=8, ge=1, le=30)
|
||||
|
||||
@model_validator(mode="after")
|
||||
def drop_empty_non_agent_configuration(self):
|
||||
if self.non_agent_api is not None and not self.non_agent_api.url:
|
||||
self.non_agent_api = None
|
||||
return self
|
||||
|
||||
|
||||
class ARIConfigurationRequest(BaseModel):
|
||||
|
|
@ -20,6 +81,10 @@ class ARIConfigurationRequest(BaseModel):
|
|||
default="",
|
||||
description="websocket_client.conf connection name for externalMedia (e.g., dograh_staging)",
|
||||
)
|
||||
external_pbx: Optional[VicidialExternalPBXConfiguration] = Field(
|
||||
default=None,
|
||||
description="Optional external PBX connected through this Asterisk instance",
|
||||
)
|
||||
from_numbers: List[str] = Field(
|
||||
default_factory=list,
|
||||
description="List of SIP extensions/numbers for outbound calls (optional)",
|
||||
|
|
@ -34,4 +99,5 @@ class ARIConfigurationResponse(BaseModel):
|
|||
app_name: str
|
||||
app_password: str # Masked
|
||||
ws_client_name: str = ""
|
||||
external_pbx: Optional[VicidialExternalPBXConfiguration] = None
|
||||
from_numbers: List[str]
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
"""External-PBX adapter entrypoint for the ARI provider."""
|
||||
|
||||
from .base import ExternalPBXAdapter, ExternalPBXResult
|
||||
from .registry import create_adapter, register_adapter, registered_adapter_types
|
||||
from .vicidial import VicidialAdapter
|
||||
|
||||
register_adapter("vicidial", VicidialAdapter)
|
||||
|
||||
__all__ = [
|
||||
"ExternalPBXAdapter",
|
||||
"ExternalPBXResult",
|
||||
"create_adapter",
|
||||
"registered_adapter_types",
|
||||
]
|
||||
44
api/services/telephony/providers/ari/external_pbx/base.py
Normal file
44
api/services/telephony/providers/ari/external_pbx/base.py
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
"""Contracts for PBXs that hand a customer leg to Dograh through Asterisk."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from abc import ABC, abstractmethod
|
||||
from dataclasses import dataclass
|
||||
from typing import Awaitable, Callable, Mapping
|
||||
|
||||
HeaderReader = Callable[[str], Awaitable[str]]
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ExternalPBXResult:
|
||||
ok: bool
|
||||
action: str
|
||||
message: str
|
||||
|
||||
|
||||
class ExternalPBXAdapter(ABC):
|
||||
"""PBX-specific operations; ARI continues to own only Dograh's local leg."""
|
||||
|
||||
type: str
|
||||
|
||||
@abstractmethod
|
||||
async def capture_call_identity(
|
||||
self, read_header: HeaderReader
|
||||
) -> dict[str, str] | None:
|
||||
"""Read a stable upstream-call identity from inbound SIP headers."""
|
||||
|
||||
@abstractmethod
|
||||
async def hangup(self, identity: Mapping[str, str]) -> ExternalPBXResult:
|
||||
"""Hang up the customer leg owned by the external PBX."""
|
||||
|
||||
@abstractmethod
|
||||
async def transfer(
|
||||
self, identity: Mapping[str, str], destination: str
|
||||
) -> ExternalPBXResult:
|
||||
"""Transfer the customer leg to a PBX-native destination."""
|
||||
|
||||
@abstractmethod
|
||||
async def update_fields(
|
||||
self, identity: Mapping[str, str], fields: Mapping[str, str]
|
||||
) -> ExternalPBXResult:
|
||||
"""Update provider-native fields associated with the call."""
|
||||
|
|
@ -0,0 +1,34 @@
|
|||
"""Registry for drop-in external-PBX adapters."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
from collections.abc import Callable
|
||||
from typing import Any
|
||||
|
||||
from .base import ExternalPBXAdapter
|
||||
|
||||
AdapterFactory = Callable[[dict[str, Any]], ExternalPBXAdapter]
|
||||
_FACTORIES: dict[str, AdapterFactory] = {}
|
||||
|
||||
|
||||
def register_adapter(pbx_type: str, factory: AdapterFactory) -> None:
|
||||
normalized = pbx_type.strip().lower()
|
||||
if not normalized:
|
||||
raise ValueError("External PBX type cannot be empty")
|
||||
if normalized in _FACTORIES:
|
||||
raise ValueError(f"External PBX adapter already registered: {normalized}")
|
||||
_FACTORIES[normalized] = factory
|
||||
|
||||
|
||||
def create_adapter(config: dict[str, Any] | None) -> ExternalPBXAdapter | None:
|
||||
if not config:
|
||||
return None
|
||||
pbx_type = str(config.get("type", "")).strip().lower()
|
||||
factory = _FACTORIES.get(pbx_type)
|
||||
if factory is None:
|
||||
raise ValueError(f"Unsupported external PBX type: {pbx_type or '<empty>'}")
|
||||
return factory(config)
|
||||
|
||||
|
||||
def registered_adapter_types() -> tuple[str, ...]:
|
||||
return tuple(sorted(_FACTORIES))
|
||||
170
api/services/telephony/providers/ari/external_pbx/vicidial.py
Normal file
170
api/services/telephony/providers/ari/external_pbx/vicidial.py
Normal file
|
|
@ -0,0 +1,170 @@
|
|||
"""VICIdial implementation of external-PBX call and lead operations."""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import re
|
||||
from typing import Any, Mapping
|
||||
|
||||
import aiohttp
|
||||
from loguru import logger
|
||||
|
||||
from .base import ExternalPBXAdapter, ExternalPBXResult, HeaderReader
|
||||
|
||||
_LEAD_FIELD_RE = re.compile(r"^[A-Za-z][A-Za-z0-9_]{0,63}$")
|
||||
_RESERVED_LEAD_FIELDS = frozenset({"source", "user", "pass", "function", "lead_id"})
|
||||
|
||||
|
||||
class VicidialAdapter(ExternalPBXAdapter):
|
||||
type = "vicidial"
|
||||
|
||||
def __init__(self, config: dict[str, Any]):
|
||||
agent_api = config.get("agent_api") or {}
|
||||
non_agent_api = config.get("non_agent_api") or {}
|
||||
self._agent_url = str(agent_api.get("url", "")).strip()
|
||||
self._agent_user = str(agent_api.get("username", "")).strip()
|
||||
self._agent_password = str(agent_api.get("password", ""))
|
||||
self._agent_source = str(agent_api.get("source", "dograh")).strip()
|
||||
self._non_agent_url = str(non_agent_api.get("url", "")).strip()
|
||||
self._non_agent_user = str(non_agent_api.get("username", "")).strip()
|
||||
self._non_agent_password = str(non_agent_api.get("password", ""))
|
||||
self._non_agent_source = str(non_agent_api.get("source", "dograh")).strip()
|
||||
self._timeout = aiohttp.ClientTimeout(
|
||||
total=min(max(int(config.get("timeout_seconds", 8)), 1), 30)
|
||||
)
|
||||
|
||||
async def capture_call_identity(
|
||||
self, read_header: HeaderReader
|
||||
) -> dict[str, str] | None:
|
||||
callerid = (await read_header("X-VICIDIAL-callerid")).strip()
|
||||
if not callerid:
|
||||
return None
|
||||
return {
|
||||
"type": self.type,
|
||||
"callerid": callerid,
|
||||
"agent_user": (await read_header("X-VICIDIAL-user")).strip(),
|
||||
"lead_id": (await read_header("X-VICIDIAL-lead_id")).strip(),
|
||||
"campaign_id": (await read_header("X-VICIDIAL-campaign_id")).strip(),
|
||||
"ingroup_id": (await read_header("X-VICIDIAL-ingroup_id")).strip(),
|
||||
}
|
||||
|
||||
async def _agent_call_control(
|
||||
self, identity: Mapping[str, str], stage: str, **extra: str
|
||||
) -> ExternalPBXResult:
|
||||
if not all([self._agent_url, self._agent_user, self._agent_password]):
|
||||
return ExternalPBXResult(
|
||||
False, stage.lower(), "Agent API is not configured"
|
||||
)
|
||||
if not identity.get("callerid") or not identity.get("agent_user"):
|
||||
return ExternalPBXResult(
|
||||
False, stage.lower(), "VICIdial call identity is incomplete"
|
||||
)
|
||||
params = {
|
||||
"source": self._agent_source,
|
||||
"user": self._agent_user,
|
||||
"pass": self._agent_password,
|
||||
"agent_user": identity["agent_user"],
|
||||
"function": "ra_call_control",
|
||||
"stage": stage,
|
||||
"value": identity["callerid"],
|
||||
**extra,
|
||||
}
|
||||
try:
|
||||
async with aiohttp.ClientSession(timeout=self._timeout) as session:
|
||||
async with session.get(self._agent_url, params=params) as response:
|
||||
response_text = (await response.text()).strip()
|
||||
ok = response.status == 200 and response_text.startswith("SUCCESS")
|
||||
logger.info(
|
||||
"[VICIdial] ra_call_control completed "
|
||||
f"stage={stage} status={response.status} ok={ok}"
|
||||
)
|
||||
return ExternalPBXResult(
|
||||
ok,
|
||||
stage.lower(),
|
||||
"VICIdial accepted the operation"
|
||||
if ok
|
||||
else "VICIdial rejected the operation",
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.error(f"[VICIdial] ra_call_control failed stage={stage}: {exc}")
|
||||
return ExternalPBXResult(
|
||||
False, stage.lower(), "VICIdial API request failed"
|
||||
)
|
||||
|
||||
async def hangup(self, identity: Mapping[str, str]) -> ExternalPBXResult:
|
||||
return await self._agent_call_control(identity, "HANGUP")
|
||||
|
||||
async def transfer(
|
||||
self, identity: Mapping[str, str], destination: str
|
||||
) -> ExternalPBXResult:
|
||||
choice = destination.strip()
|
||||
if choice.lower() == "source":
|
||||
choice = str(identity.get("ingroup_id", "")).strip()
|
||||
if not choice:
|
||||
return ExternalPBXResult(
|
||||
False, "ingrouptransfer", "No VICIdial in-group was resolved"
|
||||
)
|
||||
return await self._agent_call_control(
|
||||
identity, "INGROUPTRANSFER", ingroup_choices=choice
|
||||
)
|
||||
|
||||
async def update_fields(
|
||||
self, identity: Mapping[str, str], fields: Mapping[str, str]
|
||||
) -> ExternalPBXResult:
|
||||
if not fields:
|
||||
return ExternalPBXResult(True, "update_lead", "No lead fields configured")
|
||||
if not all(
|
||||
[self._non_agent_url, self._non_agent_user, self._non_agent_password]
|
||||
):
|
||||
return ExternalPBXResult(
|
||||
False, "update_lead", "Non-agent API is not configured"
|
||||
)
|
||||
lead_id = str(identity.get("lead_id", "")).strip()
|
||||
if not lead_id:
|
||||
return ExternalPBXResult(
|
||||
False, "update_lead", "No VICIdial lead ID captured"
|
||||
)
|
||||
|
||||
safe_fields: dict[str, str] = {}
|
||||
for key, value in fields.items():
|
||||
normalized = str(key).strip()
|
||||
if (
|
||||
not _LEAD_FIELD_RE.fullmatch(normalized)
|
||||
or normalized.lower() in _RESERVED_LEAD_FIELDS
|
||||
):
|
||||
logger.warning(
|
||||
f"[VICIdial] Ignoring invalid lead field name: {normalized!r}"
|
||||
)
|
||||
continue
|
||||
safe_fields[normalized] = str(value)
|
||||
if not safe_fields:
|
||||
return ExternalPBXResult(
|
||||
False, "update_lead", "No valid lead fields resolved"
|
||||
)
|
||||
|
||||
params = {
|
||||
**safe_fields,
|
||||
"source": self._non_agent_source,
|
||||
"user": self._non_agent_user,
|
||||
"pass": self._non_agent_password,
|
||||
"function": "update_lead",
|
||||
"lead_id": lead_id,
|
||||
}
|
||||
try:
|
||||
async with aiohttp.ClientSession(timeout=self._timeout) as session:
|
||||
async with session.get(self._non_agent_url, params=params) as response:
|
||||
response_text = (await response.text()).strip()
|
||||
ok = response.status == 200 and response_text.startswith("SUCCESS")
|
||||
logger.info(
|
||||
"[VICIdial] update_lead completed "
|
||||
f"status={response.status} ok={ok} field_count={len(safe_fields)}"
|
||||
)
|
||||
return ExternalPBXResult(
|
||||
ok,
|
||||
"update_lead",
|
||||
"VICIdial lead updated" if ok else "VICIdial rejected the lead update",
|
||||
)
|
||||
except Exception as exc:
|
||||
logger.error(f"[VICIdial] update_lead failed: {exc}")
|
||||
return ExternalPBXResult(
|
||||
False, "update_lead", "VICIdial API request failed"
|
||||
)
|
||||
|
|
@ -20,6 +20,7 @@ from api.services.telephony.base import (
|
|||
NormalizedInboundData,
|
||||
TelephonyProvider,
|
||||
)
|
||||
from api.services.telephony.providers.ari.external_pbx import create_adapter
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from fastapi import WebSocket
|
||||
|
|
@ -51,6 +52,7 @@ class ARIProvider(TelephonyProvider):
|
|||
self.app_name = config.get("app_name", "")
|
||||
self.app_password = config.get("app_password", "")
|
||||
self.from_numbers = config.get("from_numbers", [])
|
||||
self.external_pbx_adapter = create_adapter(config.get("external_pbx"))
|
||||
|
||||
if isinstance(self.from_numbers, str):
|
||||
self.from_numbers = [self.from_numbers]
|
||||
|
|
@ -363,6 +365,53 @@ class ARIProvider(TelephonyProvider):
|
|||
"""ARI supports call transfers via bridge manipulation."""
|
||||
return True
|
||||
|
||||
async def transfer_external_pbx_call(
|
||||
self,
|
||||
*,
|
||||
identity: Dict[str, Any],
|
||||
destination: str,
|
||||
field_updates: Optional[Dict[str, str]] = None,
|
||||
) -> Optional[Dict[str, Any]]:
|
||||
"""Delegate a PBX-owned customer leg to the configured adapter."""
|
||||
|
||||
adapter = self.external_pbx_adapter
|
||||
if adapter is None or not identity:
|
||||
return None
|
||||
identity_type = identity.get("type") or identity.get("provider")
|
||||
if identity_type != adapter.type:
|
||||
logger.warning(
|
||||
"[ARI External PBX] Captured identity does not match configured "
|
||||
f"adapter: identity={identity_type!r} adapter={adapter.type!r}"
|
||||
)
|
||||
return {
|
||||
"status": "failed",
|
||||
"action": "external_pbx_transfer",
|
||||
"message": "The external PBX call identity is invalid.",
|
||||
"reason": "external_pbx_identity_mismatch",
|
||||
}
|
||||
|
||||
update_result = None
|
||||
if field_updates:
|
||||
update_result = await adapter.update_fields(identity, field_updates)
|
||||
if not update_result.ok:
|
||||
logger.warning(
|
||||
"[ARI External PBX] Field update failed; continuing transfer "
|
||||
f"adapter={adapter.type} message={update_result.message}"
|
||||
)
|
||||
|
||||
transfer_result = await adapter.transfer(identity, destination)
|
||||
return {
|
||||
"status": "success" if transfer_result.ok else "failed",
|
||||
"action": "external_pbx_transfer",
|
||||
"message": (
|
||||
"Transferring your call now."
|
||||
if transfer_result.ok
|
||||
else "I'm sorry, I couldn't complete the transfer."
|
||||
),
|
||||
"reason": None if transfer_result.ok else "external_pbx_transfer_failed",
|
||||
"field_update_ok": update_result.ok if update_result else None,
|
||||
}
|
||||
|
||||
async def transfer_call(
|
||||
self,
|
||||
destination: str,
|
||||
|
|
|
|||
|
|
@ -3,11 +3,14 @@
|
|||
This module contains the business logic for Asterisk ARI call operations.
|
||||
"""
|
||||
|
||||
from typing import Any, Dict
|
||||
from typing import TYPE_CHECKING, Any, Dict
|
||||
|
||||
from loguru import logger
|
||||
from pipecat.serializers.call_strategies import HangupStrategy, TransferStrategy
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from .external_pbx import ExternalPBXAdapter
|
||||
|
||||
|
||||
class ARIBridgeSwapStrategy(TransferStrategy):
|
||||
"""Implements bridge swap transfer for Asterisk ARI.
|
||||
|
|
@ -200,6 +203,9 @@ class ARIBridgeSwapStrategy(TransferStrategy):
|
|||
class ARIHangupStrategy(HangupStrategy):
|
||||
"""Implements hangup for Asterisk ARI channels."""
|
||||
|
||||
def __init__(self, external_pbx_adapter: "ExternalPBXAdapter | None" = None):
|
||||
self._external_pbx_adapter = external_pbx_adapter
|
||||
|
||||
async def execute_hangup(self, context: Dict[str, Any]) -> bool:
|
||||
"""Hang up the Asterisk channel via ARI REST API."""
|
||||
try:
|
||||
|
|
@ -217,11 +223,9 @@ class ARIHangupStrategy(HangupStrategy):
|
|||
)
|
||||
return False
|
||||
|
||||
# If this call came from an upstream PBX (VICIdial), hang up its
|
||||
# customer leg via its API FIRST -- so the upstream manages its own
|
||||
# conference/remote-agent teardown cleanly instead of racing dograh's
|
||||
# SIP BYE -- THEN drop dograh's own leg below.
|
||||
await self._terminate_upstream_if_any(channel_id)
|
||||
# The external PBX owns the real customer leg. End it before the
|
||||
# local ARI leg so its conference teardown cannot race our SIP BYE.
|
||||
await self._terminate_external_pbx_if_any(channel_id)
|
||||
|
||||
endpoint = f"{ari_endpoint}/ari/channels/{channel_id}"
|
||||
auth = BasicAuth(app_name, app_password)
|
||||
|
|
@ -250,8 +254,8 @@ class ARIHangupStrategy(HangupStrategy):
|
|||
logger.exception(f"Failed to hang up Asterisk channel: {e}")
|
||||
return False
|
||||
|
||||
async def _terminate_upstream_if_any(self, channel_id: str) -> None:
|
||||
"""If this run came from an upstream PBX, hang up its customer leg via API.
|
||||
async def _terminate_external_pbx_if_any(self, channel_id: str) -> None:
|
||||
"""If configured, hang up the external PBX's customer leg first.
|
||||
|
||||
Reuses the same channel->run lookup the transfer strategy uses
|
||||
(Redis ``ari:channel:{id}`` -> run_id -> ``initial_context``). Best-effort:
|
||||
|
|
@ -262,7 +266,6 @@ class ARIHangupStrategy(HangupStrategy):
|
|||
|
||||
from api.constants import REDIS_URL
|
||||
from api.db import db_client
|
||||
from api.services.telephony.upstream_pbx import terminate_upstream_call
|
||||
|
||||
redis = aioredis.from_url(REDIS_URL, decode_responses=True)
|
||||
run_id = await redis.get(f"ari:channel:{channel_id}")
|
||||
|
|
@ -271,16 +274,48 @@ class ARIHangupStrategy(HangupStrategy):
|
|||
run = await db_client.get_workflow_run_by_id(int(run_id))
|
||||
if not run:
|
||||
return
|
||||
upstream = (run.initial_context or {}).get("upstream_pbx")
|
||||
# If the call was already transferred to the upstream PBX, the customer
|
||||
identity = (run.initial_context or {}).get("external_pbx_call")
|
||||
# Read the legacy key for calls created before this refactor.
|
||||
identity = identity or (run.initial_context or {}).get("upstream_pbx")
|
||||
# If the call was already transferred to the external PBX, the customer
|
||||
# leg has moved on -- do NOT hang it up (that would drop the transferred
|
||||
# customer); just let dograh's own legs tear down below.
|
||||
transferred = (run.gathered_context or {}).get("upstream_transferred")
|
||||
if upstream and not transferred:
|
||||
transferred = (run.gathered_context or {}).get("external_pbx_transferred")
|
||||
transferred = transferred or (run.gathered_context or {}).get(
|
||||
"upstream_transferred"
|
||||
)
|
||||
if identity and not transferred and self._external_pbx_adapter:
|
||||
from api.services.telephony.external_pbx import (
|
||||
resolve_external_pbx_field_mappings,
|
||||
)
|
||||
|
||||
workflow_configurations = (
|
||||
await db_client.get_workflow_run_configurations(
|
||||
int(run_id), run.workflow.organization_id
|
||||
)
|
||||
)
|
||||
field_updates = resolve_external_pbx_field_mappings(
|
||||
run.gathered_context,
|
||||
workflow_configurations.get("external_pbx_field_mappings", []),
|
||||
)
|
||||
if field_updates:
|
||||
update_result = await self._external_pbx_adapter.update_fields(
|
||||
identity, field_updates
|
||||
)
|
||||
if not update_result.ok:
|
||||
logger.warning(
|
||||
"[ARI Hangup] External PBX field update failed; "
|
||||
f"continuing hangup: {update_result.message}"
|
||||
)
|
||||
logger.info(
|
||||
f"[ARI Hangup] Upstream PBX call ({upstream.get('provider')}); "
|
||||
"[ARI Hangup] External PBX call "
|
||||
f"({self._external_pbx_adapter.type}); "
|
||||
f"terminating customer leg via API before dropping dograh leg"
|
||||
)
|
||||
await terminate_upstream_call(upstream)
|
||||
result = await self._external_pbx_adapter.hangup(identity)
|
||||
if not result.ok:
|
||||
logger.warning(
|
||||
f"[ARI Hangup] External PBX rejected hangup: {result.message}"
|
||||
)
|
||||
except Exception as e:
|
||||
logger.error(f"[ARI Hangup] upstream terminate check failed: {e}")
|
||||
logger.error(f"[ARI Hangup] external PBX terminate check failed: {e}")
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ from api.services.pipecat.audio_mixer import build_audio_out_mixer
|
|||
from api.services.pipecat.transport_params import realtime_param_overrides
|
||||
from api.services.telephony.factory import load_credentials_for_transport
|
||||
|
||||
from .external_pbx import create_adapter
|
||||
from .serializers import AsteriskFrameSerializer
|
||||
from .strategies import ARIBridgeSwapStrategy, ARIHangupStrategy
|
||||
|
||||
|
|
@ -47,7 +48,9 @@ async def create_transport(
|
|||
app_name=app_name,
|
||||
app_password=app_password,
|
||||
transfer_strategy=ARIBridgeSwapStrategy(),
|
||||
hangup_strategy=ARIHangupStrategy(),
|
||||
hangup_strategy=ARIHangupStrategy(
|
||||
external_pbx_adapter=create_adapter(config.get("external_pbx"))
|
||||
),
|
||||
params=AsteriskFrameSerializer.InputParams(
|
||||
asterisk_sample_rate=audio_config.transport_in_sample_rate,
|
||||
sample_rate=audio_config.pipeline_sample_rate,
|
||||
|
|
|
|||
|
|
@ -30,6 +30,22 @@ if TYPE_CHECKING:
|
|||
from api.services.telephony.base import TelephonyProvider
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ProviderUIOption:
|
||||
"""One selectable value for a provider configuration field."""
|
||||
|
||||
value: str
|
||||
label: str
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ProviderUICondition:
|
||||
"""Display a field only when another form value matches ``equals``."""
|
||||
|
||||
field: str
|
||||
equals: Any
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
class ProviderUIField:
|
||||
"""One form field for the telephony configuration UI.
|
||||
|
|
@ -46,6 +62,10 @@ class ProviderUIField:
|
|||
sensitive: bool = False # If true, mask when displaying stored value
|
||||
description: Optional[str] = None
|
||||
placeholder: Optional[str] = None
|
||||
options: Optional[List[ProviderUIOption]] = None
|
||||
visible_when: Optional[ProviderUICondition] = None
|
||||
section: Optional[str] = None
|
||||
feature_gate: Optional[str] = None
|
||||
|
||||
|
||||
@dataclass(frozen=True)
|
||||
|
|
|
|||
|
|
@ -1,386 +0,0 @@
|
|||
"""Upstream-PBX call control.
|
||||
|
||||
When a call originates on an upstream PBX (e.g. VICIdial) and is patched into
|
||||
dograh over a SIP trunk, the *customer's* real call leg lives on the upstream
|
||||
PBX, not on dograh's Asterisk -- dograh only owns its agent leg (the SIP leg
|
||||
into Stasis + the externalMedia WebSocket). So when the AI decides to hang up or
|
||||
transfer, dograh must tell the upstream PBX what to do via its API, and must do
|
||||
so BEFORE tearing down its own SIP leg -- otherwise the SIP BYE races the
|
||||
upstream PBX's own conference/remote-agent teardown and can leave it in an
|
||||
inconsistent state.
|
||||
|
||||
The upstream identity (the handle for these API calls) is captured off the
|
||||
inbound SIP headers in ari_manager and stored on the workflow run's
|
||||
``initial_context["upstream_pbx"]``. The adapter is selected per call by
|
||||
``upstream["provider"]``.
|
||||
|
||||
This deployment is VICIdial-focused; the FreeSWITCH adapter is retained but
|
||||
inert unless an upstream tags itself ``freeswitch`` (via ``X-PBX-*`` headers).
|
||||
Connection settings come from environment variables so the same image works
|
||||
against a PBX on another server (the api container reaches it over normal egress
|
||||
-- no shared ``pbx-net`` required):
|
||||
|
||||
VICIDIAL_API_URL e.g. http://vici.example.com/agc/api.php
|
||||
VICIDIAL_API_USER VICIdial API user
|
||||
VICIDIAL_API_PASS VICIdial API password
|
||||
VICIDIAL_API_SOURCE source tag sent to the API (default: dograh)
|
||||
|
||||
VICIDIAL_NON_AGENT_API_URL e.g. http://vici.example.com/vicidial/non_agent_api.php
|
||||
VICIDIAL_NON_AGENT_API_USER non-agent API user (distinct from the agent API)
|
||||
VICIDIAL_NON_AGENT_API_PASS non-agent API password
|
||||
VICIDIAL_NON_AGENT_API_SOURCE source tag sent to the non-agent API (default: dograh)
|
||||
|
||||
FREESWITCH_ESL_HOST FreeSWITCH Event Socket host (optional)
|
||||
FREESWITCH_ESL_PORT FreeSWITCH Event Socket port (default: 8021)
|
||||
FREESWITCH_ESL_PASSWORD FreeSWITCH ESL password (default: ClueCon)
|
||||
"""
|
||||
|
||||
import asyncio
|
||||
import os
|
||||
|
||||
import aiohttp
|
||||
from loguru import logger
|
||||
|
||||
# --- VICIdial agent-API connection (from env; remote-server friendly) ---
|
||||
_VICIDIAL_API_URL = os.getenv("VICIDIAL_API_URL", "")
|
||||
_VICIDIAL_API_USER = os.getenv("VICIDIAL_API_USER", "")
|
||||
_VICIDIAL_API_PASS = os.getenv("VICIDIAL_API_PASS", "")
|
||||
_VICIDIAL_API_SOURCE = os.getenv("VICIDIAL_API_SOURCE", "dograh")
|
||||
|
||||
# --- VICIdial non-agent API (update_lead etc.; separate endpoint + creds) ---
|
||||
_VICIDIAL_NON_AGENT_API_URL = os.getenv("VICIDIAL_NON_AGENT_API_URL", "")
|
||||
_VICIDIAL_NON_AGENT_API_USER = os.getenv("VICIDIAL_NON_AGENT_API_USER", "")
|
||||
_VICIDIAL_NON_AGENT_API_PASS = os.getenv("VICIDIAL_NON_AGENT_API_PASS", "")
|
||||
_VICIDIAL_NON_AGENT_API_SOURCE = os.getenv("VICIDIAL_NON_AGENT_API_SOURCE", "dograh")
|
||||
|
||||
# Extraction variables whose name starts with this prefix are forwarded to the
|
||||
# VICIdial non-agent ``update_lead`` API: the prefix is stripped to yield the
|
||||
# raw lead column name and the extracted value is sent as that column's value.
|
||||
# e.g. an extraction variable ``X-VICI-UPDATE-LEAD_address3`` with value ``Y``
|
||||
# becomes ``address3=Y`` on the lead. This lets a workflow plumb arbitrary,
|
||||
# conversation-derived fields into the VICIdial flow without code changes (see
|
||||
# ``collect_update_lead_fields``).
|
||||
UPDATE_LEAD_VAR_PREFIX = "X-VICI-UPDATE-LEAD_"
|
||||
|
||||
# API-control params that must never be overridden by a forwarded field -- a
|
||||
# variable named e.g. ``X-VICI-UPDATE-LEAD_function`` would otherwise hijack the
|
||||
# update_lead call. These are dropped (with a warning) from forwarded fields.
|
||||
_UPDATE_LEAD_RESERVED_FIELDS = frozenset(
|
||||
{"source", "user", "pass", "function", "lead_id"}
|
||||
)
|
||||
|
||||
_HTTP_TIMEOUT = aiohttp.ClientTimeout(total=8)
|
||||
|
||||
# --- FreeSWITCH ESL connection (from env; retained, inert unless used) ---
|
||||
# FreeSWITCH owns the customer leg; dograh drives hangup/transfer over the Event
|
||||
# Socket Library by the channel UUID captured from the X-PBX-UUID header.
|
||||
_FS_ESL_HOST = os.getenv("FREESWITCH_ESL_HOST", "")
|
||||
_FS_ESL_PORT = int(os.getenv("FREESWITCH_ESL_PORT", "8021"))
|
||||
_FS_ESL_PASSWORD = os.getenv("FREESWITCH_ESL_PASSWORD", "ClueCon")
|
||||
_FS_ESL_TIMEOUT = 8
|
||||
|
||||
|
||||
async def _ra_call_control(upstream: dict, stage: str, **extra) -> bool:
|
||||
"""Invoke VICIdial's agent API ``ra_call_control`` for the captured RA call.
|
||||
|
||||
The call is identified by ``value`` (the VICIdial callerid captured from the
|
||||
``X-VICIDIAL-callerid`` header) plus the remote-agent ``agent_user``.
|
||||
"""
|
||||
if not _VICIDIAL_API_URL:
|
||||
logger.warning(
|
||||
"[upstream_pbx] VICIDIAL_API_URL not configured — cannot drive "
|
||||
f"VICIdial {stage}"
|
||||
)
|
||||
return False
|
||||
params = {
|
||||
"source": _VICIDIAL_API_SOURCE,
|
||||
"user": _VICIDIAL_API_USER,
|
||||
"pass": _VICIDIAL_API_PASS,
|
||||
"agent_user": upstream.get("agent_user", ""),
|
||||
"function": "ra_call_control",
|
||||
"stage": stage,
|
||||
"value": upstream.get("callerid", ""),
|
||||
**extra,
|
||||
}
|
||||
try:
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.get(
|
||||
_VICIDIAL_API_URL, params=params, timeout=_HTTP_TIMEOUT
|
||||
) as resp:
|
||||
text = (await resp.text()).strip()
|
||||
ok = text.startswith("SUCCESS")
|
||||
logger.info(
|
||||
f"[upstream_pbx] VICIdial ra_call_control {stage} "
|
||||
f"(agent_user={params['agent_user']}, value={params['value']}) -> {text}"
|
||||
)
|
||||
return ok
|
||||
except Exception as e:
|
||||
logger.error(f"[upstream_pbx] VICIdial ra_call_control {stage} failed: {e}")
|
||||
return False
|
||||
|
||||
|
||||
async def _non_agent_update_lead(lead_id: str, **fields) -> bool:
|
||||
"""Invoke VICIdial's non-agent API ``update_lead`` for one lead.
|
||||
|
||||
Uses the dedicated non-agent API endpoint/credentials (distinct from the
|
||||
agent API). ``fields`` are passed straight through as query params, e.g.
|
||||
``address3="Y"``.
|
||||
"""
|
||||
if not _VICIDIAL_NON_AGENT_API_URL:
|
||||
logger.warning(
|
||||
"[upstream_pbx] VICIDIAL_NON_AGENT_API_URL not configured — cannot "
|
||||
"update_lead"
|
||||
)
|
||||
return False
|
||||
if not lead_id:
|
||||
logger.warning(
|
||||
"[upstream_pbx] update_lead requested but no lead_id captured — skipping"
|
||||
)
|
||||
return False
|
||||
# ``fields`` is spread first so the API-control params below always win even
|
||||
# if a forwarded field collides with one of them (defense in depth; the
|
||||
# collector also drops reserved names).
|
||||
params = {
|
||||
**fields,
|
||||
"source": _VICIDIAL_NON_AGENT_API_SOURCE,
|
||||
"user": _VICIDIAL_NON_AGENT_API_USER,
|
||||
"pass": _VICIDIAL_NON_AGENT_API_PASS,
|
||||
"function": "update_lead",
|
||||
"lead_id": lead_id,
|
||||
}
|
||||
try:
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.get(
|
||||
_VICIDIAL_NON_AGENT_API_URL, params=params, timeout=_HTTP_TIMEOUT
|
||||
) as resp:
|
||||
text = (await resp.text()).strip()
|
||||
ok = text.startswith("SUCCESS")
|
||||
logger.info(
|
||||
f"[upstream_pbx] VICIdial update_lead (lead_id={lead_id}, "
|
||||
f"fields={fields}) -> {text}"
|
||||
)
|
||||
return ok
|
||||
except Exception as e:
|
||||
logger.error(f"[upstream_pbx] VICIdial update_lead failed: {e}")
|
||||
return False
|
||||
|
||||
|
||||
def collect_update_lead_fields(gathered_context: dict) -> dict:
|
||||
"""Map ``X-VICI-UPDATE-LEAD_<field>`` extracted variables to update_lead fields.
|
||||
|
||||
Scans a workflow run's gathered context (its ``extracted_variables`` map) for
|
||||
variables named with the :data:`UPDATE_LEAD_VAR_PREFIX` prefix and returns
|
||||
``{<field>: <value>}`` for each one that has a non-empty value. The prefix is
|
||||
stripped to yield the raw VICIdial lead column (e.g.
|
||||
``X-VICI-UPDATE-LEAD_address3`` -> ``address3``).
|
||||
|
||||
Empty/None values are skipped so we never blank out an existing lead column,
|
||||
and reserved API-control params are dropped so a stray variable name cannot
|
||||
hijack the update_lead request.
|
||||
"""
|
||||
if not gathered_context:
|
||||
return {}
|
||||
extracted = gathered_context.get("extracted_variables")
|
||||
if not isinstance(extracted, dict):
|
||||
return {}
|
||||
|
||||
fields: dict[str, str] = {}
|
||||
for key, value in extracted.items():
|
||||
if not isinstance(key, str) or not key.startswith(UPDATE_LEAD_VAR_PREFIX):
|
||||
continue
|
||||
field = key[len(UPDATE_LEAD_VAR_PREFIX) :].strip()
|
||||
if not field or value is None:
|
||||
continue
|
||||
text = str(value).strip()
|
||||
if not text:
|
||||
continue
|
||||
if field in _UPDATE_LEAD_RESERVED_FIELDS:
|
||||
logger.warning(
|
||||
f"[upstream_pbx] Ignoring reserved update_lead field '{field}' "
|
||||
f"from variable '{key}'"
|
||||
)
|
||||
continue
|
||||
fields[field] = text
|
||||
return fields
|
||||
|
||||
|
||||
async def update_upstream_lead(upstream: dict, fields: dict) -> bool:
|
||||
"""Update the upstream lead with ``fields`` before a transfer.
|
||||
|
||||
Dispatched by provider; currently only VICIdial (via the non-agent
|
||||
``update_lead`` API). ``fields`` maps VICIdial lead column -> value, e.g.
|
||||
``{"address3": "Y"}`` (typically built by
|
||||
:func:`collect_update_lead_fields` from the run's extracted variables).
|
||||
Best-effort: never blocks the transfer if it fails.
|
||||
"""
|
||||
if not upstream or not fields:
|
||||
return False
|
||||
if upstream.get("provider") == "vicidial":
|
||||
return await _non_agent_update_lead(upstream.get("lead_id", ""), **fields)
|
||||
return False
|
||||
|
||||
|
||||
async def _fs_esl_api(command: str) -> tuple[bool, str]:
|
||||
"""Run a FreeSWITCH ``api`` command over the Event Socket (inbound mode).
|
||||
|
||||
Connects, authenticates, issues ``api <command>`` and returns
|
||||
``(ok, response_body)`` where ok is True when FreeSWITCH replied ``+OK``.
|
||||
"""
|
||||
if not _FS_ESL_HOST:
|
||||
logger.warning("[upstream_pbx] FREESWITCH_ESL_HOST not configured")
|
||||
return False, ""
|
||||
|
||||
async def _run() -> tuple[bool, str]:
|
||||
reader, writer = await asyncio.open_connection(_FS_ESL_HOST, _FS_ESL_PORT)
|
||||
try:
|
||||
await reader.readuntil(b"\n\n") # "Content-Type: auth/request"
|
||||
writer.write(f"auth {_FS_ESL_PASSWORD}\n\n".encode())
|
||||
await writer.drain()
|
||||
await reader.readuntil(b"\n\n") # auth command/reply
|
||||
writer.write(f"api {command}\n\n".encode())
|
||||
await writer.drain()
|
||||
headers = (await reader.readuntil(b"\n\n")).decode(errors="replace")
|
||||
length = 0
|
||||
for line in headers.splitlines():
|
||||
if line.lower().startswith("content-length:"):
|
||||
length = int(line.split(":", 1)[1].strip())
|
||||
body = (
|
||||
(await reader.readexactly(length)).decode(errors="replace")
|
||||
if length
|
||||
else ""
|
||||
)
|
||||
return body.startswith("+OK"), body.strip()
|
||||
finally:
|
||||
writer.close()
|
||||
try:
|
||||
await writer.wait_closed()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
try:
|
||||
return await asyncio.wait_for(_run(), timeout=_FS_ESL_TIMEOUT)
|
||||
except Exception as e:
|
||||
logger.error(f"[upstream_pbx] FreeSWITCH ESL '{command}' failed: {e}")
|
||||
return False, ""
|
||||
|
||||
|
||||
async def _fs_uuid_kill(upstream: dict) -> bool:
|
||||
uuid = upstream.get("uuid", "")
|
||||
if not uuid:
|
||||
return False
|
||||
ok, resp = await _fs_esl_api(f"uuid_kill {uuid}")
|
||||
logger.info(f"[upstream_pbx] FreeSWITCH uuid_kill {uuid} -> {resp or ok}")
|
||||
return ok
|
||||
|
||||
|
||||
async def _fs_uuid_transfer(upstream: dict, destination: str) -> bool:
|
||||
uuid = upstream.get("uuid", "")
|
||||
if not uuid:
|
||||
return False
|
||||
number = destination.split("/")[-1]
|
||||
# The customer leg is transferred into the FS dialplan extension
|
||||
# dograh_xfer_<number>, which bridges to that registered user/agent.
|
||||
ok, resp = await _fs_esl_api(
|
||||
f"uuid_transfer {uuid} dograh_xfer_{number} XML dograh-customer"
|
||||
)
|
||||
logger.info(
|
||||
f"[upstream_pbx] FreeSWITCH uuid_transfer {uuid} -> {number}: {resp or ok}"
|
||||
)
|
||||
return ok
|
||||
|
||||
|
||||
async def terminate_upstream_call(upstream: dict) -> bool:
|
||||
"""Hang up the upstream PBX's customer leg. Call this BEFORE dropping dograh's leg."""
|
||||
if not upstream:
|
||||
return False
|
||||
provider = upstream.get("provider")
|
||||
if provider == "vicidial":
|
||||
return await _ra_call_control(upstream, "HANGUP")
|
||||
if provider == "freeswitch":
|
||||
return await _fs_uuid_kill(upstream)
|
||||
return False
|
||||
|
||||
|
||||
async def transfer_upstream_call(upstream: dict, destination: str) -> bool:
|
||||
"""Transfer the upstream PBX's customer leg, dispatched by provider.
|
||||
|
||||
VICIdial: always INGROUPTRANSFER (these upstream customers are bounced back
|
||||
to a queue/agent group, never a bare extension). An explicit ``ingroup:<id>``
|
||||
destination picks that in-group; anything else (including a plain
|
||||
extension/number) falls back to the in-group the call arrived on (captured
|
||||
from the ``X-VICIDIAL-ingroup_id`` header).
|
||||
FreeSWITCH: uuid_transfer the customer leg to the FS dialplan extension that
|
||||
bridges to the target. (Both tolerate a leading ``PJSIP/`` in destination.)
|
||||
"""
|
||||
if not upstream:
|
||||
return False
|
||||
provider = upstream.get("provider")
|
||||
if provider == "vicidial":
|
||||
# An explicit "ingroup:<id>" destination names the in-group; everything
|
||||
# else defaults to the in-group the call arrived on.
|
||||
choice = ""
|
||||
if destination.startswith("ingroup"):
|
||||
_, _, choice = destination.partition(":")
|
||||
choice = choice.strip()
|
||||
if not choice or choice == "source":
|
||||
choice = upstream.get("ingroup_id", "")
|
||||
if not choice:
|
||||
logger.warning(
|
||||
"[upstream_pbx] VICIdial INGROUPTRANSFER requested but no in-group "
|
||||
f"id available (destination={destination!r}, captured ingroup_id "
|
||||
"is empty) -- not transferring"
|
||||
)
|
||||
return False
|
||||
return await _ra_call_control(
|
||||
upstream, "INGROUPTRANSFER", ingroup_choices=choice
|
||||
)
|
||||
if provider == "freeswitch":
|
||||
return await _fs_uuid_transfer(upstream, destination)
|
||||
return False
|
||||
|
||||
|
||||
# --- Hardcoded post-conversation routing (VICIdial "address3" disposition) ---
|
||||
# The workflow extracts ``X-VICI-UPDATE-LEAD_address3``; its final value decides
|
||||
# where the customer is sent once the AI conversation ends:
|
||||
# "Y" -> INGROUPTRANSFER into in-group "dograhtest1"
|
||||
# "N" -> INGROUPTRANSFER into in-group "dograhtest2"
|
||||
# anything else (including a missing/blank value) -> do NOT transfer; the
|
||||
# customer leg is hung up instead.
|
||||
# Matched case-insensitively on the stripped value.
|
||||
ADDRESS3_INGROUP_ROUTES = {
|
||||
"Y": "dograhtest1",
|
||||
"N": "dograhtest2",
|
||||
}
|
||||
|
||||
|
||||
async def route_upstream_after_call(upstream: dict, fields: dict) -> tuple[str, bool]:
|
||||
"""Dispatch the upstream customer leg from the extracted ``address3`` value.
|
||||
|
||||
Hardcoded business routing for VICIdial (see :data:`ADDRESS3_INGROUP_ROUTES`):
|
||||
an ``address3`` of "Y"/"N" bounces the customer into in-group
|
||||
``dograhtest1``/``dograhtest2`` respectively; any other value -- including a
|
||||
missing one -- is treated as "no transfer" and the customer leg is hung up.
|
||||
|
||||
``fields`` is the ``{lead_column: value}`` map built by
|
||||
:func:`collect_update_lead_fields` from the run's extracted variables.
|
||||
|
||||
Returns ``(action, ok)`` where ``action`` is ``"transfer"`` or ``"hangup"``
|
||||
(so the caller can tear down dograh's own leg appropriately) and ``ok`` is the
|
||||
upstream API result for that action.
|
||||
"""
|
||||
raw = (fields or {}).get("address3", "")
|
||||
address3 = str(raw).strip().upper()
|
||||
ingroup = ADDRESS3_INGROUP_ROUTES.get(address3)
|
||||
if ingroup:
|
||||
logger.info(
|
||||
f"[upstream_pbx] address3={raw!r} -> INGROUPTRANSFER to in-group "
|
||||
f"'{ingroup}'"
|
||||
)
|
||||
ok = await transfer_upstream_call(upstream, f"ingroup:{ingroup}")
|
||||
return "transfer", ok
|
||||
logger.info(
|
||||
f"[upstream_pbx] address3={raw!r} is not a routable disposition "
|
||||
"(expected Y or N) -- not transferring; hanging up the customer leg"
|
||||
)
|
||||
ok = await terminate_upstream_call(upstream)
|
||||
return "hangup", ok
|
||||
|
|
@ -20,6 +20,7 @@ from api.schemas.tool import (
|
|||
McpRefreshResponse,
|
||||
ToolResponse,
|
||||
)
|
||||
from api.services.organization_preferences import external_pbx_integrations_enabled
|
||||
from api.services.posthog_client import capture_event
|
||||
from api.services.workflow.mcp_tool_session import discover_mcp_tools
|
||||
from api.services.workflow.tools.mcp_tool import (
|
||||
|
|
@ -119,6 +120,41 @@ async def validate_tool_credential_references(
|
|||
)
|
||||
|
||||
|
||||
async def validate_external_pbx_tool_definition(
|
||||
definition: dict[str, Any],
|
||||
*,
|
||||
organization_id: int,
|
||||
existing_definition: Optional[dict[str, Any]] = None,
|
||||
) -> None:
|
||||
"""Enforce the org feature gate for context-to-in-group routing."""
|
||||
|
||||
config = definition.get("config")
|
||||
existing_config = (existing_definition or {}).get("config")
|
||||
uses_external_pbx = (
|
||||
isinstance(config, dict)
|
||||
and config.get("destination_source") == "context_mapping"
|
||||
)
|
||||
existing_uses_external_pbx = (
|
||||
isinstance(existing_config, dict)
|
||||
and existing_config.get("destination_source") == "context_mapping"
|
||||
)
|
||||
if not uses_external_pbx and not existing_uses_external_pbx:
|
||||
return
|
||||
if await external_pbx_integrations_enabled(organization_id):
|
||||
return
|
||||
if isinstance(existing_config, dict) and existing_config == config:
|
||||
# Preserve a hidden existing mapping while the feature is disabled.
|
||||
return
|
||||
raise ToolManagementError(
|
||||
"external_pbx_feature_disabled",
|
||||
(
|
||||
"External PBX integrations are disabled for this organization. "
|
||||
"Enable them in Platform Settings before configuring in-group routing."
|
||||
),
|
||||
status_code=403,
|
||||
)
|
||||
|
||||
|
||||
async def populate_discovered_tools(
|
||||
definition: dict[str, Any], *, organization_id: int
|
||||
) -> dict[str, Any]:
|
||||
|
|
@ -168,6 +204,9 @@ async def create_tool_for_user(
|
|||
)
|
||||
|
||||
definition = request.definition.model_dump()
|
||||
await validate_external_pbx_tool_definition(
|
||||
definition, organization_id=user.selected_organization_id
|
||||
)
|
||||
await validate_tool_credential_references(
|
||||
definition, organization_id=user.selected_organization_id
|
||||
)
|
||||
|
|
|
|||
|
|
@ -517,11 +517,11 @@ class PipecatEngine:
|
|||
Awaits any background extractions still running from previous nodes,
|
||||
then runs the current node's extraction inline so callers that need the
|
||||
freshest extracted variables before acting can rely on them -- e.g.
|
||||
end_call_with_reason before disposing the call, or an upstream-PBX
|
||||
transfer that maps extracted variables into the VICIdial update_lead
|
||||
end_call_with_reason before disposing the call, or an external-PBX
|
||||
transfer that maps extracted variables into a provider lead update
|
||||
call before handing the customer off.
|
||||
|
||||
Idempotent: only the first call does work. The upstream-PBX transfer
|
||||
Idempotent: only the first call does work. The external-PBX transfer
|
||||
runs this just before forwarding update_lead, so the subsequent
|
||||
end_call_with_reason would otherwise re-extract the same terminal state.
|
||||
"""
|
||||
|
|
@ -788,6 +788,20 @@ class PipecatEngine:
|
|||
call_tags.append(call_disposition)
|
||||
self._gathered_context["call_tags"] = call_tags
|
||||
|
||||
# Hangup strategies run while serializing the terminal frame. Persist
|
||||
# the final extracted values first so external-PBX adapters can apply
|
||||
# workflow lead-field mappings before terminating the customer leg.
|
||||
try:
|
||||
await db_client.update_workflow_run(
|
||||
run_id=self._workflow_run_id,
|
||||
gathered_context=self._gathered_context,
|
||||
)
|
||||
except Exception as exc:
|
||||
# Call teardown must never be held hostage by an enrichment write.
|
||||
logger.warning(
|
||||
f"Could not persist final gathered context before hangup: {exc}"
|
||||
)
|
||||
|
||||
logger.debug(
|
||||
f"Finishing run with reason: {reason}, disposition: {call_disposition} "
|
||||
f"queueing frame {frame_to_push}"
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ from api.db import db_client
|
|||
from api.enums import ToolCategory, WorkflowRunMode
|
||||
from api.services.pipecat.audio_playback import play_audio, play_audio_loop
|
||||
from api.services.telephony.call_transfer_manager import get_call_transfer_manager
|
||||
from api.services.telephony.external_pbx import resolve_external_pbx_field_mappings
|
||||
from api.services.telephony.factory import get_telephony_provider_for_run
|
||||
from api.services.telephony.transfer_event_protocol import TransferContext
|
||||
from api.services.workflow.tools.calculator import get_calculator_tools, safe_calculator
|
||||
|
|
@ -609,6 +610,18 @@ class CustomToolManager:
|
|||
)
|
||||
return
|
||||
|
||||
external_pbx_call = (
|
||||
getattr(workflow_run, "initial_context", None) or {}
|
||||
).get("external_pbx_call")
|
||||
# Compatibility for calls that started before the migration.
|
||||
external_pbx_call = external_pbx_call or (
|
||||
getattr(workflow_run, "initial_context", None) or {}
|
||||
).get("upstream_pbx")
|
||||
if external_pbx_call:
|
||||
# Context-to-in-group and lead-field mappings must see the
|
||||
# final conversation-derived values.
|
||||
await self._engine.perform_final_variable_extraction()
|
||||
|
||||
resolver = config.get("resolver") if isinstance(config, dict) else None
|
||||
is_dynamic_transfer = config.get(
|
||||
"destination_source", "static"
|
||||
|
|
@ -661,6 +674,26 @@ class CustomToolManager:
|
|||
)
|
||||
return
|
||||
|
||||
if (
|
||||
resolved_transfer.source == "context_mapping"
|
||||
and not external_pbx_call
|
||||
):
|
||||
clear_transfer_setup_mute_state()
|
||||
await self._handle_transfer_result(
|
||||
{
|
||||
"status": "failed",
|
||||
"message": (
|
||||
"This call did not arrive through the configured "
|
||||
"external PBX."
|
||||
),
|
||||
"action": "transfer_failed",
|
||||
"reason": "external_pbx_call_required",
|
||||
},
|
||||
function_call_params,
|
||||
properties,
|
||||
)
|
||||
return
|
||||
|
||||
# Validate destination phone number
|
||||
if not destination or not destination.strip():
|
||||
validation_error_result = {
|
||||
|
|
@ -675,6 +708,10 @@ class CustomToolManager:
|
|||
)
|
||||
return
|
||||
|
||||
provider = await get_telephony_provider_for_run(
|
||||
workflow_run, organization_id
|
||||
)
|
||||
|
||||
if resolved_transfer.message:
|
||||
await self._engine.task.queue_frame(
|
||||
TTSSpeakFrame(
|
||||
|
|
@ -689,95 +726,52 @@ class CustomToolManager:
|
|||
if played:
|
||||
self._engine._queued_speech_mute_state = "waiting"
|
||||
|
||||
# Upstream-PBX (VICIdial) call: the customer's real leg lives on
|
||||
# the upstream PBX, so transfer it via the upstream API
|
||||
# (ra_call_control EXTENSIONTRANSFER / INGROUPTRANSFER) instead of
|
||||
# dograh's ARI bridge-swap, which assumes dograh owns both legs.
|
||||
upstream = (getattr(workflow_run, "initial_context", None) or {}).get(
|
||||
"upstream_pbx"
|
||||
)
|
||||
if upstream:
|
||||
from api.services.telephony.upstream_pbx import (
|
||||
collect_update_lead_fields,
|
||||
route_upstream_after_call,
|
||||
update_upstream_lead,
|
||||
)
|
||||
|
||||
# Extract variables right before the transfer so any
|
||||
# X-VICI-UPDATE-LEAD_* values reflect the final conversation
|
||||
# state, then forward them to the upstream PBX's update_lead
|
||||
# BEFORE handing the customer off. This lets a workflow plumb
|
||||
# arbitrary, conversation-derived fields into the VICIdial
|
||||
# lead. Best-effort: never blocks the transfer.
|
||||
await self._engine.perform_final_variable_extraction()
|
||||
update_fields = collect_update_lead_fields(
|
||||
self._engine._gathered_context
|
||||
)
|
||||
logger.info(
|
||||
f"[transfer] update_lead fields from extracted "
|
||||
f"variables: {update_fields}"
|
||||
)
|
||||
if update_fields:
|
||||
await update_upstream_lead(upstream, update_fields)
|
||||
|
||||
# Hardcoded address3 routing (see route_upstream_after_call):
|
||||
# "Y"/"N" transfer the customer into in-group
|
||||
# dograhtest1/dograhtest2; anything else hangs the customer up
|
||||
# instead of transferring. The resolved destination is
|
||||
# intentionally ignored for upstream calls.
|
||||
action, ok = await route_upstream_after_call(
|
||||
upstream, update_fields
|
||||
)
|
||||
if action == "transfer":
|
||||
# Mark the run so the end-of-call hangup does NOT also hang
|
||||
# up the now-transferred customer (see ARIHangupStrategy).
|
||||
await db_client.update_workflow_run(
|
||||
run_id=self._engine._workflow_run_id,
|
||||
gathered_context={"upstream_transferred": True},
|
||||
if external_pbx_call:
|
||||
workflow_configurations = (
|
||||
await db_client.get_workflow_run_configurations(
|
||||
self._engine._workflow_run_id, organization_id
|
||||
)
|
||||
await function_call_params.result_callback(
|
||||
{
|
||||
"status": "success" if ok else "failed",
|
||||
"action": "upstream_transfer",
|
||||
"message": (
|
||||
"Transferring your call now."
|
||||
if ok
|
||||
else "I'm sorry, I couldn't complete the transfer."
|
||||
),
|
||||
},
|
||||
properties=properties,
|
||||
)
|
||||
if ok:
|
||||
# Give the upstream PBX time to redirect the customer
|
||||
# out of the conference toward the in-group BEFORE we
|
||||
# drop dograh's own leg -- otherwise the teardown races
|
||||
# the redirect and cancels the customer's call (it
|
||||
# never rings).
|
||||
)
|
||||
field_updates = resolve_external_pbx_field_mappings(
|
||||
self._engine._gathered_context,
|
||||
workflow_configurations.get("external_pbx_field_mappings", []),
|
||||
)
|
||||
external_result = await provider.transfer_external_pbx_call(
|
||||
identity=external_pbx_call,
|
||||
destination=destination,
|
||||
field_updates=field_updates,
|
||||
)
|
||||
if external_result is not None:
|
||||
clear_transfer_setup_mute_state()
|
||||
if external_result.get("status") == "success":
|
||||
self._engine._gathered_context[
|
||||
"external_pbx_transferred"
|
||||
] = True
|
||||
await db_client.update_workflow_run(
|
||||
run_id=self._engine._workflow_run_id,
|
||||
gathered_context={"external_pbx_transferred": True},
|
||||
)
|
||||
await function_call_params.result_callback(
|
||||
external_result, properties=properties
|
||||
)
|
||||
# Let VICIdial redirect the customer out of its
|
||||
# conference before Dograh tears down the local leg.
|
||||
await asyncio.sleep(4)
|
||||
else:
|
||||
# address3 wasn't Y/N: route_upstream_after_call already
|
||||
# hung up the customer leg. Leave upstream_transferred
|
||||
# unset so the end-of-call teardown re-confirms the hangup
|
||||
# (a no-op if it already succeeded, a retry if it didn't).
|
||||
await function_call_params.result_callback(
|
||||
{
|
||||
"status": "success",
|
||||
"action": "upstream_hangup",
|
||||
"message": "Ending the call now.",
|
||||
},
|
||||
properties=properties,
|
||||
)
|
||||
# Tear down dograh's own legs; the customer leg has already
|
||||
# been handled on the upstream PBX side.
|
||||
await self._engine.end_call_with_reason(
|
||||
EndTaskReason.END_CALL_TOOL_REASON.value,
|
||||
abort_immediately=True,
|
||||
)
|
||||
return
|
||||
await self._engine.end_call_with_reason(
|
||||
EndTaskReason.END_CALL_TOOL_REASON.value,
|
||||
abort_immediately=True,
|
||||
)
|
||||
else:
|
||||
await self._handle_transfer_result(
|
||||
{
|
||||
**external_result,
|
||||
"action": "transfer_failed",
|
||||
},
|
||||
function_call_params,
|
||||
properties,
|
||||
)
|
||||
return
|
||||
|
||||
provider = await get_telephony_provider_for_run(
|
||||
workflow_run, organization_id
|
||||
)
|
||||
if not provider.supports_transfers() or not provider.validate_config():
|
||||
validation_error_result = {
|
||||
"status": "failed",
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@ import httpx
|
|||
from loguru import logger
|
||||
|
||||
from api.db import db_client
|
||||
from api.services.organization_preferences import external_pbx_integrations_enabled
|
||||
from api.services.workflow.tools.custom_tool import _resolve_preset_parameters
|
||||
from api.utils.credential_auth import build_auth_header
|
||||
from api.utils.template_renderer import render_template
|
||||
|
|
@ -123,6 +124,70 @@ def _resolve_static_transfer(
|
|||
)
|
||||
|
||||
|
||||
def _context_value(
|
||||
path: str,
|
||||
call_context_vars: Optional[Dict[str, Any]],
|
||||
gathered_context_vars: Optional[Dict[str, Any]],
|
||||
) -> Any:
|
||||
initial = call_context_vars or {}
|
||||
gathered = gathered_context_vars or {}
|
||||
normalized = path.strip()
|
||||
if normalized.startswith("initial_context."):
|
||||
current: Any = initial
|
||||
parts = normalized.removeprefix("initial_context.").split(".")
|
||||
elif normalized.startswith("gathered_context."):
|
||||
current = gathered
|
||||
parts = normalized.removeprefix("gathered_context.").split(".")
|
||||
else:
|
||||
current = gathered
|
||||
parts = normalized.split(".")
|
||||
|
||||
for part in parts:
|
||||
if not isinstance(current, dict):
|
||||
return None
|
||||
current = current.get(part)
|
||||
if current is None and "." not in normalized:
|
||||
extracted = gathered.get("extracted_variables")
|
||||
if isinstance(extracted, dict):
|
||||
current = extracted.get(normalized)
|
||||
return current
|
||||
|
||||
|
||||
def _resolve_context_mapping_transfer(
|
||||
config: dict[str, Any],
|
||||
call_context_vars: Optional[Dict[str, Any]],
|
||||
gathered_context_vars: Optional[Dict[str, Any]],
|
||||
) -> ResolvedTransferConfig:
|
||||
mapping = config.get("context_mapping")
|
||||
if not isinstance(mapping, dict):
|
||||
raise TransferResolutionError(
|
||||
"invalid_context_mapping", "Transfer context mapping is missing"
|
||||
)
|
||||
path = str(mapping.get("context_path", "")).strip()
|
||||
raw_value = _context_value(path, call_context_vars, gathered_context_vars)
|
||||
match_value = "" if raw_value is None else str(raw_value).strip().casefold()
|
||||
destination = ""
|
||||
for route in mapping.get("routes") or []:
|
||||
if not isinstance(route, dict):
|
||||
continue
|
||||
if str(route.get("context_value", "")).strip().casefold() == match_value:
|
||||
destination = str(route.get("destination", "")).strip()
|
||||
break
|
||||
if not destination:
|
||||
destination = str(mapping.get("fallback_destination") or "").strip()
|
||||
if not destination:
|
||||
raise TransferResolutionError(
|
||||
"no_context_mapping_match",
|
||||
f"No destination mapping matched gathered context path '{path}'",
|
||||
)
|
||||
return ResolvedTransferConfig(
|
||||
destination=destination,
|
||||
timeout_seconds=_base_timeout(config),
|
||||
source="context_mapping",
|
||||
metadata={"context_path": path, "matched": bool(match_value)},
|
||||
)
|
||||
|
||||
|
||||
def _resolver_arguments(
|
||||
*,
|
||||
resolver: dict[str, Any],
|
||||
|
|
@ -276,6 +341,25 @@ async def resolve_transfer_config(
|
|||
) -> ResolvedTransferConfig:
|
||||
"""Resolve transfer destination and options for a transfer tool call."""
|
||||
|
||||
destination_source = config.get("destination_source", "static")
|
||||
if destination_source == "context_mapping":
|
||||
if not organization_id or not await external_pbx_integrations_enabled(
|
||||
organization_id
|
||||
):
|
||||
raise TransferResolutionError(
|
||||
"external_pbx_feature_disabled",
|
||||
"External PBX integrations are disabled for this organization",
|
||||
)
|
||||
resolved = _resolve_context_mapping_transfer(
|
||||
config, call_context_vars, gathered_context_vars
|
||||
)
|
||||
logger.info(
|
||||
"Transfer destination resolved from context mapping "
|
||||
f"context_path={resolved.metadata.get('context_path')} "
|
||||
f"resolved={resolved}"
|
||||
)
|
||||
return resolved
|
||||
|
||||
resolver = config.get("resolver")
|
||||
if config.get("destination_source", "static") != "dynamic" or not isinstance(
|
||||
resolver, dict
|
||||
|
|
|
|||
206
api/tests/telephony/providers/ari/test_external_pbx.py
Normal file
206
api/tests/telephony/providers/ari/test_external_pbx.py
Normal file
|
|
@ -0,0 +1,206 @@
|
|||
from types import SimpleNamespace
|
||||
from unittest.mock import AsyncMock
|
||||
|
||||
import pytest
|
||||
import redis.asyncio as aioredis
|
||||
|
||||
from api.db import db_client
|
||||
from api.services.telephony.external_pbx import resolve_external_pbx_field_mappings
|
||||
from api.services.telephony.providers.ari.external_pbx import (
|
||||
ExternalPBXResult,
|
||||
create_adapter,
|
||||
)
|
||||
from api.services.telephony.providers.ari.strategies import ARIHangupStrategy
|
||||
from api.services.workflow.tools import transfer_resolver
|
||||
|
||||
|
||||
def _vicidial_config() -> dict:
|
||||
return {
|
||||
"type": "vicidial",
|
||||
"agent_api": {
|
||||
"url": "https://vici.example.com/agc/api.php",
|
||||
"username": "agent-api-user",
|
||||
"password": "secret",
|
||||
"source": "dograh",
|
||||
},
|
||||
"non_agent_api": {
|
||||
"url": "https://vici.example.com/vicidial/non_agent_api.php",
|
||||
"username": "lead-api-user",
|
||||
"password": "secret",
|
||||
"source": "dograh",
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_vicidial_adapter_captures_call_identity_from_headers():
|
||||
adapter = create_adapter(_vicidial_config())
|
||||
headers = {
|
||||
"X-VICIDIAL-callerid": "M123",
|
||||
"X-VICIDIAL-user": "remote-agent",
|
||||
"X-VICIDIAL-lead_id": "42",
|
||||
"X-VICIDIAL-campaign_id": "campaign",
|
||||
"X-VICIDIAL-ingroup_id": "source-group",
|
||||
}
|
||||
|
||||
async def read_header(name: str) -> str:
|
||||
return headers.get(name, "")
|
||||
|
||||
identity = await adapter.capture_call_identity(read_header)
|
||||
|
||||
assert identity == {
|
||||
"type": "vicidial",
|
||||
"callerid": "M123",
|
||||
"agent_user": "remote-agent",
|
||||
"lead_id": "42",
|
||||
"campaign_id": "campaign",
|
||||
"ingroup_id": "source-group",
|
||||
}
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_vicidial_adapter_resolves_source_ingroup(monkeypatch):
|
||||
adapter = create_adapter(_vicidial_config())
|
||||
call_control = AsyncMock(
|
||||
return_value=ExternalPBXResult(True, "ingrouptransfer", "ok")
|
||||
)
|
||||
monkeypatch.setattr(adapter, "_agent_call_control", call_control)
|
||||
|
||||
result = await adapter.transfer(
|
||||
{"callerid": "M123", "agent_user": "agent", "ingroup_id": "support"},
|
||||
"source",
|
||||
)
|
||||
|
||||
assert result.ok is True
|
||||
call_control.assert_awaited_once_with(
|
||||
{"callerid": "M123", "agent_user": "agent", "ingroup_id": "support"},
|
||||
"INGROUPTRANSFER",
|
||||
ingroup_choices="support",
|
||||
)
|
||||
|
||||
|
||||
def test_field_mapping_reads_extracted_variables_and_skips_empty_values():
|
||||
fields = resolve_external_pbx_field_mappings(
|
||||
{
|
||||
"extracted_variables": {"qualified": "yes", "empty": " "},
|
||||
"call_disposition": "completed",
|
||||
},
|
||||
[
|
||||
{"context_path": "qualified", "destination_field": "address3"},
|
||||
{"context_path": "empty", "destination_field": "comments"},
|
||||
{
|
||||
"context_path": "call_disposition",
|
||||
"destination_field": "status_notes",
|
||||
},
|
||||
],
|
||||
)
|
||||
|
||||
assert fields == {"address3": "yes", "status_notes": "completed"}
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_context_mapping_resolves_ingroup_destination(monkeypatch):
|
||||
monkeypatch.setattr(
|
||||
transfer_resolver,
|
||||
"external_pbx_integrations_enabled",
|
||||
AsyncMock(return_value=True),
|
||||
)
|
||||
|
||||
resolved = await transfer_resolver.resolve_transfer_config(
|
||||
tool=SimpleNamespace(tool_uuid="tool-1"),
|
||||
config={
|
||||
"destination_source": "context_mapping",
|
||||
"context_mapping": {
|
||||
"context_path": "qualified",
|
||||
"routes": [
|
||||
{"context_value": "YES", "destination": "sales"},
|
||||
],
|
||||
},
|
||||
},
|
||||
arguments={},
|
||||
call_context_vars={},
|
||||
gathered_context_vars={"extracted_variables": {"qualified": " yes "}},
|
||||
organization_id=7,
|
||||
workflow_run_id=11,
|
||||
)
|
||||
|
||||
assert resolved.destination == "sales"
|
||||
assert resolved.source == "context_mapping"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_context_mapping_is_disabled_at_runtime(monkeypatch):
|
||||
monkeypatch.setattr(
|
||||
transfer_resolver,
|
||||
"external_pbx_integrations_enabled",
|
||||
AsyncMock(return_value=False),
|
||||
)
|
||||
|
||||
with pytest.raises(
|
||||
transfer_resolver.TransferResolutionError,
|
||||
match="External PBX integrations are disabled",
|
||||
):
|
||||
await transfer_resolver.resolve_transfer_config(
|
||||
tool=SimpleNamespace(tool_uuid="tool-1"),
|
||||
config={
|
||||
"destination_source": "context_mapping",
|
||||
"context_mapping": {
|
||||
"context_path": "qualified",
|
||||
"routes": [
|
||||
{"context_value": "yes", "destination": "sales"},
|
||||
],
|
||||
},
|
||||
},
|
||||
arguments={},
|
||||
call_context_vars={},
|
||||
gathered_context_vars={"qualified": "yes"},
|
||||
organization_id=7,
|
||||
workflow_run_id=11,
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_hangup_strategy_updates_lead_before_customer_leg(monkeypatch):
|
||||
redis = AsyncMock()
|
||||
redis.get.return_value = "11"
|
||||
monkeypatch.setattr(aioredis, "from_url", lambda *args, **kwargs: redis)
|
||||
run = SimpleNamespace(
|
||||
initial_context={
|
||||
"external_pbx_call": {
|
||||
"type": "vicidial",
|
||||
"callerid": "M123",
|
||||
"agent_user": "agent",
|
||||
"lead_id": "42",
|
||||
}
|
||||
},
|
||||
gathered_context={"extracted_variables": {"qualified": "yes"}},
|
||||
workflow=SimpleNamespace(organization_id=7),
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
db_client, "get_workflow_run_by_id", AsyncMock(return_value=run)
|
||||
)
|
||||
monkeypatch.setattr(
|
||||
db_client,
|
||||
"get_workflow_run_configurations",
|
||||
AsyncMock(
|
||||
return_value={
|
||||
"external_pbx_field_mappings": [
|
||||
{"context_path": "qualified", "destination_field": "address3"}
|
||||
]
|
||||
}
|
||||
),
|
||||
)
|
||||
adapter = SimpleNamespace(
|
||||
type="vicidial",
|
||||
update_fields=AsyncMock(
|
||||
return_value=ExternalPBXResult(True, "update_lead", "ok")
|
||||
),
|
||||
hangup=AsyncMock(return_value=ExternalPBXResult(True, "hangup", "ok")),
|
||||
)
|
||||
|
||||
await ARIHangupStrategy(adapter)._terminate_external_pbx_if_any("channel-1")
|
||||
|
||||
adapter.update_fields.assert_awaited_once_with(
|
||||
run.initial_context["external_pbx_call"], {"address3": "yes"}
|
||||
)
|
||||
adapter.hangup.assert_awaited_once_with(run.initial_context["external_pbx_call"])
|
||||
117
api/tests/telephony/test_external_pbx_configuration.py
Normal file
117
api/tests/telephony/test_external_pbx_configuration.py
Normal file
|
|
@ -0,0 +1,117 @@
|
|||
from unittest.mock import AsyncMock
|
||||
|
||||
import pytest
|
||||
from fastapi import HTTPException
|
||||
|
||||
from api.routes import organization
|
||||
from api.services import tool_management
|
||||
|
||||
|
||||
def _credentials(password: str = "agent-secret") -> dict:
|
||||
return {
|
||||
"ari_endpoint": "https://asterisk.example.com",
|
||||
"app_name": "dograh",
|
||||
"app_password": "ari-secret",
|
||||
"external_pbx": {
|
||||
"type": "vicidial",
|
||||
"agent_api": {
|
||||
"url": "https://vici.example.com/agc/api.php",
|
||||
"username": "agent-user",
|
||||
"password": password,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
def test_nested_external_pbx_secrets_are_masked_without_mutating_source():
|
||||
credentials = _credentials()
|
||||
|
||||
masked = organization._mask_sensitive("ari", credentials)
|
||||
|
||||
assert masked["app_password"] != "ari-secret"
|
||||
assert masked["external_pbx"]["agent_api"]["password"] != "agent-secret"
|
||||
assert credentials["external_pbx"]["agent_api"]["password"] == "agent-secret"
|
||||
|
||||
|
||||
def test_nested_masked_external_pbx_secrets_are_restored_on_update():
|
||||
existing = _credentials()
|
||||
request = organization._mask_sensitive("ari", existing)
|
||||
|
||||
organization.preserve_masked_fields("ari", request, existing)
|
||||
|
||||
assert request["app_password"] == "ari-secret"
|
||||
assert request["external_pbx"]["agent_api"]["password"] == "agent-secret"
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_disabled_feature_allows_unchanged_telephony_configuration(monkeypatch):
|
||||
monkeypatch.setattr(
|
||||
organization,
|
||||
"external_pbx_integrations_enabled",
|
||||
AsyncMock(return_value=False),
|
||||
)
|
||||
existing = _credentials()
|
||||
|
||||
await organization._enforce_external_pbx_feature(
|
||||
7,
|
||||
"ari",
|
||||
_credentials(),
|
||||
existing_credentials=existing,
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_disabled_feature_rejects_removing_telephony_configuration(monkeypatch):
|
||||
monkeypatch.setattr(
|
||||
organization,
|
||||
"external_pbx_integrations_enabled",
|
||||
AsyncMock(return_value=False),
|
||||
)
|
||||
|
||||
with pytest.raises(HTTPException) as exc_info:
|
||||
await organization._enforce_external_pbx_feature(
|
||||
7,
|
||||
"ari",
|
||||
{"external_pbx": None},
|
||||
existing_credentials=_credentials(),
|
||||
)
|
||||
|
||||
assert exc_info.value.status_code == 403
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_disabled_feature_preserves_existing_tool_mapping(monkeypatch):
|
||||
monkeypatch.setattr(
|
||||
tool_management,
|
||||
"external_pbx_integrations_enabled",
|
||||
AsyncMock(return_value=False),
|
||||
)
|
||||
definition = {
|
||||
"type": "transfer_call",
|
||||
"config": {
|
||||
"destination_source": "context_mapping",
|
||||
"context_mapping": {
|
||||
"context_path": "qualified",
|
||||
"routes": [{"context_value": "yes", "destination": "sales"}],
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
await tool_management.validate_external_pbx_tool_definition(
|
||||
definition,
|
||||
organization_id=7,
|
||||
existing_definition=definition,
|
||||
)
|
||||
|
||||
changed = {
|
||||
"type": "transfer_call",
|
||||
"config": {"destination_source": "static", "destination": "+15555550100"},
|
||||
}
|
||||
with pytest.raises(tool_management.ToolManagementError) as exc_info:
|
||||
await tool_management.validate_external_pbx_tool_definition(
|
||||
changed,
|
||||
organization_id=7,
|
||||
existing_definition=definition,
|
||||
)
|
||||
|
||||
assert exc_info.value.status_code == 403
|
||||
|
|
@ -42,3 +42,39 @@ def test_transfer_call_dynamic_accepts_resolver_without_destination():
|
|||
assert config.destination_source == "dynamic"
|
||||
assert config.destination == ""
|
||||
assert config.resolver is not None
|
||||
|
||||
|
||||
def test_transfer_call_context_mapping_requires_mapping():
|
||||
with pytest.raises(ValueError, match="context_mapping is required"):
|
||||
TransferCallConfig(destination_source="context_mapping")
|
||||
|
||||
|
||||
def test_transfer_call_context_mapping_accepts_unique_routes():
|
||||
config = TransferCallConfig(
|
||||
destination_source="context_mapping",
|
||||
context_mapping={
|
||||
"context_path": "qualified",
|
||||
"routes": [
|
||||
{"context_value": "yes", "destination": "sales"},
|
||||
{"context_value": "no", "destination": "support"},
|
||||
],
|
||||
"fallback_destination": "source",
|
||||
},
|
||||
)
|
||||
|
||||
assert config.context_mapping is not None
|
||||
assert config.context_mapping.routes[0].destination == "sales"
|
||||
|
||||
|
||||
def test_transfer_call_context_mapping_rejects_duplicate_values_case_insensitively():
|
||||
with pytest.raises(ValueError, match="must be unique"):
|
||||
TransferCallConfig(
|
||||
destination_source="context_mapping",
|
||||
context_mapping={
|
||||
"context_path": "qualified",
|
||||
"routes": [
|
||||
{"context_value": "Yes", "destination": "sales"},
|
||||
{"context_value": "yes", "destination": "support"},
|
||||
],
|
||||
},
|
||||
)
|
||||
|
|
|
|||
|
|
@ -59,3 +59,22 @@ def test_cap_stays_within_concurrency_stale_timeout():
|
|||
from api.services.campaign.rate_limiter import rate_limiter
|
||||
|
||||
assert MAX_CALL_DURATION_SECONDS <= rate_limiter.stale_call_timeout
|
||||
|
||||
|
||||
def test_external_pbx_field_mapping_is_validated():
|
||||
config = WorkflowConfigurationDefaults(
|
||||
external_pbx_field_mappings=[
|
||||
{"context_path": "qualified", "destination_field": "address3"}
|
||||
]
|
||||
)
|
||||
|
||||
assert config.external_pbx_field_mappings[0].destination_field == "address3"
|
||||
|
||||
|
||||
def test_external_pbx_field_mapping_rejects_invalid_field_names():
|
||||
with pytest.raises(ValidationError, match="destination_field"):
|
||||
WorkflowConfigurationDefaults(
|
||||
external_pbx_field_mappings=[
|
||||
{"context_path": "qualified", "destination_field": "invalid-field"}
|
||||
]
|
||||
)
|
||||
|
|
|
|||
|
|
@ -2,11 +2,6 @@
|
|||
# Overrides docker-compose.yaml to build api and ui images from local source
|
||||
# instead of pulling them from a registry. Remove this file to revert to
|
||||
# pulling prebuilt images.
|
||||
#
|
||||
# NOTE: VICIdial now runs on a SEPARATE server, so there is no shared pbx-net —
|
||||
# the api container reaches VICIdial's agent API over normal egress (set
|
||||
# VICIDIAL_API_URL in .env). If setup_remote.sh regenerates this file it only
|
||||
# restores the build blocks below, which is exactly what we want.
|
||||
services:
|
||||
api:
|
||||
build:
|
||||
|
|
|
|||
|
|
@ -207,24 +207,6 @@ services:
|
|||
# from this value and nginx load-balances across them with least_conn.
|
||||
FASTAPI_WORKERS: "${FASTAPI_WORKERS:-1}"
|
||||
|
||||
# VICIdial call control. When an inbound call is patched in from VICIdial
|
||||
# over the SIP trunk, the customer's real leg lives THERE, not on dograh's
|
||||
# Asterisk — so the AI's hangup/transfer is driven via VICIdial's agent API
|
||||
# (api/services/telephony/upstream_pbx.py). VICIdial runs on a SEPARATE
|
||||
# server: point these at its reachable agent API (the api container reaches
|
||||
# it over normal egress). Leave VICIDIAL_API_URL unset to disable.
|
||||
VICIDIAL_API_URL: "${VICIDIAL_API_URL:-}"
|
||||
VICIDIAL_API_USER: "${VICIDIAL_API_USER:-}"
|
||||
VICIDIAL_API_PASS: "${VICIDIAL_API_PASS:-}"
|
||||
VICIDIAL_API_SOURCE: "${VICIDIAL_API_SOURCE:-dograh}"
|
||||
# VICIdial non-agent API (update_lead, e.g. tagging address3=MEDICAID=Y
|
||||
# before a transfer). Separate endpoint (non_agent_api.php) and creds from
|
||||
# the agent API above. Leave VICIDIAL_NON_AGENT_API_URL unset to disable.
|
||||
VICIDIAL_NON_AGENT_API_URL: "${VICIDIAL_NON_AGENT_API_URL:-}"
|
||||
VICIDIAL_NON_AGENT_API_USER: "${VICIDIAL_NON_AGENT_API_USER:-}"
|
||||
VICIDIAL_NON_AGENT_API_PASS: "${VICIDIAL_NON_AGENT_API_PASS:-}"
|
||||
VICIDIAL_NON_AGENT_API_SOURCE: "${VICIDIAL_NON_AGENT_API_SOURCE:-dograh}"
|
||||
|
||||
# Trust X-Forwarded-* headers from any peer so uvicorn honors nginx's
|
||||
# `X-Forwarded-Proto: https`. nginx runs as its own container and reaches
|
||||
# uvicorn from a Docker-network IP (not loopback), but uvicorn trusts only
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -116,6 +116,7 @@
|
|||
"integrations/telephony/cloudonix",
|
||||
"integrations/telephony/vobiz",
|
||||
"integrations/telephony/asterisk-ari",
|
||||
"integrations/telephony/vicidial",
|
||||
"integrations/telephony/webhooks",
|
||||
"integrations/telephony/agent-stream",
|
||||
"integrations/telephony/custom"
|
||||
|
|
|
|||
138
docs/integrations/telephony/vicidial.mdx
Normal file
138
docs/integrations/telephony/vicidial.mdx
Normal file
|
|
@ -0,0 +1,138 @@
|
|||
---
|
||||
title: "VICIdial Integration"
|
||||
description: "Connect Dograh to VICIdial through Asterisk ARI for call control, in-group transfers, and lead updates"
|
||||
---
|
||||
|
||||
## Overview
|
||||
|
||||
Use this integration when VICIdial owns the customer call and connects Dograh
|
||||
to it through Asterisk. Dograh uses Asterisk ARI for audio and VICIdial APIs for
|
||||
operations that must affect the original customer leg:
|
||||
|
||||
- Hang up the customer call when the agent ends the conversation
|
||||
- Transfer the customer to a VICIdial in-group
|
||||
- Update selected VICIdial lead fields from gathered workflow context
|
||||
|
||||
VICIdial controls are an advanced organization feature. Users who do not enable
|
||||
the feature do not see VICIdial configuration, transfer mappings, or lead field
|
||||
mappings in the UI.
|
||||
|
||||
## Prerequisites
|
||||
|
||||
Before configuring VICIdial, ensure that:
|
||||
|
||||
- Asterisk ARI is connected to Dograh as described in the
|
||||
[Asterisk ARI integration](./asterisk-ari)
|
||||
- VICIdial sends the customer call to the Asterisk dialplan that enters the
|
||||
Dograh Stasis application
|
||||
- You have VICIdial agent API credentials with permission to hang up and
|
||||
perform in-group transfers
|
||||
- If workflows will update leads, you also have non-agent API credentials with
|
||||
permission to call `update_lead`
|
||||
|
||||
## Enable the organization feature
|
||||
|
||||
1. Open **Platform Settings** by going to https://app.dograh.com/settings
|
||||
2. Enable **External PBX integrations**.
|
||||
|
||||
This switch reveals the advanced settings in Asterisk telephony
|
||||
configurations, Transfer Call tools, and workflow configurations. Disabling it
|
||||
hides and disables those controls without deleting their saved values.
|
||||
|
||||
## Configure VICIdial credentials
|
||||
|
||||
1. Open **Telephony Configurations**.
|
||||
2. Create or edit an **Asterisk ARI** configuration.
|
||||
3. In **External PBX**, set **External PBX Type** to **VICIdial**.
|
||||
4. Configure the agent API:
|
||||
- **Agent API URL**: normally ends in `/agc/api.php`
|
||||
- **Agent API User**
|
||||
- **Agent API Password**
|
||||
5. To update leads, configure the non-agent API:
|
||||
- **Non-Agent API URL**: normally ends in `/vicidial/non_agent_api.php`
|
||||
- **Non-Agent API User**
|
||||
- **Non-Agent API Password**
|
||||
6. Save the configuration.
|
||||
|
||||
The non-agent API is optional when no lead updates are required. If it is used,
|
||||
its URL, user, and password must all be present. Credentials are stored with the
|
||||
telephony configuration and are returned masked by the Dograh API.
|
||||
|
||||
## Pass VICIdial call identity to Asterisk
|
||||
|
||||
Dograh needs VICIdial's call identity to control the original customer leg.
|
||||
Configure VICIdial or the connecting dialplan to preserve these SIP headers on
|
||||
the call that enters the Dograh Stasis application:
|
||||
|
||||
| Header | Purpose |
|
||||
| --- | --- |
|
||||
| `X-VICIDIAL-callerid` | Call-control identifier used by the agent API |
|
||||
| `X-VICIDIAL-user` | Remote-agent user used by the agent API |
|
||||
| `X-VICIDIAL-lead_id` | Lead identifier used by optional lead updates |
|
||||
| `X-VICIDIAL-campaign_id` | **(Optional)** Campaign context retained with the call |
|
||||
| `X-VICIDIAL-ingroup_id` | **(Optional)** Original in-group available to transfer fallback routing |
|
||||
|
||||
Hangup and transfer require the call-control identifier and remote-agent user.
|
||||
Lead updates additionally require the lead ID. The source in-group header is
|
||||
only required when a transfer mapping uses the `source` fallback.
|
||||
|
||||
## Configure in-group transfers
|
||||
|
||||
In-group mappings select a VICIdial destination from information gathered by
|
||||
the agent during a call.
|
||||
|
||||
1. Open or create a **Transfer Call** tool.
|
||||
2. Select **Context Mapping** as the destination source.
|
||||
3. Enter a context path, such as `qualified` or
|
||||
`extracted_variables.qualified`.
|
||||
4. Add one route for each expected value and its destination in-group ID.
|
||||
5. Optionally configure a fallback in-group. Enter `source` to return the
|
||||
caller to the original in-group captured from the SIP headers.
|
||||
6. Save the tool and attach it to the workflow.
|
||||
|
||||
The match is case-insensitive. Dograh performs final variable extraction before
|
||||
resolving the mapping. If no route or fallback matches, the transfer fails and
|
||||
the agent can recover instead of silently hanging up the caller.
|
||||
|
||||
## Configure lead field mappings
|
||||
|
||||
Lead field mappings copy selected values from gathered context into the
|
||||
VICIdial lead before transfer or hangup.
|
||||
|
||||
1. Open the workflow's **Configurations** dialog.
|
||||
2. In **External PBX Field Updates**, add a mapping.
|
||||
3. Enter the gathered-context path and the destination VICIdial lead field.
|
||||
4. Add any additional mappings and save the workflow configuration.
|
||||
|
||||
For example, map `extracted_variables.customer_state` to `state`. A context
|
||||
path can address a direct gathered-context value or a nested value. Mappings
|
||||
whose source value is absent are skipped.
|
||||
|
||||
The VICIdial adapter ignores mappings that target the API control parameters
|
||||
`source`, `user`, `pass`, `function`, and `lead_id`. The non-agent API
|
||||
configuration is required for mappings to be applied. A lead-update failure
|
||||
does not prevent Dograh from attempting the requested transfer or hangup.
|
||||
|
||||
## Runtime behavior
|
||||
|
||||
When the workflow transfers the call, Dograh resolves the configured in-group,
|
||||
applies available lead updates, asks VICIdial to transfer the customer leg, and
|
||||
then closes only the local Asterisk media leg.
|
||||
|
||||
When the conversation ends without a transfer, Dograh persists final gathered
|
||||
context, applies available lead updates, asks VICIdial to hang up the customer
|
||||
leg, and then closes the local Asterisk leg.
|
||||
|
||||
## Troubleshooting
|
||||
|
||||
- **VICIdial settings are not visible:** enable **External PBX integrations**
|
||||
in Platform Settings.
|
||||
- **The local media leg ends but the customer remains connected:** confirm that
|
||||
`X-VICIDIAL-callerid` and `X-VICIDIAL-user` reach Asterisk and that the agent
|
||||
API credentials can control the call.
|
||||
- **A transfer cannot resolve a destination:** inspect the workflow's final
|
||||
gathered context, the configured context path, and the mapping values.
|
||||
- **The `source` fallback fails:** ensure `X-VICIDIAL-ingroup_id` is present on
|
||||
the inbound call.
|
||||
- **Lead fields are unchanged:** confirm `X-VICIDIAL-lead_id`, the non-agent API
|
||||
credentials, and the destination field names.
|
||||
|
|
@ -56,6 +56,7 @@ import {
|
|||
TableRow,
|
||||
} from "@/components/ui/table";
|
||||
import { useAppConfig } from "@/context/AppConfigContext";
|
||||
import { useOrgConfig } from "@/context/OrgConfigContext";
|
||||
import { detailFromError } from "@/lib/apiError";
|
||||
import { useAuth } from "@/lib/auth";
|
||||
import { resolveWebhookBaseUrl } from "@/lib/webhookUrl";
|
||||
|
|
@ -69,6 +70,7 @@ export default function TelephonyConfigurationDetailPage() {
|
|||
|
||||
const { user, getAccessToken, loading: authLoading } = useAuth();
|
||||
const { config: appConfig } = useAppConfig();
|
||||
const { externalPbxIntegrationsEnabled } = useOrgConfig();
|
||||
const inboundWebhookUrl = `${resolveWebhookBaseUrl(appConfig?.tunnelUrl)}${INBOUND_WEBHOOK_PATH}`;
|
||||
const [config, setConfig] = useState<TelephonyConfigurationDetail | null>(null);
|
||||
const [phoneNumbers, setPhoneNumbers] = useState<PhoneNumberResponse[]>([]);
|
||||
|
|
@ -248,11 +250,13 @@ export default function TelephonyConfigurationDetailPage() {
|
|||
</CardHeader>
|
||||
<CardContent className="space-y-4">
|
||||
<dl className="grid grid-cols-2 gap-x-6 gap-y-2 text-sm">
|
||||
{Object.entries(config.credentials ?? {}).map(([k, v]) => (
|
||||
{Object.entries(config.credentials ?? {})
|
||||
.filter(([key]) => key !== "external_pbx" || externalPbxIntegrationsEnabled)
|
||||
.map(([k, v]) => (
|
||||
<div key={k} className="flex justify-between gap-3">
|
||||
<dt className="text-muted-foreground">{k}</dt>
|
||||
<dd className="font-mono text-right truncate max-w-[60%]">
|
||||
{String(v ?? "")}
|
||||
{v && typeof v === "object" ? "Configured" : String(v ?? "")}
|
||||
</dd>
|
||||
</div>
|
||||
))}
|
||||
|
|
|
|||
|
|
@ -1,5 +1,7 @@
|
|||
"use client";
|
||||
|
||||
import { Plus, Trash2 } from "lucide-react";
|
||||
|
||||
import type { RecordingResponseSchema } from "@/client/types.gen";
|
||||
import { RecordingSelect, StaticTextWarning } from "@/components/flow/TextOrAudioInput";
|
||||
import {
|
||||
|
|
@ -12,6 +14,7 @@ import {
|
|||
type ToolParameter,
|
||||
UrlInput,
|
||||
} from "@/components/http";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
|
|
@ -20,6 +23,7 @@ import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
|
|||
import { Textarea } from "@/components/ui/textarea";
|
||||
|
||||
import {
|
||||
type ContextDestinationRoute,
|
||||
type EndCallMessageType,
|
||||
type TransferDestinationSource,
|
||||
} from "../../config";
|
||||
|
|
@ -56,6 +60,13 @@ export interface TransferCallToolConfigProps {
|
|||
onParametersChange: (parameters: ToolParameter[]) => void;
|
||||
presetParameters: PresetToolParameter[];
|
||||
onPresetParametersChange: (parameters: PresetToolParameter[]) => void;
|
||||
externalPbxRoutingEnabled: boolean;
|
||||
contextMappingPath: string;
|
||||
onContextMappingPathChange: (path: string) => void;
|
||||
contextDestinationRoutes: ContextDestinationRoute[];
|
||||
onContextDestinationRoutesChange: (routes: ContextDestinationRoute[]) => void;
|
||||
fallbackDestination: string;
|
||||
onFallbackDestinationChange: (destination: string) => void;
|
||||
}
|
||||
|
||||
export function TransferCallToolConfig({
|
||||
|
|
@ -90,6 +101,13 @@ export function TransferCallToolConfig({
|
|||
onParametersChange,
|
||||
presetParameters,
|
||||
onPresetParametersChange,
|
||||
externalPbxRoutingEnabled,
|
||||
contextMappingPath,
|
||||
onContextMappingPathChange,
|
||||
contextDestinationRoutes,
|
||||
onContextDestinationRoutesChange,
|
||||
fallbackDestination,
|
||||
onFallbackDestinationChange,
|
||||
}: TransferCallToolConfigProps) {
|
||||
return (
|
||||
<Card>
|
||||
|
|
@ -217,14 +235,22 @@ export function TransferCallToolConfig({
|
|||
Choose whether the transfer uses a configured destination or resolves one from an HTTP endpoint.
|
||||
</p>
|
||||
</div>
|
||||
<Tabs
|
||||
{!externalPbxRoutingEnabled && destinationSource === "context_mapping" ? (
|
||||
<div className="rounded-md border bg-muted/30 p-3 text-sm text-muted-foreground">
|
||||
This tool has advanced external-PBX routing configured. Enable
|
||||
External PBX integrations in Platform Settings to view or change it.
|
||||
</div>
|
||||
) : <Tabs
|
||||
value={destinationSource}
|
||||
onValueChange={(v) => onDestinationSourceChange(v as TransferDestinationSource)}
|
||||
className="w-full"
|
||||
>
|
||||
<TabsList className="grid w-full grid-cols-2">
|
||||
<TabsList className={`grid w-full ${externalPbxRoutingEnabled ? "grid-cols-3" : "grid-cols-2"}`}>
|
||||
<TabsTrigger value="static">Static / Template</TabsTrigger>
|
||||
<TabsTrigger value="dynamic">Dynamic HTTP Resolver</TabsTrigger>
|
||||
{externalPbxRoutingEnabled && (
|
||||
<TabsTrigger value="context_mapping">Context Mapping</TabsTrigger>
|
||||
)}
|
||||
</TabsList>
|
||||
|
||||
<TabsContent value="static" className="space-y-4 mt-4">
|
||||
|
|
@ -343,7 +369,96 @@ export function TransferCallToolConfig({
|
|||
/>
|
||||
</div>
|
||||
</TabsContent>
|
||||
</Tabs>
|
||||
{externalPbxRoutingEnabled && (
|
||||
<TabsContent value="context_mapping" className="space-y-5 mt-4">
|
||||
<div>
|
||||
<Label>External PBX Context Routing</Label>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Resolve a gathered-context value to a provider-native destination.
|
||||
Matching ignores case and surrounding whitespace.
|
||||
</p>
|
||||
</div>
|
||||
<div className="grid gap-2">
|
||||
<Label htmlFor="pbx-context-path">Gathered Context Field</Label>
|
||||
<Input
|
||||
id="pbx-context-path"
|
||||
value={contextMappingPath}
|
||||
onChange={(event) => onContextMappingPathChange(event.target.value)}
|
||||
placeholder="qualified or extracted_variables.qualified"
|
||||
/>
|
||||
</div>
|
||||
<div className="space-y-3">
|
||||
<div className="flex items-center justify-between">
|
||||
<Label>Value to Destination Mappings</Label>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => onContextDestinationRoutesChange([
|
||||
...contextDestinationRoutes,
|
||||
{ context_value: "", destination: "" },
|
||||
])}
|
||||
>
|
||||
<Plus className="mr-1 h-4 w-4" /> Add mapping
|
||||
</Button>
|
||||
</div>
|
||||
{contextDestinationRoutes.map((route, index) => (
|
||||
<div key={index} className="grid grid-cols-[1fr_1fr_auto] gap-2">
|
||||
<Input
|
||||
aria-label={`Context value ${index + 1}`}
|
||||
value={route.context_value}
|
||||
onChange={(event) => onContextDestinationRoutesChange(
|
||||
contextDestinationRoutes.map((item, itemIndex) =>
|
||||
itemIndex === index
|
||||
? { ...item, context_value: event.target.value }
|
||||
: item
|
||||
)
|
||||
)}
|
||||
placeholder="Context value"
|
||||
/>
|
||||
<Input
|
||||
aria-label={`PBX destination ${index + 1}`}
|
||||
value={route.destination}
|
||||
onChange={(event) => onContextDestinationRoutesChange(
|
||||
contextDestinationRoutes.map((item, itemIndex) =>
|
||||
itemIndex === index
|
||||
? { ...item, destination: event.target.value }
|
||||
: item
|
||||
)
|
||||
)}
|
||||
placeholder="Provider destination"
|
||||
/>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
aria-label={`Remove mapping ${index + 1}`}
|
||||
onClick={() => onContextDestinationRoutesChange(
|
||||
contextDestinationRoutes.filter((_, itemIndex) => itemIndex !== index)
|
||||
)}
|
||||
>
|
||||
<Trash2 className="h-4 w-4" />
|
||||
</Button>
|
||||
</div>
|
||||
))}
|
||||
{contextDestinationRoutes.length === 0 && (
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Add at least one mapping.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
<div className="grid gap-2">
|
||||
<Label htmlFor="pbx-fallback-destination">Fallback Destination (Optional)</Label>
|
||||
<Input
|
||||
id="pbx-fallback-destination"
|
||||
value={fallbackDestination}
|
||||
onChange={(event) => onFallbackDestinationChange(event.target.value)}
|
||||
placeholder="Provider-native fallback destination"
|
||||
/>
|
||||
</div>
|
||||
</TabsContent>
|
||||
)}
|
||||
</Tabs>}
|
||||
</div>
|
||||
</CardContent>
|
||||
</Card>
|
||||
|
|
|
|||
|
|
@ -39,10 +39,12 @@ import { Label } from "@/components/ui/label";
|
|||
import { Skeleton } from "@/components/ui/skeleton";
|
||||
import { Textarea } from "@/components/ui/textarea";
|
||||
import { TOOL_DOCUMENTATION_URLS } from "@/constants/documentation";
|
||||
import { useOrgConfig } from "@/context/OrgConfigContext";
|
||||
import { detailFromError } from "@/lib/apiError";
|
||||
import { useAuth } from "@/lib/auth";
|
||||
|
||||
import {
|
||||
type ContextDestinationRoute,
|
||||
createMcpDefinition,
|
||||
DEFAULT_END_CALL_REASON_DESCRIPTION,
|
||||
type EndCallMessageType,
|
||||
|
|
@ -76,6 +78,7 @@ function headersToRows(headers: Record<string, string> | undefined | null): KeyV
|
|||
export default function ToolDetailPage() {
|
||||
const { toolUuid } = useParams<{ toolUuid: string }>();
|
||||
const { user, getAccessToken, redirectToLogin, loading } = useAuth();
|
||||
const { externalPbxIntegrationsEnabled } = useOrgConfig();
|
||||
const router = useRouter();
|
||||
|
||||
const [tool, setTool] = useState<ToolResponse | null>(null);
|
||||
|
|
@ -128,6 +131,10 @@ export default function ToolDetailPage() {
|
|||
const [transferResolverWaitMessage, setTransferResolverWaitMessage] = useState("");
|
||||
const [transferParameters, setTransferParameters] = useState<ToolParameter[]>([]);
|
||||
const [transferPresetParameters, setTransferPresetParameters] = useState<PresetToolParameter[]>([]);
|
||||
const [transferContextMappingPath, setTransferContextMappingPath] = useState("");
|
||||
const [transferContextDestinationRoutes, setTransferContextDestinationRoutes] =
|
||||
useState<ContextDestinationRoute[]>([]);
|
||||
const [transferFallbackDestination, setTransferFallbackDestination] = useState("");
|
||||
|
||||
// HTTP API form state - custom message type
|
||||
const [customMessageType, setCustomMessageType] = useState<'text' | 'audio'>('text');
|
||||
|
|
@ -227,6 +234,11 @@ export default function ToolDetailPage() {
|
|||
required: p.required ?? true,
|
||||
})),
|
||||
);
|
||||
setTransferContextMappingPath(config.context_mapping?.context_path || "");
|
||||
setTransferContextDestinationRoutes(config.context_mapping?.routes || []);
|
||||
setTransferFallbackDestination(
|
||||
config.context_mapping?.fallback_destination || ""
|
||||
);
|
||||
} else {
|
||||
setTransferDestinationSource("static");
|
||||
setTransferDestination("");
|
||||
|
|
@ -241,6 +253,9 @@ export default function ToolDetailPage() {
|
|||
setTransferResolverWaitMessage("");
|
||||
setTransferParameters([]);
|
||||
setTransferPresetParameters([]);
|
||||
setTransferContextMappingPath("");
|
||||
setTransferContextDestinationRoutes([]);
|
||||
setTransferFallbackDestination("");
|
||||
}
|
||||
} else if (tool.category === "mcp") {
|
||||
// Populate MCP specific fields
|
||||
|
|
@ -382,6 +397,28 @@ export default function ToolDetailPage() {
|
|||
return;
|
||||
}
|
||||
}
|
||||
if (transferDestinationSource === "context_mapping") {
|
||||
if (!transferContextMappingPath.trim()) {
|
||||
setError("Please enter a gathered-context field for PBX routing");
|
||||
return;
|
||||
}
|
||||
if (
|
||||
transferContextDestinationRoutes.length === 0 ||
|
||||
transferContextDestinationRoutes.some(
|
||||
(route) => !route.context_value.trim() || !route.destination.trim()
|
||||
)
|
||||
) {
|
||||
setError("Add at least one complete context value to destination mapping");
|
||||
return;
|
||||
}
|
||||
const routeValues = transferContextDestinationRoutes.map((route) =>
|
||||
route.context_value.trim().toLocaleLowerCase()
|
||||
);
|
||||
if (new Set(routeValues).size !== routeValues.length) {
|
||||
setError("Destination mapping context values must be unique");
|
||||
return;
|
||||
}
|
||||
}
|
||||
} else if (tool.category === "mcp") {
|
||||
// Validate MCP server URL (must be http(s))
|
||||
if (!mcpUrl.trim()) {
|
||||
|
|
@ -500,6 +537,17 @@ export default function ToolDetailPage() {
|
|||
: undefined,
|
||||
}
|
||||
: undefined,
|
||||
context_mapping: transferDestinationSource === "context_mapping"
|
||||
? {
|
||||
context_path: transferContextMappingPath.trim(),
|
||||
routes: transferContextDestinationRoutes.map((route) => ({
|
||||
context_value: route.context_value.trim(),
|
||||
destination: route.destination.trim(),
|
||||
})),
|
||||
fallback_destination:
|
||||
transferFallbackDestination.trim() || undefined,
|
||||
}
|
||||
: undefined,
|
||||
};
|
||||
// Build transfer call request body
|
||||
requestBody = {
|
||||
|
|
@ -799,6 +847,13 @@ const data = await response.json();`;
|
|||
onParametersChange={setTransferParameters}
|
||||
presetParameters={transferPresetParameters}
|
||||
onPresetParametersChange={setTransferPresetParameters}
|
||||
externalPbxRoutingEnabled={externalPbxIntegrationsEnabled}
|
||||
contextMappingPath={transferContextMappingPath}
|
||||
onContextMappingPathChange={setTransferContextMappingPath}
|
||||
contextDestinationRoutes={transferContextDestinationRoutes}
|
||||
onContextDestinationRoutesChange={setTransferContextDestinationRoutes}
|
||||
fallbackDestination={transferFallbackDestination}
|
||||
onFallbackDestinationChange={setTransferFallbackDestination}
|
||||
/>
|
||||
) : isMcpTool ? (
|
||||
<Card>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,18 @@ import type {
|
|||
export type ToolCategory = "http_api" | "end_call" | "transfer_call" | "calculator" | "native" | "integration" | "mcp";
|
||||
|
||||
export type EndCallMessageType = "none" | "custom" | "audio";
|
||||
export type TransferDestinationSource = "static" | "dynamic";
|
||||
export type TransferDestinationSource = "static" | "dynamic" | "context_mapping";
|
||||
|
||||
export interface ContextDestinationRoute {
|
||||
context_value: string;
|
||||
destination: string;
|
||||
}
|
||||
|
||||
export interface ContextDestinationMappingConfig {
|
||||
context_path: string;
|
||||
routes: ContextDestinationRoute[];
|
||||
fallback_destination?: string | null;
|
||||
}
|
||||
|
||||
export interface TransferResolverConfig {
|
||||
type: "http";
|
||||
|
|
@ -34,6 +45,7 @@ export interface TransferResolverConfig {
|
|||
export interface ExtendedTransferCallConfig extends TransferCallConfig {
|
||||
destination_source?: TransferDestinationSource;
|
||||
resolver?: TransferResolverConfig | null;
|
||||
context_mapping?: ContextDestinationMappingConfig | null;
|
||||
}
|
||||
|
||||
export interface ToolCategoryConfig {
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
import { Plus, Trash2 } from "lucide-react";
|
||||
import { useEffect, useState } from "react";
|
||||
|
||||
import { Button } from "@/components/ui/button";
|
||||
|
|
@ -6,10 +7,12 @@ import { Input } from "@/components/ui/input";
|
|||
import { Label } from "@/components/ui/label";
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
|
||||
import { Switch } from "@/components/ui/switch";
|
||||
import { useOrgConfig } from "@/context/OrgConfigContext";
|
||||
import {
|
||||
AmbientNoiseConfiguration,
|
||||
DEFAULT_PROVISIONAL_VAD_PAUSE_SECS,
|
||||
DEFAULT_TURN_START_MIN_WORDS,
|
||||
ExternalPBXFieldMapping,
|
||||
resolveWorkflowConfigurations,
|
||||
TURN_START_STRATEGY_OPTIONS,
|
||||
TurnStartStrategy,
|
||||
|
|
@ -32,6 +35,7 @@ export const ConfigurationsDialog = ({
|
|||
workflowName,
|
||||
onSave
|
||||
}: ConfigurationsDialogProps) => {
|
||||
const { externalPbxIntegrationsEnabled } = useOrgConfig();
|
||||
const resolvedWorkflowConfigurations = resolveWorkflowConfigurations(workflowConfigurations);
|
||||
const [name, setName] = useState<string>(workflowName);
|
||||
const [ambientNoiseConfig, setAmbientNoiseConfig] = useState<AmbientNoiseConfiguration>(
|
||||
|
|
@ -61,10 +65,18 @@ export const ConfigurationsDialog = ({
|
|||
const [contextCompactionEnabled, setContextCompactionEnabled] = useState<boolean>(
|
||||
resolvedWorkflowConfigurations.context_compaction_enabled
|
||||
);
|
||||
const [externalPbxFieldMappings, setExternalPbxFieldMappings] = useState<ExternalPBXFieldMapping[]>(
|
||||
resolvedWorkflowConfigurations.external_pbx_field_mappings
|
||||
);
|
||||
const [isSaving, setIsSaving] = useState(false);
|
||||
const selectedTurnStartStrategy = TURN_START_STRATEGY_OPTIONS.find(
|
||||
(option) => option.value === turnStartStrategy
|
||||
);
|
||||
const externalPbxFieldMappingsValid = externalPbxFieldMappings.every(
|
||||
(mapping) =>
|
||||
Boolean(mapping.context_path.trim()) &&
|
||||
/^[A-Za-z][A-Za-z0-9_]{0,63}$/.test(mapping.destination_field.trim())
|
||||
);
|
||||
|
||||
const handleSave = async () => {
|
||||
setIsSaving(true);
|
||||
|
|
@ -80,6 +92,7 @@ export const ConfigurationsDialog = ({
|
|||
turn_stop_strategy: turnStopStrategy,
|
||||
transcript_configuration: resolvedWorkflowConfigurations.transcript_configuration,
|
||||
context_compaction_enabled: contextCompactionEnabled,
|
||||
external_pbx_field_mappings: externalPbxFieldMappings,
|
||||
}, name);
|
||||
onOpenChange(false);
|
||||
} catch (error) {
|
||||
|
|
@ -103,12 +116,13 @@ export const ConfigurationsDialog = ({
|
|||
setProvisionalVadPauseSecs(nextWorkflowConfigurations.provisional_vad_pause_secs);
|
||||
setTurnStopStrategy(nextWorkflowConfigurations.turn_stop_strategy);
|
||||
setContextCompactionEnabled(nextWorkflowConfigurations.context_compaction_enabled);
|
||||
setExternalPbxFieldMappings(nextWorkflowConfigurations.external_pbx_field_mappings);
|
||||
}
|
||||
}, [open, workflowName, workflowConfigurations]);
|
||||
|
||||
return (
|
||||
<Dialog open={open} onOpenChange={onOpenChange}>
|
||||
<DialogContent className="max-w-lg">
|
||||
<DialogContent className="max-w-lg max-h-[90vh] overflow-y-auto">
|
||||
<DialogHeader>
|
||||
<DialogTitle>Configurations</DialogTitle>
|
||||
</DialogHeader>
|
||||
|
|
@ -401,13 +415,92 @@ export const ConfigurationsDialog = ({
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{externalPbxIntegrationsEnabled && (
|
||||
<div className="space-y-4 border-t pt-4">
|
||||
<div>
|
||||
<h3 className="text-sm font-semibold mb-1">External PBX Field Updates</h3>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Optionally copy final gathered-context values into provider-native fields before transfer or hangup.
|
||||
</p>
|
||||
</div>
|
||||
<div className="flex items-center justify-between">
|
||||
<Label className="text-sm">Field Mappings</Label>
|
||||
<Button
|
||||
type="button"
|
||||
variant="outline"
|
||||
size="sm"
|
||||
onClick={() => setExternalPbxFieldMappings((current) => [
|
||||
...current,
|
||||
{ context_path: "", destination_field: "" },
|
||||
])}
|
||||
>
|
||||
<Plus className="mr-1 h-4 w-4" /> Add mapping
|
||||
</Button>
|
||||
</div>
|
||||
<div className="space-y-2">
|
||||
{externalPbxFieldMappings.map((mapping, index) => (
|
||||
<div key={index} className="grid grid-cols-[1fr_1fr_auto] gap-2">
|
||||
<Input
|
||||
aria-label={`Gathered context field ${index + 1}`}
|
||||
value={mapping.context_path}
|
||||
onChange={(event) => setExternalPbxFieldMappings((current) =>
|
||||
current.map((item, itemIndex) =>
|
||||
itemIndex === index
|
||||
? { ...item, context_path: event.target.value }
|
||||
: item
|
||||
)
|
||||
)}
|
||||
placeholder="qualified"
|
||||
/>
|
||||
<Input
|
||||
aria-label={`External PBX destination field ${index + 1}`}
|
||||
value={mapping.destination_field}
|
||||
onChange={(event) => setExternalPbxFieldMappings((current) =>
|
||||
current.map((item, itemIndex) =>
|
||||
itemIndex === index
|
||||
? { ...item, destination_field: event.target.value }
|
||||
: item
|
||||
)
|
||||
)}
|
||||
placeholder="address3"
|
||||
/>
|
||||
<Button
|
||||
type="button"
|
||||
variant="ghost"
|
||||
size="icon"
|
||||
aria-label={`Remove external PBX field mapping ${index + 1}`}
|
||||
onClick={() => setExternalPbxFieldMappings((current) =>
|
||||
current.filter((_, itemIndex) => itemIndex !== index)
|
||||
)}
|
||||
>
|
||||
<Trash2 className="h-4 w-4" />
|
||||
</Button>
|
||||
</div>
|
||||
))}
|
||||
{externalPbxFieldMappings.length === 0 && (
|
||||
<p className="text-xs text-muted-foreground">
|
||||
No external fields will be updated. Context names may be direct extracted-variable names or paths such as extracted_variables.qualified.
|
||||
</p>
|
||||
)}
|
||||
{!externalPbxFieldMappingsValid && (
|
||||
<p className="text-xs text-destructive">
|
||||
Each mapping needs a context field and a destination field containing only letters, numbers, and underscores.
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<DialogFooter>
|
||||
<Button variant="outline" onClick={() => onOpenChange(false)}>
|
||||
Cancel
|
||||
</Button>
|
||||
<Button onClick={handleSave} disabled={isSaving}>
|
||||
<Button
|
||||
onClick={handleSave}
|
||||
disabled={isSaving || (externalPbxIntegrationsEnabled && !externalPbxFieldMappingsValid)}
|
||||
>
|
||||
{isSaving ? "Saving..." : "Save"}
|
||||
</Button>
|
||||
</DialogFooter>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -96,6 +96,10 @@ export type AriConfigurationRequest = {
|
|||
* websocket_client.conf connection name for externalMedia (e.g., dograh_staging)
|
||||
*/
|
||||
ws_client_name?: string;
|
||||
/**
|
||||
* Optional external PBX connected through this Asterisk instance
|
||||
*/
|
||||
external_pbx?: VicidialExternalPbxConfiguration | null;
|
||||
/**
|
||||
* From Numbers
|
||||
*
|
||||
|
|
@ -130,6 +134,7 @@ export type AriConfigurationResponse = {
|
|||
* Ws Client Name
|
||||
*/
|
||||
ws_client_name?: string;
|
||||
external_pbx?: VicidialExternalPbxConfiguration | null;
|
||||
/**
|
||||
* From Numbers
|
||||
*/
|
||||
|
|
@ -1329,6 +1334,46 @@ export type CloudonixConfigurationResponse = {
|
|||
from_numbers: Array<string>;
|
||||
};
|
||||
|
||||
/**
|
||||
* ContextDestinationMappingConfig
|
||||
*
|
||||
* Resolve an external-PBX destination from gathered context.
|
||||
*/
|
||||
export type ContextDestinationMappingConfig = {
|
||||
/**
|
||||
* Context Path
|
||||
*
|
||||
* Gathered-context path or extracted-variable name used for routing.
|
||||
*/
|
||||
context_path: string;
|
||||
/**
|
||||
* Routes
|
||||
*/
|
||||
routes: Array<ContextDestinationRoute>;
|
||||
/**
|
||||
* Fallback Destination
|
||||
*
|
||||
* Optional provider-native fallback destination.
|
||||
*/
|
||||
fallback_destination?: string | null;
|
||||
};
|
||||
|
||||
/**
|
||||
* ContextDestinationRoute
|
||||
*
|
||||
* Map one gathered-context value to an external-PBX destination.
|
||||
*/
|
||||
export type ContextDestinationRoute = {
|
||||
/**
|
||||
* Context Value
|
||||
*/
|
||||
context_value: string;
|
||||
/**
|
||||
* Destination
|
||||
*/
|
||||
destination: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* CreateAPIKeyRequest
|
||||
*/
|
||||
|
|
@ -2472,6 +2517,22 @@ export type EndCallToolDefinition = {
|
|||
config: EndCallConfig;
|
||||
};
|
||||
|
||||
/**
|
||||
* ExternalPBXFieldMapping
|
||||
*
|
||||
* Map one gathered-context value to a provider-native field.
|
||||
*/
|
||||
export type ExternalPbxFieldMapping = {
|
||||
/**
|
||||
* Context Path
|
||||
*/
|
||||
context_path: string;
|
||||
/**
|
||||
* Destination Field
|
||||
*/
|
||||
destination_field: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* FileDescriptor
|
||||
*
|
||||
|
|
@ -4192,6 +4253,10 @@ export type OrganizationPreferences = {
|
|||
* Timezone
|
||||
*/
|
||||
timezone?: string | null;
|
||||
/**
|
||||
* External Pbx Integrations Enabled
|
||||
*/
|
||||
external_pbx_integrations_enabled?: boolean;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -5703,6 +5768,20 @@ export type TelephonyProviderMetadata = {
|
|||
docs_url?: string | null;
|
||||
};
|
||||
|
||||
/**
|
||||
* TelephonyProviderUICondition
|
||||
*/
|
||||
export type TelephonyProviderUiCondition = {
|
||||
/**
|
||||
* Field
|
||||
*/
|
||||
field: string;
|
||||
/**
|
||||
* Equals
|
||||
*/
|
||||
equals: unknown;
|
||||
};
|
||||
|
||||
/**
|
||||
* TelephonyProviderUIField
|
||||
*
|
||||
|
|
@ -5737,6 +5816,29 @@ export type TelephonyProviderUiField = {
|
|||
* Placeholder
|
||||
*/
|
||||
placeholder?: string | null;
|
||||
/**
|
||||
* Options
|
||||
*/
|
||||
options?: Array<TelephonyProviderUiOption> | null;
|
||||
visible_when?: TelephonyProviderUiCondition | null;
|
||||
/**
|
||||
* Section
|
||||
*/
|
||||
section?: string | null;
|
||||
};
|
||||
|
||||
/**
|
||||
* TelephonyProviderUIOption
|
||||
*/
|
||||
export type TelephonyProviderUiOption = {
|
||||
/**
|
||||
* Value
|
||||
*/
|
||||
value: string;
|
||||
/**
|
||||
* Label
|
||||
*/
|
||||
label: string;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -5947,9 +6049,9 @@ export type TransferCallConfig = {
|
|||
/**
|
||||
* Destination Source
|
||||
*
|
||||
* Whether transfer destination is static/template or resolved by HTTP.
|
||||
* Whether the destination is static/template, resolved by HTTP, or mapped from gathered context to an external-PBX destination.
|
||||
*/
|
||||
destination_source?: 'static' | 'dynamic';
|
||||
destination_source?: 'static' | 'dynamic' | 'context_mapping';
|
||||
/**
|
||||
* Destination
|
||||
*
|
||||
|
|
@ -5990,6 +6092,10 @@ export type TransferCallConfig = {
|
|||
* Optional resolver that determines transfer routing at call time.
|
||||
*/
|
||||
resolver?: HttpTransferResolverConfig | null;
|
||||
/**
|
||||
* Optional gathered-context to external-PBX destination mapping.
|
||||
*/
|
||||
context_mapping?: ContextDestinationMappingConfig | null;
|
||||
};
|
||||
|
||||
/**
|
||||
|
|
@ -6453,6 +6559,88 @@ export type ValidationError = {
|
|||
};
|
||||
};
|
||||
|
||||
/**
|
||||
* VicidialAgentAPIConfiguration
|
||||
*
|
||||
* VICIdial remote-agent call-control API configuration.
|
||||
*/
|
||||
export type VicidialAgentApiConfiguration = {
|
||||
/**
|
||||
* Url
|
||||
*
|
||||
* Full URL to agc/api.php
|
||||
*/
|
||||
url: string;
|
||||
/**
|
||||
* Username
|
||||
*
|
||||
* VICIdial agent API user
|
||||
*/
|
||||
username: string;
|
||||
/**
|
||||
* Password
|
||||
*
|
||||
* VICIdial agent API password
|
||||
*/
|
||||
password: string;
|
||||
/**
|
||||
* Source
|
||||
*
|
||||
* VICIdial API source tag
|
||||
*/
|
||||
source?: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* VicidialExternalPBXConfiguration
|
||||
*
|
||||
* External-PBX configuration used by the VICIdial strategy adapter.
|
||||
*/
|
||||
export type VicidialExternalPbxConfiguration = {
|
||||
/**
|
||||
* Type
|
||||
*/
|
||||
type?: 'vicidial';
|
||||
agent_api: VicidialAgentApiConfiguration;
|
||||
non_agent_api?: VicidialNonAgentApiConfiguration | null;
|
||||
/**
|
||||
* Timeout Seconds
|
||||
*/
|
||||
timeout_seconds?: number;
|
||||
};
|
||||
|
||||
/**
|
||||
* VicidialNonAgentAPIConfiguration
|
||||
*
|
||||
* Optional VICIdial non-agent API configuration for lead updates.
|
||||
*/
|
||||
export type VicidialNonAgentApiConfiguration = {
|
||||
/**
|
||||
* Url
|
||||
*
|
||||
* Full non_agent_api.php URL
|
||||
*/
|
||||
url?: string | null;
|
||||
/**
|
||||
* Username
|
||||
*
|
||||
* Non-agent API user
|
||||
*/
|
||||
username?: string | null;
|
||||
/**
|
||||
* Password
|
||||
*
|
||||
* Non-agent API password
|
||||
*/
|
||||
password?: string | null;
|
||||
/**
|
||||
* Source
|
||||
*
|
||||
* Non-agent API source tag
|
||||
*/
|
||||
source?: string;
|
||||
};
|
||||
|
||||
/**
|
||||
* VobizConfigurationRequest
|
||||
*
|
||||
|
|
@ -6718,6 +6906,10 @@ export type WorkflowConfigurationDefaults = {
|
|||
* Context Compaction Enabled
|
||||
*/
|
||||
context_compaction_enabled?: boolean;
|
||||
/**
|
||||
* External Pbx Field Mappings
|
||||
*/
|
||||
external_pbx_field_mappings?: Array<ExternalPbxFieldMapping>;
|
||||
[key: string]: unknown;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -13,6 +13,8 @@ import type { OrganizationPreferences } from "@/client/types.gen";
|
|||
import { Button } from "@/components/ui/button";
|
||||
import { Input } from "@/components/ui/input";
|
||||
import { Label } from "@/components/ui/label";
|
||||
import { Switch } from "@/components/ui/switch";
|
||||
import { useOrgConfig } from "@/context/OrgConfigContext";
|
||||
import { useUserConfig } from "@/context/UserConfigContext";
|
||||
import { detailFromError } from "@/lib/apiError";
|
||||
import { useAuth } from "@/lib/auth";
|
||||
|
|
@ -20,6 +22,7 @@ import { useAuth } from "@/lib/auth";
|
|||
const emptyPreferences: OrganizationPreferences = {
|
||||
test_phone_number: "",
|
||||
timezone: Intl.DateTimeFormat().resolvedOptions().timeZone || "UTC",
|
||||
external_pbx_integrations_enabled: false,
|
||||
};
|
||||
|
||||
const timezoneSelectStyles = {
|
||||
|
|
@ -91,6 +94,7 @@ function getTimezoneValue(tz: ITimezoneOption | string): string {
|
|||
export function OrganizationPreferencesSection() {
|
||||
const { user, loading: authLoading } = useAuth();
|
||||
const { refreshConfig } = useUserConfig();
|
||||
const { refreshConfig: refreshOrgConfig } = useOrgConfig();
|
||||
const timezoneSelectId = useId();
|
||||
const hasFetched = useRef(false);
|
||||
|
||||
|
|
@ -130,6 +134,8 @@ export function OrganizationPreferencesSection() {
|
|||
setPreferences({
|
||||
test_phone_number: nextPreferences.test_phone_number || "",
|
||||
timezone: nextPreferences.timezone || emptyPreferences.timezone,
|
||||
external_pbx_integrations_enabled:
|
||||
nextPreferences.external_pbx_integrations_enabled ?? false,
|
||||
});
|
||||
setTimezone(
|
||||
nextPreferences.timezone || emptyPreferences.timezone || "UTC",
|
||||
|
|
@ -151,6 +157,8 @@ export function OrganizationPreferencesSection() {
|
|||
body: {
|
||||
test_phone_number: preferences.test_phone_number || null,
|
||||
timezone: getTimezoneValue(timezone),
|
||||
external_pbx_integrations_enabled:
|
||||
preferences.external_pbx_integrations_enabled ?? false,
|
||||
},
|
||||
},
|
||||
);
|
||||
|
|
@ -167,9 +175,12 @@ export function OrganizationPreferencesSection() {
|
|||
setPreferences({
|
||||
test_phone_number: result.data.test_phone_number || "",
|
||||
timezone: result.data.timezone || emptyPreferences.timezone,
|
||||
external_pbx_integrations_enabled:
|
||||
result.data.external_pbx_integrations_enabled ?? false,
|
||||
});
|
||||
setTimezone(result.data.timezone || emptyPreferences.timezone || "UTC");
|
||||
await refreshConfig();
|
||||
await refreshOrgConfig();
|
||||
toast.success("Preferences saved");
|
||||
} catch {
|
||||
toast.error("Failed to save preferences");
|
||||
|
|
@ -212,6 +223,28 @@ export function OrganizationPreferencesSection() {
|
|||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div className="flex items-start justify-between gap-4 rounded-lg border p-4">
|
||||
<div className="space-y-1">
|
||||
<Label htmlFor="settings-external-pbx-integrations">
|
||||
External PBX integrations
|
||||
</Label>
|
||||
<p className="text-xs text-muted-foreground">
|
||||
Show and enable advanced external-PBX configuration for Asterisk,
|
||||
transfer tools, and workflows. Existing configuration is preserved
|
||||
when this is disabled.
|
||||
</p>
|
||||
</div>
|
||||
<Switch
|
||||
id="settings-external-pbx-integrations"
|
||||
checked={preferences.external_pbx_integrations_enabled ?? false}
|
||||
onCheckedChange={(checked) =>
|
||||
setPreferences({
|
||||
...preferences,
|
||||
external_pbx_integrations_enabled: checked,
|
||||
})
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
<Button type="submit" disabled={saving}>
|
||||
<Save className="mr-2 h-4 w-4" />
|
||||
{saving ? "Saving..." : "Save"}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,45 @@ interface ConfigFormDialogProps {
|
|||
type FieldValue = string | number | boolean | undefined;
|
||||
type FieldValues = Record<string, FieldValue>;
|
||||
|
||||
function flattenValues(
|
||||
value: Record<string, unknown>,
|
||||
prefix = "",
|
||||
): FieldValues {
|
||||
const flattened: FieldValues = {};
|
||||
for (const [key, child] of Object.entries(value)) {
|
||||
const path = prefix ? `${prefix}.${key}` : key;
|
||||
if (child && typeof child === "object" && !Array.isArray(child)) {
|
||||
Object.assign(flattened, flattenValues(child as Record<string, unknown>, path));
|
||||
} else if (
|
||||
child === undefined ||
|
||||
typeof child === "string" ||
|
||||
typeof child === "number" ||
|
||||
typeof child === "boolean"
|
||||
) {
|
||||
flattened[path] = child;
|
||||
}
|
||||
}
|
||||
return flattened;
|
||||
}
|
||||
|
||||
function nestValues(values: FieldValues): Record<string, unknown> {
|
||||
const nested: Record<string, unknown> = {};
|
||||
for (const [path, value] of Object.entries(values)) {
|
||||
if (value === undefined || value === "") continue;
|
||||
const parts = path.split(".");
|
||||
let current = nested;
|
||||
for (const part of parts.slice(0, -1)) {
|
||||
const child = current[part];
|
||||
if (!child || typeof child !== "object" || Array.isArray(child)) {
|
||||
current[part] = {};
|
||||
}
|
||||
current = current[part] as Record<string, unknown>;
|
||||
}
|
||||
current[parts[parts.length - 1]] = value;
|
||||
}
|
||||
return nested;
|
||||
}
|
||||
|
||||
export function ConfigFormDialog({
|
||||
open,
|
||||
onOpenChange,
|
||||
|
|
@ -71,6 +110,15 @@ export function ConfigFormDialog({
|
|||
() => providers.find((p) => p.provider === providerName),
|
||||
[providers, providerName],
|
||||
);
|
||||
const visibleFields = useMemo(
|
||||
() =>
|
||||
currentProvider?.fields.filter(
|
||||
(field) =>
|
||||
!field.visible_when ||
|
||||
values[field.visible_when.field] === field.visible_when.equals,
|
||||
) ?? [],
|
||||
[currentProvider, values],
|
||||
);
|
||||
|
||||
// Fetch provider metadata once when the dialog opens.
|
||||
useEffect(() => {
|
||||
|
|
@ -88,7 +136,7 @@ export function ConfigFormDialog({
|
|||
setProviderName(existing.provider);
|
||||
setName(existing.name);
|
||||
setIsDefault(existing.is_default_outbound);
|
||||
setValues((existing.credentials ?? {}) as FieldValues);
|
||||
setValues(flattenValues(existing.credentials ?? {}));
|
||||
} else if (list.length > 0 && !providerName) {
|
||||
setProviderName(list[0].provider);
|
||||
setValues({});
|
||||
|
|
@ -106,7 +154,15 @@ export function ConfigFormDialog({
|
|||
}, [providerName, isEdit]);
|
||||
|
||||
const updateField = (fieldName: string, value: FieldValue) => {
|
||||
setValues((prev) => ({ ...prev, [fieldName]: value }));
|
||||
setValues((prev) => {
|
||||
const next = { ...prev, [fieldName]: value };
|
||||
if (value === undefined) {
|
||||
for (const field of currentProvider?.fields ?? []) {
|
||||
if (field.visible_when?.field === fieldName) delete next[field.name];
|
||||
}
|
||||
}
|
||||
return next;
|
||||
});
|
||||
};
|
||||
|
||||
const handleSubmit = async () => {
|
||||
|
|
@ -123,7 +179,7 @@ export function ConfigFormDialog({
|
|||
// Build the provider-discriminated config payload from collected values.
|
||||
const configPayload = {
|
||||
provider: providerName,
|
||||
...values,
|
||||
...nestValues(values),
|
||||
} as unknown as TelephonyConfigPayload;
|
||||
|
||||
if (isEdit && existing) {
|
||||
|
|
@ -253,8 +309,13 @@ export function ConfigFormDialog({
|
|||
|
||||
{currentProvider && (
|
||||
<div className="space-y-3 border-t pt-3">
|
||||
{currentProvider.fields.map((field) => (
|
||||
{visibleFields.map((field, index) => (
|
||||
<div className="space-y-1" key={field.name}>
|
||||
{field.section && field.section !== visibleFields[index - 1]?.section && (
|
||||
<div className="pb-2 pt-3">
|
||||
<h3 className="text-sm font-semibold">{field.section}</h3>
|
||||
</div>
|
||||
)}
|
||||
<Label htmlFor={`cfg-field-${field.name}`}>
|
||||
{field.label}
|
||||
{!field.required && (
|
||||
|
|
@ -345,6 +406,26 @@ function FieldInput({ field, value, onChange, isEdit }: FieldInputProps) {
|
|||
/>
|
||||
);
|
||||
}
|
||||
if (field.type === "select") {
|
||||
return (
|
||||
<Select
|
||||
value={value === undefined ? "__none__" : String(value)}
|
||||
onValueChange={(next) => onChange(next === "__none__" ? undefined : next)}
|
||||
>
|
||||
<SelectTrigger id={`cfg-field-${field.name}`}>
|
||||
<SelectValue placeholder={placeholder || "Select an option"} />
|
||||
</SelectTrigger>
|
||||
<SelectContent>
|
||||
{!field.required && <SelectItem value="__none__">Not configured</SelectItem>}
|
||||
{(field.options ?? []).map((option) => (
|
||||
<SelectItem key={option.value} value={option.value}>
|
||||
{option.label}
|
||||
</SelectItem>
|
||||
))}
|
||||
</SelectContent>
|
||||
</Select>
|
||||
);
|
||||
}
|
||||
return (
|
||||
<Input
|
||||
id={`cfg-field-${field.name}`}
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@
|
|||
import { createContext, ReactNode, useCallback, useContext, useEffect, useRef, useState } from 'react';
|
||||
|
||||
import { client } from '@/client/client.gen';
|
||||
import { getCurrentOrganizationContextApiV1OrganizationsContextGet, getUserConfigurationsApiV1UserConfigurationsUserGet } from '@/client/sdk.gen';
|
||||
import type { OrganizationContextResponse, UserConfigurationRequestResponseSchema } from '@/client/types.gen';
|
||||
import { getCurrentOrganizationContextApiV1OrganizationsContextGet, getPreferencesApiV1OrganizationsPreferencesGet, getUserConfigurationsApiV1UserConfigurationsUserGet } from '@/client/sdk.gen';
|
||||
import type { OrganizationContextResponse, OrganizationPreferences, UserConfigurationRequestResponseSchema } from '@/client/types.gen';
|
||||
import { setupAuthInterceptor } from '@/lib/apiClient';
|
||||
import type { AuthUser } from '@/lib/auth';
|
||||
import { useAuth } from '@/lib/auth';
|
||||
|
|
@ -28,6 +28,8 @@ interface OrgConfigContextType {
|
|||
permissions: TeamPermission[];
|
||||
user: AuthUser | null;
|
||||
organizationPricing: OrganizationPricing | null;
|
||||
organizationPreferences: OrganizationPreferences | null;
|
||||
externalPbxIntegrationsEnabled: boolean;
|
||||
}
|
||||
|
||||
const OrgConfigContext = createContext<OrgConfigContextType | null>(null);
|
||||
|
|
@ -52,6 +54,7 @@ export function OrgConfigProvider({ children }: { children: ReactNode }) {
|
|||
const [loading, setLoading] = useState(true);
|
||||
const [error, setError] = useState<Error | null>(null);
|
||||
const [organizationPricing, setOrganizationPricing] = useState<OrganizationPricing | null>(null);
|
||||
const [organizationPreferences, setOrganizationPreferences] = useState<OrganizationPreferences | null>(null);
|
||||
const [permissions, setPermissions] = useState<TeamPermission[]>([]);
|
||||
|
||||
const auth = useAuth();
|
||||
|
|
@ -102,9 +105,10 @@ export function OrgConfigProvider({ children }: { children: ReactNode }) {
|
|||
|
||||
setLoading(true);
|
||||
try {
|
||||
const [orgContextResponse, userConfigResponse] = await Promise.all([
|
||||
const [orgContextResponse, userConfigResponse, preferencesResponse] = await Promise.all([
|
||||
getCurrentOrganizationContextApiV1OrganizationsContextGet(),
|
||||
getUserConfigurationsApiV1UserConfigurationsUserGet(),
|
||||
getPreferencesApiV1OrganizationsPreferencesGet(),
|
||||
]);
|
||||
|
||||
if (orgContextResponse.data) {
|
||||
|
|
@ -116,6 +120,10 @@ export function OrgConfigProvider({ children }: { children: ReactNode }) {
|
|||
setOrganizationPricing(pricingFromUserConfig(userConfigResponse.data));
|
||||
}
|
||||
|
||||
if (preferencesResponse.data) {
|
||||
setOrganizationPreferences(preferencesResponse.data);
|
||||
}
|
||||
|
||||
setError(null);
|
||||
} catch (err) {
|
||||
setError(err instanceof Error ? err : new Error('Failed to fetch organization configuration'));
|
||||
|
|
@ -147,6 +155,9 @@ export function OrgConfigProvider({ children }: { children: ReactNode }) {
|
|||
permissions,
|
||||
user: auth.user,
|
||||
organizationPricing,
|
||||
organizationPreferences,
|
||||
externalPbxIntegrationsEnabled:
|
||||
organizationPreferences?.external_pbx_integrations_enabled ?? false,
|
||||
}}
|
||||
>
|
||||
{children}
|
||||
|
|
|
|||
|
|
@ -64,6 +64,11 @@ export interface TranscriptConfiguration {
|
|||
include_end_timestamps: boolean;
|
||||
}
|
||||
|
||||
export interface ExternalPBXFieldMapping {
|
||||
context_path: string;
|
||||
destination_field: string;
|
||||
}
|
||||
|
||||
export const DEFAULT_TRANSCRIPT_CONFIGURATION: TranscriptConfiguration = {
|
||||
include_end_timestamps: false,
|
||||
};
|
||||
|
|
@ -110,6 +115,7 @@ type WorkflowConfigurationBase = Omit<
|
|||
| "turn_stop_strategy"
|
||||
| "dictionary"
|
||||
| "context_compaction_enabled"
|
||||
| "external_pbx_field_mappings"
|
||||
>;
|
||||
|
||||
export type WorkflowConfigurations = WorkflowConfigurationBase & {
|
||||
|
|
@ -125,6 +131,7 @@ export type WorkflowConfigurations = WorkflowConfigurationBase & {
|
|||
voicemail_detection?: VoicemailDetectionConfiguration;
|
||||
transcript_configuration: TranscriptConfiguration;
|
||||
context_compaction_enabled: boolean; // Summarize context on node transitions to remove stale tool calls
|
||||
external_pbx_field_mappings: ExternalPBXFieldMapping[];
|
||||
model_overrides?: ModelOverrides; // Per-workflow model configuration overrides
|
||||
model_configuration_v2_override?: OrganizationAiModelConfigurationV2; // Full v2 model configuration override
|
||||
[key: string]: unknown; // Allow additional properties for future configurations
|
||||
|
|
@ -145,6 +152,7 @@ const FALLBACK_WORKFLOW_CONFIGURATIONS: WorkflowConfigurations = {
|
|||
dictionary: '',
|
||||
transcript_configuration: DEFAULT_TRANSCRIPT_CONFIGURATION,
|
||||
context_compaction_enabled: false,
|
||||
external_pbx_field_mappings: [],
|
||||
};
|
||||
|
||||
export function resolveWorkflowConfigurations(
|
||||
|
|
@ -196,6 +204,10 @@ export function resolveWorkflowConfigurations(
|
|||
configurations?.context_compaction_enabled
|
||||
?? defaults?.context_compaction_enabled
|
||||
?? FALLBACK_WORKFLOW_CONFIGURATIONS.context_compaction_enabled,
|
||||
external_pbx_field_mappings:
|
||||
configurations?.external_pbx_field_mappings
|
||||
?? defaults?.external_pbx_field_mappings
|
||||
?? FALLBACK_WORKFLOW_CONFIGURATIONS.external_pbx_field_mappings,
|
||||
transcript_configuration: {
|
||||
...DEFAULT_TRANSCRIPT_CONFIGURATION,
|
||||
...(defaults?.transcript_configuration as Partial<TranscriptConfiguration> | undefined),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue