本地开发版

src/core/callcenter/__init__.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # encoding:utf-8
 
-from .config import dictConfig, BaseConfig
+from .config import BaseConfig
 from flask import Flask, request, render_template_string
 from flask_sqlalchemy import SQLAlchemy
 

src/core/callcenter/config.py

@@ -1,6 +1,6 @@
 
 import os
-from logging.config import dictConfig
+# from logging.config import dictConfig
 
 from src.core.datasource import SERVE_HOST, MYSQL_PASSWORD
 
@@ -21,34 +21,34 @@ class BaseConfig(object):
     SQLALCHEMY_ECHO = True  # Optional: Log SQL queries
 
 
-dictConfig({
-        "version": 1,
-        "disable_existing_loggers": False,  # 不覆盖默认配置
-        "formatters": {  # 日志输出样式
-            "default": {
-                "format": "%(asctime)s - %(module)s.%(lineno)d - %(levelname)s - %(threadName)s: %(message)s"
-            }
-        },
-        "handlers": {
-            "console": {
-                "class": "logging.StreamHandler",  # 控制台输出
-                "level": "DEBUG",
-                "formatter": "default",
-            },
-            "log_file": {
-                "class": "logging.handlers.RotatingFileHandler",
-                "level": "INFO",
-                "formatter": "default",   # 日志输出样式对应formatters
-                "filename": "./logs/flask.log",  # 指定log文件目录
-                "maxBytes": 20*1024*1024,   # 文件最大20M
-                "backupCount": 10,          # 最多10个文件
-                "encoding": "utf8",         # 文件编码
-            },
-
-        },
-        "root": {
-            "level": "DEBUG",  # # handler中的level会覆盖掉这里的level
-            "handlers": ["console", "log_file"],
-        },
-    }
-)
+# dictConfig({
+#         "version": 1,
+#         "disable_existing_loggers": False,  # 不覆盖默认配置
+#         "formatters": {  # 日志输出样式
+#             "default": {
+#                 "format": "%(asctime)s - %(module)s.%(lineno)d - %(levelname)s - %(threadName)s: %(message)s"
+#             }
+#         },
+#         "handlers": {
+#             "console": {
+#                 "class": "logging.StreamHandler",  # 控制台输出
+#                 "level": "DEBUG",
+#                 "formatter": "default",
+#             },
+#             "log_file": {
+#                 "class": "logging.handlers.RotatingFileHandler",
+#                 "level": "INFO",
+#                 "formatter": "default",   # 日志输出样式对应formatters
+#                 "filename": "./logs/flask.log",  # 指定log文件目录
+#                 "maxBytes": 20*1024*1024,   # 文件最大20M
+#                 "backupCount": 10,          # 最多10个文件
+#                 "encoding": "utf8",         # 文件编码
+#             },
+#
+#         },
+#         "root": {
+#             "level": "DEBUG",  # # handler中的level会覆盖掉这里的level
+#             "handlers": ["console", "log_file"],
+#         },
+#     }
+# )

src/core/callcenter/views.py

@@ -16,10 +16,11 @@ from flask import Flask, request, render_template_string
 from src.core.callcenter.call import CallService
 from src.core.callcenter.api import MakeCallRequest, AgentInfo, AgentActionRequest, HangupCallRequest, \
     HumanServiceQueryRequest
-from src.core.voip.bot import BotAgent
+# from src.core.voip.bot import BotAgent
 
 
-agent = BotAgent(app.logger)
+# agent = BotAgent(app.logger)
+agent = None
 inbound_client = InboundClient(agent, app.logger)
 outbound_client = OutboundClient(agent, app.logger)
 call_service = CallService(inbound_client, app.logger)

src/core/datasource.py

@@ -15,7 +15,7 @@ from src.core import singleton
 from redis import StrictRedis, ConnectionPool
 
 SERVE_HOST = os.environ.get("SERVE_HOST")
-SERVE_HOST = "192.168.124.6"
+SERVE_HOST = "192.168.100.195"
 MYSQL_PASSWORD = 'EKoAe3H8xybQKrFPApXM'
 
 if SERVE_HOST != "192.168.100.159":

src/core/voip/constant.py

@@ -4,7 +4,6 @@
 import os
 import mmh3
 import queue
-import pjsua2 as pj
 
 player_script_dir = '/code/src/core/voip/scripts/'
 
@@ -16,6 +15,7 @@ def murmur3_32(player_file):
 
 
 def build_audio_format():
+    import pjsua2 as pj
     fmt = pj.MediaFormatAudio()
     fmt.type = pj.PJMEDIA_TYPE_AUDIO
     fmt.id = pj.PJMEDIA_FORMAT_PCM