unified-ai-router 3.0.3 → 3.1.1

package/main.js

@@ -11,9 +11,18 @@ class AIRouter
 		this.providers = providers;
 	}
 
+	createClient ( provider )
+	{
+		return new OpenAI({
+			apiKey: provider.apiKey,
+			baseURL: provider.apiUrl,
+			timeout: 60000,
+		});
+	}
+
 	async chatCompletion ( messages, options = {}, stream = false )
 	{
-		const { stream: streamOption, tools, model, ...restOptions } = options;
+		const { stream: streamOption, tools, ...restOptions } = options;
 		const isStreaming = stream || streamOption;
 
 		logger.info( `Starting chatCompletion with ${this.providers.length} providers (streaming: ${isStreaming})` );
@@ -24,11 +33,7 @@ class AIRouter
 			try
 			{
 				logger.info( `Attempting with provider: ${provider.name}` );
-				const client = new OpenAI({
-					apiKey: provider.apiKey,
-					baseURL: provider.apiUrl,
-					timeout: 60000,
-				});
+				const client = this.createClient( provider );
 
 				const params = {
 					model: provider.model,
@@ -46,7 +51,7 @@ class AIRouter
 						for await ( const chunk of responseStream )
 						{
 							const content = chunk.choices[0]?.delta?.content;
-							const reasoning = chunk.choices[0]?.delta?.reasoning
+							const reasoning = chunk.choices[0]?.delta?.reasoning;
 							const tool_calls_delta = chunk.choices[0]?.delta?.tool_calls;
 							if ( content !== null )
 							{
@@ -78,7 +83,7 @@ class AIRouter
 					{
 						response.reasoning = reasoning
 					}
-					if ( tools !== null )
+					if ( tool_calls !== null )
 					{
 						response.tool_calls = tool_calls
 					}
@@ -97,7 +102,7 @@ class AIRouter
 
 	async chatCompletionWithResponse ( messages, options = {})
 	{
-		const { stream, tools, model, ...restOptions } = options;
+		const { stream, tools, ...restOptions } = options;
 		const isStreaming = stream;
 
 		logger.info( `Starting chatCompletionWithResponse with ${this.providers.length} providers (streaming: ${isStreaming})` );
@@ -108,11 +113,7 @@ class AIRouter
 			try
 			{
 				logger.info( `Attempting with provider: ${provider.name}` );
-				const client = new OpenAI({
-					apiKey: provider.apiKey,
-					baseURL: provider.apiUrl,
-					timeout: 60000,
-				});
+				const client = this.createClient( provider );
 
 				const params = {
 					model: provider.model,
@@ -134,6 +135,7 @@ class AIRouter
 		}
 		throw new Error( `All providers failed. Last error: ${lastError.message}` );
 	}
+
 	async getModels ()
 	{
 		const models = [];
@@ -147,13 +149,9 @@ class AIRouter
 			try
 			{
 				logger.info( `Fetching models for provider: ${provider.name}` );
-				const client = new OpenAI({
-					apiKey: provider.apiKey,
-					baseURL: provider.apiUrl,
-					timeout: 60000,
-				});
+				const client = this.createClient( provider );
 				const listResponse = await client.models.list();
-				const modelList = listResponse.data && listResponse.data.length > 0 ? listResponse.data : listResponse.body || [];
+				const modelList = Array.isArray( listResponse.data ) ? listResponse.data : listResponse.body || [];
 				const model = modelList.find( m => { return m.id === provider.model || m.id === `models/${provider.model}` });
 				if ( model )
 				{

package/openai-compatible-server/index.js

@@ -1,18 +1,18 @@
 const express = require( "express" );
 const cors = require( "cors" );
-const AIRouter = require( "../main" );
 const pino = require( "pino" );
 const pretty = require( "pino-pretty" );
 const pinoStream = pretty({ colorize: true, ignore: "pid,hostname" });
 const logger = pino({ base: false }, pinoStream );
 require( "dotenv" ).config({ quiet: true });
+const AIRouter = require( "../main" );
+const providers = require( "../provider" )
+const aiRouter = new AIRouter( providers );
 
 const app = express();
 app.use( cors() );
 app.use( express.json() );
 
-const providers = require( "../provider" )
-const aiRouter = new AIRouter( providers );
 
 app.post( "/v1/chat/completions", async ( req, res ) =>
 {
@@ -31,7 +31,7 @@ app.post( "/v1/chat/completions", async ( req, res ) =>
 
 		try
 		{
-			const result = await aiRouter.chatCompletionWithResponse( messages, { model, ...rest });
+			const result = await aiRouter.chatCompletionWithResponse( messages, { model, stream, ...rest });
 
 			for await ( const chunk of result.data )
 			{
@@ -53,7 +53,57 @@ app.post( "/v1/chat/completions", async ( req, res ) =>
 	{
 		try
 		{
-			const result = await aiRouter.chatCompletionWithResponse( messages, { model, ...rest });
+			const result = await aiRouter.chatCompletionWithResponse( messages, { model, stream, ...rest });
+
+			res.json( result.data );
+		}
+		catch ( err )
+		{
+			logger.error( err );
+			res.status( 500 ).json({ error: { message: err.message } });
+		}
+	}
+});
+app.post( "/chat/completions", async ( req, res ) =>
+{
+	const { messages, model, stream, ...rest } = req.body;
+
+	if ( !messages || !Array.isArray( messages ) )
+	{
+		return res.status( 400 ).json({ error: { message: "messages must be an array" } });
+	}
+
+	if ( stream )
+	{
+		res.setHeader( "Content-Type", "text/event-stream" );
+		res.setHeader( "Cache-Control", "no-cache" );
+		res.setHeader( "Connection", "keep-alive" );
+
+		try
+		{
+			const result = await aiRouter.chatCompletionWithResponse( messages, { model, stream, ...rest });
+
+			for await ( const chunk of result.data )
+			{
+				res.write( `data: ${JSON.stringify( chunk )}\n\n` );
+			}
+
+			res.write( "data: [DONE]\n\n" );
+		}
+		catch ( err )
+		{
+			logger.error( err );
+			res.write( `data: ${JSON.stringify({ error: { message: err.message } })}\n\n` );
+			res.write( "data: [DONE]\n\n" );
+		}
+
+		res.end();
+	}
+	else
+	{
+		try
+		{
+			const result = await aiRouter.chatCompletionWithResponse( messages, { model, stream, ...rest });
 
 			res.json( result.data );
 		}
@@ -79,6 +129,20 @@ app.get( "/v1/models", async ( req, res ) =>
 	}
 });
 
+app.get( "/models", async ( req, res ) =>
+{
+	try
+	{
+		const models = await aiRouter.getModels();
+		res.json({ data: models });
+	}
+	catch ( error )
+	{
+		logger.error( `Error in /models: ${error.message}` );
+		res.status( 500 ).json({ error: { message: error.message } });
+	}
+});
+
 app.get( "/health", ( req, res ) => { return res.json({ status: "ok" }) });
 
 // Start server

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "unified-ai-router",
-  "version": "3.0.3",
+  "version": "3.1.1",
   "description": "A unified interface for multiple LLM providers with automatic fallback. This project includes an OpenAI-compatible server and a deployable Telegram bot with a Mini App interface. It supports major providers like OpenAI, Google, Grok, and more, ensuring reliability and flexibility for your AI applications.",
   "license": "ISC",
   "author": "mlibre",