aotrautils 0.0.1038 → 0.0.1040

aotrautils/aotrautils.build.js

@@ -1,6 +1,6 @@
 
 
-/*utils COMMONS library associated with aotra version : «1_29072022-2359 (25/06/2024-03:01:27)»*/
+/*utils COMMONS library associated with aotra version : «1_29072022-2359 (02/09/2024-03:11:33)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -5185,7 +5185,7 @@ JSON.recycle=function recycle($){
 
 
 
-
+// CAUTION : TODO : FIXME WILL ERROR IF THERE IS A NON-ESCAPED SINGLE QUOTE ("'") IN RAW STRING !!!
 // JSON parsing management :
 window.parseJSON=function(strParam){
 	
@@ -5251,106 +5251,6 @@ window.stringifyObject=function(objectToStringify){
 
 
 
-// AI management :
-
-
-
-class OpenAIAPIClient{
-	
-	constructor(modelName, apiURL, agentRole, prompt){
-		
-  	//DBG
-  	lognow(">>>>>>>>>>>>>>>>!!!!!!apiURL:",apiURL);
-		
-		// this.apiKey=apiKey;
-		this.modelName=modelName;
-		this.apiURL=apiURL;
-		this.agentRole=agentRole;
-		this.prompt=prompt;
-	}
-
-	async getAnswer(AIAPIKey, additionalPrompt){
-		
-		const self=this;
-	  const messages = [
-	   { role: "system", content: this.agentRole },
-	   { role: "user", content: (this.prompt + additionalPrompt) },
-	  ];
-	  
-  	//DBG
-  	lognow("------------self.apiURL:",self.apiURL);
-		
-		const result=await this.launchRequest(AIAPIKey, messages);
-		
-		// DBG
-		console.log("! RESULT text :",result);
-		
-		return result;
-	}
-	
-	
-	/*private*/launchRequest(AIAPIKey, messages){
-				
-		// DBG
-		lognow("! launchRequest messages :",messages);
-		
-		
-		const headers={
-			"Authorization": "Bearer "+AIAPIKey,
-			"Content-Type": "application/json",
-		};
-		const parameters={
-			model:this.modelName,
-			messages:messages,
-		};
-
-		return new Promise((resolve,reject)=>{
-			performHTTPRequest(this.apiURL,"POST",headers,parameters,true).then((responseObj)=>{
-				const responseData=responseObj.responseData;
-				const data=responseData;
-				
-		 	 	// DBG
-		 	  console.log("~~~~~~~~~~~data :",data);
-		 	  
-				if(data.error){
-					const error=data.error;
-					// TRACE
-					console.error("Error:", error);
-					reject(new Error(`${error}`));
-				}
-		
-				const assistantReply = data.choices[0].message.content;
-			 	// DBG
-			  console.log("~~~~~~~~~~~assistantReply :",assistantReply);
-			  
-				resolve(assistantReply);
-			}).catch(error => {
-				// TRACE
-				console.error("Error:", error);
-				reject(error);
-			});
-		});
-		
-		
-		
-		
-	}
-	
-	
-
-	
-}
-
-
-// Nodejs compatibility :
-getOpenAIAPIClient=(modelName, apiURL, agentRole, prompt)=>{
-	return new OpenAIAPIClient(modelName, apiURL, agentRole, prompt);
-};
-
-
-
-
-
 // MUST REMAIN AT THE END OF THIS LIBRARY FILE !
 
 AOTRAUTILS_LIB_IS_LOADED=true;
@@ -5359,7 +5259,7 @@ AOTRAUTILS_LIB_IS_LOADED=true;
 
 	
 
