Skip to content

[In progress] Improve efficiency of L30 accounts #2336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AEtHeLsYn wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

[In progress] Improve efficiency of L30 accounts #2336

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
31a8f2e
Improve efficiency of L30 accounts
AEtHeLsYn Oct 10, 2017
e7c50c9
Optimize checks and fix catching of login exceptions
AEtHeLsYn Oct 10, 2017
3da3178
Change encounter location to step_location
AEtHeLsYn Oct 11, 2017
efc478f
Fix exhausting interator
AEtHeLsYn Oct 12, 2017
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
107 changes: 71 additions & 36 deletions pogom/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1864,6 +1864,9 @@ def parse_map(args, map_dict, step_location, db_update_queue, wh_update_queue,
sightings = {}
new_spawn_points = []
sp_id_list = []
hlvl_account = None
hlvl_api = None
using_accountset = False

# Consolidate the individual lists in each cell into two lists of Pokemon
# and a list of forts.
Expand Down Expand Up @@ -1935,6 +1938,28 @@ def parse_map(args, map_dict, step_location, db_update_queue, wh_update_queue,
encountered_pokemon = [
(p['encounter_id'], p['spawnpoint_id']) for p in query]

# If we have encounters we get an account form AccountSet to
# encounter all of them in the same parse
if args.encounter:
encounter = next((p for p in wild_pokemon if
p.pokemon_data.pokemon_id in
args.enc_whitelist), None) is not None

if encounter:
# If the host has L30s in the regular account pool, we
# can just use the current account.
if level >= 30:
hlvl_account = account
hlvl_api = api
else:
hlvl_account, hlvl_api = get_hlvlaccount(args,
account_sets,
status,
step_location,
key_scheduler)
if hlvl_account and hlvl_api:
using_accountset = True

for p in wild_pokemon:

sp = SpawnPoint.get_by_id(p.spawn_point_id, p.latitude,
Expand Down Expand Up @@ -2023,9 +2048,10 @@ def parse_map(args, map_dict, step_location, db_update_queue, wh_update_queue,

# Scan for IVs/CP and moves.
pokemon_info = False
if args.encounter and (pokemon_id in args.enc_whitelist):
if (args.encounter and (pokemon_id in args.enc_whitelist) and
hlvl_account and hlvl_api):
pokemon_info = encounter_pokemon(
args, p, account, api, account_sets, status, key_scheduler)
args, p, hlvl_account, hlvl_api, status, step_location)

pokemon[p.encounter_id] = {
'encounter_id': b64encode(str(p.encounter_id)),
Expand Down Expand Up @@ -2089,6 +2115,11 @@ def parse_map(args, map_dict, step_location, db_update_queue, wh_update_queue,
})
wh_update_queue.put(('pokemon', wh_poke))

# We're done with the encounters. If it's from an
# AccountSet, release account back to the pool.
if using_accountset and hlvl_account and hlvl_api:
account_sets.release(hlvl_account)

if forts and (not args.no_pokestops or not args.no_gyms):
if not args.no_pokestops:
stop_ids = [f.id for f in forts if f.type == 1]
Expand Down Expand Up @@ -2351,43 +2382,23 @@ def parse_map(args, map_dict, step_location, db_update_queue, wh_update_queue,
}


def encounter_pokemon(args, pokemon, account, api, account_sets, status,
key_scheduler):
using_accountset = False
hlvl_account = None
pokemon_id = None
result = False
def get_hlvlaccount(args, account_sets, status, step_location, key_scheduler):
try:
hlvl_api = None
pokemon_id = pokemon.pokemon_data.pokemon_id
scan_location = [pokemon.latitude, pokemon.longitude]
# If the host has L30s in the regular account pool, we
# can just use the current account.
if account['level'] >= 30:
hlvl_account = account
hlvl_api = api
else:
# Get account to use for IV and CP scanning.
hlvl_account = account_sets.next('30', scan_location)
using_accountset = True

time.sleep(args.encounter_delay)
# We pick an account in the center of step_location
account_location = [step_location[0], step_location[1]]
hlvl_account = account_sets.next('30', account_location)

# If we didn't get an account, we can't encounter.
if not hlvl_account:
log.error('No L30 accounts are available, please' +
' consider adding more. Skipping encounter.')
return False

# Logging.
log.info('Encountering Pokemon ID %s with account %s at %s, %s.',
pokemon_id, hlvl_account['username'], scan_location[0],
scan_location[1])
return None, None

# If not args.no_api_store is enabled, we need to
# re-use an old API object if it's stored and we're
# using an account from the AccountSet.
if not args.no_api_store and using_accountset:
if not args.no_api_store:
hlvl_api = hlvl_account.get('api', None)

# Make new API for this account if we're not using an
Expand Down Expand Up @@ -2415,11 +2426,11 @@ def encounter_pokemon(args, pokemon, account, api, account_sets, status,
hlvl_api.activate_hash_server(key)

# We have an API object now. If necessary, store it.
if using_accountset and not args.no_api_store:
if not args.no_api_store:
hlvl_account['api'] = hlvl_api

# Set location.
hlvl_api.set_position(*scan_location)
hlvl_api.set_position(*account_location)

# Log in.
check_login(args, hlvl_account, hlvl_api, status['proxy_url'])
Expand All @@ -2430,7 +2441,36 @@ def encounter_pokemon(args, pokemon, account, api, account_sets, status,
log.warning('Expected account of level 30 or higher, ' +
'but account %s is only level %d',
hlvl_account['username'], encounter_level)
return False
return None, None

return hlvl_account, hlvl_api

except Exception as e:
log.exception('There was an error getting L30 account: %s.', e)

# If we have an exception we must free the account
account_sets.release(hlvl_account)

return None, None


def encounter_pokemon(args, pokemon, hlvl_account, hlvl_api, status,
step_location):
pokemon_id = None
result = False
try:
pokemon_id = pokemon.pokemon_data.pokemon_id
scan_location = [step_location[0], step_location[1]]

time.sleep(args.encounter_delay)

# Logging.
log.info('Encountering Pokemon ID %s with account %s at %s, %s.',
pokemon_id, hlvl_account['username'], scan_location[0],
scan_location[1])

# Set location.
hlvl_api.set_position(*scan_location)

# Encounter Pokémon.
encounter_result = encounter(
Expand Down Expand Up @@ -2477,11 +2517,6 @@ def encounter_pokemon(args, pokemon, account, api, account_sets, status,
hlvl_account['username'],
e)

# We're done with the encounter. If it's from an
# AccountSet, release account back to the pool.
if using_accountset:
account_sets.release(hlvl_account)

return result


Expand Down