feat:新接口适配,代码优化
This commit is contained in:
@@ -46,11 +46,15 @@ def is_json(myjson):
|
||||
'''
|
||||
时间工具函数,进行按天叠加的功能,例如:获取3天后的时间
|
||||
'''
|
||||
def get_time_info(offset: int) -> int:
|
||||
now = datetime.now()
|
||||
def get_time_info(offset: int, base_date=None) -> int:
|
||||
if base_date:
|
||||
now = datetime.strptime(base_date, "%Y-%m-%d %H:%M:%S")
|
||||
else:
|
||||
now = datetime.now()
|
||||
if offset > 0:
|
||||
now = now + timedelta(days=offset)
|
||||
midnight = now.replace(hour=0, minute=0, second=0, microsecond=0)
|
||||
|
||||
return int(midnight.timestamp() * 1000)
|
||||
|
||||
|
||||
@@ -192,12 +196,8 @@ def query_booking_info(params: dict) -> str:
|
||||
raise Exception("tenantId 不能为空")
|
||||
access_token = getinfo.get_access_token(tenant_id)
|
||||
params['access_token'] = access_token
|
||||
# params['startTimeStamp'] = get_time_info(0)
|
||||
# params['endTimeStamp'] = get_time_info(10)
|
||||
# if not params.get('startTimeStamp', None):
|
||||
# params['startTimeStamp'] = get_time_info(0)
|
||||
# if not params.get('endTimeStamp', None):
|
||||
# params['endTimeStamp'] = get_time_info(10)
|
||||
params['startTimeStamp'] = get_time_info(0)
|
||||
params['endTimeStamp'] = get_time_info(10)
|
||||
# 查询所有已预定的会议
|
||||
meeting_room = getinfo.query_meetingbooking_info(params)
|
||||
# 过滤掉已经取消的会议
|
||||
@@ -225,10 +225,12 @@ def query_booking_info_by_user(params: dict, data=None):
|
||||
# 模型prompt部分已做时间补全处理,这里是为保险起见
|
||||
time_date = getinfo.standard_format(start_time) or getinfo.standard_format(end_time)
|
||||
current_date = time_date.split(' ')[0]
|
||||
logger.info("current date is {0}".format(current_date))
|
||||
mintime = datetime.min.time().strftime('%H:%M:%S')
|
||||
maxtime = datetime.max.time().strftime('%H:%M:%S')
|
||||
start_time = parse_time(getinfo.standard_format(start_time) or " ".join((current_date, mintime)))
|
||||
end_time = parse_time(getinfo.standard_format(end_time) or " ".join((current_date, maxtime)))
|
||||
# datetime.
|
||||
params['startTimeStamp'] = start_time
|
||||
params['endTimeStamp'] = end_time
|
||||
try:
|
||||
@@ -786,8 +788,10 @@ def gen_system_prompt()->str:
|
||||
消息对话入口,处理智能体与用户对话交互
|
||||
包括历史记录的维护
|
||||
'''
|
||||
def process_chat(covers_id:str,user_id: str, user_input: str, params: dict):
|
||||
|
||||
def process_chat(body: dict, params: dict):
|
||||
covers_id = body['covers_id']
|
||||
user_id = body['user_id']
|
||||
user_input = body['user_query']
|
||||
history = []
|
||||
logger.info("query history")
|
||||
query_history = redis_message_manage.get_history(covers_id)
|
||||
|
||||
@@ -235,6 +235,6 @@ def room_chat(request):
|
||||
or request.headers.get('yht_access_token', None))
|
||||
if yht_token:
|
||||
params['yht_access_token'] = yht_token
|
||||
data = json.loads(request.body)
|
||||
resp = process_chat(data['covers_id'],data['user_id'], data['user_query'], params)
|
||||
body = json.loads(request.body)
|
||||
resp = process_chat(body, params)
|
||||
return JsonResponse(resp)
|
||||
|
||||
Reference in New Issue
Block a user