Skip to content

Commit b674043

Browse files
committed
fix: Remove precompute method from agent classes and update logging in connection handling
1 parent 2df0865 commit b674043

File tree

7 files changed

+5
-24
lines changed

7 files changed

+5
-24
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,3 +172,4 @@ cython_debug/
172172

173173
# ADF
174174
agent.log*
175+
precompute

adf_core_python/core/agent/agent.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ def post_connect(self) -> None:
154154
self._agent_info,
155155
)
156156

157-
self.logger.info("Agent running in %s mode", self._mode)
158157
self.logger.debug(f"agent_config: {self.config}")
159158

160159
def update_step_info(
@@ -213,10 +212,6 @@ def update_step_info(
213212
def think(self) -> None:
214213
pass
215214

216-
@abstractmethod
217-
def precompute(self) -> None:
218-
pass
219-
220215
@abstractmethod
221216
def get_requested_entities(self) -> list[EntityURN]:
222217
pass
@@ -269,12 +264,12 @@ def handle_connect_ok(self, msg: Any) -> None:
269264
self.send_acknowledge(msg.request_id)
270265
self.post_connect()
271266
self.logger.info(
272-
f"Connected to kernel: {self.__class__.__qualname__} (request_id: {msg.request_id})",
267+
f"Connected to kernel: {self.__class__.__qualname__} (request_id: {msg.request_id}, agent_id: {self.agent_id}, mode: {self.mode})",
273268
request_id=msg.request_id,
274269
)
275-
if self.precompute_flag:
276-
print("self.precompute_flag: ", self.precompute_flag)
277-
self.precompute()
270+
if self.is_precompute:
271+
self.logger.info("Precompute finished")
272+
exit(0)
278273

279274
self.finish_post_connect_event.set()
280275

adf_core_python/core/agent/office/office_fire.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,5 @@ def __init__(
3131
finish_post_connect_event,
3232
)
3333

34-
def precompute(self) -> None:
35-
pass
36-
3734
def get_requested_entities(self) -> list[EntityURN]:
3835
return [EntityURN.FIRE_STATION]

adf_core_python/core/agent/office/office_police.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,5 @@ def __init__(
3131
finish_post_connect_event,
3232
)
3333

34-
def precompute(self) -> None:
35-
pass
36-
3734
def get_requested_entities(self) -> list[EntityURN]:
3835
return [EntityURN.POLICE_OFFICE]

adf_core_python/core/agent/platoon/platoon_ambulance.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,5 @@ def __init__(
3131
finish_post_connect_event,
3232
)
3333

34-
def precompute(self) -> None:
35-
pass
36-
3734
def get_requested_entities(self) -> list[EntityURN]:
3835
return [EntityURN.AMBULANCE_TEAM]

adf_core_python/core/agent/platoon/platoon_fire.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,5 @@ def __init__(
3131
finish_post_connect_event,
3232
)
3333

34-
def precompute(self) -> None:
35-
pass
36-
3734
def get_requested_entities(self) -> list[EntityURN]:
3835
return [EntityURN.FIRE_BRIGADE]

adf_core_python/core/agent/platoon/platoon_police.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,5 @@ def __init__(
3131
finish_post_connect_event,
3232
)
3333

34-
def precompute(self) -> None:
35-
pass
36-
3734
def get_requested_entities(self) -> list[EntityURN]:
3835
return [EntityURN.POLICE_FORCE]

0 commit comments

Comments
 (0)