aotrautils-srv 0.0.908 → 0.0.910

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (07/04/2024-15:45:57)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (07/04/2024-16:01:40)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5195,10 +5195,8 @@ class OpenAIAPIClient{
 	  
   	//DBG
   	lognow("------------self.apiURL:",self.apiURL);
-		lognow("------------! messages :",messages);
 		
-		
-		const result=this.launchRequest(AIAPIKey, messages);
+		const result=await this.launchRequest(AIAPIKey, messages);
 		
 		// DBG
 		console.log("! RESULT text :",result);
@@ -5213,54 +5211,98 @@ class OpenAIAPIClient{
 		lognow("! launchRequest messages :",messages);
 		
 		
+		const headers={
+			"Authorization": "Bearer "+AIAPIKey,
+			"Content-Type": "application/json",
+		};
+		const parameters={
+			model:self.modelName,
+			messages,
+		};
+
 		const self=this;
-		return new Promise((resolve,reject)=>{
-			
-			fetch(self.apiURL, {
-			   method: "POST",
-			   headers: {
-						"Authorization": "Bearer "+AIAPIKey,
-						"Content-Type": "application/json",
-			   },
-			   body: JSON.stringify({
-						model:self.modelName,
-						messages,
-			   }),
-			  })
-				// STRANGE : DOES NOT WORK !!:
-		    //.then(response => response.json())
-		    // STRANGE : DOES WORK :
-		   .then(response => {
-			
-		  	 	// DBG
-		  	  console.log("~~~~~~~~~~~response :",response);
-		  	  
-					return response.json();
-				})
-		   .then(data => {
-			
-					if(data.error){
-						const error=data.error;
-						// TRACE
-						console.error("Error:", error);
-						reject(""+error);
-						return;
-					}
-			
-		  	 	// DBG
-		  	  console.log("~~~~~~~~~~~data :",data);
-					
-					const assistantReply = data.choices[0].message.content;
-					resolve(assistantReply);
-		   })
-		   .catch(error => {
-					// TRACE
-					console.error("Error:", error);
-					reject(""+error);
-		   });
-		   
-		   
+		return performHTTPRequestNode(self.apiURL,"POST",headers,parameters).then((responseObj)=>{
+			const responseData=responseObj.responseData;
+			//const response=responseObj.response;
+			//const responseDataStr=responseObj.responseDataStr;
+			const dataLocal=responseData;
+			doOnIncomingMessageForResponse(dataLocal);
+		}).then(response=>{
+			
+	 	 	// DBG
+	 	  console.log("~~~~~~~~~~~response :",response);
+	 	  
+	 	  const data=response;
+			if(data.error){
+				const error=data.error;
+				// TRACE
+				console.error("Error:", error);
+				throw new Error(`${error}`);
+			}
+	
+			const assistantReply = data.choices[0].message.content;
+		 	// DBG
+		  console.log("~~~~~~~~~~~assistantReply :",assistantReply);
+			return assistantReply;
+		}).catch(error => {
+			// TRACE
+			console.error("Error:", error);
+			reject(""+error);
 		});
+		
+		
+		
+		
+		
+//		return new Promise((resolve,reject)=>{
+//			
+//			fetch(self.apiURL, {
+//			   method: "POST",
+//			   headers: {
+//						"Authorization": "Bearer "+AIAPIKey,
+//						"Content-Type": "application/json",
+//			   },
+//			   body: JSON.stringify({
+//						model:self.modelName,
+//						messages,
+//			   }),
+//			  })
+//				// STRANGE : DOES NOT WORK !!:
+//		    //.then(response => response.json())
+//		    // STRANGE : DOES WORK :
+//		   .then(response => {
+//			
+//		  	 	// DBG
+//		  	  console.log("~~~~~~~~~~~response :",response);
+//		  	  
+//					return response.json();
+//				})
+//		   .then(data => {
+//			
+//					if(data.error){
+//						const error=data.error;
+//						// TRACE
+//						console.error("Error:", error);
+//						reject(""+error);
+//						return;
+//					}
+//			
+//		  	 	// DBG
+//		  	  console.log("~~~~~~~~~~~data :",data);
+//					
+//					const assistantReply = data.choices[0].message.content;
+//					resolve(assistantReply);
+//		   })
+//		   .catch(error => {
+//					// TRACE
+//					console.error("Error:", error);
+//					reject(""+error);
+//		   });
+//		});
+		
+		
+		
+		
 	}
 	
 	
@@ -5286,7 +5328,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 	
 
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (07/04/2024-15:45:57)»*/
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (07/04/2024-16:01:40)»*/
 /*-----------------------------------------------------------------------------*/
 
 

aotrautils-srv/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aotrautils-srv",
-	"version": "0.0.908",
+	"version": "0.0.910",
 	"main": "aotrautils-srv.build.js",
 	"description": "A library for vanilla javascript utils (server-side) used in aotra javascript CMS",
 	"author": "Jeremie Ratomposon <info@alqemia.com> (https://alqemia.com)",