Spaces:
Runtime error
Runtime error
远兮 commited on
Commit ·
bd50541
1
Parent(s): 03f0d4a
bugfix
Browse files- chatgpt-next-web/service.py +14 -3
chatgpt-next-web/service.py
CHANGED
|
@@ -345,6 +345,17 @@ def get_user_profile():
|
|
| 345 |
else:
|
| 346 |
formatted_expiration = '已过期'
|
| 347 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 348 |
return jsonify({
|
| 349 |
'code': 0,
|
| 350 |
'message': 'Success',
|
|
@@ -353,7 +364,7 @@ def get_user_profile():
|
|
| 353 |
'basic_chat_limit': basic_chat_limit,
|
| 354 |
'advanced_chat_limit': advanced_chat_limit,
|
| 355 |
'expiration': formatted_expiration,
|
| 356 |
-
'package_title': package.get(b'title', b'
|
| 357 |
}
|
| 358 |
})
|
| 359 |
|
|
@@ -654,12 +665,12 @@ def exceeded_chat_limit(user_id, package, model):
|
|
| 654 |
print('basic_chat_limit:', basic_chat_limit)
|
| 655 |
if get_free_count(user_id) > 0:
|
| 656 |
return False
|
| 657 |
-
if basic_chat_limit <= 0:
|
| 658 |
return True
|
| 659 |
|
| 660 |
if model == 'gpt-4':
|
| 661 |
advanced_chat_limit = int(package.get(b'advanced_chat_limit', 0))
|
| 662 |
-
if advanced_chat_limit <= 0:
|
| 663 |
return True
|
| 664 |
|
| 665 |
return False
|
|
|
|
| 345 |
else:
|
| 346 |
formatted_expiration = '已过期'
|
| 347 |
|
| 348 |
+
if (package.get(b'title') is None):
|
| 349 |
+
return jsonify({
|
| 350 |
+
'code': 0,
|
| 351 |
+
'message': 'Success',
|
| 352 |
+
'data': {
|
| 353 |
+
'free_count': free_count,
|
| 354 |
+
'basic_chat_limit': basic_chat_limit,
|
| 355 |
+
'advanced_chat_limit': advanced_chat_limit
|
| 356 |
+
}
|
| 357 |
+
})
|
| 358 |
+
|
| 359 |
return jsonify({
|
| 360 |
'code': 0,
|
| 361 |
'message': 'Success',
|
|
|
|
| 364 |
'basic_chat_limit': basic_chat_limit,
|
| 365 |
'advanced_chat_limit': advanced_chat_limit,
|
| 366 |
'expiration': formatted_expiration,
|
| 367 |
+
'package_title': package.get(b'title', b'unknown').decode('utf-8')
|
| 368 |
}
|
| 369 |
})
|
| 370 |
|
|
|
|
| 665 |
print('basic_chat_limit:', basic_chat_limit)
|
| 666 |
if get_free_count(user_id) > 0:
|
| 667 |
return False
|
| 668 |
+
if basic_chat_limit <= 0 and basic_chat_limit != -1:
|
| 669 |
return True
|
| 670 |
|
| 671 |
if model == 'gpt-4':
|
| 672 |
advanced_chat_limit = int(package.get(b'advanced_chat_limit', 0))
|
| 673 |
+
if advanced_chat_limit <= 0 and advanced_chat_limit != -1:
|
| 674 |
return True
|
| 675 |
|
| 676 |
return False
|