Master with llm 3

15619P2Agent/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1711515815379</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

15619P2ClassicAgent/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1711515815384</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

15619P2PlusAgent/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1711515815385</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

15619PracticeAgent/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1711515815387</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

AccountableTalkAgent/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1711515815388</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

ActiveMQClient/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1711515815390</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

BaseAgent/.project

@@ -14,4 +14,15 @@
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
+	<filteredResources>
+		<filter>
+			<id>1711515815391</id>
+			<name></name>
+			<type>30</type>
+			<matcher>
+				<id>org.eclipse.core.resources.regexFilterMatcher</id>
+				<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
+			</matcher>
+		</filter>
+	</filteredResources>
 </projectDescription>

BaseAgent/src/basilica2/agents/components/InputCoordinator.java

@@ -405,6 +405,20 @@ public HashMap getListeners()
     	return listeners;
     }
 
+    public BasilicaListener getListenerByName(String listenerName) {
+        // Iterate through all registered listener lists
+        for (List<BasilicaListener> listenerList : listeners.values()) {
+            // Search each list for a listener with the matching class name
+            for (BasilicaListener listener : listenerList) {
+                if (listener.getClass().getSimpleName().equals(listenerName)) {
+                    return listener;
+                }
+            }
+        }
+        // Return null if no matching listener is found
+        return null;
+    }
+
     public BasilicaPreProcessor getPreProcessor(String preProcessorString)
     {
     	for (ArrayList<BasilicaPreProcessor> preepList : this.preprocessors.values()) {
@@ -416,6 +430,18 @@ public BasilicaPreProcessor getPreProcessor(String preProcessorString)
     	}
     	return null; 
     }
