debug

src/core/callcenter/callback.py

@@ -33,7 +33,7 @@ class Callback(object):
                 # self.logger.info("callback::call_type=%s, call_info=%s", call_type, call_info)
                 if call_type is None:
                     continue
-                if CallType.BOT_CALL == call_type:
+                if CallType.BOT_CALL == call_type or CallType.INCOMING_BOT_CALL == call_type:
                     self.choose_thread_pool_executor(event).submit(self.agent_event_service.bot_event_channel, event, call_info, device_info)
                 else:
                     self.choose_thread_pool_executor(event).submit(self.agent_event_service.agent_event_channel, event, call_info, device_info)

src/core/callcenter/constant.py

@@ -121,7 +121,7 @@ def format_time_millis(time_millis, pattern='%Y%m%d'):
 #     return BASE_RECORD_PATH + call.call_type + '/' + call.saas_id + '/' + call.caller + '/' + format_time_millis(call.call_time)
 
 def get_record_prefix(call):
-    if CallType.BOT_CALL.code == call.call_type:
+    if CallType.BOT_CALL.code == call.call_type or CallType.INCOMING_BOT_CALL.code == call.call_type:
         return BASE_RECORD_PATH + str(call.call_type) + '/' + str(call.saas_id) + '/' + str(call.caller) + '/' + format_time_millis(call.call_time)
     else:
         return BASE_RECORD_PATH + str(call.call_type) + '/' + str(call.saas_id) + '/' + str(call.caller) + '/' + format_time_millis(call.call_time)

src/core/callcenter/enumeration.py

@@ -279,7 +279,9 @@ class DeviceType(Enum):
 class CallType(Enum):
     AGENT_CALL = (1, '手动外呼')
     BOT_CALL = (2, '机器人外呼')
-    BOTH_CALL = (3, '双向外呼')
+    INCOMING_BOT_CALL = (3, '呼入转AI')
+    INCOMING_AGENT_CALL = (4, '呼入转人')
+    BOTH_CALL = (5, '双向外呼')
 
     def __init__(self, code=None, description=None):
         self.code = code

src/core/callcenter/esl/client.py

@@ -541,7 +541,7 @@ class OutboundClient:
                         # 检查白名单
                         _bucket_call_type = 0
                         con.execute("answer", "", device_id)
-                        self.build_call_info(call_id, device_id, new_device_id, destination=None, bucket_type=_bucket_call_type, **kwargs)
+                        self.build_call_info(CallType.INCOMING_AGENT_CALL.code, call_id, device_id, new_device_id, destination=None, bucket_type=_bucket_call_type, **kwargs)
                         self.server.agent.acd_service.transfer_to_agent(call_id, device_id)
                     elif bucket and bucket.name == 'AI':
                         #转到ai机器人
@@ -549,13 +549,13 @@ class OutboundClient:
                         service_category = 1
                         destination = self.server.agent.register(**kwargs)
                         self.server.logger.info("device_id=%s, destination=%s, new_device_id=%s" % (device_id, destination, new_device_id))
-                        self.build_call_info(call_id, device_id, new_device_id, str(destination), bucket_type=_bucket_call_type, **kwargs)
+                        self.build_call_info(CallType.INCOMING_BOT_CALL.code, call_id, device_id, new_device_id, str(destination), bucket_type=_bucket_call_type, **kwargs)
                         self.server.cache.add_device_user_part(device_id, destination)
                         con.execute("bridge", "{sip_h_P-LIBRA-CallId=%s,sip_h_P-LIBRA-DeviceId=%s,origination_uuid=%s}user/%s" % (call_id, new_device_id, new_device_id, destination), device_id)
                     else:
                         # 传统服务
                         con.execute("answer", "", device_id)
-                        self.build_call_info(call_id, device_id, new_device_id, destination=None, bucket_type=_bucket_call_type,  **kwargs)
+                        self.build_call_info(CallType.INCOMING_AGENT_CALL.code, call_id, device_id, new_device_id, destination=None, bucket_type=_bucket_call_type,  **kwargs)
                         self.server.agent.acd_service.transfer_to_agent(call_id, device_id)
 
                     registry.CALL_INCOMING_REQUESTS.labels(f"{_bucket_call_type}").inc()
@@ -578,29 +578,32 @@ class OutboundClient:
             #         # Ignore the error if socket is already closed
             #         pass
 
-        def build_call_info(self, call_id, device_id, new_device_id, destination, bucket_type, **kwargs):
+        def build_call_info(self, call_type, call_id, device_id, new_device_id, destination, bucket_type, **kwargs):
             caller = kwargs.get('Channel-Caller-ID-Number')
             called = destination
             now = datetime.now().timestamp()
 
             call_info = CallInfo(call_id=call_id, agent_key=destination,
                                  caller=caller, called=called, direction=Direction.INBOUND.code,
-                                 call_type=CallType.BOT_CALL.code, call_time=now,
+                                 call_type=call_type, call_time=now,
                                  uuid1=call_id, uuid2=device_id, saas_id=saasId, bucket_type=bucket_type,
                                  core_uuid=None, cti_flow_id=None, conference=None, group_id=None, hidden_customer=0, caller_display=None, called_display=None, number_location=None, agent_name=None, login_type=None, ivr_id=None, task_id=None, media_host=None, sip_server=None, client_host=None, record=None, record2=None, record_time=None, answer_flag=None, wait_time=None, answer_count=0, hangup_dir=None, sdk_hangup=0, hangup_code=None, answer_time=None, end_time=None, talk_time=None, first_queue_time=None, queue_start_time=None, queue_end_time=None, overflow_count=0, cdr_notify_url=None, queue_level=None, transfer_agent=None,device_list=[], device_info_map = {}, follow_data = {}, process_data = {}, next_commands=[], call_details=[])
             device_custom = DeviceInfo(device_id=device_id, call_time=now,
                                      call_id=call_id, device_type=DeviceType.CUSTOMER.code,
                                      agent_key=destination, cdr_type=CdrType.OUTBOUND.code,
                                      cti_flow_id=None, conference=None, agent_name=None, from_agent=None, caller=None, called=None, display=None, called_location=None, caller_location=None, ring_start_time=None, ring_end_time=None, answer_time=None, bridge_time=None, end_time=None, talk_time=None, sip_protocol=None, channel_name=None, hangup_cause=None, ring_cause=None, sip_status=None, record=None, record_time=None, record_start_time=None, state=None, apparent_number=None, caller_display=None)
