incorporate objects defined in yaml configuration into gridworld #248

cguardia · 2023-07-21T10:15:34Z

Description

Use configurable object types instead of only food to populate the grid. For now all objects with a positive calories attribute behave as food. Other objects should show up, but do not respond to user movements.

Covers #232 and #233

…w-object-types

alecpm

This is a good start on the food to object conversion, but there's still a lot of work to be done to make this all work the way it should where the object behavior (especially spawning) is determined by object properties instead of global experiment config.

alecpm · 2023-07-21T17:13:34Z

dlgr/griduniverse/experiment.py

-    'food_planting': bool,
-    'food_planting_cost': int,
-    'food_probability_distribution': unicode,
+    'object_count': int,


@cguardia I don't think any of these should be in the experiment config, they should be object properties in the YAML and don't need to be registered here.

I'm going to propose a generic plantable property unless someone can think of a better word. Seems generic enough (eg: you can "plant evidence", etc.)

Sure, for now we'll only be using it for food, so it doesn't much matter I think.

alecpm · 2023-07-21T17:18:27Z

dlgr/griduniverse/experiment.py

-        self.food_maturation_threshold = kwargs.get(
-            'food_maturation_threshold', 0.0)
+        # Objects
+        self.object_count = kwargs.get('object_count', 8)


These shouldn't be coming in via __init__ but being read from self.object_config since they are per object configuration. Generally speaking, I think we don't need to set them here since they will differ per object and need to be looked up per object when doing spawning, etc.

alecpm · 2023-07-21T17:22:48Z

dlgr/griduniverse/experiment.py