-/*utils CLIENT library associated with aotra version : «1_29072022-2359 (25/06/2024-03:01:27)»*/
+/*utils CLIENT library associated with aotra version : «1_29072022-2359 (02/09/2024-03:11:33)»*/
 /*-----------------------------------------------------------------------------*/
 /* ## Utility global methods in a browser (htmljs) client environment.
  *
@@ -13574,7 +13474,7 @@ createOritaMicroClient=function(url, port, isNode=false, staticMicroClientIdPara
 
 
 
-/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (25/06/2024-03:01:27)»*/
+/*utils GEOMETRY library associated with aotra version : «1_29072022-2359 (02/09/2024-03:11:33)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -14813,7 +14713,151 @@ function rayVsUnitSphereClosestPoint(p, r) {
 // MUST REMAIN AT THE END OF THIS LIBRARY FILE !
 
 AOTRAUTILS_GEOMETRY_LIB_IS_LOADED=true;
-/*utils SERVER library associated with aotra version : «1_29072022-2359 (25/06/2024-03:01:27)»*/
+/*utils AI library associated with aotra version : «1_29072022-2359 (02/09/2024-03:11:33)»*/
+/*-----------------------------------------------------------------------------*/
+
+
+/* ## Utility AI methods in a javascript, console (nodejs) server, or vanilla javascript with no browser environment.
+ *
+ * This set of methods gathers utility generic-purpose methods usable in any JS project.
+ * Several authors of snippets published freely on the Internet contributed to this library.
+ * Feel free to use/modify-enhance/publish them under the terms of its license.
+ * 
+ * # Library name : «aotrautils» 
+ * # Library license : HGPL(Help Burma) (see aotra README information for details : https://alqemia.com/aotra.js )
+ * # Author name : Jérémie Ratomposon (massively helped by his native country free education system)
+ * # Author email : info@alqemia.com
+ * # Organization name : Alqemia
+ * # Organization email : admin@alqemia.com
+ * # Organization website :  https://alqemia.com
+ * 
+ *  
+ */
+
+
+
+// COMPATIBILITY browser javascript / nodejs environment :
+if(typeof(window)==="undefined")	window=global;	
+
+
+
+//=========================================================================
+// GLOBAL CONSTANTS :
+
+//=========================================================================
+
+
+
+
+// AI management :
+
+
+
+class OpenAIAPIClient{
+	
+	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={}){
+		
+		const PARAMETERS_DELIMITERS=["<",">"];
+		
+		let newDefaultPrompt=this.defaultPrompt;
+		foreach(defaultPromptParameters, (value,key)=>{
+			const regexp=new RegExp(PARAMETERS_DELIMITERS[0]+key+newDefaultPrompt[1] ,"gim");
+			newDefaultPrompt=newDefaultPrompt.replace(regexp,value);
+		});
+		
+		const self=this;
+	  const messages = [
+	   { role: "system", content: this.agentRole },
+	   { role: "user", content: (newDefaultPrompt+ "\n" + additionalPrompt) },
+	  ];
+	  
+  	//DBG
+  	lognow("------------self.apiURL:",self.apiURL);
+		
+		const result=await this.launchRequest(AIAPIKey, messages);
+		
+		// DBG
+		console.log("! RESULT text :",result);
+		
+		return result;
+	}
+	
+	
+	/*private*/launchRequest(AIAPIKey, messages){
+				
+		// DBG
+		lognow("! launchRequest messages :",messages);
+		
+		
+		const headers={
+			"Authorization": "Bearer "+AIAPIKey,
+			"Content-Type": "application/json",
+		};
+		const parameters={
+			model:this.modelName,
+			messages:messages,
+		};
+
+		return new Promise((resolve,reject)=>{
+			performHTTPRequest(this.apiURL,"POST",headers,parameters,true).then((responseObj)=>{
+				const responseData=responseObj.responseData;
+				const data=responseData;
+				
+		 	 	// DBG
+		 	  console.log("~~~~~~~~~~~data :",data);
+		 	  
+				if(data.error){
+					const error=data.error;
+					// TRACE
+					console.error("Error:", error);
+					reject(new Error(`${error}`));
+				}
+		
+				const assistantReply = data.choices[0].message.content;
+			 	// DBG
+			  console.log("~~~~~~~~~~~assistantReply :",assistantReply);
+			  
+				resolve(assistantReply);
+			}).catch(error => {
+				// TRACE
+				console.error("Error:", error);
+				reject(error);
+			});
+		});
+		
+		
+		
+		
+	}
+	
+	
+
+	
+}
+
+
+// Nodejs compatibility :
+getOpenAIAPIClient=(modelName, apiURL, agentRole, defaultPrompt)=>{
+	return new OpenAIAPIClient(modelName, apiURL, agentRole, defaultPrompt);
+};
+
+
+
+
+
+/*utils SERVER library associated with aotra version : «1_29072022-2359 (02/09/2024-03:11:33)»*/
 /*-----------------------------------------------------------------------------*/
 
 
@@ -16537,8 +16581,8 @@ getListManager=function(config){
 };
 
 
-
-// NO : IN A NODE CONTEXT WITH requre("") WILL RESULT IN AN UNDEFINED FUNCTION ERROR !!! 
+// CAUTION ! TODO : FIXME : We replace in response all single quotes with "`" (egrave) in order to avoid errors !
+// NO : IN A NODE CONTEXT WITH require("...") WILL RESULT IN AN UNDEFINED FUNCTION ERROR !!! 
 // function performHTTPRequest(...){...
 // USE THIS INSTEAD :
 performHTTPRequest=function(completeURL,httpMethod="GET",headers={},requestBodyOrNamedArgs=null,isNodeContext=false,addCORSHeader=ADD_CORS_HEADER){
@@ -16640,7 +16684,15 @@ performHTTPRequest=function(completeURL,httpMethod="GET",headers={},requestBodyO
 		  response.on("end", () => {
 			
 				try{
-					const responseData=parseJSON(responseDataStr);
+					let responseData;
+					try{
+						responseData=parseJSON(responseDataStr);
+					}catch(error){
+						// CAUTION ! TODO : FIXME : We replace in response all single quotes with "`" (egrave) in order to avoid errors !
+						// DEBUG
+						responseDataStr=responseDataStr.replace(/'/gim,"`");
+						responseData=parseJSON(responseDataStr);
+					}
 					resolve( {responseData:responseData, response:response, responseDataStr:responseDataStr} );
 				}catch(error){
 					// DBG

aotrautils/package.json

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