-            device_bot = DeviceInfo(device_id=new_device_id, call_time=now,
-                                     call_id=call_id, device_type=DeviceType.ROBOT.code,
-                                     agent_key=destination, cdr_type=CdrType.INBOUND.code,
-                                     cti_flow_id=None, conference=None, agent_name=None, from_agent=None, caller=None, called=None, display=None, called_location=None, caller_location=None, ring_start_time=None, ring_end_time=None, answer_time=None, bridge_time=None, end_time=None, talk_time=None, sip_protocol=None, channel_name=None, hangup_cause=None, ring_cause=None, sip_status=None, record=None, record_time=None, record_start_time=None, state=None, apparent_number=None, caller_display=None)
-
             call_info.device_list.append(device_id)
-            call_info.device_list.append(new_device_id)
             # call_info.next_commands.append(NextCommand(device_id, NextType.NEXT_CALL_BRIDGE.code, new_device_id))
-            call_info.device_info_map = {device_id: device_custom, new_device_id: device_bot}
+            call_info.device_info_map = {device_id: device_custom}
+
+            if CallType.INCOMING_BOT_CALL.code == call_type:
+                device_bot = DeviceInfo(device_id=new_device_id, call_time=now,
+                                         call_id=call_id, device_type=DeviceType.ROBOT.code,
+                                         agent_key=destination, cdr_type=CdrType.INBOUND.code,
+                                         cti_flow_id=None, conference=None, agent_name=None, from_agent=None, caller=None, called=None, display=None, called_location=None, caller_location=None, ring_start_time=None, ring_end_time=None, answer_time=None, bridge_time=None, end_time=None, talk_time=None, sip_protocol=None, channel_name=None, hangup_cause=None, ring_cause=None, sip_status=None, record=None, record_time=None, record_start_time=None, state=None, apparent_number=None, caller_display=None)
+                call_info.device_list.append(new_device_id)
+                call_info.device_info_map = {new_device_id: device_bot}
+
             self.server.cache.add_call_info(call_info)
             return call_info
 

src/core/callcenter/esl/handler/channel_answer_handler.py

@@ -33,7 +33,7 @@ class ChannelAnswerHandler(EslEventHandler):
         if CallType.AGENT_CALL.code == call_info.call_type and device_info.device_type == DeviceType.CUSTOMER.code:
             device_info.record = self.record(event, device_id)
 
-        if CallType.BOT_CALL.code == call_info.call_type and device_info.device_type == DeviceType.ROBOT.code:
+        if (CallType.BOT_CALL.code == call_info.call_type or CallType.INCOMING_BOT_CALL.code == call_info.call_type) and device_info.device_type == DeviceType.ROBOT.code:
             device_info.record = self.record(event, device_id)
             call_info.answer_flag = AnswerFlag.ROBOT_ANSWER.code
             registry.CALL_BOT_ANSWER_REQUESTS.labels(f"{call_info.bucket_type}").inc()
@@ -153,7 +153,7 @@ class ChannelAnswerHandler(EslEventHandler):
             return
 
         _record_url = None
-        if CallType.BOT_CALL.code == call.call_type:
+        if CallType.BOT_CALL.code == call.call_type or CallType.INCOMING_BOT_CALL.code == call.call_type:
             if DeviceType.CUSTOMER.code == device.device_type:
                 _record_url = self.start_recording(device_id, get_record_file_name(call_id, CallStage.ALL), call)
             elif DeviceType.ROBOT.code == device.device_type:

src/core/callcenter/esl/handler/channel_hangup_handler.py

@@ -115,7 +115,7 @@ class ChannelHangupHandler(EslEventHandler):
                 self.call_service.hangup_all(call_info, CallCause.HANGUP_EVENT)
                 # self.inbound_client.hangup_call(call_id, device_id, CallCause.HANGUP_EVENT)
 
-            if CallType.BOT_CALL.code == call_info.call_type and device_info.device_type == DeviceType.ROBOT.code:
+            if (CallType.BOT_CALL.code == call_info.call_type or CallType.INCOMING_BOT_CALL.code == call_info.call_type) and device_info.device_type == DeviceType.ROBOT.code:
                 if not device_info.answer_time:
                     registry.CALL_BOT_NO_ANSWER_ERROR_REQUESTS.labels(f"{call_info.bucket_type}", f"{device_info.sip_status}").inc()
                 registry.CALL_BOT_HANGUP_REQUESTS.labels(f"{call_info.bucket_type}", f"{device_info.sip_status}").inc()