832 Commits

Author SHA1 Message Date
Jack Hopkins
2eb53cc6bf Plots 2024-12-11 13:44:32 +00:00
Mart
56416589ae some bugfixes 2024-12-11 12:12:56 +00:00
Mart
e967728a93 added meta to programs being saved by chunked mcts 2024-12-11 10:22:06 +00:00
Mart
8b83652bda added meta to programs being saved by chunked mcts 2024-12-11 10:21:25 +00:00
Jack Hopkins
30c3bcd0f6 Merge branch 'refactor/mcts' of https://github.com/JackHopkins/PaperclipMaximiser into refactor/mcts 2024-12-05 22:55:03 +00:00
Jack Hopkins
0b1f8ddf80 CLI for running MCTS 2024-12-05 22:54:45 +00:00
MartBakler
bcf756921a added creation of program for the last step (#79) 2024-12-05 14:43:47 +00:00
Jack Hopkins
829ce44917 Added logit bias to prevent sampling 'while' 2024-12-05 11:27:32 +00:00
Jack Hopkins
e651c9ce92 Abort chunks if an error is raised. Position equality is now more permissive 2024-12-04 17:38:02 +00:00
Jack Hopkins
b38e977cab Fix merge conflict 2024-12-04 14:24:44 +00:00
Jack Hopkins
9c4ef699f4 LLM factory change 2024-12-04 14:24:12 +00:00
Jack Hopkins
a02dd2e898 Add parent samplers 2024-12-04 14:23:55 +00:00
MartBakler
f68c5fd1b0 Bugfixes for planning mcts (#78)
* added stop sequences to acall for openai

* added saving of judge output string

* added saving of executor natural language plan
2024-12-04 14:08:09 +00:00
Jack Hopkins
61bd3f2bcb Fixed connection issue with poles 2024-12-03 15:24:07 +00:00
Mart
f4e718bcc4 removed testing code 2024-12-02 11:26:25 +00:00
Mart
5876ccadf4 removed testing code 2024-12-02 11:26:03 +00:00
Mart
afb9f70a17 added water and steam achievement tests 2024-12-02 11:25:23 +00:00
Jack Hopkins
c16c68e280 Merged 2024-12-01 01:14:36 +00:00
Jack Hopkins
b17200260b Docs 2024-12-01 01:05:45 +00:00
MartBakler
52f01b7e15 Evaluation routine (#73)
* checkpoint

* bugfixes and added dynamic production flow calculator

* added lua implementation of the achievement tracking

* cleanup

* movedprod stats to a new file

* created a test

* removed unnecessary file

* tidied up

* removed change
2024-12-01 01:05:16 +00:00
Jack Hopkins
f861b4f08d Add tick-based sleep functionality 2024-11-30 18:07:44 +00:00
Jack Hopkins
dc35f87186 Merged 2024-11-29 22:43:05 +00:00
Jack Hopkins
d3c1af9c81 Merge branch 'main' of https://github.com/JackHopkins/PaperclipMaximiser into feature/blueprint_mcts 2024-11-29 15:37:52 +00:00
Jack Hopkins
f081cab8c3 Feature/blueprint mcts (#72)
* Add blueprint based initial states. Add diversity sampling.

* Fixed namespace reinitialising bug

* Give reward for harvesting. Increase complexity exponent in calculating reward

* Implemented planning MCTS with the parallelisation infrastructure.

* Slightly better prompts
2024-11-29 15:36:52 +00:00
Jack Hopkins
17ce96e8e8 Merge branch 'main' into feature/blueprint_mcts 2024-11-29 15:36:46 +00:00
Jack Hopkins
c2c0c61b76 Slightly better prompts 2024-11-29 15:34:34 +00:00
Jack Hopkins
599459ddd9 Feature/blueprint mcts (#71)
* Add blueprint based initial states. Add diversity sampling.

* Fixed namespace reinitialising bug

* Give reward for harvesting. Increase complexity exponent in calculating reward

* Implemented planning MCTS with the parallelisation infrastructure.
2024-11-28 18:30:26 +00:00
Jack Hopkins
07436345a5 Implemented planning MCTS with the parallelisation infrastructure. 2024-11-28 18:27:39 +00:00
Jack Hopkins
3a38be136a Merged 2024-11-28 13:50:20 +00:00
Jack Hopkins
55d7d8f238 Give reward for harvesting. Increase complexity exponent in calculating reward 2024-11-28 13:48:12 +00:00
MartBakler
b417a098b8 Planning model (#69)
* added new prompts

* first version of planning executor

* checkpoint

* first draft

* added plan parent id

* removed changes

* fixed a small error

* merged with newest

* fixedsome bugs

* added meta and outputs

* added mew logging

* updated prompts

* improvements and bugfixes

* entrypoint for planning

* removed testing code

* removed testing code

* made additions to get them working with generation paramaters

* revoked some changes

* removed file
2024-11-28 13:37:37 +00:00
Jack Hopkins
a7f64cb9cb Fixed namespace reinitialising bug 2024-11-28 01:01:44 +00:00
Jack Hopkins
af1db3445c Add blueprint based initial states. Add diversity sampling. 2024-11-27 12:36:57 +00:00
Jack Hopkins
29a075a74f Feature/multi mcts (#68)
* Added a formatter class to simplify long conversational chains before going to the LLM to save tokens / context.

* Instance logging using Rich. More data and some bug fixes.

* Partial implementation of a chunked MCTS searcher

* Retain comments and whitespace in chunk parser

* Add inventory and entities to the observation state if missing via modifying agent generated code.

* added the plan sampler

* Ensure holdout runs for chunked mcts. Ensure all 3 servers process tasks.'

* added example how to use

* added correct stop sequence parsing

* added planning

* added docstring

* Fixed error serialization bug. Added objective seeding.

* Add recursive crafting support.

* Add refined system policy. Fixed pipe connect when invalid connection points or jagged path

* Removing connection points after setting them in serialized

* Add support for running MCTS in full parallelization, with instance grouping parameters

* Bug fixes, better logging.

* Holdout scores are retrieved after each chunk is processed.

* Sleep action is now subdivided by the game speed.

* Better holdout

---------

Co-authored-by: Jack Hopkins <jackhopkins@192.168.1.116>
Co-authored-by: Jack Hopkins <jackhopkins@Jacks-MacBook-Pro.local>
Co-authored-by: Mart <mart@paperplane.ai>
2024-11-25 15:21:31 +00:00
MartBakler
726cad777f merged with main (#65) 2024-11-22 12:28:44 +00:00
Jack Hopkins
d657325d40 Chunked MCTS (#63)
* Added a formatter class to simplify long conversational chains before going to the LLM to save tokens / context.

* Instance logging using Rich. More data and some bug fixes.

* Partial implementation of a chunked MCTS searcher

* Retain comments and whitespace in chunk parser

* Add inventory and entities to the observation state if missing via modifying agent generated code.

* added the plan sampler

* Ensure holdout runs for chunked mcts. Ensure all 3 servers process tasks.'

* added example how to use

* added correct stop sequence parsing

* added planning

* added docstring

* Fixed error serialization bug. Added objective seeding.

* Add recursive crafting support.

---------

Co-authored-by: Jack Hopkins <jackhopkins@192.168.1.116>
Co-authored-by: Jack Hopkins <jackhopkins@Jacks-MacBook-Pro.local>
Co-authored-by: Mart <mart@paperplane.ai>
2024-11-21 18:16:51 +00:00
MartBakler
d90f109c60 Merge pull request #59 from JackHopkins/connect_entities_improvement
Connect entities improvement
2024-11-18 21:45:08 +00:00
Mart
1705441452 added a empty lua file to not error our action nput 2024-11-17 23:08:25 +00:00
Mart
b6e40472d4 added a action that returns the amount of connections required 2024-11-17 22:53:45 +00:00
Mart
0379f8171c added dry run tests 2024-11-17 19:19:22 +00:00
Mart
24246bda49 added the erroring if not enough entities for connection before placing and dry run returns the amount available and the amount needed 2024-11-17 17:56:24 +00:00
Mart
ad2c821755 always doing 2 runs 2024-11-17 17:15:48 +00:00
Mart
97e978dd07 added the counting of transport entities 2024-11-17 16:55:29 +00:00
Mart
b676d70694 added dry run where it is not built when dry_run is true 2024-11-17 16:45:52 +00:00
Jack Hopkins
c1ef97e632 Added planning prompts, and only including program outputs. 2024-11-17 15:36:43 +00:00
Jack Hopkins
988bf67e54 Fixed connect_entities and place_entity_next_to bugs. 2024-11-15 22:27:41 +00:00
Jack Hopkins
162ec2f723 Add DB support for MCTS with game state reconstitution 2024-11-15 15:43:57 +00:00
Jack Hopkins
ed1668020b Added readme files to the cluster directory 2024-11-15 11:28:56 +00:00
Jack Hopkins
4e9924ba0c Added actions for saving and loading the state, as blueprints (without items) or not (with everything). 2024-11-15 11:18:14 +00:00
Jack Hopkins
afc465bd64 Fix crafting issue where you could craft uncraftable entities 2024-11-13 16:57:23 +00:00