nomid2 commited on
Commit
ed0c017
·
verified ·
1 Parent(s): c666a95

Upload chat.js

Browse files
Files changed (1) hide show
  1. src/router/chat.js +7 -19
src/router/chat.js CHANGED
@@ -6,6 +6,7 @@ const { MODEL_MAPPING, MAMMOUTH_API_URL, AUTH_TOKEN, UNLIMITED_MODELS } = requir
6
  const accountManager = require('../lib/manager')
7
  const imageUploader = require('../lib/uploader')
8
  const logger = require('../lib/logger')
 
9
 
10
  const router = express.Router()
11
 
@@ -554,40 +555,27 @@ router.post('/completions', authenticate, async (req, res) => {
554
  })
555
  }
556
  } else {
557
- // 其他错误
558
  logger.logRequestEnd(requestId, 500, {
559
  error: error.message,
560
  totalDuration: Date.now() - startTime
561
  })
562
 
563
- res.status(500).json({
564
- error: {
565
- message: '处理请求时发生错误',
566
- type: 'server_error',
567
- details: error.message
568
- }
569
- })
570
  }
571
  }
572
  } catch (error) {
573
- // 记录最终错误
574
  if (requestId) {
575
- logger.logError(requestId, 'REQUEST_ERROR', error.message, {
576
- totalDuration: Date.now() - startTime
577
- })
578
  logger.logRequestEnd(requestId, 500, {
579
  error: error.message,
580
  totalDuration: Date.now() - startTime
581
  })
582
  }
583
 
584
- console.error('请求处理错误:', error)
585
- res.status(500).json({
586
- error: {
587
- message: '处理请求时发生错误',
588
- type: 'server_error',
589
- details: error.message
590
- }
591
  })
592
  }
593
  })
 
6
  const accountManager = require('../lib/manager')
7
  const imageUploader = require('../lib/uploader')
8
  const logger = require('../lib/logger')
9
+ const ErrorHandler = require('../lib/errorHandler')
10
 
11
  const router = express.Router()
12
 
 
555
  })
556
  }
557
  } else {
558
+ // 其他错误,使用统一错误处理
559
  logger.logRequestEnd(requestId, 500, {
560
  error: error.message,
561
  totalDuration: Date.now() - startTime
562
  })
563
 
564
+ ErrorHandler.handleModelError(res, error, requestId, requestedModel, isStreamRequest)
 
 
 
 
 
 
565
  }
566
  }
567
  } catch (error) {
568
+ // 使用统一错误处理
569
  if (requestId) {
 
 
 
570
  logger.logRequestEnd(requestId, 500, {
571
  error: error.message,
572
  totalDuration: Date.now() - startTime
573
  })
574
  }
575
 
576
+ ErrorHandler.handleApiError(res, error, requestId, {
577
+ totalDuration: Date.now() - startTime,
578
+ endpoint: '/v1/chat/completions'
 
 
 
 
579
  })
580
  }
581
  })