+    public List<BasilicaPreProcessor> getAllPreProcessorsContains(String content) {
+    	List<BasilicaPreProcessor> preprocessors = new ArrayList<>();
+    	for (ArrayList<BasilicaPreProcessor> preepList : this.preprocessors.values()) {
+    		for (BasilicaPreProcessor preep : preepList) {
+    			String listenerName = preep.toString();
+    			if (listenerName.contains("LlmChatListener")) {
+    				preprocessors.add(preep);
+    			}
+    		}
+    	}
+    	return preprocessors;
+    }
 
     public void removeListener(Class key, BasilicaListener blister)
     {

BaseAgent/src/basilica2/agents/components/OutputCoordinator.java

@@ -8,11 +8,16 @@
 import java.time.LocalDateTime;
 
 import org.jivesoftware.smack.packet.Message;
+import org.json.JSONArray;
+import org.json.JSONException;
 
+import basilica2.agents.events.BotMessageEvent;
 import basilica2.agents.events.MessageEvent;
 import basilica2.agents.events.PrivateMessageEvent;
 import basilica2.agents.events.priority.AbstractPrioritySource;
 import basilica2.agents.events.priority.PriorityEvent;
+import basilica2.agents.listeners.BasilicaListener;
+import basilica2.agents.listeners.ChatHistoryListener;
 import basilica2.agents.components.StateMemory;
 import basilica2.agents.data.State;
 import basilica2.util.MessageEventLogger;
@@ -52,6 +57,8 @@ public class OutputCoordinator extends Component implements TimeoutReceiver
 	private Boolean outputToPSI = false; 
 	private Boolean separateOutputToPSI = false;
 	private Boolean multimodalFormatToPSI = true; 
+	private Boolean outputBotMessage = false;
+	private Boolean useListenerName = false;
 	CommunicationManager psiCommunicationManager; 
 // 	ZeroMQClient psiCommunicationManager; 
 //  private ZMQ.Socket publisher;
@@ -94,6 +101,10 @@ public OutputCoordinator(Agent agent, String s1, String s2)
 			catch(Exception e) {e.printStackTrace();}
 			try{bazaarToPSITopic = myProperties.getProperty("Bazaar_to_PSI_Topic", bazaarToPSITopic);}
 			catch(Exception e) {e.printStackTrace();}
+			try{outputBotMessage = Boolean.parseBoolean(myProperties.getProperty("output_bot_message", "false"));}
+			catch(Exception e) {e.printStackTrace();}
+			try{useListenerName = Boolean.parseBoolean(myProperties.getProperty("use_listener_name", "false"));}
+			catch(Exception e) {e.printStackTrace();}
 // 			try{psiHost = myProperties.getProperty("PSI_Host", psiHost);}
 // 			catch(Exception e) {e.printStackTrace();}
 // 			try{psiPort = myProperties.getProperty("PSI_Port", psiPort);}
@@ -401,9 +412,24 @@ private void publishMessage(MessageEvent me)
 		// Might be a better idea to merge output coordinator and actor, or
 		// connect them directly
 
-		log(Logger.LOG_NORMAL, "OutputCoordinator.publishMessage - Enter - message: " + me.getText());
-		System.err.print("OutputCoordinator.publishMessage - Enter - message: " + me.getText());
-
+		log(Logger.LOG_NORMAL, "OutputCoordinator.publishMessage - Enter - message: " + me.getText() + " from " + me.getFrom());
+		System.err.println("OutputCoordinator.publishMessage - Enter - message: " + me.getText());
+		if (outputBotMessage) {
+//			BotMessageEvent newBM = new BotMessageEvent(this, me.getFrom(), me.getText());
+			InputCoordinator IC = (InputCoordinator)me.getSender();
+			System.err.println("OutputCoordinator: pushing bot message... " + me.getText());
+//			IC.pushEvent(newBM);
+			BasilicaListener CHL = IC.getListenerByName("ChatHistoryListener");
+			try {
+				((ChatHistoryListener) CHL).handleMessageEvent(IC, me);
+			} catch (JSONException e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+//		    JSONArray chatHistory = ((ChatHistoryListener) CHL).retrieveChatHistory(this.contextLen);
+
+			log(Logger.LOG_NORMAL, "OutputCoordinator.sendBotMessage -  send message to ChatHistoryListener: " + me.getText());
+		} 
 		String withinPromptDelimiter = "|||"; 
 		String messageText; 
 		if (!me.getText().contains(withinPromptDelimiter))
@@ -546,7 +572,10 @@ private String formatMultimodalMessage(MessageEvent me)
 		String messageString; 
 
 		String text; 
-		String from = agent.getUsername();
+		String from = agent.getUsername(); 
+		if (this.useListenerName) {
+			from = me.getFrom();
+		}
 		String to; 
 		String textOrig = me.getText();	
 

BaseAgent/src/basilica2/agents/data/State.java

@@ -66,7 +66,6 @@ public class Student
 		public String facialExp;
 		public poseEventType pose;
 		public String emotion;
-
 		@Override
 		public String toString()
 		{
@@ -88,6 +87,8 @@ public String toString()
 	private int jointActivityMetric = 0; 
 	private Boolean multimodalDontListenWhileSpeaking = true; 
 	private LocalDateTime multimodalDontListenEnd = null; 
+	public String globalActiveListener = "";
+
 	// public String conceptId;
 	// public String conceptExecutionStatus;
 
@@ -107,6 +108,8 @@ public static State copy(State s)
 
 		news.multimodalDontListenWhileSpeaking = s.multimodalDontListenWhileSpeaking;
 		news.multimodalDontListenEnd = s.multimodalDontListenEnd;
+		news.globalActiveListener = s.globalActiveListener;
+
 		Map<String, Object> map = s.more();
 		for (String k : map.keySet())
 			news.stateMap.put(k, map.get(k));
@@ -634,6 +637,16 @@ public void setMultimodalDontListenWhileSpeakingEnd(LocalDateTime dontListenEnd)
 	{
 		this.multimodalDontListenEnd = dontListenEnd;
 	}
+
+	public void setGlobalActiveListener(String name) {
+		globalActiveListener = name;
+	}
+
+	public String getGlobalActiveListener() {
+		return globalActiveListener;
+	}
+
+
 
 	@Override
 	public String toString()

BaseAgent/src/basilica2/agents/events/BotMessageEvent.java

@@ -0,0 +1,85 @@
+/*
+ *  Copyright (c), 2020 Carnegie Mellon University.
+ *  All rights reserved.
+ *  
+ *  Use in source and binary forms, with or without modifications, are permitted
+ *  provided that that following conditions are met:
+ *  
+ *  1. Source code must retain the above copyright notice, this list of
+ *  conditions and the following disclaimer.
+ *  
+ *  2. Binary form must reproduce the above copyright notice, this list of
+ *  conditions and the following disclaimer in the documentation and/or
+ *  other materials provided with the distribution.
+ *  
+ *  Permission to redistribute source and binary forms, with or without
+ *  modifications, for any purpose must be obtained from the authors.
+ *  Contact Rohit Kumar (rohitk@cs.cmu.edu) for such permission.
+ *  
+ *  THIS SOFTWARE IS PROVIDED BY CARNEGIE MELLON UNIVERSITY ``AS IS'' AND
+ *  ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ *  THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ *  PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL CARNEGIE MELLON UNIVERSITY
+ *  NOR ITS EMPLOYEES BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *  THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ *  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  
+ */
+package basilica2.agents.events;
+
+import edu.cmu.cs.lti.basilica2.core.Component;
+import edu.cmu.cs.lti.basilica2.core.Event;
+import edu.cmu.cs.lti.project911.utils.log.Logger;
+
+/**
+ *
+ * @author rcmurray
+ */
+public class BotMessageEvent extends Event {
+
+    public static String GENERIC_NAME = "BOT_MESSAGE_EVENT";
+    private String botMessage = "NOT FOUND";
+    private String from = "NOT FOUND";
+//	public enum fileEventType  
+//	{
+//		created, changed, deleted;
+//	}
+//	private fileEventType eventType; 
+
+    public BotMessageEvent(Component s, String from, String n) {
+        super(s);
+        botMessage = n;
+        this.from = from;
+
+//        System.err.println("FileEvent created: file: " + n + " -- event type:" + t);
+//        Logger.commonLog(getClass().getSimpleName(),Logger.LOG_NORMAL,"FileEvent created - file: " + n + "   -- event type: " + t);
+    }
+
+    public String getText() {
+        return botMessage;
+    }
+
+	public void setFrom(String newFrom)
+	{
+		from = newFrom;
+	}
+
+	public String getFrom()
+	{
+		return from;
+	}
+
+    @Override
+    public String getName() {
+        return GENERIC_NAME;
+    }
+
+    @Override
+    public String toString() {
+        return "botMessageEvent: " + botMessage;
+    }
+}