github/claude-relay-service
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/claude-relay-service.git synced 2026-01-23 21:17:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: gemini 流式响应

Browse Source
This commit is contained in:
mouyong
2025-08-04 22:36:36 +08:00
parent 50ebf38140
commit f2312893d4
1 changed files with 51 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/routes/geminiRoutes.js
View File

@@ -291,9 +291,9 @@ router.get('/key-info', authenticateApiKey, async (req, res) => {
} }
}); });
router.post('/v1internal\\:loadCodeAssist', authenticateApiKey, async (req, res) => { // 共用的 loadCodeAssist 处理函数
async function handleLoadCodeAssist(req, res) {
try { try {
const sessionHash = sessionHelper.generateSessionHash(req.body); const sessionHash = sessionHelper.generateSessionHash(req.body);
// 使用统一调度选择账号（传递请求的模型） // 使用统一调度选择账号（传递请求的模型）
@@ -304,7 +304,8 @@ router.post('/v1internal\\:loadCodeAssist', authenticateApiKey, async (req, res)
const { metadata, cloudaicompanionProject } = req.body; const { metadata, cloudaicompanionProject } = req.body;
logger.info('LoadCodeAssist request', { const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.info(`LoadCodeAssist request (${version})`, {
metadata: metadata || {}, metadata: metadata || {},
cloudaicompanionProject: cloudaicompanionProject || null, cloudaicompanionProject: cloudaicompanionProject || null,
apiKeyId: req.apiKey?.id || 'unknown' apiKeyId: req.apiKey?.id || 'unknown'
@@ -314,15 +315,17 @@ router.post('/v1internal\\:loadCodeAssist', authenticateApiKey, async (req, res)
const response = await geminiAccountService.loadCodeAssist(client, cloudaicompanionProject); const response = await geminiAccountService.loadCodeAssist(client, cloudaicompanionProject);
res.json(response); res.json(response);
} catch (error) { } catch (error) {
logger.error('Error in loadCodeAssist endpoint', { error: error.message }); const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.error(`Error in loadCodeAssist endpoint (${version})`, { error: error.message });
res.status(500).json({ res.status(500).json({
error: 'Internal server error', error: 'Internal server error',
message: error.message message: error.message
}); });
} }
}); }
router.post('/v1internal\\:onboardUser', authenticateApiKey, async (req, res) => { // 共用的 onboardUser 处理函数
async function handleOnboardUser(req, res) {
try { try {
const { tierId, cloudaicompanionProject, metadata } = req.body; const { tierId, cloudaicompanionProject, metadata } = req.body;
const sessionHash = sessionHelper.generateSessionHash(req.body); const sessionHash = sessionHelper.generateSessionHash(req.body);
@@ -332,7 +335,8 @@ router.post('/v1internal\\:onboardUser', authenticateApiKey, async (req, res) =>
const { accountId } = await unifiedGeminiScheduler.selectAccountForApiKey(req.apiKey, sessionHash, requestedModel); const { accountId } = await unifiedGeminiScheduler.selectAccountForApiKey(req.apiKey, sessionHash, requestedModel);
const { accessToken, refreshToken } = await geminiAccountService.getAccount(accountId); const { accessToken, refreshToken } = await geminiAccountService.getAccount(accountId);
logger.info('OnboardUser request', { const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.info(`OnboardUser request (${version})`, {
tierId: tierId || 'not provided', tierId: tierId || 'not provided',
cloudaicompanionProject: cloudaicompanionProject || null, cloudaicompanionProject: cloudaicompanionProject || null,
metadata: metadata || {}, metadata: metadata || {},
@@ -351,15 +355,17 @@ router.post('/v1internal\\:onboardUser', authenticateApiKey, async (req, res) =>
res.json(response); res.json(response);
} }
} catch (error) { } catch (error) {
logger.error('Error in onboardUser endpoint', { error: error.message }); const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.error(`Error in onboardUser endpoint (${version})`, { error: error.message });
res.status(500).json({ res.status(500).json({
error: 'Internal server error', error: 'Internal server error',
message: error.message message: error.message
}); });
} }
}); }
router.post('/v1internal\\:countTokens', authenticateApiKey, async (req, res) => { // 共用的 countTokens 处理函数
async function handleCountTokens(req, res) {
try { try {
// 处理请求体结构，支持直接 contents 或 request.contents // 处理请求体结构，支持直接 contents 或 request.contents
const requestData = req.body.request || req.body; const requestData = req.body.request || req.body;
@@ -380,7 +386,8 @@ router.post('/v1internal\\:countTokens', authenticateApiKey, async (req, res) =>
const { accountId } = await unifiedGeminiScheduler.selectAccountForApiKey(req.apiKey, sessionHash, model); const { accountId } = await unifiedGeminiScheduler.selectAccountForApiKey(req.apiKey, sessionHash, model);
const { accessToken, refreshToken } = await geminiAccountService.getAccount(accountId); const { accessToken, refreshToken } = await geminiAccountService.getAccount(accountId);
logger.info('CountTokens request', { const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.info(`CountTokens request (${version})`, {
model: model, model: model,
contentsLength: contents.length, contentsLength: contents.length,
apiKeyId: req.apiKey?.id || 'unknown' apiKeyId: req.apiKey?.id || 'unknown'
@@ -391,7 +398,8 @@ router.post('/v1internal\\:countTokens', authenticateApiKey, async (req, res) =>
res.json(response); res.json(response);
} catch (error) { } catch (error) {
logger.error('Error in countTokens endpoint', { error: error.message }); const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.error(`Error in countTokens endpoint (${version})`, { error: error.message });
res.status(500).json({ res.status(500).json({
error: { error: {
message: error.message || 'Internal server error', message: error.message || 'Internal server error',
@@ -399,9 +407,10 @@ router.post('/v1internal\\:countTokens', authenticateApiKey, async (req, res) =>
} }
}); });
} }
}); }
router.post('/v1internal\\:generateContent', authenticateApiKey, async (req, res) => { // 共用的 generateContent 处理函数
async function handleGenerateContent(req, res) {
try { try {
const { model, project, user_prompt_id, request: requestData } = req.body; const { model, project, user_prompt_id, request: requestData } = req.body;
const sessionHash = sessionHelper.generateSessionHash(req.body); const sessionHash = sessionHelper.generateSessionHash(req.body);
@@ -421,7 +430,8 @@ router.post('/v1internal\\:generateContent', authenticateApiKey, async (req, res
const account = await geminiAccountService.getAccount(accountId); const account = await geminiAccountService.getAccount(accountId);
const { accessToken, refreshToken } = account; const { accessToken, refreshToken } = account;
logger.info('GenerateContent request', { const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.info(`GenerateContent request (${version})`, {
model: model, model: model,
userPromptId: user_prompt_id, userPromptId: user_prompt_id,
projectId: project || account.projectId, projectId: project || account.projectId,
@@ -439,7 +449,8 @@ router.post('/v1internal\\:generateContent', authenticateApiKey, async (req, res
res.json(response); res.json(response);
} catch (error) { } catch (error) {
logger.error('Error in generateContent endpoint', { error: error.message }); const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.error(`Error in generateContent endpoint (${version})`, { error: error.message });
res.status(500).json({ res.status(500).json({
error: { error: {
message: error.message || 'Internal server error', message: error.message || 'Internal server error',
@@ -447,9 +458,10 @@ router.post('/v1internal\\:generateContent', authenticateApiKey, async (req, res
} }
}); });
} }
}); }
router.post('/v1internal\\:streamGenerateContent', authenticateApiKey, async (req, res) => { // 共用的 streamGenerateContent 处理函数
async function handleStreamGenerateContent(req, res) {
let abortController = null; let abortController = null;
try { try {
@@ -471,7 +483,8 @@ router.post('/v1internal\\:streamGenerateContent', authenticateApiKey, async (re
const account = await geminiAccountService.getAccount(accountId); const account = await geminiAccountService.getAccount(accountId);
const { accessToken, refreshToken } = account; const { accessToken, refreshToken } = account;
logger.info('StreamGenerateContent request', { const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.info(`StreamGenerateContent request (${version})`, {
model: model, model: model,
userPromptId: user_prompt_id, userPromptId: user_prompt_id,
projectId: project || account.projectId, projectId: project || account.projectId,
@@ -528,7 +541,8 @@ router.post('/v1internal\\:streamGenerateContent', authenticateApiKey, async (re
}); });
} catch (error) { } catch (error) {
logger.error('Error in streamGenerateContent endpoint', { error: error.message }); const version = req.path.includes('v1beta') ? 'v1beta' : 'v1internal';
logger.error(`Error in streamGenerateContent endpoint (${version})`, { error: error.message });
if (!res.headersSent) { if (!res.headersSent) {
res.status(500).json({ res.status(500).json({
@@ -544,6 +558,22 @@ router.post('/v1internal\\:streamGenerateContent', authenticateApiKey, async (re
abortController = null; abortController = null;
} }
} }
}); }
// v1internal 和 v1beta 端点注册
router.post('/v1internal\\:loadCodeAssist', authenticateApiKey, handleLoadCodeAssist);
router.post('/v1beta\\:loadCodeAssist', authenticateApiKey, handleLoadCodeAssist);
router.post('/v1internal\\:onboardUser', authenticateApiKey, handleOnboardUser);
router.post('/v1beta\\:onboardUser', authenticateApiKey, handleOnboardUser);
router.post('/v1internal\\:countTokens', authenticateApiKey, handleCountTokens);
router.post('/v1beta\\:countTokens', authenticateApiKey, handleCountTokens);
router.post('/v1internal\\:generateContent', authenticateApiKey, handleGenerateContent);
router.post('/v1beta\\:generateContent', authenticateApiKey, handleGenerateContent);
router.post('/v1internal\\:streamGenerateContent', authenticateApiKey, handleStreamGenerateContent);
router.post('/v1beta\\:streamGenerateContent', authenticateApiKey, handleStreamGenerateContent);
module.exports = router; module.exports = router;