Skip to content
This repository was archived by the owner on Oct 7, 2025. It is now read-only.

Count up and restart on repeated spinnable check failures #1034

Merged
Grennith merged 13 commits into from
Nov 29, 2020
Merged

Count up and restart on repeated spinnable check failures #1034

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
8809587
count up and restart on repeated spinnable check failures
crhbetz Oct 16, 2020
84f4d9f
rework spinnable checking
crhbetz Nov 17, 2020
90e0cb5
fix W504
crhbetz Nov 17, 2020
d5e741d
ensure fresh data for spinnable check, better log
crhbetz Nov 17, 2020
47d44ff
timeout fetching new data is also a data failure
crhbetz Nov 17, 2020
86b8959
spinnable_data_failure logic fix
crhbetz Nov 17, 2020
139632a
count up and restart on repeated spinnable check failures
crhbetz Oct 16, 2020
7a54645
rework spinnable checking
crhbetz Nov 17, 2020
fc8eb3e
fix W504
crhbetz Nov 17, 2020
b415a7b
ensure fresh data for spinnable check, better log
crhbetz Nov 17, 2020
f5ac455
timeout fetching new data is also a data failure
crhbetz Nov 17, 2020
c2f37cd
spinnable_data_failure logic fix
crhbetz Nov 17, 2020
22cda69
Merge branch 'spinnable-data-failure' of https://github.com/crhbetz/M…
crhbetz Nov 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 59 additions & 22 deletions mapadroid/worker/WorkerQuests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ def __init__(self, args, dev_id, origin, last_known_state, communicator: Abstrac
self._rotation_waittime = self.get_devicesettings_value('rotation_waittime', 300)
self._latest_quest = 0
self._clear_box_failcount = 0
self._spinnable_data_failcount = 0

def _pre_work_loop(self):
if self.clear_thread is not None:
Expand Down Expand Up @@ -152,8 +153,8 @@ def _move_to_location(self):
self.logger.debug("Getting time")
speed = routemanager_settings.get("speed", 0)
max_distance = routemanager_settings.get("max_distance", None)
if (speed == 0 or (max_distance and 0 < max_distance < distance) or
(self.last_location.lat == 0.0 and self.last_location.lng == 0.0)):
if (speed == 0 or (max_distance and 0 < max_distance < distance)
or (self.last_location.lat == 0.0 and self.last_location.lng == 0.0)):
self.logger.debug("main: Teleporting...")
self._transporttype = 0
self._communicator.set_location(
Expand Down Expand Up @@ -603,14 +604,30 @@ def _update_injection_settings(self):

def _current_position_has_spinnable_stop(self, timestamp: float):
latest: dict = self._mitm_mapper.request_latest(self._origin)

# ensure data from after the given timestamp
if latest.get("timestamp_last_data", 0) < timestamp:
data_received = self._wait_for_data(timestamp=timestamp, proto_to_wait_for=106)
if data_received == LatestReceivedType.UNDEFINED:
self._spinnable_data_failure()
return False, False
latest: dict = self._mitm_mapper.request_latest(self._origin)

# TODO: can this still happen with the if-clause above?
if latest is None or PROTO_NUMBER_FOR_GMO not in latest.keys():
self.logger.warning("Can't spin stop - no GMO data available!")
self._spinnable_data_failure()
return False, False

gmo_cells: list = latest.get(PROTO_NUMBER_FOR_GMO).get("values", {}).get("payload", {}).get("cells",
None)
pdlocation = latest.get("location", Location(0, 0))
pdlocation = Location(0, 0) if not pdlocation else pdlocation
stop_found = False

if gmo_cells == list():
self.logger.warning("Can't spin stop - no map info in GMO!")
self._spinnable_data_failure()
return False, False
for cell in gmo_cells:
# each cell contains an array of forts, check each cell for a fort with our current location (maybe +-
Expand All @@ -625,20 +642,24 @@ def _current_position_has_spinnable_stop(self, timestamp: float):
longitude: float = fort.get("longitude", 0.0)
if latitude == 0.0 or longitude == 0.0:
continue
elif (abs(self.current_location.lat - latitude) > 0.00003 or
abs(self.current_location.lng - longitude) > 0.00003):
elif (abs(pdlocation.lat - latitude) > 0.00003 or abs(pdlocation.lng - longitude) > 0.00003):
continue

if latitude == self.current_location.lat and longitude == self.current_location.lng:
stop_found = True

fort_type: int = fort.get("type", 0)
if fort_type == 0:
self._db_wrapper.delete_stop(latitude, longitude)
self.logger.warning("Tried to open a stop but found a gym instead!")
self._spinnable_data_failcount = 0
Copy link
Collaborator

@fosJoddie fosJoddie Oct 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might be the culprit.

We are looping over all pokestops and gyms we found in the GMO, but if we find a gym close by, we try and delete the pokestop at that location, and claim we tried to open a gym.

Actually I'm curious why this check is even here. This is the "are we at a place where there's a stop in the gmo" - not "we have tried to click a stop" ... anyhow. if gmo finds a gym here, it will fail spinnable check and reset spinnable

Copy link
Contributor

@JabLuszko JabLuszko Oct 20, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

But this is after the coords check and max accepted diff there is 0.00003. That gym would have been almost on top of pokestop, like ~4 meters MAX apart. Not saying not possible, but that must be a very very very special location :-)

Copy link

@jfberry jfberry Oct 20, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't followed this. But in my locality we have two gyms where people have moved pokestops right on top. Literally they show as underneath. So these situations do exist. These stops fail quest scan, but if you msg me on discord I will send you long,lat so you can see

Copy link
Contributor Author

@crhbetz crhbetz Oct 21, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That log line is misleading. We're not yet trying to open anything there. I want to reset the counter every time we get a "defined" result. So finding a gym where we expected a stop is a defined result. The stop being disabled/closed/on cooldown is a defined result.

On the other hand - not finding the stop at all or having "no map data" is not a defined result, because it could possibly be some type of hiccup.

return False, True

visited: bool = fort.get("visited", False)
if self._level_mode and self._ignore_spinned_stops and visited:
self.logger.info("Level mode: Stop already visited - skipping it")
self._db_wrapper.submit_pokestop_visited(self._origin, latitude, longitude)
self._spinnable_data_failcount = 0
return False, True

enabled: bool = fort.get("enabled", True)
Expand All @@ -650,10 +671,16 @@ def _current_position_has_spinnable_stop(self, timestamp: float):
cooldown: int = fort.get("cooldown_complete_ms", 0)
if not cooldown == 0:
self.logger.warning("Can't spin the stop - it has cooldown")
self._spinnable_data_failcount = 0
return fort_type == 1 and enabled and not closed and cooldown == 0, False
# by now we should've found the stop in the GMO
# TODO: consider counter in DB for stop and delete if N reached, reset when updating with GMO
self.logger.warning("Can't spin stop - couldn't find it closeby!")
if stop_found:
self.logger.warning("Unable to confirm the stop being spinnable - likely not standing exactly on top ...")
self._spinnable_data_failcount = 0
else:
self.logger.warning("Unable to find the stop closeby!")
self._spinnable_data_failure()
return False, False

def _open_pokestop(self, timestamp: float):
Expand All @@ -662,22 +689,23 @@ def _open_pokestop(self, timestamp: float):

# let's first check the GMO for the stop we intend to visit and abort if it's disabled, a gym, whatsoever
spinnable_stop, skip_recheck = self._current_position_has_spinnable_stop(timestamp)

recheck_count = 0
while not spinnable_stop and not skip_recheck and not recheck_count > 2:
recheck_count += 1
self.logger.info("Wait for new data to check the stop again ... (attempt {})", recheck_count + 1)
data_received = self._wait_for_data(timestamp=time.time(), proto_to_wait_for=106, timeout=35)
if data_received != LatestReceivedType.UNDEFINED:
spinnable_stop, skip_recheck = self._current_position_has_spinnable_stop(timestamp)

if not spinnable_stop:
if not skip_recheck:
# wait for GMO in case we moved too far away
data_received = self._wait_for_data(
timestamp=timestamp, proto_to_wait_for=106, timeout=35)
if data_received != LatestReceivedType.UNDEFINED:
spinnable_stop, _ = self._current_position_has_spinnable_stop(timestamp)
if not spinnable_stop:
self.logger.info("Stop {}, {} considered to be ignored in the next round due to failed "
"spinnable check", self.current_location.lat, self.current_location.lng)
self._mapping_manager.routemanager_add_coords_to_be_removed(self._routemanager_name,
self.current_location.lat,
self.current_location.lng)
return None
else:
return None
self.logger.info("Stop {}, {} considered to be ignored in the next round due to failed "
"spinnable check", self.current_location.lat, self.current_location.lng)
self._mapping_manager.routemanager_add_coords_to_be_removed(self._routemanager_name,
self.current_location.lat,
self.current_location.lng)
return None

while data_received != LatestReceivedType.STOP and int(to) < 3:
self._stop_process_time = math.floor(time.time())
self._waittime_without_delays = self._stop_process_time
Expand Down Expand Up @@ -776,8 +804,7 @@ def _handle_stop(self, timestamp: float):
self.clear_thread_task = ClearThreadTasks.QUEST
break

elif (data_received == FortSearchResultTypes.TIME or data_received ==
FortSearchResultTypes.OUT_OF_RANGE):
elif (data_received == FortSearchResultTypes.TIME or data_received == FortSearchResultTypes.OUT_OF_RANGE):
self.logger.warning('Softban - return to main screen and open again...')
on_main_menu = self._check_pogo_main_screen(10, False)
if not on_main_menu:
Expand Down Expand Up @@ -905,3 +932,13 @@ def _wait_data_worker(self, latest, proto_to_wait_for, timestamp):
# TODO: latter indicates too high speeds for example
time.sleep(0.5)
return LatestReceivedType.UNDEFINED

def _spinnable_data_failure(self):
if self._spinnable_data_failcount > 9:
self._spinnable_data_failcount = 0
self.logger.warning("Worker failed spinning stop with GMO/data issues 10+ times - restart pogo")
if not self._restart_pogo(mitm_mapper=self._mitm_mapper):
# TODO: put in loop, count up for a reboot ;)
raise InternalStopWorkerException
else:
self._spinnable_data_failcount += 1