Skip to content

Commit fae71ac

Browse files
authored
Merge pull request #1 from CLSFramework/dev-formation
Dev formation
2 parents 3d0674c + 689db80 commit fae71ac

30 files changed

+25125
-65
lines changed

server.py

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from src.sample_coach_agent import SampleCoachAgent
1414
from src.sample_player_agent import SamplePlayerAgent
1515
from src.sample_trainer_agent import SampleTrainerAgent
16+
import traceback
1617

1718

1819
console_logging_level = logging.INFO
@@ -51,8 +52,7 @@ def GetAction(self, state: pb2.State):
5152
return self.GetTrainerActions(state)
5253
except Exception as e:
5354
self.logger.error(f"Error in GetAction: {e}")
54-
import traceback
55-
traceback.print_exc()
55+
self.logger.error(traceback.format_exc())
5656
return pb2.PlayerActions()
5757

5858
def GetPlayerActions(self, state: pb2.State):
@@ -81,16 +81,31 @@ def GetTrainerActions(self, state: pb2.State):
8181
return pb2.TrainerActions(actions=self.agent.get_actions())
8282

8383
def SetServerParams(self, server_params: pb2.ServerParam):
84-
self.logger.debug(f"Server params received unum {server_params.register_response.uniform_number}")
85-
self.agent.set_server_params(server_params)
84+
try:
85+
self.logger.debug(f"Server params received unum {server_params.register_response.uniform_number}")
86+
self.agent.set_server_params(server_params)
87+
except Exception as e:
88+
self.logger.error(f"Error in GetAction: {e}")
89+
self.logger.error(traceback.format_exc())
90+
return pb2.PlayerActions()
8691

8792
def SetPlayerParams(self, player_params: pb2.PlayerParam):
88-
self.logger.debug(f"Player params received unum {player_params.register_response.uniform_number}")
89-
self.agent.set_player_params(player_params)
93+
try:
94+
self.logger.debug(f"Player params received unum {player_params.register_response.uniform_number}")
95+
self.agent.set_player_params(player_params)
96+
except Exception as e:
97+
self.logger.error(f"Error in GetAction: {e}")
98+
self.logger.error(traceback.format_exc())
99+
return pb2.PlayerActions()
90100

91101
def SetPlayerType(self, player_type: pb2.PlayerType):
92-
self.logger.debug(f"Player type received unum {player_type.register_response.uniform_number}")
93-
self.agent.set_player_types(player_type)
102+
try:
103+
self.logger.debug(f"Player type received unum {player_type.register_response.uniform_number}")
104+
self.agent.set_player_types(player_type)
105+
except Exception as e:
106+
self.logger.error(f"Error in GetAction: {e}")
107+
self.logger.error(traceback.format_exc())
108+
return pb2.PlayerActions()
94109

95110
class GameHandler(pb2_grpc.GameServicer):
96111
def __init__(self, shared_lock, shared_number_of_connections) -> None:
@@ -158,8 +173,7 @@ def Register(self, register_request: pb2.RegisterRequest, context):
158173
return register_response
159174
except Exception as e:
160175
main_logger.error(f"Error in Register: {e}")
161-
import traceback
162-
traceback.print_exc()
176+
main_logger.error(traceback.format_exc())
163177
return pb2.RegisterResponse()
164178

165179
def SendByeCommand(self, register_response: pb2.RegisterResponse, context):
Lines changed: 99 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,99 @@
1+
{
2+
"version" : "20220408-135243",
3+
"method" : "Static",
4+
"role" : [
5+
{
6+
"number" : 1,
7+
"name" : "Goalie",
8+
"type" : "Unknown",
9+
"side" : "C",
10+
"pair" : 0
11+
},
12+
{
13+
"number" : 2,
14+
"name" : "CenterBack",
15+
"type" : "Unknown",
16+
"side" : "C",
17+
"pair" : 0
18+
},
19+
{
20+
"number" : 3,
21+
"name" : "CenterBack",
22+
"type" : "Unknown",
23+
"side" : "C",
24+
"pair" : 0
25+
},
26+
{
27+
"number" : 4,
28+
"name" : "SideBack",
29+
"type" : "Unknown",
30+
"side" : "C",
31+
"pair" : 0
32+
},
33+
{
34+
"number" : 5,
35+
"name" : "SideBack",
36+
"type" : "Unknown",
37+
"side" : "C",
38+
"pair" : 0
39+
},
40+
{
41+
"number" : 6,
42+
"name" : "OffensiveHalf",
43+
"type" : "Unknown",
44+
"side" : "C",
45+
"pair" : 0
46+
},
47+
{
48+
"number" : 7,
49+
"name" : "DefensiveHalf",
50+
"type" : "Unknown",
51+
"side" : "C",
52+
"pair" : 0
53+
},
54+
{
55+
"number" : 8,
56+
"name" : "DefensiveHalf",
57+
"type" : "Unknown",
58+
"side" : "C",
59+
"pair" : 0
60+
},
61+
{
62+
"number" : 9,
63+
"name" : "SideHalf",
64+
"type" : "Unknown",
65+
"side" : "C",
66+
"pair" : 0
67+
},
68+
{
69+
"number" : 10,
70+
"name" : "SideHalf",
71+
"type" : "Unknown",
72+
"side" : "C",
73+
"pair" : 0
74+
},
75+
{
76+
"number" : 11,
77+
"name" : "CenterForward",
78+
"type" : "Unknown",
79+
"side" : "C",
80+
"pair" : 0
81+
}
82+
],
83+
"data" : [
84+
{
85+
"index" : 0,
86+
"ball" : { "x" : 0.00, "y" : 0.00 },
87+
"1" : { "x" : -49.00, "y" : 0.00 },
88+
"2" : { "x" : -12.50, "y" : -5.00 },
89+
"3" : { "x" : -12.50, "y" : 5.00 },
90+
"4" : { "x" : -11.60, "y" : -15.80 },
91+
"5" : { "x" : -11.60, "y" : 15.80 },
92+
"6" : { "x" : -6.70, "y" : -1.90 },
93+
"7" : { "x" : -10.00, "y" : -10.80 },
94+
"8" : { "x" : -10.00, "y" : 10.80 },
95+
"9" : { "x" : -0.50, "y" : -23.80 },
96+
"10" : { "x" : -0.50, "y" : 23.80 },
97+
"11" : { "x" : -0.39, "y" : 0.00 } }
98+
]
99+
}

0 commit comments

Comments
 (0)