@@ -670,23 +679,23 @@ def instructions(self):
            text += """ Movement commands will be ignored almost all of the time,


This is eventually going to have to be re-done. See #250.

alecpm · 2023-07-21T17:28:33Z

dlgr/griduniverse/experiment.py

-                food = self.food_locations[position]
+            if position in self.object_locations:
+                food = self.object_locations[position]
+                # any object with calories is food for now. Other objects are ignored.


I don't think this is quite right. "Food" is any non-interactive object with calories, so:

item_info = self.object_config.get(obj_id) is_food = item_info.get('calories', 0) and not item_info.get('interactive', True)

Maybe this can be a dynamic property of Object.

alecpm · 2023-07-21T17:30:11Z

dlgr/griduniverse/experiment.py

                else:
-                    self.num_food -= 1
+                    self.object_count -= 1


This needs to be tracked per object type, I think.

alecpm · 2023-07-21T17:38:18Z

dlgr/griduniverse/experiment.py

        self.probability_function_args = []
-        parts = self.food_probability_distribution.split()
+        parts = self.probability_distribution.split()


This should also be object specific.

alecpm · 2023-07-21T17:42:47Z

dlgr/griduniverse/experiment.py

            player.score -= self.grid.food_planting_cost
-            self.grid.spawn_food(position=position)
+            self.grid.spawn_object(position=position)


I think this needs an object_id, specifically the object_id for "Food". Maybe that's a new experiment config parameter, maybe a required plantable_object_id when food_planting is enabled. Choosing an object type at random doesn't really work for this.

alecpm · 2023-07-21T17:46:15Z

dlgr/griduniverse/experiment.py

-            if self.grid.food_maturation_threshold and (count % 100) == 0:
-                self.grid.food_updated = True
+            # Log object updates every hundred rounds to capture maturity changes
+            if self.grid.maturation_threshold and (count % 100) == 0:


I think self.grid.maturation_threshold needs to be computed at launch using something like any([o.get(maturation_threshold, 0) for o in self.object_config]). That way this step will happen if any object type has a maturation_threshold set.

dlgr/griduniverse/experiment.py

dlgr/griduniverse/static/scripts/demo.js

…onfig.yml

dlgr/griduniverse/experiment.py

alecpm · 2023-07-26T17:28:54Z

dlgr/griduniverse/game_config.yml

@@ -1,82 +1,120 @@
 ---
+item_defaults:


I like the idea of being able to configure the defaults across all items.

alecpm

Spoke too soon with my last review. There's still a couple small things that look like they need fixes. It is looking much better!

dlgr/griduniverse/experiment.py

alecpm · 2023-07-26T17:32:57Z

dlgr/griduniverse/experiment.py

+        # Items
+        self.respawn = kwargs.get("respawn", True)
+        self.public_good_multiplier = kwargs.get("public_good_multiplier", 1)
+        self.growth_rate = kwargs.get("growth_rate", 1.00)


This should definitely be item level, I think.

dlgr/griduniverse/experiment.py

alecpm · 2023-07-26T17:39:45Z

dlgr/griduniverse/experiment.py

    @property
    def limited_player_colors(self):
-        return self.player_colors[:self.num_colors]
+        return self.player_colors[: self.num_colors]


What is black doing here?

Also, maybe we should put these colors in game_config.yml?

dlgr/griduniverse/experiment.py

alecpm · 2023-07-26T17:52:24Z

dlgr/griduniverse/experiment.py

+            logger.info("Spawning items")
+            for item_type in self.item_config.values():
+                for i in range(item_type["item_count"]):
+                    if (i % 250) == 0:


I wonder if we need to adjust this sleep check to use an overall loop counter to adjust for the fact that any given item type is likely to have a lower count. Probably doesn't matter for now, but doing the check per item type seems odd to me.

… tear-down

dlgr/griduniverse/config.txt

dlgr/griduniverse/experiment.py

alecpm · 2023-07-31T18:47:43Z

dlgr/griduniverse/experiment.py

    def spawn_player(self, id=None, **kwargs):
        """Spawn a player."""
+        # For player position, use same distribution as first configured item.
+        item_id = list(self.item_config.keys())[0]


Why are we doing this instead of leaving it to the default random distribution? Very unintuitive to me. We can add configuration for player distribution later, right?

Yeah, I think we should add a config for that.

alecpm

All my initial comments have been addressed. I've added some new comments, but they are minor optimization or clarification suggestions. I think this PR is in good shape. I may test a little and implement my suggestions before merge.

jessesnyder · 2023-07-31T21:19:43Z

dlgr/griduniverse/experiment.py

@@ -1231,6 +1241,8 @@ def configure(self):
            (t["actor_start"], t["target_start"]): t
            for t in self.game_config.get("transitions", ())
        }
+
+        self.player_config = self.game_config.get("player_config")


I think that at least for now, we'll need to JSON serialize self.player_config into self.player_config_json so the front-end can read it, but I'm not certain this is the the case (these may not actually be actually be used).

We already pass the player color stuff directly, and the probability distribution is definitely server only. I think we're OK here for now, but if we eventually have client side player config in this structure, we'll probably need it. For now I don't think we do.

jessesnyder · 2023-07-31T21:24:26Z

dlgr/griduniverse/experiment.py

        """Select an empty cell at random, using the configured probability
        distribution."""
        rows = self.rows
        columns = self.columns
        empty_cell = False
+        if item_id:
+            prob_func = self.item_config[item_id]["probability_function"]


Doesn't this need to be getattr(distributions, self.item_config[item_id]["probability_function"]) (the config value is just a string)?

Oh, I see... you've already created a map to the actual functions earlier. 👍🏼

alecpm · 2023-07-31T21:28:56Z

Not sure how I closed this.

jessesnyder and others added 9 commits July 20, 2023 15:49

Make object and transition config accessible to client side

5805389

Remove unsused var

1aacbf7

Hard-code a type_id for food, for now

61936c2

Replace Food with generic Resource

9beb69d

Add Food to game config

e9654de

Add some notes

1757b62

incorporate objects defined in yaml configuration into gridworld

2eabd8b

Only consume things immediately if they're non-interactive

a2e7e90

Merge branch 'issues/233-participants-see-objects' into issues/232-ne…

6442db1

…w-object-types

alecpm requested changes Jul 21, 2023

View reviewed changes

alecpm requested a review from jessesnyder July 21, 2023 18:26

jessesnyder added 5 commits July 21, 2023 11:31

Bugfix: attribute name

d2c809e

Add some logging on grid object spawning

61730ae

Use YAML config for Food, and remove other objects for now

43c5a73

Update attr names in JS to match python

130301c

Commit compiled JS

17b8f4c

alecpm reviewed Jul 21, 2023

View reviewed changes

dlgr/griduniverse/static/scripts/demo.js Outdated Show resolved Hide resolved

cguardia and others added 4 commits July 22, 2023 13:29

Use item rather than object or resource

fe9ef39

Commit compiled JS

4f88723

tablib is no longer a dependency, so remove related test

ef257ff

Mechanical changes to get most tests passing again

03b09e7

jessesnyder force-pushed the issues/232-new-object-types branch 2 times, most recently from 0437d7d to 0bb507d Compare July 24, 2023 23:50

Use a shared reference to item_config across Item instances

02cbb59

jessesnyder force-pushed the issues/232-new-object-types branch from 0bb507d to 02cbb59 Compare July 24, 2023 23:52

jessesnyder and others added 5 commits July 25, 2023 10:31

Move from hard-coding colors to using a "sprite" definition in game_c…

6abf932

…onfig.yml

Add note about possibly avoidable copy of shared values

a2494ee

Port maturation threshold and speed to item config

4be6708

Attempt to blindly update grid item deserialization

4789d8d

add black; first black run updates

44e8614

jessesnyder reviewed Jul 26, 2023

View reviewed changes

dlgr/griduniverse/experiment.py Outdated Show resolved Hide resolved

alecpm reviewed Jul 26, 2023

View reviewed changes

This comment was marked as outdated.

Sign in to view

alecpm requested changes Jul 26, 2023

View reviewed changes

jessesnyder and others added 3 commits July 26, 2023 11:53

Fix some bugs with replenish_items(), but some still remain

8ddd3fe

move away form grid based to item based config and evaluation

b44192a

fix merge conflict

2b86e49

jessesnyder added the one hour one life label Jul 28, 2023

jessesnyder added 7 commits July 28, 2023 11:41

Update supported python versions

2d9e251

Make Item immutable(ish)

c768385

Better test isolation

b831c99

Blacken tests

a2fcae5

Make instruction test very basic for now

7b09115

Greatly reduce mocking and make sure @Property patches are removed on…

31e06c6

… tear-down

Restore docstring

e795dc7

alecpm reviewed Jul 31, 2023

View reviewed changes

dlgr/griduniverse/config.txt Outdated Show resolved Hide resolved

alecpm reviewed Jul 31, 2023

View reviewed changes

dlgr/griduniverse/experiment.py Outdated Show resolved Hide resolved

Restore config.txt, add docstring, remove spurious comment

3d1419b

alecpm reviewed Jul 31, 2023

View reviewed changes

dlgr/griduniverse/experiment.py Outdated Show resolved Hide resolved

alecpm reviewed Jul 31, 2023

View reviewed changes

alecpm approved these changes Jul 31, 2023

View reviewed changes

jessesnyder and others added 2 commits July 31, 2023 12:14

Optimize replenish_items

395f571

Add player config with distribution config.

2410991

alecpm mentioned this pull request Jul 31, 2023

Experimenter defines spawning rules: 8pts #240

Open

1 task

jessesnyder reviewed Jul 31, 2023

View reviewed changes

alecpm closed this Jul 31, 2023

alecpm reopened this Jul 31, 2023

alecpm merged commit 64d7583 into one-hour-one-life Jul 31, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

incorporate objects defined in yaml configuration into gridworld #248

incorporate objects defined in yaml configuration into gridworld #248

cguardia commented Jul 21, 2023 •

edited by jessesnyder

Loading

alecpm left a comment

alecpm Jul 21, 2023

jessesnyder Jul 24, 2023

alecpm Jul 24, 2023

alecpm Jul 21, 2023

alecpm Jul 21, 2023 •

edited

Loading

alecpm Jul 21, 2023

alecpm Jul 21, 2023

alecpm Jul 21, 2023

alecpm Jul 21, 2023

alecpm Jul 21, 2023

alecpm Jul 26, 2023

This comment was marked as outdated.

alecpm left a comment

alecpm Jul 26, 2023

alecpm Jul 26, 2023

alecpm Jul 26, 2023

alecpm Jul 26, 2023

alecpm Jul 31, 2023

cguardia Jul 31, 2023

alecpm left a comment •

edited

Loading

jessesnyder Jul 31, 2023

alecpm Jul 31, 2023

jessesnyder Jul 31, 2023

jessesnyder Jul 31, 2023

alecpm commented Jul 31, 2023

		@@ -670,23 +679,23 @@ def instructions(self):
		text += """ Movement commands will be ignored almost all of the time,

incorporate objects defined in yaml configuration into gridworld #248

incorporate objects defined in yaml configuration into gridworld #248

Conversation

cguardia commented Jul 21, 2023 • edited by jessesnyder Loading

Description

alecpm left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alecpm Jul 21, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

This comment was marked as outdated.

alecpm left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alecpm left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alecpm commented Jul 31, 2023

cguardia commented Jul 21, 2023 •

edited by jessesnyder

Loading

alecpm Jul 21, 2023 •

edited

Loading

alecpm left a comment •

edited

Loading