aotrautils-srv 0.0.1849 → 0.0.1851

aotrautils-srv/aotrautils-srv.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (09/06/2026-14:12:54)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (14/06/2026-23:54:16)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -485,12 +485,19 @@ window.aotestMethods.getScenariiByName=function(allTests, scenariiNames){
 	}, null, null, scenario=>contains(scenariiNames,scenario.name));
 	return results;
 }
+window.aotestMethods.getNumberOfScenariiInApp=function(allTestsBagForClientIdForAppReadOnly, testsType){
+	let currentScenariiNumberInApp=0;
+	window.aotestMethods.iterateOverScenarii(allTestsBagForClientIdForAppReadOnly, (scenario)=>{
+		currentScenariiNumberInApp++;
+	}, testsType);
+	return currentScenariiNumberInApp;
+}
 window.aotestMethods.getNumberOfScenariiInGlobal=function(allTestsBagForClientReadOnly, testsType){
-		let currentScenariiNumber=0;
-		window.aotestMethods.iterateOverScenarii(allTestsBagForClientReadOnly, (scenario)=>{
-			currentScenariiNumber++;
-		}, testsType);
-		return currentScenariiNumber;
+	let currentScenariiNumber=0;
+	foreach(allTestsBagForClientReadOnly, (allTestsBag, appName)=>{
+		currentScenariiNumber+=aotestMethods.getNumberOfScenariiInApp(allTestsBag, testsType);
+	});
+	return currentScenariiNumber;
 }
 window.aotestMethods.iterateOverScenarii=function(allTests, doOnIteration, testsType=null, filterFunction=null, mustTerminateFunction=null){
 	if(!testsType || testsType==="*"){
@@ -5122,6 +5129,11 @@ window.stringifyObject=function(objectToStringify, prettifierOption=null/*(can b
 	return null;
 }
 
+window.stringifyIfNeeded=function(objOrString){
+	if(objOrString==null)	return "";
+	return (isString(objOrString) ? objOrString : stringifyObject(objOrString));
+}
+
 
 window.splitURL=(urlOrigin)=>{
 	let protocol=null;
@@ -5458,7 +5470,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 	
 
-/*utils AI library associated with aotra version : «1_29072022-2359 (09/06/2026-14:12:54)»*/
+/*utils AI library associated with aotra version : «1_29072022-2359 (14/06/2026-23:54:16)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5489,6 +5501,20 @@ if(typeof(window)==="undefined")	window=global;
 //=========================================================================
 // GLOBAL CONSTANTS :
 
+window.DEFAULT_LLM_PROVIDER_NAME="claude";
+
+window.LLM_PROVIDERS_PARAMETERS={
+	"openai":{
+		modelName:"gpt-3.5-turbo",
+		apiURL:"https://api.openai.com/v1/chat/completions"
+	},
+	"claude":{
+		modelName:"claude-sonnet-4-8",
+		apiURL:"https://api.anthropic.com/v1/messages"
+	},
+};
+
+
 //=========================================================================
 
 
@@ -5497,22 +5523,20 @@ if(typeof(window)==="undefined")	window=global;
 // AI management :
 
 
+// Commons :
 
-class OpenAIAPIClient{
+
+window.LLMAPIClient=class LLMAPIClient{
 	
 	constructor(modelName, apiURL, agentRole, defaultPrompt){
 		
-  	//DBG
-  	lognow(">>>>>>>>>>>>>>>>!!!!!!apiURL:",apiURL);
-		
-		// this.apiKey=apiKey;
 		this.modelName=modelName;
 		this.apiURL=apiURL;
 		this.agentRole=agentRole;
 		this.defaultPrompt=defaultPrompt;
 	}
 
-	async getAnswer(AIAPIKey, additionalPrompt, defaultPromptParameters={}){
+	async getAnswer(AIAPIKey, userPrompt, defaultPromptParameters={}){
 		
 		const PARAMETERS_DELIMITERS=["<",">"];
 		
@@ -5522,46 +5546,39 @@ class OpenAIAPIClient{
 			newDefaultPrompt=newDefaultPrompt.replace(regexp,value);
 		});
 		
-		const self=this;
-	  const messages = [
-	   { role: "system", content: this.agentRole },
-	   { role: "user", content: (newDefaultPrompt+ "\n" + additionalPrompt) },
-	  ];
+	  const messages=this.getMessages(newDefaultPrompt, userPrompt);
 	  
-  	//DBG
-  	lognow("------------self.apiURL:",self.apiURL);
-		
 		const result=await this.launchRequest(AIAPIKey, messages);
 		
-		// DBG
-		console.log("! RESULT text :",result);
-		
 		return result;
 	}
 	
 	
+	/*protected*/getMessages(defaultPrompt, userPrompt){
+		return [
+			{ role: "system", content: this.agentRole },
+			{ role: "user", content: (defaultPrompt+"\n"
+																 +userPrompt) },
+		];
+	}
+	
+	
 	/*private*/launchRequest(AIAPIKey, messages){
-				
-		// DBG
-		lognow("! launchRequest messages :",messages);
 		
+		const self=this;
 		
-		const headers={
-			"Authorization": "Bearer "+AIAPIKey,
-			"Content-Type": "application/json",
-		};
-		const parameters={
-			model:this.modelName,
-			messages:messages,
-		};
+		
+		const headers=this.getAPIRequestHeaders(AIAPIKey);
+
+		const parameters=getAPIRequestParameters(messages);
 
 		return new Promise((resolve,reject)=>{
-			performHTTPRequest(this.apiURL,"POST",headers,parameters,true).then((responseObj)=>{
+			performHTTPRequest(this.apiURL, "POST", headers, parameters, true).then((responseObj)=>{
 				const responseData=responseObj.responseData;
 				const data=responseData;
 				
 		 	 	// DBG
-		 	  console.log("~~~~~~~~~~~data :",data);
+		 	  console.log("DEBUG : ~~~~~~~~~~~data :",data);
 		 	  
 				if(data.error){
 					const error=data.error;
@@ -5569,42 +5586,151 @@ class OpenAIAPIClient{
 					console.error("Error:", error);
 					reject(new Error(`${error}`));
 				}
-		
-				const assistantReply = data.choices[0].message.content;
-			 	// DBG
-			  console.log("~~~~~~~~~~~assistantReply :",assistantReply);
-			  
+				
+				const assistantReply=self.getAssistantReply(data);
+				
 				resolve(assistantReply);
 			}).catch(errorObj=>{
 				const error=errorObj.error;
 				const httpStatus=errorObj.httpStatus;
 				// TRACE
-				console.error("Error:", error);
+				lognow("ERROR:", error);
 				reject(error);
 			});
 		});
 		
 		
-		
-		
 	}
 	
 	
+	/*protected*/getAPIRequestHeaders(AIAPIKey){
+		return {
+			"Authorization": "Bearer "+AIAPIKey,
+			"Content-Type": "application/json",
+		};
+	}
+
+	/*protected*/getAPIRequestParameters(messages){
+		return{
+			model:this.modelName,
+			messages:messages,
+		};
+	}
+
+	/*protected*/getAssistantReply(data){
+		return data.choices[0].message.content;
+	}
+	
+	
+}
+
+
+
+
+// Claude :
+
+
+
+window.ClaudeAPIClient=class ClaudeAPIClient extends LLMAPIClient{
+	
+	constructor(modelName, apiURL, agentRole, defaultPrompt){
+		super(modelName, apiURL, agentRole, defaultPrompt);		
+  	
+	}
+
+
+	/*protected*/getAPIRequestHeaders(AIAPIKey){
+		return {
+			"x-api-key": AIAPIKey,
+			"anthropic-version": "2023-06-01",
+			"Content-Type": "application/json"
+		};
+	}
+
+	/*protected*/getAPIRequestParameters(messages){
+		return{
+			model:this.modelName,
+			messages:messages,
+			"max_tokens": 2048,
+			system:this.agentRole,
+		};
+	}
+
+	/*protected*/getMessages(defaultPrompt, userPrompt){
+		return [
+			{ role: "user", content: (defaultPrompt+"\n"
+																 +userPrompt) },
+		];
+	}
+
+	/*protected*/getAssistantReply(data){
+		const message=data.content.find(message=>message.type==="text");
+		const reply=message?.text ?? "";
+		return reply;
+	}
+	
+}
+
+
+
+// "Open"AI API :
+
+
+window.OpenAIAPIClient=class OpenAIAPIClient extends LLMAPIClient{
+	
+	constructor(modelName, apiURL, agentRole, defaultPrompt){
+		super(modelName, apiURL, agentRole, defaultPrompt);		
+  	
+	}
+
+	/*protected*/getAPIRequestHeaders(AIAPIKey){
+		return {
+			"Authorization": "Bearer "+AIAPIKey,
+			"Content-Type": "application/json",
+		};
+	}
+
+	/*protected*/getAPIRequestParameters(messages){
+		return {
+			model:this.modelName,
+			messages:messages,
+		};
+	}
+
+	/*protected*/getMessages(defaultPrompt, userPrompt){
+		return [
+			{ role: "system", content: this.agentRole },
+			{ role: "user", content: (defaultPrompt+"\n"
+																 +userPrompt) },
+		];
+	}
+
+	/*protected*/getAssistantReply(data){
+		const messageInfo=data.choices.find(choice=>choice.message?.role==="assistant");
+		const reply=messageInfo?.message?.content ?? "";
+		return reply;
+	}
 
 	
 }
 
 
+
+
+// ****************************************************************
+
 // Nodejs compatibility :
-getOpenAIAPIClient=(modelName, apiURL, agentRole, defaultPrompt)=>{
-	return new OpenAIAPIClient(modelName, apiURL, agentRole, defaultPrompt);
+getLLMAPIClient=(modelName, apiURL, agentRole, defaultPrompt, llmProviderName=DEFAULT_LLM_PROVIDER_NAME)=>{
+	if(llmProviderName=="openai")
+		return new OpenAIAPIClient(modelName, apiURL, agentRole, defaultPrompt);
+	return new ClaudeAPIClient(modelName, apiURL, agentRole, defaultPrompt);
 };
 
 
 
 
 
-/*utils CONSOLE library associated with aotra version : «1_29072022-2359 (09/06/2026-14:12:54)»*/
+/*utils CONSOLE library associated with aotra version : «1_29072022-2359 (14/06/2026-23:54:16)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -8165,9 +8291,10 @@ launchNodeHTTPServer=function(port, doOnConnect=null, doOnFinalizeServer=null, d
 		
 		if(isURLInExclusionZone){
       	// TRACE
-      	console.log("ERROR 403 forbidden access error :");
-      	console.log(error);
-      	
+      	lognow("ERROR 403 forbidden access error :");
+      	lognow("ERROR : request:",request);
+				lognow("ERROR : response:",response);
+				
       	response.writeHead(403);
         response.end("Sorry, cannot access resource : error: "+error.code+" ..\n");
         response.end();
@@ -8202,9 +8329,9 @@ launchNodeHTTPServer=function(port, doOnConnect=null, doOnFinalizeServer=null, d
               
           }else {
 
-        	// TRACE
-          	console.log("ERROR 500 server error :");
-          	console.log(error);
+        		// TRACE
+          	lognow("ERROR 500 server error :");
+						lognow("ERROR : error:",error);
           	
           	response.writeHead(500);
             response.end("Sorry, check with the site admin for error: "+error.code+" ..\n");

aotrautils-srv/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "aotrautils-srv",
-	"version": "0.0.1849",
+	"version": "0.0.1851",
 	"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)",