diff --git a/src/models/qwen.js b/src/models/qwen.js index c343253..d3d7bec 100644 --- a/src/models/qwen.js +++ b/src/models/qwen.js @@ -1,26 +1,21 @@ // This code uses Dashscope and HTTP to ensure the latest support for the Qwen model. -// Qwen is also compatible with the OpenAI API format, and the base URL to be configured is: "https://dashscope.aliyuncs.com/compatible-mode/v1". - -https://dashscope.aliyuncs.com/compatible-mode/v1 +// Qwen is also compatible with the OpenAI API format; import { getKey } from '../utils/keys.js'; export class Qwen { constructor(modelName, url) { - // Initialize model name and API URL this.modelName = modelName; this.url = url || 'https://dashscope.aliyuncs.com/api/v1/services/aigc/text-generation/generation'; - this.apiKey = getKey('QWEN_API_KEY'); // Get API key from utility function + this.apiKey = getKey('QWEN_API_KEY'); } async sendRequest(turns, systemMessage, stopSeq = '***', retryCount = 0) { - // Limit retry attempts to avoid infinite recursion if (retryCount > 5) { console.error('Maximum retry attempts reached.'); return 'Error: Too many retry attempts.'; } - // Build request data const data = { model: this.modelName || 'qwen-plus', input: { messages: [{ role: 'system', content: systemMessage }, ...turns] }, @@ -32,78 +27,65 @@ export class Qwen { data.input.messages.push({ role: 'user', content: 'hello' }); } - // Validate data format before sending request if (!data.model || !data.input || !data.input.messages || !data.parameters) { console.error('Invalid request data format:', data); throw new Error('Invalid request data format.'); } try { - // Send request to API const response = await this._makeHttpRequest(this.url, data); const choice = response?.output?.choices?.[0]; - // Retry request if response is incomplete due to length limit if (choice?.finish_reason === 'length' && turns.length > 0) { return this.sendRequest(turns.slice(1), systemMessage, stopSeq, retryCount + 1); } - // Return response content or default message return choice?.message?.content || 'No content received.'; } catch (err) { - // Error handling, log error and return error message console.error('Error occurred:', err); return 'An error occurred, please try again.'; } } async embed(text) { - // Validate embedding input if (!text || typeof text !== 'string') { console.error('Invalid embedding input: text must be a non-empty string.'); return 'Invalid embedding input: text must be a non-empty string.'; } - // Build embedding request data const data = { model: 'text-embedding-v2', input: { texts: [text] }, parameters: { text_type: 'query' }, }; - // Validate data format before sending request if (!data.model || !data.input || !data.input.texts || !data.parameters) { console.error('Invalid embedding request data format:', data); throw new Error('Invalid embedding request data format.'); } try { - // Send embedding request to API const response = await this._makeHttpRequest(this.url, data); const embedding = response?.output?.embeddings?.[0]?.embedding; return embedding || 'No embedding result received.'; } catch (err) { - // Error handling, log error and return error message console.error('Error occurred:', err); return 'An error occurred, please try again.'; } } async _makeHttpRequest(url, data) { - // Set request headers, including authorization and content type const headers = { 'Authorization': `Bearer ${this.apiKey}`, 'Content-Type': 'application/json', }; - // Send HTTP POST request to API const response = await fetch(url, { method: 'POST', headers, body: JSON.stringify(data), }); - // Check response status code, throw error if not successful if (!response.ok) { const errorText = await response.text(); console.error(`Request failed, status code ${response.status}: ${response.statusText}`); @@ -111,7 +93,6 @@ export class Qwen { throw new Error(`Request failed, status code ${response.status}: ${response.statusText}`); } - // Parse and return response JSON const responseText = await response.text(); try { return JSON.parse(responseText);