Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Final Task PR #472

Open
wants to merge 249 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
249 commits
Select commit Hold shift + click to select a range
d2f46db
adding human readable blueprint objects
icwhite Dec 23, 2024
095cdc2
adding the blueprint to the goal string
icwhite Dec 23, 2024
acdc73a
wrote validation functions for blueprint and added commands for the a…
icwhite Dec 27, 2024
5b46d3e
fixing bugs with the initial blueprint validation functions
icwhite Dec 28, 2024
3f72895
fixing issues with the bot not receiving the messages properly:
icwhite Dec 29, 2024
9e7ead7
added conversation examples and fixed an issue with the validation fu…
icwhite Dec 29, 2024
9575437
reset function and better prompts
icwhite Jan 8, 2025
a383ee9
test blueprint layout file
icwhite Jan 22, 2025
0eb503c
finished function to test the blueprint layout. now working on proced…
mmaheshwari2 Jan 23, 2025
dccb120
compartmentalized 3d matrix randomly
mmaheshwari2 Jan 24, 2025
858cc6b
evaluation script with jar files and some parallelization
icwhite Jan 24, 2025
1632dce
Merge branch 'procedural_generation' of https://github.com/icwhite/mi…
icwhite Jan 24, 2025
fb4c394
abstract random room generation
mmaheshwari2 Jan 25, 2025
75e3c6a
updating to use environment variables
icwhite Jan 25, 2025
4a79866
Merge branch 'procedural_generation' of https://github.com/icwhite/mi…
icwhite Jan 25, 2025
ff3da96
added autobuild and autodelete to blueprint class (with functions to …
mmaheshwari2 Jan 26, 2025
13bd808
basic setup for sequential generation
mmaheshwari2 Jan 26, 2025
b72d3af
fixes for sequential generation function
mmaheshwari2 Jan 26, 2025
6fda167
no rooms in rooms and sharing borders is okay
mmaheshwari2 Jan 28, 2025
87ecbc1
rooms can use matrix edge. also starting stairs / doors dev
mmaheshwari2 Jan 28, 2025
ad9ecd7
properly solved overlapping rooms
mmaheshwari2 Jan 30, 2025
554df2a
modified stairs. changed outside to glass
mmaheshwari2 Jan 30, 2025
de3049b
automated building
mmaheshwari2 Jan 31, 2025
69a830c
added automatic teleportation to the spot and made the house out of g…
icwhite Jan 31, 2025
7433732
save before pull
mmaheshwari2 Feb 3, 2025
a03e46e
Merge branch 'procedural_generation' of https://github.com/icwhite/mi…
mmaheshwari2 Feb 3, 2025
84cdb0f
add ladder
mmaheshwari2 Feb 3, 2025
9283a79
carpets done
mmaheshwari2 Feb 8, 2025
bf88a96
added windows, room materials. abstracted out for easy implementation
mmaheshwari2 Feb 9, 2025
127db0d
refactoring changes for construction task to make way for cooking task
icwhite Feb 10, 2025
bf1914d
fixed borders of rooms
mmaheshwari2 Feb 10, 2025
b53dd47
refactored procedural generation into construction tasks
mmaheshwari2 Feb 10, 2025
b7bdbf7
abstracted out room size and variance. also tried centering window pa…
mmaheshwari2 Feb 10, 2025
80f9c9f
refactoring construction task files
icwhite Feb 11, 2025
14ea211
resolve merge
icwhite Feb 11, 2025
de0f025
refactored import
mmaheshwari2 Feb 13, 2025
b26d58f
Merge branch 'procedural_generation' of https://github.com/icwhite/mi…
mmaheshwari2 Feb 13, 2025
4804e91
procedural generation task generation and analysis
mmaheshwari2 Feb 13, 2025
78843c9
easier to understand
mmaheshwari2 Feb 13, 2025
baaab58
3 big changes. 1:blueprint removed from blueprint.explain() 2:constru…
mmaheshwari2 Feb 20, 2025
2cdafc7
new construciton tasks with dynamic timeouts
mmaheshwari2 Feb 20, 2025
4193945
reduced construction task examples size. variants are now variable fo…
mmaheshwari2 Feb 20, 2025
719b72d
set up to use s3 logging instead of wandb
icwhite Feb 22, 2025
8a75d8a
changing the give to player command to account for an edge case where…
icwhite Feb 23, 2025
2f82489
Add some example cooking tasks
Ayushmaniar Feb 23, 2025
1ba5f13
Improve task.js with better modularized code
Ayushmaniar Feb 23, 2025
786bee3
Added different initialization for cooking_tasks
Ayushmaniar Feb 23, 2025
0c237b7
Merge branch 'cooking_tasks' of https://github.com/icwhite/mindcraft …
Ayushmaniar Feb 23, 2025
57c47c0
Provide agent specific goals in task, added more example tasks
Ayushmaniar Feb 23, 2025
0a597b5
making multi agent few shot prompting
icwhite Feb 24, 2025
1e581a9
deleting unnecessary files
icwhite Feb 24, 2025
2da97b5
adding a mechanism to add environment variables to the keys.json auto…
icwhite Feb 24, 2025
f4125a0
add tasks files
icwhite Feb 24, 2025
7cafc25
making the default to load in the collaborative profiles
icwhite Feb 24, 2025
332ad0a
getting rid of unnecessary changes
icwhite Feb 24, 2025
ff5882d
fixed door inventory
mmaheshwari2 Feb 25, 2025
872ca99
added ladder fix to inventory
mmaheshwari2 Feb 25, 2025
fd4f952
Added example tasks for different goals per agent
Ayushmaniar Feb 26, 2025
78ce03f
added todo for tools for agents in inventory
mmaheshwari2 Feb 28, 2025
8c2bd81
merge conflicts resolved
icwhite Feb 28, 2025
42c8062
Merge pull request #3 from icwhite/cooking_tasks
Ayushmaniar Feb 28, 2025
2bd6b2c
log this.task_id in task.js
icwhite Feb 28, 2025
4d2e2c9
debugging merge
mmaheshwari2 Mar 1, 2025
23bf693
debugging merge
mmaheshwari2 Mar 1, 2025
39cec7c
changed the checking if complete cycle to be more frequent and update…
icwhite Mar 1, 2025
ae39028
longer sleeps, early breaking for scenarios where there is only one a…
icwhite Mar 1, 2025
a42c782
better tasks and better few shot prompts for collaboration
icwhite Mar 1, 2025
af79c78
fixing evaluation script to actually add bots as op and add new models
icwhite Mar 2, 2025
37b1fc0
increase timeout length for adding bot to world for the first time
icwhite Mar 2, 2025
0494514
fixed merge
mmaheshwari2 Mar 2, 2025
d46c587
analyze construction task update
mmaheshwari2 Mar 2, 2025
91a3710
vllm support added
icwhite Mar 3, 2025
44fc1b4
evaluation script for vllm
icwhite Mar 3, 2025
d6a8e30
Merge remote-tracking branch 'origin/procedural_generation_save'
mmaheshwari2 Mar 3, 2025
0ee3adf
debugging merge
mmaheshwari2 Mar 3, 2025
9327981
merging crafting_save and procedural generation save
icwhite Mar 4, 2025
8e08c02
getting rid of small weird changes
icwhite Mar 4, 2025
ba1e826
refactored for main merge. generated train tasks for construction. ad…
mmaheshwari2 Mar 4, 2025
329248e
purged test code
mmaheshwari2 Mar 4, 2025
2036288
tested eval script, changed model to 4o-mini
mmaheshwari2 Mar 4, 2025
173e7c5
Replaced items in the chest
Ayushmaniar Mar 4, 2025
2bdaf6e
Merge branch 'main' into procedural_generation_save
icwhite Mar 4, 2025
cda69ee
Merge pull request #4 from icwhite/procedural_generation_save
icwhite Mar 4, 2025
e3ec9d3
fixing merge related small bugs
icwhite Mar 4, 2025
3414516
refactoring changes
icwhite Mar 4, 2025
aa24f93
Added cooking tasks folder
Ayushmaniar Mar 4, 2025
b32507e
Merge branch 'main' of https://github.com/icwhite/mindcraft
Ayushmaniar Mar 4, 2025
abd558a
Better cooking tasks 1
Ayushmaniar Mar 4, 2025
6e0d7e1
change evaluation_script to allow for new world names
icwhite Mar 5, 2025
2aca273
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 5, 2025
7e7f893
fix evaluation script bug
icwhite Mar 5, 2025
5da24ec
a script to analyze results and a small merge clean up
icwhite Mar 5, 2025
9aefb46
updating port number for vllm
icwhite Mar 5, 2025
dda1ba2
better readability for incoming devs. revised blueprint generation fo…
mahesmeh001 Mar 7, 2025
c68ea07
readme for construction tasks
mahesmeh001 Mar 7, 2025
b4616b8
Updated cooking tasks
Ayushmaniar Mar 7, 2025
6ba5e42
Merge branch 'main' of https://github.com/icwhite/mindcraft
Ayushmaniar Mar 7, 2025
c484ff8
Added cooking_profile and modified collab_profile
Ayushmaniar Mar 7, 2025
3525a71
Added logging code to prompter.js
charvibannur Mar 7, 2025
674f0f7
pull code
charvibannur Mar 7, 2025
7492582
changed eval script slightly
icwhite Mar 8, 2025
c655370
Fixed blocked_actions to resolve merge in agent.js
Ayushmaniar Mar 8, 2025
a27b336
Merge branch 'main' of https://github.com/icwhite/mindcraft
Ayushmaniar Mar 8, 2025
1924e2e
Further removed changes from agent.js to resolve merge conflict
Ayushmaniar Mar 8, 2025
684cd41
Added blocked_actions empty list back to settings.js
Ayushmaniar Mar 8, 2025
6dfd2f6
Merge branch 'main' into main
Ayushmaniar Mar 8, 2025
8e63522
Stop tracking results files
Ayushmaniar Mar 8, 2025
d70491e
Moving collab profiles to tasks folder and removing vllm.json
Ayushmaniar Mar 9, 2025
d871cd9
Adding vllm back, untracking and deleting unnecessary files
Ayushmaniar Mar 9, 2025
52b4e09
Fixed agent.js, removed unncessary change in main.js, moved/deleted u…
Ayushmaniar Mar 9, 2025
8644d48
More fixes to agent.js, removed jill.json from settings.js
Ayushmaniar Mar 9, 2025
cc4a9b8
Removed comments from agent.js and removed blueprint_generation.js
Ayushmaniar Mar 9, 2025
b75d941
smol changes
icwhite Mar 9, 2025
9a22d78
updating prompter to include better logging
icwhite Mar 9, 2025
c1a7785
add train tasks for testing purposes
icwhite Mar 9, 2025
cf011f0
single agent crafting tasks for debug
icwhite Mar 9, 2025
e9e8cf3
single agent task support in evaluation script
icwhite Mar 9, 2025
3576c6f
Merge branch 'main' into main_save_03-07-2025
icwhite Mar 9, 2025
2f80b65
fixing small bugs related to single agent support
icwhite Mar 9, 2025
5b95b2f
confirming correct profile path
icwhite Mar 9, 2025
0ee122f
longer timeouts
icwhite Mar 9, 2025
5b70855
remove blocked actions from command docs
icwhite Mar 9, 2025
57a1fa2
update debug tasks
icwhite Mar 9, 2025
5103cd8
evaluation script small update
icwhite Mar 10, 2025
406ebe6
add url option to evaluation script
icwhite Mar 10, 2025
669b71f
Chest items bug fix, spawn 4 of each animal instead of 2
Ayushmaniar Mar 11, 2025
7402839
teleport close to building
icwhite Mar 11, 2025
d0ddc8f
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 11, 2025
379047c
add more single agent tasks
icwhite Mar 11, 2025
1a8d02c
fix to analyse results
icwhite Mar 11, 2025
7ca26a7
testing new profile
icwhite Mar 11, 2025
c1ce3bf
fix merge conflict
MaxRobinsonTheGreat Mar 11, 2025
87d34aa
add blueprint to blocked actions
MaxRobinsonTheGreat Mar 11, 2025
ce8dd89
prompter refactor
MaxRobinsonTheGreat Mar 11, 2025
e96131b
added python requirements
MaxRobinsonTheGreat Mar 12, 2025
7225699
move task json out of root
MaxRobinsonTheGreat Mar 12, 2025
753b8aa
fix andy path
MaxRobinsonTheGreat Mar 12, 2025
d9b1e48
ignoring construction task files bc too big. generation now has varia…
mahesmeh001 Mar 13, 2025
ff60dc6
Removed large files from Git tracking
mahesmeh001 Mar 13, 2025
6de37f2
removed logging in procedural generation function
mahesmeh001 Mar 13, 2025
afe13ff
commenting
mahesmeh001 Mar 13, 2025
4269c6f
Added hells kitchen tasks, improvements to cooking_tasks world reset,…
Ayushmaniar Mar 14, 2025
d8e933a
small fix to loading with cheats
icwhite Mar 14, 2025
dc3322b
more /op commands
icwhite Mar 14, 2025
fa6a5df
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 14, 2025
9c3e726
fix prompter logging
icwhite Mar 14, 2025
8c78398
fix single agent issue
icwhite Mar 14, 2025
83ac17a
revised construction task generation to be by agent count. modified …
mahesmeh001 Mar 14, 2025
2dea51f
fix prompter
icwhite Mar 15, 2025
d399f8e
blocked actions
icwhite Mar 15, 2025
125aa73
adding blocked actions
icwhite Mar 15, 2025
2597d32
move multi agent crafting tasks back
MaxRobinsonTheGreat Mar 15, 2025
eebd43e
Merge branch 'main' into cleanup
MaxRobinsonTheGreat Mar 15, 2025
c5b8345
Turned off item_collecting for cooking_profile.json
Ayushmaniar Mar 15, 2025
4b1e02f
add manual collection for crops/other weird blocks
MaxRobinsonTheGreat Mar 15, 2025
1195a19
Merge pull request #6 from icwhite/fix_collect_crops
MaxRobinsonTheGreat Mar 15, 2025
7c96cca
Bug fix for validator execution before the bot initialization
Ayushmaniar Mar 16, 2025
7bb2b9c
Change analyse results to take all possible success signals
hlillemark Mar 16, 2025
444ef71
Merge branch 'main' of https://github.com/icwhite/mindcraft
hlillemark Mar 16, 2025
4d1319f
Correct task ended message checking from "ended in" to "ended with"
Ayushmaniar Mar 16, 2025
8bdb1b0
Updated takeFromChest skill to withdraw items from multiple slots whe…
Ayushmaniar Mar 16, 2025
1ccba3a
new train, test, dev tasks and new analysis files
icwhite Mar 17, 2025
2027b71
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 17, 2025
19bedf0
making eval script more robust to server randomly crashing
icwhite Mar 17, 2025
dcfa9c0
Merge branch 'main' of https://github.com/icwhite/mindcraft
hlillemark Mar 17, 2025
192d92b
fix restart and the issue where the server sometimes doesn't get dele…
icwhite Mar 17, 2025
7370161
Merge branch 'main' of https://github.com/icwhite/mindcraft
hlillemark Mar 17, 2025
2e4974d
dynamic logging
icwhite Mar 17, 2025
fe4e756
one more try catch block around starting the server
icwhite Mar 17, 2025
0dea3c0
group project tasks
icwhite Mar 17, 2025
5a230e7
Edit eval script to work with ollama model
hlillemark Mar 17, 2025
dd5dd72
Merge pull request #7 from icwhite/add-ollama-evaluation
icwhite Mar 17, 2025
15ef88a
silly deletion issue
icwhite Mar 17, 2025
94faf8f
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 17, 2025
a92eb58
fixed tool based problems with construction tasks (ladders needs bloc…
mahesmeh001 Mar 19, 2025
96250b3
Merge branch 'main' into cleanup
MaxRobinsonTheGreat Mar 19, 2025
57be4ec
remove log
MaxRobinsonTheGreat Mar 19, 2025
a6cb062
add script to run all tasks in task file
MaxRobinsonTheGreat Mar 19, 2025
44bbde9
Modified base cooking tasks and added 3+ agent tasks for cooking
Ayushmaniar Mar 20, 2025
bb50486
add new options and better logging
icwhite Mar 20, 2025
213cd2c
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 20, 2025
6f8027b
add additional logging of config settings
icwhite Mar 20, 2025
7bf9766
added exp name to prompter.js and splitting around think tokens
icwhite Mar 20, 2025
4db0f8d
further debugging of reasoning models
icwhite Mar 20, 2025
7b69077
updating thinking model prompt to not give instructions and instead a…
icwhite Mar 20, 2025
12b327f
Merge branch 'main' into constructionTaskRevision
mahesmeh001 Mar 20, 2025
e0bbd66
Fixed validator not getting executed after agent exiting the world du…
Ayushmaniar Mar 20, 2025
cdeb506
add strict format to messages to help qwen and deepseek models
icwhite Mar 20, 2025
f329967
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 20, 2025
056e1bc
backwards compatibility for llama
icwhite Mar 20, 2025
e3d61ce
changing task path
icwhite Mar 20, 2025
6526985
added back missing import to vllm js
icwhite Mar 20, 2025
ac4d18a
stopped tracking files within bots/
mahesmeh001 Mar 20, 2025
a61c6da
Merge branch 'constructionTaskRevision' of https://github.com/icwhite…
mahesmeh001 Mar 20, 2025
21dfa0a
construction task fixes
mahesmeh001 Mar 20, 2025
c7dd239
Update construction_tasks.js
mahesmeh001 Mar 20, 2025
e35e0ba
Update settings.js
mahesmeh001 Mar 20, 2025
6dc5c64
Merge branch 'main' into cleanup
MaxRobinsonTheGreat Mar 20, 2025
e24ddc7
Merge pull request #5 from icwhite/cleanup
MaxRobinsonTheGreat Mar 20, 2025
fa03061
Remove door and improve multi-agent collaboration for 3+ tasks
Ayushmaniar Mar 20, 2025
48e8feb
Merge branch 'main' of https://github.com/icwhite/mindcraft
Ayushmaniar Mar 20, 2025
b72500a
Merge branch 'main' into constructionTaskRevision
icwhite Mar 21, 2025
c9b52ff
Merge pull request #8 from icwhite/constructionTaskRevision
icwhite Mar 21, 2025
19b12c8
Teleportation changes which got removed due to merge conflicts, added…
Ayushmaniar Mar 21, 2025
62cdef8
Merge branch 'main' of https://github.com/icwhite/mindcraft
Ayushmaniar Mar 21, 2025
06e85dd
set item collecting to true for cooking_profile to get rid of givePla…
Ayushmaniar Mar 21, 2025
c1a2111
Set elbow_room to false for crafting and cooking tasks
Ayushmaniar Mar 22, 2025
8af595f
vllm
icwhite Mar 22, 2025
c2db0fb
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 22, 2025
57af4f1
adding back logging
icwhite Mar 22, 2025
93db8b6
fixing construction tasks
icwhite Mar 22, 2025
1cefe44
Multi data collection script
hlillemark Mar 22, 2025
d6094ee
Add some documentation
hlillemark Mar 22, 2025
824b595
More construction tasks fixes, adding file for crafting task analysis…
Ayushmaniar Mar 23, 2025
acea74e
Changed default model to gpt-4o-mini for minimum cost
Ayushmaniar Mar 23, 2025
8ed0fa2
Merge pull request #9 from icwhite/multi-data-collection-script
icwhite Mar 23, 2025
1c46a72
Grouped the results of construction tasks by materials and rooms. Dis…
Ayushmaniar Mar 23, 2025
9c674e6
Merge branch 'main' of https://github.com/icwhite/mindcraft
Ayushmaniar Mar 23, 2025
4c5320e
Added files for filtering easy test tasks (30) and training tasks (500)
Ayushmaniar Mar 23, 2025
98f9d86
quick patch to delete server files
icwhite Mar 23, 2025
8f9ed98
add filtered train tasks
hlillemark Mar 23, 2025
db962d7
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 23, 2025
b965123
increase timeout
icwhite Mar 23, 2025
354e1f7
construction tasks try catch loop
icwhite Mar 23, 2025
76de807
Updated analyze scripts to perform model comparison
Ayushmaniar Mar 23, 2025
cc3c6d8
Merge branch 'main' of https://github.com/icwhite/mindcraft
Ayushmaniar Mar 23, 2025
8130703
additional logging information
icwhite Mar 23, 2025
a6f9392
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 23, 2025
c637e37
fix evaluation script for 4 agents
icwhite Mar 24, 2025
ab491ed
Allow agents to use !endConversation for cooking tasks
Ayushmaniar Mar 25, 2025
dbe96b8
Human names for 2+ agents, modifications to goal prompts for 2+ agent…
Ayushmaniar Mar 25, 2025
97e158a
longer timeout
icwhite Mar 26, 2025
c24c8aa
Merge branch 'main' of https://github.com/icwhite/mindcraft
icwhite Mar 26, 2025
607c383
New test and train (easier) tasks for 2+ agent cooking
Ayushmaniar Mar 26, 2025
4e0ae4b
Merge branch 'main' of https://github.com/icwhite/mindcraft
Ayushmaniar Mar 26, 2025
d68d35e
Add filtered tasks for 3, 4, 5 agents
hlillemark Mar 26, 2025
38c701a
Merge branch 'main' of https://github.com/icwhite/mindcraft
hlillemark Mar 26, 2025
f862964
evaluation script add no pruning and block conversation
icwhite Mar 26, 2025
fab5721
cooking tasks longer timeout
icwhite Mar 27, 2025
a515867
Add new test and train tasks for 3+ agent cooking
Ayushmaniar Mar 27, 2025
7afaba9
Added 2 agent fully unblocked test tasks for comparing with 3+ agents…
Ayushmaniar Mar 27, 2025
4d2e90a
Added timeout for history saving
Ayushmaniar Mar 27, 2025
63e7861
Situations where no task score is present for logs of all bots
Ayushmaniar Mar 27, 2025
75037f7
longer timeout test tasks
icwhite Mar 28, 2025
d39b254
Updates on construction and cooking tasks, prettyTable, flexibility t…
Ayushmaniar Mar 28, 2025
cd54819
Merge branch 'main' of https://github.com/icwhite/mindcraft
Ayushmaniar Mar 28, 2025
beb8605
Comment removal
Ayushmaniar Mar 29, 2025
cd89bc9
Removed README.md file
Ayushmaniar Mar 29, 2025
22973a9
Removing LICENSE
Ayushmaniar Mar 29, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
Binary file not shown.
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,14 @@ services/viaproxy/saves.json
services/viaproxy/viaproxy.yml
tmp/
wandb/
experiments/
experiments/
andy_*.json
jill_*.json
src/models/logs/*
server_data/*
results/*
tasks/construction_tasks/test_multiagent_construction_tasks.json
tasks/construction_tasks/train_multiagent_construction_tasks.json
tasks/construction_tasks/test/**
tasks/construction_tasks/train/**
server_data*
Empty file added Dockerfile
Empty file.
21 changes: 0 additions & 21 deletions LICENSE

This file was deleted.

157 changes: 0 additions & 157 deletions README.md

This file was deleted.

Loading