Skip to content

Commit

Permalink
black format
Browse files Browse the repository at this point in the history
  • Loading branch information
gasse committed May 10, 2024
1 parent caea1f8 commit f2e2185
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 5 deletions.
10 changes: 8 additions & 2 deletions core/src/browsergym/core/action/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from dataclasses import dataclass
from typing import Any


@dataclass
class NamedArgument:
name: str
Expand All @@ -12,6 +13,7 @@ class NamedArgument:
def __repr__(self):
return f"{self.name}={repr(self.value)}"


def _build_highlevel_action_parser() -> pp.ParserElement:
"""
Returns:
Expand Down Expand Up @@ -53,15 +55,19 @@ def literal_eval(toks):

list_items = pp.DelimitedList(element, allow_trailing_delim=True).set_name(None)
list << pp.Group(LBRACK + pp.Optional(list_items) + RBRACK, aslist=True)
_tuple << pp.Group(LPAREN + pp.Optional(list_items) + RPAREN, aslist=True).set_parse_action(lambda tokens: tuple(tokens[0]))
_tuple << pp.Group(LPAREN + pp.Optional(list_items) + RPAREN, aslist=True).set_parse_action(
lambda tokens: tuple(tokens[0])
)

dict_item = pp.Group(string + COLON + element, aslist=True).set_name("dict item")
dict_items = pp.DelimitedList(dict_item, allow_trailing_delim=True).set_name(None)
dict << pp.Dict(LBRACE + pp.Optional(dict_items) + RBRACE, asdict=True)

arg = element
list_args = pp.DelimitedList(arg, allow_trailing_delim=True).set_name(None)
named_arg = (pp.pyparsing_common.identifier() + pp.Literal("=") + element).set_parse_action(lambda tokens: NamedArgument(name=tokens[0], value=tokens[2]))
named_arg = (pp.pyparsing_common.identifier() + pp.Literal("=") + element).set_parse_action(
lambda tokens: NamedArgument(name=tokens[0], value=tokens[2])
)
list_named_args = pp.DelimitedList(named_arg, allow_trailing_delim=True).set_name(None)
function_call = pp.pyparsing_common.identifier() + pp.Group(
LPAREN + pp.Optional(list_args) + pp.Optional(list_named_args) + RPAREN, aslist=True
Expand Down
18 changes: 15 additions & 3 deletions core/tests/test_actions_highlevel.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,19 @@ def test_action_parser():

function_calls = parser.parse_string('a(x=12, y = 12.2, other = "text")', parseAll=True)
_, function_args = function_calls[0]
assert function_args == [NamedArgument(name='x', value=12), NamedArgument(name="y", value=12.2), NamedArgument(name="other", value="text")]
assert function_args == [
NamedArgument(name="x", value=12),
NamedArgument(name="y", value=12.2),
NamedArgument(name="other", value="text"),
]

function_calls = parser.parse_string('a(12, y = 12.2, other = "text")', parseAll=True)
_, function_args = function_calls[0]
assert function_args == [12, NamedArgument(name="y", value=12.2), NamedArgument(name="other", value="text")]
assert function_args == [
12,
NamedArgument(name="y", value=12.2),
NamedArgument(name="other", value="text"),
]

with pytest.raises(ParseException):
function_calls = parser.parse_string('a(x = 12, 12.2, other = "text")', parseAll=True)
Expand Down Expand Up @@ -97,7 +105,11 @@ def test_action_parser():
function_calls = parser.parse_string('fun(12, x="val", y={"aaa": 23})', parseAll=True)
function_name, function_args = function_calls[0]
assert function_name == "fun"
assert function_args == [12, NamedArgument(name="x", value="val"), NamedArgument(name="y", value={"aaa": 23})]
assert function_args == [
12,
NamedArgument(name="x", value="val"),
NamedArgument(name="y", value={"aaa": 23}),
]


def test_valid_action():
Expand Down

0 comments on commit f2e2185

Please sign in to comment.