added short term plans, fixed tests, made activities more realistic

nmatter1 · nmatter1 · commit 354060e60f97 · 2023-05-20T03:57:55.000-04:00
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/config/PromptsConfig.java b/smallville/src/main/java/io/github/nickm980/smallville/config/PromptsConfig.java
@@ -11,6 +11,7 @@ public class PromptsConfig {
     private String createPastAndPresent;
     private String createObjectUpdates;
     private String pickLocation;
+    private String createShortTermPlans;
     
     public PromptsConfig() {
     }
@@ -87,4 +88,12 @@ public void setPickLocation(String pickLocation) {
 	this.pickLocation= pickLocation;
     }
 
+    public String getCreateShortTermPlans() {
+	return createShortTermPlans;
+    }
+
+    public void setCreateShortTermPlans(String createShortTermPlans) {
+	this.createShortTermPlans = createShortTermPlans;
+    }
+
 }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/llm/update/ChatService.java b/smallville/src/main/java/io/github/nickm980/smallville/llm/update/ChatService.java
@@ -113,11 +113,23 @@ public String ask(Agent agent, String question) {
 	return chat.sendChat(prompt, .9);
     }
 
-    public List<Plan> getPlans(Agent agent, TimePhrase phrase) {
+    public List<Plan> getPlans(Agent agent) {
 	Prompt prompt = new PromptBuilder()
 	    .withLocations(world.getLocations())
 	    .withAgent(agent)
-	    .createFuturePlansPrompt(phrase)
+	    .createFuturePlansPrompt()
+	    .build();
+
+	String response = chat.sendChat(prompt, .7);
+
+	return parsePlans(response);
+    }
+
+    public List<Plan> getShortTermPlans(Agent agent) {
+	Prompt prompt = new PromptBuilder()
+	    .withLocations(world.getLocations())
+	    .withAgent(agent)
+	    .createShortTermPlansPrompt()
 	    .build();
 
 	String response = chat.sendChat(prompt, .7);
@@ -150,9 +162,7 @@ public CurrentPlan getCurrentPlan(Agent agent) {
 	result.setLastActivity(json.get("last_activity").asText());
 	result.setLocation(json.get("location").asText());
 
-	LOG
-	    .info(agent.getFullName() + ": " + result.getCurrentActivity() + " emoji: " + result.getEmoji()
-		    + " location: " + agent.getLocation());
+	LOG.info("[Activity]" + result.getCurrentActivity() + " location: " + agent.getLocation().getName());
 
 	return result;
     }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/llm/update/UpdateCurrentActivity.java b/smallville/src/main/java/io/github/nickm980/smallville/llm/update/UpdateCurrentActivity.java
@@ -10,7 +10,7 @@ public class UpdateCurrentActivity extends AgentUpdate {
 
     @Override
     public boolean update(ChatService service, World world, Agent agent) {
-	LOG.info("[Updater / Activity] Updating current activity and emoji");
+	LOG.info("[Activity] Updating current activity and emoji");
 
 	CurrentPlan plan = service.getCurrentPlan(agent);
 	SimulatedLocation location = world.getLocation(plan.getLocation()).orElse(agent.getLocation());
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/llm/update/UpdateFuturePlans.java b/smallville/src/main/java/io/github/nickm980/smallville/llm/update/UpdateFuturePlans.java
@@ -12,19 +12,27 @@ public class UpdateFuturePlans extends AgentUpdate {
     @Override
     public boolean update(ChatService converter, World world, Agent agent) {
 	LOG.info("[Plans] Updating future plans");
+	agent.getMemoryStream().prunePlans();
 
 	if (agent.getPlans().isEmpty() || agent.getPlans().size() < 5) {
-	    List<Plan> future = converter.getPlans(agent, TimePhrase.DAY);
-	    agent.setPlans(future);
+	    List<Plan> plans = converter.getPlans(agent);
+	    agent.setPlans(plans);
 	}
 
-	// TODO: iterate for finer grain plans that are closer to the present
+	if (agent.getMemoryStream().getShortTermPlans().size() < 5) {
+	    List<Plan> plans = converter.getShortTermPlans(agent);
 
-	for (Plan plan : agent.getPlans()) {
-	    LOG.info("[Plans] " + agent.getFullName() + ": " + plan.asNaturalLanguage());
+	    for (Plan plan : plans) {
+		plan.convertToShortTermMemory(true);
+	    }
+
+	    agent.setShortTermPlans(plans);
+	}
+
+	for (Plan plan : agent.getMemoryStream().sortByTime(agent.getPlans()).stream().map(m -> (Plan) m).toList()) {
+	    LOG.info("[Plans] " + plan.asNaturalLanguage() + " short term: " + plan.isShortTerm());
 	}
 
 	return next(converter, world, agent);
     }
-
 }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/llm/update/UpdateLocations.java b/smallville/src/main/java/io/github/nickm980/smallville/llm/update/UpdateLocations.java
@@ -8,6 +8,8 @@ public class UpdateLocations extends AgentUpdate {
 
     @Override
     public boolean update(ChatService converter, World world, Agent agent) {
+	LOG.info("[Locations] Updating location states");
+
 	ObjectChangeResponse[] objects = converter.getObjectsChangedBy(agent);
 
 	if (objects.length > 0) {
@@ -16,6 +18,7 @@ public boolean update(ChatService converter, World world, Agent agent) {
 	    }
 	}
 
+	LOG.info("[Locations] Location states updated");
 	return next(converter, world, agent);
     }
 }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/models/Agent.java b/smallville/src/main/java/io/github/nickm980/smallville/models/Agent.java
@@ -71,4 +71,8 @@ public void setPlans(List<Plan> plans) {
     public List<Plan> getPlans() {
 	return memories.getPlans();
     }
+
+    public void setShortTermPlans(List<Plan> plans) {
+	this.getMemoryStream().setShortTermPlans(plans);
+    }
 }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/models/memory/MemoryStream.java b/smallville/src/main/java/io/github/nickm980/smallville/models/memory/MemoryStream.java
@@ -1,6 +1,8 @@
 package io.github.nickm980.smallville.models.memory;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
@@ -10,10 +12,10 @@
  * Includes plans, observations, and characteristics
  */
 public class MemoryStream {
-    private Set<Memory> memories;
+    private List<Memory> memories;
 
     public MemoryStream() {
-	this.memories = new HashSet<Memory>();
+	this.memories = new ArrayList<Memory>();
     }
 
     /**
@@ -38,7 +40,7 @@ public void remember(String memory) {
 	this.memories.add(new Observation(memory));
     }
 
-    public Set<Memory> getMemories() {
+    public List<Memory> getMemories() {
 	return memories;
     }
 
@@ -83,13 +85,33 @@ public void addCharacteristics(List<Characteristic> characteristics) {
     }
 
     public void prunePlans() {
-	for (Memory memory : memories) {
+	memories.removeIf((memory) -> {
 	    if (memory instanceof Plan) {
 		Plan plan = (Plan) memory;
 		if (plan.getTime() != null && plan.getTime().compareTo(LocalDateTime.now()) < 0) {
-		    memories.remove(plan);
+		    return true;
 		}
 	    }
-	}
+	    return false;
+	});
+    }
+
+    public void setShortTermPlans(List<Plan> plans) {
+	List<Plan> removed = getShortTermPlans();
+	memories.removeAll(removed);
+	memories.addAll(plans);
+    }
+
+    public List<Plan> getShortTermPlans() {
+	return getPlans().stream().filter(plan -> plan.isShortTerm()).toList();
+    }
+
+    public List<? extends TemporalMemory> sortByTime(List<? extends TemporalMemory> mems) {
+	return mems.stream().sorted(new Comparator<TemporalMemory>() {
+	    @Override
+	    public int compare(TemporalMemory o1, TemporalMemory o2) {
+		return o1.getTime().compareTo(o2.getTime());
+	    }
+	}).toList();
     }
 }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/models/memory/Plan.java b/smallville/src/main/java/io/github/nickm980/smallville/models/memory/Plan.java
@@ -1,12 +1,10 @@
 package io.github.nickm980.smallville.models.memory;
 
-import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
 
 import io.github.nickm980.smallville.math.SmallvilleMath;
 import io.github.nickm980.smallville.models.AccessTime;
-import io.github.nickm980.smallville.models.SimulatedLocation;
 import io.github.nickm980.smallville.models.NaturalLanguageConvertible;
 
 /**
@@ -18,10 +16,20 @@
 public class Plan extends Memory implements TemporalMemory, NaturalLanguageConvertible {
 
     private final LocalDateTime time;
+    private boolean isShortTerm;
 
     public Plan(String description, LocalDateTime time) {
+	this(description, time, false);
+    }
+
+    public Plan(String description, LocalDateTime time, boolean isShortTerm) {
 	super(description);
 	this.time = time;
+	this.isShortTerm = isShortTerm;
+    }
+
+    public boolean isShortTerm() {
+	return isShortTerm;
     }
 
     public LocalDateTime getTime() {
@@ -42,4 +50,8 @@ public LocalDateTime getTime() {
     public String asNaturalLanguage() {
 	return getDescription();
     }
+
+    public void convertToShortTermMemory(boolean b) {
+	this.isShortTerm = b;
+    }
 }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/prompts/AtomicPromptBuilder.java b/smallville/src/main/java/io/github/nickm980/smallville/prompts/AtomicPromptBuilder.java
@@ -3,6 +3,7 @@
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -13,6 +14,7 @@
 import io.github.nickm980.smallville.models.SimulatedObject;
 import io.github.nickm980.smallville.models.memory.Characteristic;
 import io.github.nickm980.smallville.models.memory.Memory;
+import io.github.nickm980.smallville.models.memory.Plan;
 
 /**
  * Creates the variable prompts and converts objects to natural language
@@ -73,7 +75,6 @@ public String getAgentSummaryDescription(Agent person) {
 		Name: %name%
 		Description: %description%
 		Current Location: %location%
-		%plans%
 
 		[Current Time]
 		""";
@@ -125,4 +126,21 @@ public CharSequence getObjects(List<SimulatedObject> objects) {
 
 	return result;
     }
+
+    public CharSequence getLatestPlan(Agent agent) {
+	String result = "";
+
+	Plan plan = agent.getPlans().stream().sorted(new Comparator<Plan>() {
+	    @Override
+	    public int compare(Plan o1, Plan o2) {
+		return o1.getTime().compareTo(o2.getTime());
+	    }
+	}).findFirst().orElse(null);
+
+	if (plan == null) {
+	    return result;
+	}
+
+	return "The next plan for the day is: " + plan.asNaturalLanguage();
+    }
 }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/prompts/IPromptBuilder.java b/smallville/src/main/java/io/github/nickm980/smallville/prompts/IPromptBuilder.java
@@ -70,10 +70,9 @@ public interface IPromptBuilder {
     /**
      * Adds the future plans of the agent, given a time frame, to the prompt.
      * 
-     * @param time the time frame for the future plans
      * @return the prompt builder instance
      */
-    PromptBuilder createFuturePlansPrompt(TimePhrase time);
+    PromptBuilder createFuturePlansPrompt();
 
     /**
      * 
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/prompts/PromptBuilder.java b/smallville/src/main/java/io/github/nickm980/smallville/prompts/PromptBuilder.java
@@ -8,9 +8,7 @@
 import io.github.nickm980.smallville.exceptions.SmallvilleException;
 import io.github.nickm980.smallville.models.Agent;
 import io.github.nickm980.smallville.models.Conversation;
-import io.github.nickm980.smallville.models.Location;
 import io.github.nickm980.smallville.models.SimulatedLocation;
-import io.github.nickm980.smallville.models.SimulatedObject;
 
 public class PromptBuilder implements IPromptBuilder {
 
@@ -87,7 +85,7 @@ public PromptBuilder createMemoryRankPrompt() {
     }
 
     @Override
-    public PromptBuilder createFuturePlansPrompt(TimePhrase time) {
+    public PromptBuilder createFuturePlansPrompt() {
 	prompt = Config.getPrompts().getCreateFuturePlansPrompt();
 	return this;
     }
@@ -124,6 +122,7 @@ public Prompt build() {
 	    .replace("[Current Location's Objects]", atomicBuilder.getObjects(agent.getLocation().getObjects()))
 	    .replace("[Current Activity]", agent.getCurrentActivity())
 	    .replace("[Last Activity]", agent.getLastActivity())
+	    .replace("[Most Recent Plan]", atomicBuilder.getLatestPlan(agent))
 	    .replace("[Future Plans]", "Plans: " + atomicBuilder.asNaturalLanguage(agent.getPlans()));
 
 	return new Prompt.User(prompt);
@@ -139,7 +138,11 @@ public PromptBuilder createObjectUpdates(String tenses) {
 
     public PromptBuilder createExactLocation() {
 	prompt = Config.getPrompts().getPickLocation();
-
+	return this;
+    }
+    
+    public PromptBuilder createShortTermPlansPrompt() {
+	prompt = Config.getPrompts().getCreateShortTermPlans();
 	return this;
     }
 }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/prompts/PromptData.java b/smallville/src/main/java/io/github/nickm980/smallville/prompts/PromptData.java
@@ -14,11 +14,13 @@ public class PromptData {
     private List<SimulatedLocation> locations;
     private Conversation conversation;
     private String question;
-
+    private TimePhrase phrase;
+    
     public PromptData() {
 	this.locations = new ArrayList<SimulatedLocation>();
 	this.locations = List.of();
 	this.question = "";
+	this.phrase = TimePhrase.DAY;
     }
 
     public Agent getAgent() {
@@ -53,4 +55,12 @@ public String getQuestion() {
 	return question;
     }
 
+    public void setTimePhrase(TimePhrase phrase) {
+	this.phrase = phrase;
+    }
+    
+    public TimePhrase getTimePhrase() {
+	return phrase;
+    }
+
 }
diff --git a/smallville/src/main/java/io/github/nickm980/smallville/prompts/PromptService.java b/smallville/src/main/java/io/github/nickm980/smallville/prompts/PromptService.java
@@ -53,7 +53,7 @@ public void updateAgent(Agent agent) {
 	LOG.info("Starting update for " + agent.getFullName());
 
 	if (updateInProgress) {
-	    throw new SmallvilleException("Cannot update agetns at same time");
+	    throw new SmallvilleException("Cannot update agents at same time");
 	}
 
 	updateInProgress = true;
@@ -84,7 +84,7 @@ public void updateAgent(Agent agent) {
      */
     public void updateAgent(Agent agent, String observation) {
 	if (updateInProgress) {
-	    throw new SmallvilleException("Cannot update agetns at same time");
+	    throw new SmallvilleException("Cannot update agents at same time");
 	}
 
 	updateInProgress = true;
diff --git a/smallville/src/main/resources/prompts.yaml b/smallville/src/main/resources/prompts.yaml

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ public class PromptsConfig {`
`11`	`11`	`private String createPastAndPresent;`
`12`	`12`	`private String createObjectUpdates;`
`13`	`13`	`private String pickLocation;`
	`14`	`+ private String createShortTermPlans;`
`14`	`15`
`15`	`16`	`public PromptsConfig() {`
`16`	`17`	`}`
`@@ -87,4 +88,12 @@ public void setPickLocation(String pickLocation) {`
`87`	`88`	`this.pickLocation= pickLocation;`
`88`	`89`	`}`
`89`	`90`
	`91`	`+ public String getCreateShortTermPlans() {`
	`92`	`+ return createShortTermPlans;`
	`93`	`+ }`
	`94`	`+`
	`95`	`+ public void setCreateShortTermPlans(String createShortTermPlans) {`
	`96`	`+ this.createShortTermPlans = createShortTermPlans;`
	`97`	`+ }`
	`98`	`+`
`90`	`99`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@ public class UpdateLocations extends AgentUpdate {`
`8`	`8`
`9`	`9`	`@Override`
`10`	`10`	`public boolean update(ChatService converter, World world, Agent agent) {`
	`11`	`+ LOG.info("[Locations] Updating location states");`
	`12`	`+`
`11`	`13`	`ObjectChangeResponse[] objects = converter.getObjectsChangedBy(agent);`
`12`	`14`
`13`	`15`	`if (objects.length > 0) {`
`@@ -16,6 +18,7 @@ public boolean update(ChatService converter, World world, Agent agent) {`
`16`	`18`	`}`
`17`	`19`	`}`
`18`	`20`
	`21`	`+ LOG.info("[Locations] Location states updated");`
`19`	`22`	`return next(converter, world, agent);`
`20`	`23`	`}`
`21`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,4 +71,8 @@ public void setPlans(List<Plan> plans) {`
`71`	`71`	`public List<Plan> getPlans() {`
`72`	`72`	`return memories.getPlans();`
`73`	`73`	`}`
	`74`	`+`
	`75`	`+ public void setShortTermPlans(List<Plan> plans) {`
	`76`	`+ this.getMemoryStream().setShortTermPlans(plans);`
	`77`	`+ }`
`74`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,9 @@ public interface IPromptBuilder {`
`70`	`70`	`/**`
`71`	`71`	`* Adds the future plans of the agent, given a time frame, to the prompt.`
`72`	`72`	`*`
`73`		`- * @param time the time frame for the future plans`
`74`	`73`	`* @return the prompt builder instance`
`75`	`74`	`*/`
`76`		`- PromptBuilder createFuturePlansPrompt(TimePhrase time);`
	`75`	`+ PromptBuilder createFuturePlansPrompt();`
`77`	`76`
`78`	`77`	`/**`
`79`	`78`	`*`