From efcef6f0445739cc42ab1961ce9043c30d4e6268 Mon Sep 17 00:00:00 2001 From: CinquilCinquil <106356391+CinquilCinquil@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:31:08 -0300 Subject: [PATCH 1/5] feat(issue-98): Add SC2Action class --- urnai/sc2/actions/sc2_action.py | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 urnai/sc2/actions/sc2_action.py diff --git a/urnai/sc2/actions/sc2_action.py b/urnai/sc2/actions/sc2_action.py new file mode 100644 index 0000000..acdef88 --- /dev/null +++ b/urnai/sc2/actions/sc2_action.py @@ -0,0 +1,9 @@ +from pysc2.lib.actions import FunctionCall + + +class SC2Action: + + """This class encapsulates the usage of actions from pysc2""" + + def run(action_id, *args) -> FunctionCall: + return action_id(*args) From bc09fceb761e4afd7d9cb6ac369f2b728fbfc56d Mon Sep 17 00:00:00 2001 From: CinquilCinquil <106356391+CinquilCinquil@users.noreply.github.com> Date: Tue, 30 Jul 2024 09:32:18 -0300 Subject: [PATCH 2/5] test(issue-98): Add units tests to SC2Action --- tests/units/sc2/actions/test_sc2_action.py | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 tests/units/sc2/actions/test_sc2_action.py diff --git a/tests/units/sc2/actions/test_sc2_action.py b/tests/units/sc2/actions/test_sc2_action.py new file mode 100644 index 0000000..add920b --- /dev/null +++ b/tests/units/sc2/actions/test_sc2_action.py @@ -0,0 +1,21 @@ +import unittest + +from pysc2.lib import actions + +from urnai.actions.sc2_action import SC2Action + +_BUILD_REFINERY = actions.RAW_FUNCTIONS.Build_Refinery_pt +_NO_OP = actions.FUNCTIONS.no_op + +class TestActionBase(unittest.TestCase): + + def test_run(self): + + run_no_op = SC2Action.run(_NO_OP) + run_build_refinery = SC2Action.run(_BUILD_REFINERY, 'now', 0) + + self.assertEqual(run_no_op.function, _NO_OP.id) + self.assertEqual(run_no_op.arguments, []) + + self.assertEqual(run_build_refinery.function, _BUILD_REFINERY.id) + self.assertEqual(run_build_refinery.arguments, [[actions.Queued['now']], [0]]) From 3b6d129d09f7026eecf2912a2ef71f0386f13033 Mon Sep 17 00:00:00 2001 From: CinquilCinquil <106356391+CinquilCinquil@users.noreply.github.com> Date: Tue, 30 Jul 2024 13:54:51 -0300 Subject: [PATCH 3/5] refactor(issue-98): Fix typo in SC2Action unit tests --- tests/units/sc2/actions/test_sc2_action.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/units/sc2/actions/test_sc2_action.py b/tests/units/sc2/actions/test_sc2_action.py index add920b..cd4a8e0 100644 --- a/tests/units/sc2/actions/test_sc2_action.py +++ b/tests/units/sc2/actions/test_sc2_action.py @@ -7,7 +7,7 @@ _BUILD_REFINERY = actions.RAW_FUNCTIONS.Build_Refinery_pt _NO_OP = actions.FUNCTIONS.no_op -class TestActionBase(unittest.TestCase): +class TestSC2Action(unittest.TestCase): def test_run(self): From 9332238bdcf5952bbe7e9a5c8538f33653cc015e Mon Sep 17 00:00:00 2001 From: CinquilCinquil <106356391+CinquilCinquil@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:08:46 -0300 Subject: [PATCH 4/5] refactor(issue-98): Rename action_id to action #98 --- urnai/sc2/actions/sc2_action.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/urnai/sc2/actions/sc2_action.py b/urnai/sc2/actions/sc2_action.py index acdef88..201fdd3 100644 --- a/urnai/sc2/actions/sc2_action.py +++ b/urnai/sc2/actions/sc2_action.py @@ -5,5 +5,5 @@ class SC2Action: """This class encapsulates the usage of actions from pysc2""" - def run(action_id, *args) -> FunctionCall: - return action_id(*args) + def run(action, *args) -> FunctionCall: + return action(*args) From 2091985b82fe6be7b04d2d1884f06ff06bba41d8 Mon Sep 17 00:00:00 2001 From: Carlos Eduardo Date: Fri, 2 Aug 2024 16:29:20 -0300 Subject: [PATCH 5/5] refactor(issue-98): Rename action to action_function MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #99 Co-authored-by: Álvaro Paiva --- urnai/sc2/actions/sc2_action.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/urnai/sc2/actions/sc2_action.py b/urnai/sc2/actions/sc2_action.py index 201fdd3..d2d1047 100644 --- a/urnai/sc2/actions/sc2_action.py +++ b/urnai/sc2/actions/sc2_action.py @@ -5,5 +5,5 @@ class SC2Action: """This class encapsulates the usage of actions from pysc2""" - def run(action, *args) -> FunctionCall: - return action(*args) + def run(action_function, *args) -> FunctionCall: + return action_function(*args)